react-native-a11y-order 1.0.0 → 2.0.0-rc1

package/README.md

@@ -12,7 +12,7 @@ Native-first React Native library for controlling screen reader focus order on i
 - 🃏 **Cards with inner buttons** — card action and nested controls, both accessible at once
 - 🔒 **Focus trap** — keep VoiceOver and TalkBack inside modals, no leaking
 - 📣 **Transition announcements** — notify the screen reader on screen and panel changes
-- ⚡ New Architecture · Old Architecture · Bridgeless · Expo prebuild
+- ⚡ New Architecture · Bridgeless · Expo prebuild
 
 > [!TIP]
 > Before adding this library, try `<View collapsable={false}>` — it fixes most simple focus order issues with no extra dependencies. [Learn more](./docs/guides/collapsable.md)

package/android/build.gradle

@@ -1,110 +1,55 @@
-def reactNativeArchitectures() {
-  def value = rootProject.getProperties().get("reactNativeArchitectures")
-  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def isNewArchitectureEnabled() {
-  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
-}
-
-apply plugin: "com.android.library"
+buildscript {
+  ext.A11yOrder = [
+    kotlinVersion: "2.0.21",
+    minSdkVersion: 24,
+    compileSdkVersion: 36
+  ]
+
+  ext.getExtOrDefault = { prop ->
+    if (rootProject.ext.has(prop)) {
+      return rootProject.ext.get(prop)
+    }
 
+    return A11yOrder[prop]
+  }
 
-def appProject = rootProject.allprojects.find { it.plugins.hasPlugin('com.android.application') }
+  repositories {
+    google()
+    mavenCentral()
+  }
 
-if (isNewArchitectureEnabled()) {
-  apply plugin: "com.facebook.react"
+  dependencies {
+    classpath "com.android.tools.build:gradle:8.7.2"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
+  }
 }
 
-def getExtOrDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["A11yOrder_" + name]
-}
 
-def getExtOrIntegerDefault(name) {
-  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["A11yOrder_" + name]).toInteger()
+apply plugin: "com.android.library"
+
+if (project.extensions.findByName("kotlin") == null) {
+  apply plugin: "kotlin-android"
 }
 
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
-  def major = parsed[0].toInteger()
-  def minor = parsed[1].toInteger()
 
-  // Namespace support was added in 7.3.0
-  return (major == 7 && minor >= 3) || major >= 8
-}
+apply plugin: "com.facebook.react"
 
 android {
-    if (supportsNamespace()) {
-    namespace "com.a11yorder"
+  namespace "com.a11yorder"
 
-    sourceSets {
-      main {
-        manifest.srcFile "src/main/AndroidManifestNew.xml"
-      }
-    }
-  }
-
-  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+  compileSdkVersion getExtOrDefault("compileSdkVersion")
 
   defaultConfig {
-    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
-    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
-    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-  }
-
-  buildFeatures {
-    buildConfig true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-    }
-  }
-
-  lintOptions {
-    disable "GradleCompatible"
+    minSdkVersion getExtOrDefault("minSdkVersion")
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  sourceSets {
-    main {
-      if (isNewArchitectureEnabled()) {
-        java.srcDirs += [
-          "src/newarch",
-          "generated/java",
-          "generated/jni"
-        ]
-      } else {
-        java.srcDirs += ["src/oldarch"]
-      }
-    }
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 }
 
-repositories {
-  mavenCentral()
-  google()
-}
-
-def kotlin_version = getExtOrDefault("kotlinVersion")
-
 dependencies {
-  // For < 0.71, this will be from the local maven repo
-  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"
-}
-
-
-if (isNewArchitectureEnabled()) {
-  react {
-    jsRootDir = file("../src/")
-    libraryName = "A11yOrder"
-    codegenJavaPackageName = "com.a11yorder"
-  }
+  implementation "com.facebook.react:react-android"
 }

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.a11yorder">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

package/android/src/{newarch → main/java/com/a11yorder}/A11yIndexViewManagerSpec.java

@@ -1,12 +1,5 @@
 package com.a11yorder;
 
-import android.view.ViewGroup;
-
-import androidx.annotation.Nullable;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.A11yIndexViewManagerDelegate;
 import com.facebook.react.viewmanagers.A11yIndexViewManagerInterface;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;

package/android/src/{newarch → main/java/com/a11yorder}/A11yLockViewManagerSpec.java

@@ -1,6 +1,5 @@
 package com.a11yorder;
 
-import com.a11yorder.views.A11yLockView.A11yLockView;
 import com.facebook.react.viewmanagers.A11yLockManagerInterface;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;

package/android/src/main/java/com/a11yorder/A11yOrderPackage.java

@@ -52,7 +52,7 @@ public class A11yOrderPackage extends BaseReactPackage {
           false,                   // canOverrideExistingModule
           false,                   // needsEagerInit
           false,                   // isCxxModule
-          BuildConfig.IS_NEW_ARCHITECTURE_ENABLED // isTurboModule
+          true                     // isTurboModule
         ));
         return map;
       }

