react-native-a11y-order 0.8.2 → 0.9.1-rc

package/ios/services/RNAOSortedMap/RNAOSortedMap.mm

@@ -12,6 +12,8 @@
 @implementation RNAOSortedMap {
   NSMapTable *_dictionary;
   NSMutableArray<NSNumber *> *_sortedKeys;
+  NSMutableArray *_cachedValues;
+  BOOL _isDirty;
 }
 
 - (instancetype)init {
@@ -19,78 +21,77 @@
   if (self) {
     _dictionary = [NSMapTable strongToWeakObjectsMapTable];
     _sortedKeys = [NSMutableArray array];
+    _cachedValues = [NSMutableArray array];
+    _isDirty = YES;
   }
   return self;
 }
 
-- (void)updateSortedKey:(NSNumber*)position {
-  if([_sortedKeys count] == 0) {
-    [_sortedKeys addObject: position];
-  } else {
-    NSInteger indexOfFirstLarger = -1;
-    
-    for (NSInteger i = 0; i < _sortedKeys.count; i++) {
-      NSNumber *number = _sortedKeys[i];
-      if ([number integerValue] > [position integerValue]) {
-        indexOfFirstLarger = i;
-        break;
-      }
-    }
-    
-    
-    if(indexOfFirstLarger == -1) {
-      [_sortedKeys addObject: position];
-    } else {
-      [_sortedKeys insertObject:position atIndex:indexOfFirstLarger];
-    }
-  }
+- (void)updateSortedKey:(NSNumber *)position {
+  NSRange range = NSMakeRange(0, _sortedKeys.count);
+  NSUInteger insertIndex = [_sortedKeys indexOfObject:position
+                                        inSortedRange:range
+                                              options:NSBinarySearchingInsertionIndex
+                                      usingComparator:^NSComparisonResult(NSNumber *a, NSNumber *b) {
+    return [a compare:b];
+  }];
+  [_sortedKeys insertObject:position atIndex:insertIndex];
 }
 
-- (void)put:(NSNumber*)position withObject:(NSObject*)obj {
-  if([_dictionary objectForKey:position] == nil) {
-    [self updateSortedKey: position];
+- (void)put:(NSNumber *)position withObject:(NSObject *)obj {
+  _isDirty = YES;
+  if ([_dictionary objectForKey:position] == nil) {
+    [self updateSortedKey:position];
   }
-  [_dictionary setObject: obj forKey:position];
+  [_dictionary setObject:obj forKey:position];
 }
 
-- (void)remove:(NSNumber*)position {
-  NSUInteger positionIndex = [_sortedKeys indexOfObject:position];
-  if (positionIndex != NSNotFound) {
-    [_sortedKeys removeObjectAtIndex:positionIndex];
+- (void)remove:(NSNumber *)position {
+  _isDirty = YES;
+  NSUInteger index = [_sortedKeys indexOfObject:position];
+  if (index != NSNotFound) {
+    [_sortedKeys removeObjectAtIndex:index];
   }
   [_dictionary removeObjectForKey:position];
 }
 
-
-- (void)remove:(NSNumber*)position withObject:(NSObject*)obj {
-  if([_dictionary objectForKey:position] == obj) {
-    NSUInteger positionIndex = [_sortedKeys indexOfObject:position];
-    if (positionIndex != NSNotFound) {
-      [_sortedKeys removeObjectAtIndex:positionIndex];
+- (void)remove:(NSNumber *)position withObject:(NSObject *)obj {
+  if ([_dictionary objectForKey:position] == obj) {
+    _isDirty = YES;
+    NSUInteger index = [_sortedKeys indexOfObject:position];
+    if (index != NSNotFound) {
+      [_sortedKeys removeObjectAtIndex:index];
     }
     [_dictionary removeObjectForKey:position];
   }
 }
 
+- (void)update:(NSNumber *)lastPosition withPosition:(NSNumber *)position withObject:(NSObject *)obj {
+  [self remove:lastPosition withObject:obj];
+  [self put:position withObject:obj];
+}
+
 - (void)clear {
+  _isDirty = YES;
   [_dictionary removeAllObjects];
   [_sortedKeys removeAllObjects];
+  [_cachedValues removeAllObjects];
 }
 
-- (void)update:(NSNumber*)lastPosition withPosition:(NSNumber*)position withObject:(NSObject*)obj {
-  [self remove:lastPosition withObject: obj];
-  [self put:position withObject:obj];
-}
-
-- (NSArray*)getValues {
-  NSMutableArray *result = [NSMutableArray arrayWithCapacity:_sortedKeys.count];
-  for (NSNumber *key in _sortedKeys) {
-    NSObject *object = [_dictionary objectForKey:key];
-    if (object) {
-      [result addObject:object];
+- (NSArray *)getValues {
+  if (_isDirty) {
+    [_cachedValues removeAllObjects];
+    for (NSNumber *key in _sortedKeys) {
+      NSObject *obj = [_dictionary objectForKey:key];
+      if (obj) { [_cachedValues addObject:obj]; }
     }
+    _isDirty = NO;
   }
-  return result;
+  return [NSArray arrayWithArray:_cachedValues];
+}
+
+- (BOOL)isEmpty {
+  return _dictionary.count == 0;
 }
 
 @end

package/ios/views/RNAOA11yLockView/RNAOA11yLockView.h

@@ -16,10 +16,11 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTViewComponentView.h>
 
-
 NS_ASSUME_NONNULL_BEGIN
 
 @interface RNAOA11yLockView : RCTViewComponentView
+@property (nonatomic, assign) BOOL lockDisabled;
+@property (nonatomic, assign) NSInteger componentType;
 @end
 
 NS_ASSUME_NONNULL_END
@@ -27,9 +28,10 @@ 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

package/ios/views/RNAOA11yLockView/RNAOA11yLockView.mm

@@ -7,7 +7,6 @@
 
 #import <Foundation/Foundation.h>
 
-
 #import <UIKit/UIKit.h>
 #import <React/RCTViewManager.h>
 #import "RNAOA11yLockView.h"
@@ -33,6 +32,85 @@ using namespace facebook::react;
 
 @implementation RNAOA11yLockView
 
+- (void)didMoveToSuperview {
+  [super didMoveToSuperview];
+
+  if (self.superview) {
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(onAccessibilityFocusChanged:)
+                                                 name:UIAccessibilityElementFocusedNotification
+                                               object:nil];
+  } else {
+    [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                    name:UIAccessibilityElementFocusedNotification
+                                                  object:nil];
+  }
+}
+
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIAccessibilityElementFocusedNotification
+                                                object:nil];
+}
+
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  _lockDisabled = NO;
+  _componentType = 0;
+  [[NSNotificationCenter defaultCenter] removeObserver:self
+                                                  name:UIAccessibilityElementFocusedNotification
+                                                object:nil];
+}
+#endif
+
+- (void)onAccessibilityFocusChanged:(NSNotification *)notification {
+  if (_lockDisabled) return;
+
+  id element = notification.userInfo[UIAccessibilityFocusedElementKey];
+  if (![element isKindOfClass:[UIView class]]) return;
+
+  UIView *focused = (UIView *)element;
+  if (![focused isDescendantOfView:self]) {
+    UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, self);
+  }
+}
+
+- (void)setLockDisabled:(BOOL)lockDisabled {
+  _lockDisabled = lockDisabled;
+  [self requestScreenReaderFocus];
+}
+
+- (void)setComponentType:(NSInteger)componentType {
+  _componentType = componentType;
+}
+
+- (BOOL)shouldUpdateFocusInContext:(UIFocusUpdateContext *)context {
+  if (_lockDisabled) {
+    return [super shouldUpdateFocusInContext:context];
+  }
+
+  UIView *nextFocus = (UIView *)context.nextFocusedView;
+  if (nextFocus != nil && ![nextFocus isDescendantOfView:self]) {
+    return NO;
+  }
+
+  return [super shouldUpdateFocusInContext:context];
+}
+
+- (void)requestScreenReaderFocus {
+  if (_lockDisabled) return;
+  UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, self);
+}
+
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+
+  if (self.window) {
+    [self requestScreenReaderFocus];
+  }
+}
+
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
@@ -41,17 +119,25 @@ using namespace facebook::react;
   return concreteComponentDescriptorProvider<A11yLockComponentDescriptor>();
 }
 
-
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
     static const auto defaultProps = std::make_shared<const A11yLockProps>();
     _props = defaultProps;
   }
-  
+
   return self;
 }
 
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+  const auto &newViewProps = *std::static_pointer_cast<A11yLockProps const>(props);
+  [super updateProps:props oldProps:oldProps];
+
+  self.lockDisabled = newViewProps.lockDisabled;
+  self.componentType = newViewProps.componentType;
+}
+
 Class<RCTComponentViewProtocol> A11yLockCls(void)
 {
   return RNAOA11yLockView.class;

package/ios/views/RNAOA11yLockView/RNAOA11yLockViewManager.mm

@@ -22,4 +22,7 @@ RCT_EXPORT_MODULE(A11yLock)
   return [[RNAOA11yLockView alloc] init];
 }
 
