From 53600d2d9e0b40bd339f072be07d9561e9d9812a Mon Sep 17 00:00:00 2001
From: reuk <reuk@users.noreply.github.com>
Date: Mon, 31 Jan 2022 16:56:00 +0000
Subject: [PATCH] iOS Accessibility:  Allow navigating tables by rows

---
 .../native/accessibility/juce_ios_Accessibility.mm   |  2 +-
 .../juce_mac_AccessibilitySharedCode.mm              | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm b/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
index 4c3793508c..3efbc9dc50 100644
--- a/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
+++ b/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
@@ -438,7 +438,7 @@ private:
 
         static id getAccessibilityDataTableCellElementForRowColumn (id self, SEL, NSUInteger row, NSUInteger column)
         {
-            if (auto* tableInterface = getTableInterface (self))
+            if (auto* tableInterface = getEnclosingInterface (getHandler (self), &AccessibilityHandler::getTableInterface))
                 if (auto* cellHandler = tableInterface->getCellHandler ((int) row, (int) column))
                     return (id) cellHandler->getNativeImplementation();
 
diff --git a/modules/juce_gui_basics/native/accessibility/juce_mac_AccessibilitySharedCode.mm b/modules/juce_gui_basics/native/accessibility/juce_mac_AccessibilitySharedCode.mm
index b188848fde..15e79845e8 100644
--- a/modules/juce_gui_basics/native/accessibility/juce_mac_AccessibilitySharedCode.mm
+++ b/modules/juce_gui_basics/native/accessibility/juce_mac_AccessibilitySharedCode.mm
@@ -71,6 +71,18 @@ protected:
     static AccessibilityTableInterface* getTableInterface (id self) noexcept  { return getInterface (self, &AccessibilityHandler::getTableInterface); }
     static AccessibilityCellInterface*  getCellInterface  (id self) noexcept  { return getInterface (self, &AccessibilityHandler::getCellInterface); }
 
+    template <typename MemberFn>
+    static auto getEnclosingInterface (AccessibilityHandler* handler, MemberFn fn) noexcept -> decltype ((std::declval<AccessibilityHandler>().*fn)())
+    {
+        if (handler == nullptr)
+            return nullptr;
+
+        if (auto* interface = (handler->*fn)())
+            return interface;
+
+        return getEnclosingInterface (handler->getParent(), fn);
+    }
+
     static bool hasEditableText (AccessibilityHandler& handler) noexcept
     {
         return handler.getRole() == AccessibilityRole::editableText