package/android/src/{newarch → main/java/com/a11yorder}/A11yOrderViewManagerSpec.java

@@ -2,11 +2,6 @@ package com.a11yorder;
 
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
-
-import com.facebook.react.uimanager.ViewGroupManager;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.A11yOrderViewManagerDelegate;
 import com.facebook.react.viewmanagers.A11yOrderViewManagerInterface;
 import com.facebook.react.views.view.ReactViewManager;
 

package/ios/extensions/RCTModalHostViewComponentView+RNAOA11yOrder.h

@@ -10,21 +10,12 @@
 
 #import <UIKit/UIKit.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
-#import "RCTModalHostViewComponentView.h"
+#import <React/RCTModalHostViewComponentView.h>
 
 
 @interface RCTModalHostViewComponentView (RNAOA11yOrder)
 @end
 
-#else
-
-#import "RCTModalHostView.h"
-
-@interface RCTModalHostView (RNAOA11yOrder)
-@end
-
-#endif
 
 #endif /* RCTModalHostViewComponentView_RNAOA11yOrder_h */

package/ios/extensions/RCTModalHostViewComponentView+RNAOA11yOrder.mm

@@ -12,8 +12,6 @@
 #import "RNAOA11yAnnounceService.h"
 #import "RCTModalHostViewComponentView+RNAOA11yOrder.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 
 @implementation RCTModalHostViewComponentView (RNAOA11yOrder)
 
@@ -48,35 +46,3 @@ RNAO_INSTALL_SWIZZLES(RNAORegisterModalPresentationSwizzles)
 
 @end
 
-#else
-
-@implementation RCTModalHostView (RNAOA11yOrder)
-
-static void RNAORegisterModalPresentationSwizzles(void) {
-    Class cls = objc_getClass("RCTModalHostView");
-    if (!cls) return;
-    RNAOSwizzleInstanceMethod(cls,
-        @selector(ensurePresentedOnlyIfNeeded),
-        @selector(rnao_ensurePresentedOnlyIfNeeded));
-    RNAOSwizzleInstanceMethod(cls,
-        @selector(dismissModalViewController),
-        @selector(rnao_dismissModalViewController));
-}
-
-RNAO_INSTALL_SWIZZLES(RNAORegisterModalPresentationSwizzles)
-
-- (void)rnao_ensurePresentedOnlyIfNeeded
-{
-    [self rnao_ensurePresentedOnlyIfNeeded];
-    [[RNAOA11yAnnounceService shared] temporarilyLockAnnounce: 0.1];
-}
-
-- (void)rnao_dismissModalViewController
-{
-    [self rnao_dismissModalViewController];
-    [[RNAOA11yAnnounceService shared] temporarilyLockAnnounce: 0.1];
-}
-
-@end
-
-#endif

package/ios/extensions/UIView+RNAOA11yOrder.mm

@@ -12,11 +12,7 @@
 #import "RNAOSwizzleInstall.h"
 #import <objc/runtime.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
-#else
-#import <React/RCTView.h>
-#endif
 
 @interface RNAOWeakWrapper : NSObject
 @property (nonatomic, weak) id value;