+RCT_EXPORT_VIEW_PROPERTY(lockDisabled, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(componentType, NSInteger)
+
 @end

package/lib/commonjs/components/A11yLock/A11yBaseLock/A11yBaseLock.js

@@ -4,6 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.A11yBaseLock = void 0;
-var _reactNative = require("react-native");
-const A11yBaseLock = exports.A11yBaseLock = _reactNative.View;
+var _react = _interopRequireDefault(require("react"));
+var _A11yLockNativeComponent = _interopRequireDefault(require("../../../nativeSpecs/A11yLockNativeComponent"));
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const A11yBaseLock = exports.A11yBaseLock = /*#__PURE__*/_react.default.memo(({
+  lockDisabled = false,
+  componentType = 0,
+  forceLock = false,
+  ...props
+}) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yLockNativeComponent.default, {
+    ...props,
+    containerKey: "is-not-needed",
+    componentType: componentType,
+    lockDisabled: lockDisabled,
+    forceLock: forceLock
+  });
+});
 //# sourceMappingURL=A11yBaseLock.js.map

package/lib/commonjs/components/A11yLock/A11yBaseLock/A11yBaseLock.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","A11yBaseLock","exports","View"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAGO,MAAMC,YAAY,GAAAC,OAAA,CAAAD,YAAA,GACvBE,iBAAuD","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_A11yLockNativeComponent","_jsxRuntime","e","__esModule","default","A11yBaseLock","exports","React","memo","lockDisabled","componentType","forceLock","props","jsx","containerKey"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAAmF,IAAAE,WAAA,GAAAF,OAAA;AAAA,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAG5E,MAAMG,YAAY,GAAAC,OAAA,CAAAD,YAAA,gBAAGE,cAAK,CAACC,IAAI,CACpC,CAAC;EACCC,YAAY,GAAG,KAAK;EACpBC,aAAa,GAAG,CAAC;EACjBC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACE,IAAAX,WAAA,CAAAY,GAAA,EAACb,wBAAA,CAAAI,OAAuB;IAAA,GAClBQ,KAAK;IACTE,YAAY,EAAC,eAAe;IAC5BJ,aAAa,EAAEA,aAAc;IAC7BD,YAAY,EAAEA,YAAa;IAC3BE,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN,CACF,CAAC","ignoreList":[]}

