From 2abf68d86682a1cb862de598ff28b7987283a07b Mon Sep 17 00:00:00 2001
From: ed <eddavies95@gmail.com>
Date: Wed, 22 Sep 2021 16:24:47 +0100
Subject: [PATCH] iOS Accessibility:  Create UIAccessibilityReadingContent
 protocol-conforming classes dynamically for text elements

---
 .../accessibility/juce_ios_Accessibility.mm   | 47 +++++++++++--------
 1 file changed, 28 insertions(+), 19 deletions(-)

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 dd2aa67cd1..02748901e5 100644
--- a/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
+++ b/modules/juce_gui_basics/native/accessibility/juce_ios_Accessibility.mm
@@ -176,16 +176,21 @@ private:
     class AccessibilityElement  : public AccessibleObjCClass<UIAccessibilityElement>
     {
     public:
+        enum class Type  { defaultElement, textElement };
+
         static Holder create (AccessibilityHandler& handler)
         {
-            static AccessibilityElement cls;
-            Holder element ([cls.createInstance() initWithAccessibilityContainer: (id) handler.getComponent().getWindowHandle()]);
+            static AccessibilityElement cls     { Type::defaultElement };
+            static AccessibilityElement textCls { Type::textElement };
+
+            id instance = (hasEditableText (handler) ? textCls : cls).createInstance();
+
+            Holder element ([instance initWithAccessibilityContainer: (id) handler.getComponent().getWindowHandle()]);
             object_setInstanceVariable (element.get(), "handler", &handler);
             return element;
         }
 
-    private:
-        AccessibilityElement()
+        AccessibilityElement (Type elementType)
         {
             addMethod (@selector (isAccessibilityElement),     getIsAccessibilityElement,     "c@:");
             addMethod (@selector (accessibilityContainer),     getAccessibilityContainer,     "@@:");
@@ -205,24 +210,28 @@ private:
             addMethod (@selector (accessibilityIncrement), accessibilityPerformIncrement, "c@:");
             addMethod (@selector (accessibilityDecrement), accessibilityPerformDecrement, "c@:");
 
-            addMethod (@selector (accessibilityLineNumberForPoint:),   getAccessibilityLineNumberForPoint,   "i@:", @encode (CGPoint));
-            addMethod (@selector (accessibilityContentForLineNumber:), getAccessibilityContentForLineNumber, "@@:i");
-            addMethod (@selector (accessibilityFrameForLineNumber:),   getAccessibilityFrameForLineNumber,   @encode (CGRect), "@:i");
-            addMethod (@selector (accessibilityPageContent),           getAccessibilityPageContent,          "@@:");
-
             addMethod (@selector (accessibilityDataTableCellElementForRow:column:), getAccessibilityDataTableCellElementForRowColumn, "@@:ii");
             addMethod (@selector (accessibilityRowCount),                           getAccessibilityRowCount,                         "i@:");
             addMethod (@selector (accessibilityColumnCount),                        getAccessibilityColumnCount,                      "i@:");
             addMethod (@selector (accessibilityRowRange),                           getAccessibilityRowIndexRange,                    @encode (NSRange), "@:");
             addMethod (@selector (accessibilityColumnRange),                        getAccessibilityColumnIndexRange,                 @encode (NSRange), "@:");
 
-            addProtocol (@protocol (UIAccessibilityReadingContent));
+            if (elementType == Type::textElement)
+            {
+                addMethod (@selector (accessibilityLineNumberForPoint:),   getAccessibilityLineNumberForPoint,   "i@:", @encode (CGPoint));
+                addMethod (@selector (accessibilityContentForLineNumber:), getAccessibilityContentForLineNumber, "@@:i");
+                addMethod (@selector (accessibilityFrameForLineNumber:),   getAccessibilityFrameForLineNumber,   @encode (CGRect), "@:i");
+                addMethod (@selector (accessibilityPageContent),           getAccessibilityPageContent,          "@@:");
+
+                addProtocol (@protocol (UIAccessibilityReadingContent));
+            }
 
             addIvar<UIAccessibilityElement*> ("container");
 
             registerClass();
         }
 
+    private:
         //==============================================================================
         static UIAccessibilityElement* getContainer (id self)
         {
@@ -377,6 +386,15 @@ private:
             return NO;
         }
 
+        static id getAccessibilityDataTableCellElementForRowColumn (id self, SEL, NSUInteger row, NSUInteger column)
+        {
+            if (auto* tableInterface = getTableInterface (self))
+                if (auto* cellHandler = tableInterface->getCellHandler ((int) row, (int) column))
+                    return (id) cellHandler->getNativeImplementation();
+
+            return nil;
+        }
+
         static NSInteger getAccessibilityLineNumberForPoint (id self, SEL, CGPoint point)
         {
             if (auto* handler = getHandler (self))
@@ -433,15 +451,6 @@ private:
             return nil;
         }
 
-        static id getAccessibilityDataTableCellElementForRowColumn (id self, SEL, NSUInteger row, NSUInteger column)
-        {
-            if (auto* tableInterface = getTableInterface (self))
-                if (auto* cellHandler = tableInterface->getCellHandler ((int) row, (int) column))
-                    return (id) cellHandler->getNativeImplementation();
-
-            return nil;
-        }
-
         //==============================================================================
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AccessibilityElement)
     };