@@ -57,11 +53,7 @@ static char kRNAOScreenReaderFocusDelegate;
 
 
 static void RNAORegisterViewFocusSwizzles(void) {
-  #ifdef RCT_NEW_ARCH_ENABLED
     Class swizzleClass = objc_getClass("RCTViewComponentView");
-  #else
-    Class swizzleClass = objc_getClass("RCTView");
-  #endif
   if (!swizzleClass) return;
 
   RNAOSwizzleInstanceMethod(swizzleClass,

package/ios/helpers/RNAOFabricEventHelper/RNAOFabricEventHelper.h

@@ -5,7 +5,6 @@
 //  Created by Artur Kalach on 21/10/2025.
 //
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #ifndef RNAOFabricEventHelper_h
 #define RNAOFabricEventHelper_h
@@ -25,4 +24,3 @@ using namespace facebook::react;
 
 #endif /* RNCEKVFabricEventHelper_h */
 
-#endif

package/ios/helpers/RNAOFabricEventHelper/RNAOFabricEventHelper.mm

@@ -7,7 +7,6 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <Foundation/Foundation.h>
 
 #import "RNAOFabricEventHelper.h"
@@ -60,6 +59,4 @@ using namespace facebook::react;
 }
 
 
-
 @end
-#endif

package/ios/modules/RNAOA11yAnnounceModule.h

@@ -8,30 +8,10 @@
 
 #import <Foundation/Foundation.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <RNA11yOrderSpec/RNA11yOrderSpec.h>
 
 @interface RNAOA11yAnnounceModule : NSObject <NativeA11yAnnounceModuleSpec>
 
-#else
-
-#import <React/RCTBridgeModule.h>
-
-@interface RNAOA11yAnnounceModule : NSObject <RCTBridgeModule>
-
-- (void)announce:(NSString *)message
-         options:(NSDictionary *)options
-         resolve:(RCTPromiseResolveBlock)resolve
-          reject:(RCTPromiseRejectBlock)reject;
-
-- (void)cancel:(NSString *)announcementId
-        resolve:(RCTPromiseResolveBlock)resolve
-         reject:(RCTPromiseRejectBlock)reject;
-
-- (void)cancelAll:(RCTPromiseResolveBlock)resolve
-           reject:(RCTPromiseRejectBlock)reject;
-
-#endif
 
 @end
 

package/ios/modules/RNAOA11yAnnounceModule.mm

@@ -9,9 +9,7 @@
 #import "RNAOA11yAnnounceService.h"
 #import "RNAOSpeechAttributes.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook::react;
-#endif
 
 // ─────────────────────────────────────────────────────────────────────────────
 // MARK: - Pending entry
@@ -134,7 +132,6 @@ RCT_EXPORT_MODULE(A11yAnnounceModule);
     }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 - (void)announce:(NSString *)message
          options:(JS::NativeA11yAnnounceModule::AnnounceOptions &)options
@@ -157,19 +154,6 @@ RCT_EXPORT_MODULE(A11yAnnounceModule);
     [self _announceMessage:message opts:opts resolve:resolve reject:reject];
 }
 
-#else
-
-RCT_EXPORT_METHOD(announce:(NSString *)message
-                   options:(NSDictionary *)options
-                   resolve:(RCTPromiseResolveBlock)resolve
-                    reject:(RCTPromiseRejectBlock)reject)
-{
-    NSDictionary *opts = ([options isKindOfClass:[NSDictionary class]]) ? options : @{};
-    [self _announceMessage:message opts:opts resolve:resolve reject:reject];
-}
-
-#endif // RCT_NEW_ARCH_ENABLED
-
 
 // ─────────────────────────────────────────────────────────────────────────────
 // MARK: - cancel / cancelAll
@@ -235,12 +219,10 @@ RCT_EXPORT_METHOD(cancelAll:(RCTPromiseResolveBlock)resolve
 }
 
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params
 {
     return std::make_shared<facebook::react::NativeA11yAnnounceModuleSpecJSI>(params);
 }
-#endif
 
 @end

package/ios/views/RNAOA11yCardView/RNAOA11yCardView.h

@@ -6,7 +6,6 @@
 #ifndef RNAOA11yCardView_h
 #define RNAOA11yCardView_h
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <React/RCTViewComponentView.h>
 
@@ -17,13 +16,5 @@ NS_ASSUME_NONNULL_BEGIN
 
 NS_ASSUME_NONNULL_END
 
-#else
-
-#import <React/RCTView.h>
-
-@interface RNAOA11yCardView : RCTView
-@end
-
-#endif
 
 #endif /* RNAOA11yCardView_h */

package/ios/views/RNAOA11yCardView/RNAOA11yCardView.mm

@@ -5,15 +5,14 @@
 
 #import "RNAOA11yCardView.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #import <react/renderer/components/RNA11yOrderSpec/ComponentDescriptors.h>
+#import <react/renderer/components/RNA11yOrderSpec/Props.h>
 #import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTFabricComponentsPlugins.h>
 
 using namespace facebook::react;
 
-#endif
 
 @implementation RNAOA11yCardView {
   UIFocusGuide *_contentFocusGuide;
@@ -21,6 +20,15 @@ using namespace facebook::react;
   NSString *_contentFocusGroupIdentifier;
 }
 
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const A11yCardViewProps>();
+    _props = defaultProps;
+  }
+  return self;
+}
+
 - (nullable NSArray *)accessibilityElements {
   return self.subviews;
 }