package/lib/commonjs/components/A11yLock/A11yFocusTrap/A11yFocusTrap.js

@@ -7,14 +7,30 @@ exports.A11yFocusTrap = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactNative = require("react-native");
 var _A11yFocusTrapMountWrapper = require("./A11yFocusTrapMountWrapper");
+var _A11yBaseLock = require("../A11yBaseLock/A11yBaseLock");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const A11yFocusTrap = props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yFocusTrapMountWrapper.A11yFocusTrapMountWrapper, {
-  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-    collapsable: false,
-    accessibilityViewIsModal: true,
-    ...props
-  })
-});
+const A11yFocusTrap = ({
+  forceLock = false,
+  ...props
+}) => {
+  if (forceLock) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yFocusTrapMountWrapper.A11yFocusTrapMountWrapper, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yBaseLock.A11yBaseLock, {
+        collapsable: false,
+        accessibilityViewIsModal: true,
+        forceLock: forceLock,
+        ...props
+      })
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yFocusTrapMountWrapper.A11yFocusTrapMountWrapper, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+      collapsable: false,
+      accessibilityViewIsModal: true,
+      ...props
+    })
+  });
+};
 exports.A11yFocusTrap = A11yFocusTrap;
 //# sourceMappingURL=A11yFocusTrap.js.map

