react-native-a11y-order 0.7.1 → 0.7.2

package/ios/extensions/UIView+RNAOA11yOrder.mm

@@ -17,21 +17,31 @@
 #import <React/RCTView.h>
 #endif
 
+@interface RNAOWeakWrapper : NSObject
+@property (nonatomic, weak) id value;
+@end
+
+@implementation RNAOWeakWrapper
+@end
+
 static char kRNAOScreenReaderFocusDelegate;
 
 @implementation UIView (RNAOA11yOrder)
 
 - (void)setScreenReaderFocusDelegate:(id<RNAOScreenReaderFocusDelegate>)focusDelegate {
-  objc_setAssociatedObject(self, &kRNAOScreenReaderFocusDelegate, focusDelegate, OBJC_ASSOCIATION_ASSIGN);
+  RNAOWeakWrapper *weakDelegate = [[RNAOWeakWrapper alloc] init];
+  [weakDelegate setValue: focusDelegate];
+  objc_setAssociatedObject(self, &kRNAOScreenReaderFocusDelegate, weakDelegate, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 - (void)clearScreenReaderFocusDelegate {
-  objc_setAssociatedObject(self, &kRNAOScreenReaderFocusDelegate, nil, OBJC_ASSOCIATION_ASSIGN);
+  objc_setAssociatedObject(self, &kRNAOScreenReaderFocusDelegate, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 - (id<RNAOScreenReaderFocusDelegate>)getScreenReaderFocusDelegate {
   @try {
-    return objc_getAssociatedObject(self, &kRNAOScreenReaderFocusDelegate);
+    RNAOWeakWrapper *wrapper = objc_getAssociatedObject(self, &kRNAOScreenReaderFocusDelegate);
+    return wrapper ? wrapper.value : nil;
   } @catch (NSException *exception) {
     return nil;
   }

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_A11yIndex","require","_A11ySequence","_A11yGroup","_A11yUIContainer","_A11yPaneTitle","_A11yView","_A11yFocusFrame","_A11yFocusTrap","_A11yAnnounceModule","A11y","exports","Order","A11yIndexSequence","Index","A11yIndex","Group","A11yGroup","Container","A11yUIContainer","PaneTitle","A11yPaneTitle","ScreenChange","A11yScreenChange","View","A11yView","FocusFrame","A11yFocusFrame","FocusTrap","A11yFocusTrap"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,cAAA,GAAAJ,OAAA;AAIA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AACA,IAAAO,cAAA,GAAAP,OAAA;AA6BA,IAAAQ,mBAAA,GAAAR,OAAA;AAZO,MAAMS,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClBE,KAAK,EAAEC,+BAAiB;EACxBC,KAAK,EAAEC,oBAAS;EAChBC,KAAK,EAAEC,oBAAS;EAChBC,SAAS,EAAEC,gCAAe;EAC1BC,SAAS,EAAEC,4BAAa;EACxBC,YAAY,EAAEC,+BAAgB;EAC9BC,IAAI,EAAEC,kBAAQ;EACdC,UAAU,EAAEC,8BAAc;EAC1BC,SAAS,EAAEC;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["_A11yIndex","require","_A11ySequence","_A11yGroup","_A11yUIContainer","_A11yPaneTitle","_A11yView","_A11yFocusFrame","_A11yFocusTrap","_A11yAnnounceModule","A11y","exports","Order","A11yIndexSequence","Index","A11yIndex","Group","A11yGroup","Container","A11yUIContainer","PaneTitle","A11yPaneTitle","ScreenChange","A11yScreenChange","View","A11yView","FocusFrame","A11yFocusFrame","FocusTrap","A11yFocusTrap"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AACA,IAAAI,cAAA,GAAAJ,OAAA;AAIA,IAAAK,SAAA,GAAAL,OAAA;AACA,IAAAM,eAAA,GAAAN,OAAA;AACA,IAAAO,cAAA,GAAAP,OAAA;AA+BA,IAAAQ,mBAAA,GAAAR,OAAA;AAZO,MAAMS,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClBE,KAAK,EAAEC,+BAAiB;EACxBC,KAAK,EAAEC,oBAAS;EAChBC,KAAK,EAAEC,oBAAS;EAChBC,SAAS,EAAEC,gCAAe;EAC1BC,SAAS,EAAEC,4BAAa;EACxBC,YAAY,EAAEC,+BAAgB;EAC9BC,IAAI,EAAEC,kBAAQ;EACdC,UAAU,EAAEC,8BAAc;EAC1BC,SAAS,EAAEC;AACb,CAAC","ignoreList":[]}

package/lib/commonjs/index.web.js

@@ -4,12 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.A11y = void 0;
+Object.defineProperty(exports, "A11yModule", {
+  enumerable: true,
+  get: function () {
+    return _A11yAnnounceModule.A11yModule;
+  }
+});
+var _A11yIndex = require("./components/A11yIndex/A11yIndex");
 var _reactNative = require("react-native");
-var _A11yIndex = require("./components/A11yIndex/A11yIndex.web");
+var _A11yAnnounceModule = require("./modules/A11yAnnounceModule");
 const A11y = exports.A11y = {
   Order: _reactNative.View,
   Group: _reactNative.View,
   Index: _A11yIndex.A11yIndex,
-  Container: _reactNative.View
+  Container: _reactNative.View,
+  PaneTitle: _reactNative.View,
+  ScreenChange: _reactNative.View,
+  View: _reactNative.View,
+  FocusFrame: _reactNative.View,
+  FocusTrap: _reactNative.View
 };
 //# sourceMappingURL=index.web.js.map

package/lib/commonjs/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_A11yIndex","A11y","exports","Order","View","Group","Index","A11yIndex","Container"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAIO,MAAME,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClBE,KAAK,EAAEC,iBAAI;EACXC,KAAK,EAAED,iBAAI;EACXE,KAAK,EAAEC,oBAAS;EAChBC,SAAS,EAAEJ;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["_A11yIndex","require","_reactNative","_A11yAnnounceModule","A11y","exports","Order","View","Group","Index","A11yIndex","Container","PaneTitle","ScreenChange","FocusFrame","FocusTrap"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":";;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AA+BA,IAAAE,mBAAA,GAAAF,OAAA;AAZO,MAAMG,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClBE,KAAK,EAAEC,iBAAI;EACXC,KAAK,EAAED,iBAAI;EACXE,KAAK,EAAEC,oBAAS;EAChBC,SAAS,EAAEJ,iBAAI;EACfK,SAAS,EAAEL,iBAAI;EACfM,YAAY,EAAEN,iBAAI;EAClBA,IAAI,EAAEA,iBAAI;EACVO,UAAU,EAAEP,iBAAI;EAChBQ,SAAS,EAAER;AACb,CAAC","ignoreList":[]}

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["A11yIndex","A11yIndexSequence","A11yGroup","A11yUIContainer","A11yPaneTitle","A11yScreenChange","A11yView","A11yFocusFrame","A11yFocusTrap","A11y","Order","Index","Group","Container","PaneTitle","ScreenChange","View","FocusFrame","FocusTrap","A11yModule"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SAASA,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,iBAAiB,QAAQ,wCAAwC;AAC1E,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,eAAe,QAAQ,8CAA8C;AAC9E,SACEC,aAAa,EACbC,gBAAgB,QACX,0CAA0C;AACjD,SAASC,QAAQ,QAAQ,gCAAgC;AACzD,SAASC,cAAc,QAAQ,qDAAqD;AACpF,SAASC,aAAa,QAAQ,mDAAmD;AAiBjF,OAAO,MAAMC,IAAI,GAAG;EAClBC,KAAK,EAAET,iBAAiB;EACxBU,KAAK,EAAEX,SAAS;EAChBY,KAAK,EAAEV,SAAS;EAChBW,SAAS,EAAEV,eAAe;EAC1BW,SAAS,EAAEV,aAAa;EACxBW,YAAY,EAAEV,gBAAgB;EAC9BW,IAAI,EAAEV,QAAQ;EACdW,UAAU,EAAEV,cAAc;EAC1BW,SAAS,EAAEV;AACb,CAAC;AAED,SAASW,UAAU,QAAQ,8BAA8B","ignoreList":[]}
+{"version":3,"names":["A11yIndex","A11yIndexSequence","A11yGroup","A11yUIContainer","A11yPaneTitle","A11yScreenChange","A11yView","A11yFocusFrame","A11yFocusTrap","A11y","Order","Index","Group","Container","PaneTitle","ScreenChange","View","FocusFrame","FocusTrap","A11yModule"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SAASA,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,iBAAiB,QAAQ,wCAAwC;AAC1E,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,eAAe,QAAQ,8CAA8C;AAC9E,SACEC,aAAa,EACbC,gBAAgB,QACX,0CAA0C;AACjD,SAASC,QAAQ,QAAQ,gCAAgC;AACzD,SAASC,cAAc,QAAQ,qDAAqD;AACpF,SAASC,aAAa,QAAQ,mDAAmD;AAmBjF,OAAO,MAAMC,IAAI,GAAG;EAClBC,KAAK,EAAET,iBAAiB;EACxBU,KAAK,EAAEX,SAAS;EAChBY,KAAK,EAAEV,SAAS;EAChBW,SAAS,EAAEV,eAAe;EAC1BW,SAAS,EAAEV,aAAa;EACxBW,YAAY,EAAEV,gBAAgB;EAC9BW,IAAI,EAAEV,QAAQ;EACdW,UAAU,EAAEV,cAAc;EAC1BW,SAAS,EAAEV;AACb,CAAC;AAED,SAASW,UAAU,QAAQ,8BAA8B","ignoreList":[]}

package/lib/module/index.web.js

@@ -1,9 +1,15 @@
+import { A11yIndex } from './components/A11yIndex/A11yIndex';
 import { View } from 'react-native';
-import { A11yIndex } from './components/A11yIndex/A11yIndex.web';
 export const A11y = {
   Order: View,
   Group: View,
   Index: A11yIndex,
-  Container: View
+  Container: View,
+  PaneTitle: View,
+  ScreenChange: View,
+  View: View,
+  FocusFrame: View,
+  FocusTrap: View
 };
+export { A11yModule } from './modules/A11yAnnounceModule';
 //# sourceMappingURL=index.web.js.map

package/lib/module/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["View","A11yIndex","A11y","Order","Group","Index","Container"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AACnC,SAASC,SAAS,QAAQ,sCAAsC;AAIhE,OAAO,MAAMC,IAAI,GAAG;EAClBC,KAAK,EAAEH,IAAI;EACXI,KAAK,EAAEJ,IAAI;EACXK,KAAK,EAAEJ,SAAS;EAChBK,SAAS,EAAEN;AACb,CAAC","ignoreList":[]}
+{"version":3,"names":["A11yIndex","View","A11y","Order","Group","Index","Container","PaneTitle","ScreenChange","FocusFrame","FocusTrap","A11yModule"],"sourceRoot":"../../src","sources":["index.web.ts"],"mappings":"AAAA,SAASA,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,IAAI,QAAQ,cAAc;AAmBnC,OAAO,MAAMC,IAAI,GAAG;EAClBC,KAAK,EAAEF,IAAI;EACXG,KAAK,EAAEH,IAAI;EACXI,KAAK,EAAEL,SAAS;EAChBM,SAAS,EAAEL,IAAI;EACfM,SAAS,EAAEN,IAAI;EACfO,YAAY,EAAEP,IAAI;EAClBA,IAAI,EAAEA,IAAI;EACVQ,UAAU,EAAER,IAAI;EAChBS,SAAS,EAAET;AACb,CAAC;AAED,SAASU,UAAU,QAAQ,8BAA8B","ignoreList":[]}

package/lib/typescript/src/components/A11yView/A11yView.d.ts

@@ -6,6 +6,6 @@ export declare const A11yView: React.MemoExoticComponent<React.ForwardRefExoticC
     onScreenReaderSubViewFocusChange?: (isFocused: boolean) => void;
     onScreenReaderSubViewFocused?: () => void;
     onScreenReaderSubViewBlurred?: () => void;
-    onScreenReaderDescendantFocusChanged?: (e: import("../../types/A11yView.types").ScreenReaderDescendantFocusChangedEvent) => void;
+    onScreenReaderDescendantFocusChanged?: (e: import("../..").ScreenReaderDescendantFocusChangedEvent) => void;
 } & React.RefAttributes<View>>>;
 //# sourceMappingURL=A11yView.d.ts.map

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

@@ -1,5 +1,6 @@
 export type { IndexCommands, A11yOrderType, A11yOrderTypeEnum, A11yIndexProps, } from './types/A11yIndex.types';
 export type { A11yContainerTypeEnum, A11yUIContainerType, A11yUIContainerProps, } from './types/A11yUIContainerView.types';
+export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
 export type { A11yViewProps } from './types/A11yView.types';
 export declare const A11y: {
     Order: import("react").NamedExoticComponent<import("react-native").ViewProps>;
@@ -37,7 +38,7 @@ export declare const A11y: {
         onScreenReaderSubViewFocusChange?: (isFocused: boolean) => void;
         onScreenReaderSubViewFocused?: () => void;
         onScreenReaderSubViewBlurred?: () => void;
-        onScreenReaderDescendantFocusChanged?: (e: import("./types/A11yView.types").ScreenReaderDescendantFocusChangedEvent) => void;
+        onScreenReaderDescendantFocusChanged?: (e: import(".").ScreenReaderDescendantFocusChangedEvent) => void;
     } & import("react").RefAttributes<import("react-native").View>>>;
     FocusFrame: (props: import("react-native").ViewProps) => import("react").JSX.Element;
     FocusTrap: (props: import("./types/A11yLock.types").A11yLockProps) => import("react").JSX.Element;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAYA,YAAY,EACV,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAE3C,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAUhB,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAYA,YAAY,EACV,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAE3C,YAAY,EAAE,uCAAuC,EAAE,MAAM,wBAAwB,CAAC;AAEtF,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAUhB,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC"}

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

@@ -1,16 +1,25 @@
 import { View } from 'react-native';
-export type { IndexCommands } from './types/A11yIndex.types';
+export type { IndexCommands, A11yOrderType, A11yOrderTypeEnum, A11yIndexProps, } from './types/A11yIndex.types';
+export type { A11yContainerTypeEnum, A11yUIContainerType, A11yUIContainerProps, } from './types/A11yUIContainerView.types';
+export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
+export type { A11yViewProps } from './types/A11yView.types';
 export declare const A11y: {
     Order: typeof View;
     Group: typeof View;
-    Index: import("react").ForwardRefExoticComponent<{
+    Index: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<{
         children: React.ReactNode;
         index: number;
         orderType?: import(".").A11yOrderType;
         onScreenReaderSubViewFocusChange?: (isFocused: boolean) => void;
         onScreenReaderSubViewFocused?: () => void;
         onScreenReaderSubViewBlurred?: () => void;
-    } & import("react-native").ViewProps & import("react").RefAttributes<import(".").IndexCommands>>;
+    } & import("react-native").ViewProps & import("react").RefAttributes<import(".").IndexCommands>>>;
     Container: typeof View;
+    PaneTitle: typeof View;
+    ScreenChange: typeof View;
+    View: typeof View;
+    FocusFrame: typeof View;
+    FocusTrap: typeof View;
 };
+export { A11yModule } from './modules/A11yAnnounceModule';
 //# sourceMappingURL=index.web.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAGpC,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,eAAO,MAAM,IAAI;;;;;;;;;;;;CAKhB,CAAC"}
+{"version":3,"file":"index.web.d.ts","sourceRoot":"","sources":["../../../src/index.web.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAEpC,YAAY,EACV,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,cAAc,GACf,MAAM,yBAAyB,CAAC;AAEjC,YAAY,EACV,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,mCAAmC,CAAC;AAE3C,YAAY,EAAE,uCAAuC,EAAE,MAAM,wBAAwB,CAAC;AAEtF,YAAY,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAE5D,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;CAUhB,CAAC;AAEF,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-a11y-order",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "ReactNative library for managing screen reader focus ordering",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.ts

@@ -23,6 +23,8 @@ export type {
   A11yUIContainerProps,
 } from './types/A11yUIContainerView.types';
 
+export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
+
 export type { A11yViewProps } from './types/A11yView.types';
 
 export const A11y = {

package/src/index.web.ts

@@ -1,11 +1,33 @@
+import { A11yIndex } from './components/A11yIndex/A11yIndex';
 import { View } from 'react-native';
-import { A11yIndex } from './components/A11yIndex/A11yIndex.web';
 
-export type { IndexCommands } from './types/A11yIndex.types';
+export type {
+  IndexCommands,
+  A11yOrderType,
+  A11yOrderTypeEnum,
+  A11yIndexProps,
+} from './types/A11yIndex.types';
+
+export type {
+  A11yContainerTypeEnum,
+  A11yUIContainerType,
+  A11yUIContainerProps,
+} from './types/A11yUIContainerView.types';
+
+export type { ScreenReaderDescendantFocusChangedEvent } from './types/A11yView.types';
+
+export type { A11yViewProps } from './types/A11yView.types';
 
 export const A11y = {
   Order: View,
   Group: View,
   Index: A11yIndex,
   Container: View,
+  PaneTitle: View,
+  ScreenChange: View,
+  View: View,
+  FocusFrame: View,
+  FocusTrap: View,
 };
+
+export { A11yModule } from './modules/A11yAnnounceModule';