@@ -52,7 +60,6 @@ using namespace facebook::react;
   }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView
                           index:(NSInteger)index {
@@ -68,16 +75,5 @@ Class<RCTComponentViewProtocol> A11yCardViewCls(void) {
   return RNAOA11yCardView.class;
 }
 
-#else
-
-- (void)didAddSubview:(UIView *)subview {
-  [super didAddSubview:subview];
-  NSUInteger index = [self.subviews indexOfObject:subview];
-  if (index != NSNotFound) {
-    [self assignFocusGroupIdentifierToChild:subview atIndex:(NSInteger)index];
-  }
-}
-
-#endif
 
 @end

package/ios/views/RNAOA11yIndexView/RNAOA11yIndexView.mm

@@ -1,24 +1,21 @@
 #import "RNAOA11yIndexView.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #include <string>
 #import <react/renderer/components/RNA11yOrderSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNA11yOrderSpec/EventEmitters.h>
 #import <react/renderer/components/RNA11yOrderSpec/Props.h>
 #import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTFabricComponentsPlugins.h>
 
 using namespace facebook::react;
 
 @interface RNAOA11yIndexView () <RCTA11yIndexViewViewProtocol>
 @end
 
-#endif
 
 @implementation RNAOA11yIndexView
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
@@ -67,6 +64,5 @@ Class<RCTComponentViewProtocol> A11yIndexViewCls(void) {
   return RNAOA11yIndexView.class;
 }
 
-#endif
 
 @end

package/ios/views/RNAOA11yLockView/RNAOA11yLockView.h

@@ -13,7 +13,6 @@
 #import "RNAOViewItemProtocol.h"
 
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -26,15 +25,4 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 
-#else /* RCT_NEW_ARCH_ENABLED */
-
-#import <React/RCTView.h>
-@interface RNAOA11yLockView : RCTView
-@property (nonatomic, assign) BOOL lockDisabled;
-@property (nonatomic, assign) NSInteger componentType;
-@end
-
-#endif
-
-
 #endif /* RNAOA11yLockView_h */

package/ios/views/RNAOA11yLockView/RNAOA11yLockView.mm

@@ -8,17 +8,15 @@
 #import <Foundation/Foundation.h>
 
 #import <UIKit/UIKit.h>
-#import <React/RCTViewManager.h>
 #import "RNAOA11yLockView.h"
 
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #include <string>
 #import <react/renderer/components/RNA11yOrderSpec/ComponentDescriptors.h>
 #import <react/renderer/components/RNA11yOrderSpec/EventEmitters.h>
 #import <react/renderer/components/RNA11yOrderSpec/Props.h>
 #import <react/renderer/components/RNA11yOrderSpec/RCTComponentViewHelpers.h>
-#import "RCTFabricComponentsPlugins.h"
+#import <React/RCTFabricComponentsPlugins.h>
 
 using namespace facebook::react;
 
@@ -26,9 +24,6 @@ using namespace facebook::react;
 
 @end
 
-#endif
-
-
 
 @implementation RNAOA11yLockView
 
@@ -53,7 +48,6 @@ using namespace facebook::react;
                                                 object:nil];
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)prepareForRecycle {
   [super prepareForRecycle];
   _lockDisabled = NO;
@@ -62,7 +56,6 @@ using namespace facebook::react;
                                                   name:UIAccessibilityElementFocusedNotification
                                                 object:nil];
 }
-#endif
 
 - (void)onAccessibilityFocusChanged:(NSNotification *)notification {
   if (_lockDisabled) return;
@@ -112,8 +105,6 @@ using namespace facebook::react;
 }
 
 
-#ifdef RCT_NEW_ARCH_ENABLED
-
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
   return concreteComponentDescriptorProvider<A11yLockComponentDescriptor>();
@@ -143,6 +134,5 @@ Class<RCTComponentViewProtocol> A11yLockCls(void)
   return RNAOA11yLockView.class;
 }
 
-#endif
 
 @end

package/ios/views/RNAOA11yOrderView/RNAOA11yOrderView.h

@@ -11,9 +11,7 @@
 
 
 #import <UIKit/UIKit.h>
-#import <React/RCTUITextField.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 
 
@@ -28,16 +26,4 @@ NS_ASSUME_NONNULL_BEGIN
 NS_ASSUME_NONNULL_END
 
 
-#else /* RCT_NEW_ARCH_ENABLED */
-
-
-#import <React/RCTView.h>
-@interface RNAOA11yOrderView : RCTView
-
-@property NSString* orderKey;
-
-@end
-
-
-#endif /* RCT_NEW_ARCH_ENABLED */
 #endif /* RNAOA11yOrderView_h */