package/lib/commonjs/components/A11yLock/A11yFocusTrap/A11yFocusTrap.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_A11yFocusTrapMountWrapper","_jsxRuntime","e","__esModule","default","A11yFocusTrap","props","jsx","A11yFocusTrapMountWrapper","children","View","collapsable","accessibilityViewIsModal","exports"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,0BAAA,GAAAF,OAAA;AAAwE,IAAAG,WAAA,GAAAH,OAAA;AAAA,SAAAD,uBAAAK,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAEjE,MAAMG,aAAa,GAAIC,KAAoB,iBAChD,IAAAL,WAAA,CAAAM,GAAA,EAACP,0BAAA,CAAAQ,yBAAyB;EAAAC,QAAA,eACxB,IAAAR,WAAA,CAAAM,GAAA,EAACR,YAAA,CAAAW,IAAI;IAACC,WAAW,EAAE,KAAM;IAACC,wBAAwB,EAAE,IAAK;IAAA,GAAKN;EAAK,CAAG;AAAC,CAC9C,CAC5B;AAACO,OAAA,CAAAR,aAAA,GAAAA,aAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_A11yFocusTrapMountWrapper","_A11yBaseLock","_jsxRuntime","e","__esModule","default","A11yFocusTrap","forceLock","props","jsx","A11yFocusTrapMountWrapper","children","A11yBaseLock","collapsable","accessibilityViewIsModal","View","exports"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AAEA,IAAAE,0BAAA,GAAAF,OAAA;AACA,IAAAG,aAAA,GAAAH,OAAA;AAA4D,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAD,uBAAAM,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAErD,MAAMG,aAAa,GAAGA,CAAC;EAC5BC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACU,CAAC,KAAK;EACnB,IAAID,SAAS,EAAE;IACb,oBACE,IAAAL,WAAA,CAAAO,GAAA,EAACT,0BAAA,CAAAU,yBAAyB;MAAAC,QAAA,eACxB,IAAAT,WAAA,CAAAO,GAAA,EAACR,aAAA,CAAAW,YAAY;QACXC,WAAW,EAAE,KAAM;QACnBC,wBAAwB,EAAE,IAAK;QAC/BP,SAAS,EAAEA,SAAU;QAAA,GACjBC;MAAK,CACV;IAAC,CACuB,CAAC;EAEhC;EAEA,oBACE,IAAAN,WAAA,CAAAO,GAAA,EAACT,0BAAA,CAAAU,yBAAyB;IAAAC,QAAA,eACxB,IAAAT,WAAA,CAAAO,GAAA,EAACV,YAAA,CAAAgB,IAAI;MAACF,WAAW,EAAE,KAAM;MAACC,wBAAwB,EAAE,IAAK;MAAA,GAAKN;IAAK,CAAG;EAAC,CAC9C,CAAC;AAEhC,CAAC;AAACQ,OAAA,CAAAV,aAAA,GAAAA,aAAA","ignoreList":[]}

package/lib/commonjs/nativeSpecs/A11yLockNativeComponent.ts

@@ -7,6 +7,7 @@ export interface A11yLockNativeComponentProps extends ViewProps {
   componentType: Int32;
   containerKey?: string;
   lockDisabled?: boolean;
+  forceLock?: boolean;
 }
 
 export default codegenNativeComponent<A11yLockNativeComponentProps>('A11yLock');

package/lib/module/components/A11yLock/A11yBaseLock/A11yBaseLock.js

@@ -1,5 +1,20 @@
 "use strict";
 
-import { View } from 'react-native';
-export const A11yBaseLock = View;
+import React from 'react';
+import A11yLockNativeComponent from '../../../nativeSpecs/A11yLockNativeComponent';
+import { jsx as _jsx } from "react/jsx-runtime";
+export const A11yBaseLock = /*#__PURE__*/React.memo(({
+  lockDisabled = false,
+  componentType = 0,
+  forceLock = false,
+  ...props
+}) => {
+  return /*#__PURE__*/_jsx(A11yLockNativeComponent, {
+    ...props,
+    containerKey: "is-not-needed",
+    componentType: componentType,
+    lockDisabled: lockDisabled,
+    forceLock: forceLock
+  });
+});
 //# sourceMappingURL=A11yBaseLock.js.map

package/lib/module/components/A11yLock/A11yBaseLock/A11yBaseLock.js.map

@@ -1 +1 @@
-{"version":3,"names":["View","A11yBaseLock"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"mappings":";;AAAA,SAASA,IAAI,QAAQ,cAAc;AAGnC,OAAO,MAAMC,YAAY,GACvBD,IAAuD","ignoreList":[]}
+{"version":3,"names":["React","A11yLockNativeComponent","jsx","_jsx","A11yBaseLock","memo","lockDisabled","componentType","forceLock","props","containerKey"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,uBAAuB,MAAM,8CAA8C;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGnF,OAAO,MAAMC,YAAY,gBAAGJ,KAAK,CAACK,IAAI,CACpC,CAAC;EACCC,YAAY,GAAG,KAAK;EACpBC,aAAa,GAAG,CAAC;EACjBC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACEN,IAAA,CAACF,uBAAuB;IAAA,GAClBQ,KAAK;IACTC,YAAY,EAAC,eAAe;IAC5BH,aAAa,EAAEA,aAAc;IAC7BD,YAAY,EAAEA,YAAa;IAC3BE,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN,CACF,CAAC","ignoreList":[]}

package/lib/module/components/A11yLock/A11yFocusTrap/A11yFocusTrap.js

@@ -3,12 +3,28 @@
 import React from 'react';
 import { View } from 'react-native';
 import { A11yFocusTrapMountWrapper } from './A11yFocusTrapMountWrapper';
+import { A11yBaseLock } from '../A11yBaseLock/A11yBaseLock';
 import { jsx as _jsx } from "react/jsx-runtime";
-export const A11yFocusTrap = props => /*#__PURE__*/_jsx(A11yFocusTrapMountWrapper, {
-  children: /*#__PURE__*/_jsx(View, {
-    collapsable: false,
-    accessibilityViewIsModal: true,
-    ...props
-  })
-});
+export const A11yFocusTrap = ({
+  forceLock = false,
+  ...props
+}) => {
+  if (forceLock) {
+    return /*#__PURE__*/_jsx(A11yFocusTrapMountWrapper, {
+      children: /*#__PURE__*/_jsx(A11yBaseLock, {
+        collapsable: false,
+        accessibilityViewIsModal: true,
+        forceLock: forceLock,
+        ...props
+      })
+    });
+  }
+  return /*#__PURE__*/_jsx(A11yFocusTrapMountWrapper, {
+    children: /*#__PURE__*/_jsx(View, {
+      collapsable: false,
+      accessibilityViewIsModal: true,
+      ...props
+    })
+  });
+};
 //# sourceMappingURL=A11yFocusTrap.js.map

package/lib/module/components/A11yLock/A11yFocusTrap/A11yFocusTrap.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","View","A11yFocusTrapMountWrapper","jsx","_jsx","A11yFocusTrap","props","children","collapsable","accessibilityViewIsModal"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,QAAQ,cAAc;AAEnC,SAASC,yBAAyB,QAAQ,6BAA6B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAExE,OAAO,MAAMC,aAAa,GAAIC,KAAoB,iBAChDF,IAAA,CAACF,yBAAyB;EAAAK,QAAA,eACxBH,IAAA,CAACH,IAAI;IAACO,WAAW,EAAE,KAAM;IAACC,wBAAwB,EAAE,IAAK;IAAA,GAAKH;EAAK,CAAG;AAAC,CAC9C,CAC5B","ignoreList":[]}
+{"version":3,"names":["React","View","A11yFocusTrapMountWrapper","A11yBaseLock","jsx","_jsx","A11yFocusTrap","forceLock","props","children","collapsable","accessibilityViewIsModal"],"sourceRoot":"../../../../../src","sources":["components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,IAAI,QAAQ,cAAc;AAEnC,SAASC,yBAAyB,QAAQ,6BAA6B;AACvE,SAASC,YAAY,QAAQ,8BAA8B;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE5D,OAAO,MAAMC,aAAa,GAAGA,CAAC;EAC5BC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACU,CAAC,KAAK;EACnB,IAAID,SAAS,EAAE;IACb,oBACEF,IAAA,CAACH,yBAAyB;MAAAO,QAAA,eACxBJ,IAAA,CAACF,YAAY;QACXO,WAAW,EAAE,KAAM;QACnBC,wBAAwB,EAAE,IAAK;QAC/BJ,SAAS,EAAEA,SAAU;QAAA,GACjBC;MAAK,CACV;IAAC,CACuB,CAAC;EAEhC;EAEA,oBACEH,IAAA,CAACH,yBAAyB;IAAAO,QAAA,eACxBJ,IAAA,CAACJ,IAAI;MAACS,WAAW,EAAE,KAAM;MAACC,wBAAwB,EAAE,IAAK;MAAA,GAAKH;IAAK,CAAG;EAAC,CAC9C,CAAC;AAEhC,CAAC","ignoreList":[]}

package/lib/module/nativeSpecs/A11yLockNativeComponent.ts

@@ -7,6 +7,7 @@ export interface A11yLockNativeComponentProps extends ViewProps {
   componentType: Int32;
   containerKey?: string;
   lockDisabled?: boolean;
+  forceLock?: boolean;
 }
 
 export default codegenNativeComponent<A11yLockNativeComponentProps>('A11yLock');

package/lib/typescript/src/components/A11yLock/A11yBaseLock/A11yBaseLock.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import type { A11yLockProps } from '../../../types/A11yLock.types';
-export declare const A11yBaseLock: React.ExoticComponent<A11yLockProps>;
+export declare const A11yBaseLock: React.NamedExoticComponent<A11yLockProps>;
 //# sourceMappingURL=A11yBaseLock.d.ts.map

package/lib/typescript/src/components/A11yLock/A11yBaseLock/A11yBaseLock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"A11yBaseLock.d.ts","sourceRoot":"","sources":["../../../../../../src/components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,eAAO,MAAM,YAAY,EACJ,KAAK,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC"}
+{"version":3,"file":"A11yBaseLock.d.ts","sourceRoot":"","sources":["../../../../../../src/components/A11yLock/A11yBaseLock/A11yBaseLock.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,eAAO,MAAM,YAAY,2CAiBxB,CAAC"}

package/lib/typescript/src/components/A11yLock/A11yFocusTrap/A11yFocusTrap.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { A11yLockProps } from '../../../types/A11yLock.types';
-export declare const A11yFocusTrap: (props: A11yLockProps) => React.JSX.Element;
+export declare const A11yFocusTrap: ({ forceLock, ...props }: A11yLockProps) => React.JSX.Element;
 //# sourceMappingURL=A11yFocusTrap.d.ts.map

package/lib/typescript/src/components/A11yLock/A11yFocusTrap/A11yFocusTrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"A11yFocusTrap.d.ts","sourceRoot":"","sources":["../../../../../../src/components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAGnE,eAAO,MAAM,aAAa,GAAI,OAAO,aAAa,sBAIjD,CAAC"}
+{"version":3,"file":"A11yFocusTrap.d.ts","sourceRoot":"","sources":["../../../../../../src/components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAInE,eAAO,MAAM,aAAa,GAAI,yBAG3B,aAAa,sBAmBf,CAAC"}

package/lib/typescript/src/index.d.ts

@@ -410,7 +410,7 @@ export declare const A11y: {
         onScreenReaderDescendantFocusChanged?: (e: import(".").ScreenReaderDescendantFocusChangedEvent) => void;
     } & import("react").RefAttributes<{}>>;
     FocusFrame: (props: import("react-native").ViewProps) => import("react").JSX.Element;
-    FocusTrap: (props: import("./types/A11yLock.types").A11yLockProps) => import("react").JSX.Element;
+    FocusTrap: ({ forceLock, ...props }: import("./types/A11yLock.types").A11yLockProps) => import("react").JSX.Element;
 };
 export { A11yModule } from './modules/A11yAnnounceModule';
 //# sourceMappingURL=index.d.ts.map

package/lib/typescript/src/nativeSpecs/A11yLockNativeComponent.d.ts

@@ -4,6 +4,7 @@ export interface A11yLockNativeComponentProps extends ViewProps {
     componentType: Int32;
     containerKey?: string;
     lockDisabled?: boolean;
+    forceLock?: boolean;
 }
 declare const _default: (props: Omit<A11yLockNativeComponentProps, "ref"> & {
     ref?: React.Ref<import("react-native").HostInstance>;

package/lib/typescript/src/nativeSpecs/A11yLockNativeComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"A11yLockNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/nativeSpecs/A11yLockNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAIvE,MAAM,WAAW,4BAA6B,SAAQ,SAAS;IAC7D,aAAa,EAAE,KAAK,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;;;;AAED,wBAAgF"}
+{"version":3,"file":"A11yLockNativeComponent.d.ts","sourceRoot":"","sources":["../../../../src/nativeSpecs/A11yLockNativeComponent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2CAA2C,CAAC;AAIvE,MAAM,WAAW,4BAA6B,SAAQ,SAAS;IAC7D,aAAa,EAAE,KAAK,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;;;;AAED,wBAAgF"}

package/lib/typescript/src/types/A11yLock.types.d.ts

@@ -3,5 +3,6 @@ export type A11yLockProps = ViewProps & {
     componentType?: number;
     containerKey?: string;
     lockDisabled?: boolean;
+    forceLock?: boolean;
 };
 //# sourceMappingURL=A11yLock.types.d.ts.map

package/lib/typescript/src/types/A11yLock.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"A11yLock.types.d.ts","sourceRoot":"","sources":["../../../../src/types/A11yLock.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC"}
+{"version":3,"file":"A11yLock.types.d.ts","sourceRoot":"","sources":["../../../../src/types/A11yLock.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-a11y-order",
-  "version": "0.8.2",
+  "version": "0.9.1-rc",
   "description": "ReactNative library for managing screen reader focus ordering",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -24,7 +24,8 @@
     "!**/__tests__",
     "!**/__fixtures__",
     "!**/__mocks__",
-    "!**/.*"
+    "!**/.*",
+    "!**/CLAUDE.md"
   ],
   "scripts": {
     "example": "yarn workspace a11y-order-example",

package/src/components/A11yLock/A11yBaseLock/A11yBaseLock.tsx

@@ -1,5 +1,22 @@
-import { View } from 'react-native';
+import React from 'react';
+import A11yLockNativeComponent from '../../../nativeSpecs/A11yLockNativeComponent';
 import type { A11yLockProps } from '../../../types/A11yLock.types';
 
-export const A11yBaseLock =
-  View as unknown as React.ExoticComponent<A11yLockProps>;
+export const A11yBaseLock = React.memo<A11yLockProps>(
+  ({
+    lockDisabled = false,
+    componentType = 0,
+    forceLock = false,
+    ...props
+  }) => {
+    return (
+      <A11yLockNativeComponent
+        {...props}
+        containerKey="is-not-needed"
+        componentType={componentType}
+        lockDisabled={lockDisabled}
+        forceLock={forceLock}
+      />
+    );
+  }
+);

package/src/components/A11yLock/A11yFocusTrap/A11yFocusTrap.tsx

@@ -2,9 +2,28 @@ import React from 'react';
 import { View } from 'react-native';
 import type { A11yLockProps } from '../../../types/A11yLock.types';
 import { A11yFocusTrapMountWrapper } from './A11yFocusTrapMountWrapper';
+import { A11yBaseLock } from '../A11yBaseLock/A11yBaseLock';
 
-export const A11yFocusTrap = (props: A11yLockProps) => (
-  <A11yFocusTrapMountWrapper>
-    <View collapsable={false} accessibilityViewIsModal={true} {...props} />
-  </A11yFocusTrapMountWrapper>
-);
+export const A11yFocusTrap = ({
+  forceLock = false,
+  ...props
+}: A11yLockProps) => {
+  if (forceLock) {
+    return (
+      <A11yFocusTrapMountWrapper>
+        <A11yBaseLock
+          collapsable={false}
+          accessibilityViewIsModal={true}
+          forceLock={forceLock}
+          {...props}
+        />
+      </A11yFocusTrapMountWrapper>
+    );
+  }
+
+  return (
+    <A11yFocusTrapMountWrapper>
+      <View collapsable={false} accessibilityViewIsModal={true} {...props} />
+    </A11yFocusTrapMountWrapper>
+  );
+};

package/src/nativeSpecs/A11yLockNativeComponent.ts

@@ -7,6 +7,7 @@ export interface A11yLockNativeComponentProps extends ViewProps {
   componentType: Int32;
   containerKey?: string;
   lockDisabled?: boolean;
+  forceLock?: boolean;
 }
 
 export default codegenNativeComponent<A11yLockNativeComponentProps>('A11yLock');

package/src/types/A11yLock.types.ts

@@ -4,4 +4,5 @@ export type A11yLockProps = ViewProps & {
   componentType?: number;
   containerKey?: string;
   lockDisabled?: boolean;
+  forceLock?: boolean;
 };

package/lib/commonjs/components/A11yLock/A11yBaseLock/A11yBaseLock.android.js

@@ -1,23 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.A11yBaseLock = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _A11yLockNativeComponent = _interopRequireDefault(require("../../../nativeSpecs/A11yLockNativeComponent"));
-var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const A11yBaseLock = exports.A11yBaseLock = /*#__PURE__*/_react.default.memo(({
-  lockDisabled = false,
-  componentType = 0,
-  ...props
-}) => {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_A11yLockNativeComponent.default, {
-    ...props,
-    containerKey: "is-not-needed",
-    componentType: componentType,
-    lockDisabled: lockDisabled
-  });
-});
-//# sourceMappingURL=A11yBaseLock.android.js.map