react-native-external-keyboard 0.9.1 → 1.0.0

package/lib/module/components/KeyboardFocusLock/FocusTrap/FocusTrap.android.js

@@ -3,6 +3,7 @@
 import React from 'react';
 import { FocusTrapMountWrapper } from './FocusTrapMountWrapper';
 import { KeyboardFocusLockBase } from '../KeyboardFocusLockBase/KeyboardFocusLockBase';
+import { LockComponentType } from '../../../types';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const FocusTrap = /*#__PURE__*/React.memo(({
   lockDisabled = false,
@@ -10,7 +11,7 @@ export const FocusTrap = /*#__PURE__*/React.memo(({
 }) => /*#__PURE__*/_jsx(FocusTrapMountWrapper, {
   children: /*#__PURE__*/_jsx(KeyboardFocusLockBase, {
     ...props,
-    componentType: 0,
+    componentType: LockComponentType.Trap,
     lockDisabled: lockDisabled
   })
 }));

package/lib/module/components/KeyboardFocusLock/FocusTrap/FocusTrap.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","FocusTrapMountWrapper","KeyboardFocusLockBase","jsx","_jsx","FocusTrap","memo","lockDisabled","props","children","componentType"],"sourceRoot":"../../../../../src","sources":["components/KeyboardFocusLock/FocusTrap/FocusTrap.android.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,qBAAqB,QAAQ,gDAAgD;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAGvF,OAAO,MAAMC,SAAS,gBAAGL,KAAK,CAACM,IAAI,CACjC,CAAC;EAAEC,YAAY,GAAG,KAAK;EAAE,GAAGC;AAAM,CAAC,kBACjCJ,IAAA,CAACH,qBAAqB;EAAAQ,QAAA,eACpBL,IAAA,CAACF,qBAAqB;IAAA,GAChBM,KAAK;IACTE,aAAa,EAAE,CAAE;IACjBH,YAAY,EAAEA;EAAa,CAC5B;AAAC,CACmB,CAE3B,CAAC","ignoreList":[]}
+{"version":3,"names":["React","FocusTrapMountWrapper","KeyboardFocusLockBase","LockComponentType","jsx","_jsx","FocusTrap","memo","lockDisabled","props","children","componentType","Trap"],"sourceRoot":"../../../../../src","sources":["components/KeyboardFocusLock/FocusTrap/FocusTrap.android.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AAEzB,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,qBAAqB,QAAQ,gDAAgD;AACtF,SAASC,iBAAiB,QAAqC,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEhF,OAAO,MAAMC,SAAS,gBAAGN,KAAK,CAACO,IAAI,CACjC,CAAC;EAAEC,YAAY,GAAG,KAAK;EAAE,GAAGC;AAAM,CAAC,kBACjCJ,IAAA,CAACJ,qBAAqB;EAAAS,QAAA,eACpBL,IAAA,CAACH,qBAAqB;IAAA,GAChBO,KAAK;IACTE,aAAa,EAAER,iBAAiB,CAACS,IAAK;IACtCJ,YAAY,EAAEA;EAAa,CAC5B;AAAC,CACmB,CAE3B,CAAC","ignoreList":[]}

package/lib/module/components/KeyboardFocusLock/KeyboardFocusLockBase/KeyboardFocusLockBase.js

@@ -2,10 +2,11 @@
 
 import React from 'react';
 import ExternalKeyboardLockView from '../../../nativeSpec/ExternalKeyboardLockViewNativeComponent';
+import { LockComponentType } from '../../../types';
 import { jsx as _jsx } from "react/jsx-runtime";
 export const KeyboardFocusLockBase = /*#__PURE__*/React.memo(({
   lockDisabled = false,
-  componentType = 0,
+  componentType = LockComponentType.Trap,
   forceLock = false,
   ...props
 }) => {

package/lib/module/components/KeyboardFocusLock/KeyboardFocusLockBase/KeyboardFocusLockBase.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","ExternalKeyboardLockView","jsx","_jsx","KeyboardFocusLockBase","memo","lockDisabled","componentType","forceLock","props"],"sourceRoot":"../../../../../src","sources":["components/KeyboardFocusLock/KeyboardFocusLockBase/KeyboardFocusLockBase.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,wBAAwB,MAAM,6DAA6D;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAInG,OAAO,MAAMC,qBAAqB,gBAAGJ,KAAK,CAACK,IAAI,CAC7C,CAAC;EACCC,YAAY,GAAG,KAAK;EACpBC,aAAa,GAAG,CAAC;EACjBC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACEN,IAAA,CAACF,wBAAwB;IAAA,GACnBQ,KAAK;IACTF,aAAa,EAAEA,aAAc;IAC7BD,YAAY,EAAEA,YAAa;IAC3BE,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","ExternalKeyboardLockView","LockComponentType","jsx","_jsx","KeyboardFocusLockBase","memo","lockDisabled","componentType","Trap","forceLock","props"],"sourceRoot":"../../../../../src","sources":["components/KeyboardFocusLock/KeyboardFocusLockBase/KeyboardFocusLockBase.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,wBAAwB,MAAM,6DAA6D;AAElG,SAASC,iBAAiB,QAAqC,gBAAgB;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAEhF,OAAO,MAAMC,qBAAqB,gBAAGL,KAAK,CAACM,IAAI,CAC7C,CAAC;EACCC,YAAY,GAAG,KAAK;EACpBC,aAAa,GAAGN,iBAAiB,CAACO,IAAI;EACtCC,SAAS,GAAG,KAAK;EACjB,GAAGC;AACL,CAAC,KAAK;EACJ,oBACEP,IAAA,CAACH,wBAAwB;IAAA,GACnBU,KAAK;IACTH,aAAa,EAAEA,aAAc;IAC7BD,YAAY,EAAEA,YAAa;IAC3BG,SAAS,EAAEA;EAAU,CACtB,CAAC;AAEN,CACF,CAAC","ignoreList":[]}

package/lib/module/components/KeyboardFocusView/KeyboardFocusView.js

@@ -1,15 +1,12 @@
 "use strict";
 
 import React, { useMemo } from 'react';
-import { View, StyleSheet, Platform } from 'react-native';
+import { Platform } from 'react-native';
 import { BaseKeyboardView } from '../BaseKeyboardView/BaseKeyboardView';
-import { RenderPropComponent } from '../RenderPropComponent/RenderPropComponent';
-import { useFocusStyle } from '../../utils/useFocusStyle';
-import { useKeyboardPress } from '../../utils/useKeyboardPress/useKeyboardPress';
+import { useKeyboardFocusContainer } from '../../utils/useKeyboardFocusContainer';
 import { IsViewFocusedContext } from '../../context/IsViewFocusedContext';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 export const KeyboardFocusView = /*#__PURE__*/React.forwardRef(({
-  tintType = 'default',
   autoFocus,
   focusStyle,
   style,
@@ -18,16 +15,13 @@ export const KeyboardFocusView = /*#__PURE__*/React.forwardRef(({
   onLongPress,
   onKeyUpPress,
   onKeyDownPress,
-  group = false,
+  focusableWrapper = false,
   haloEffect = true,
-  canBeFocused = true,
-  focusable = true,
+  focusable,
   withView = true,
-  //ToDo RNCEKV-9 update and rename Discussion #63
   tintColor,
   onFocus,
   onBlur,
-  FocusHoverComponent,
   children,
   accessible,
   triggerCodes,
@@ -38,39 +32,23 @@ export const KeyboardFocusView = /*#__PURE__*/React.forwardRef(({
     focused,
     containerFocusedStyle,
     onFocusChangeHandler,
-    hoverColor
-  } = useFocusStyle({
-    onFocusChange,
-    tintColor,
-    containerFocusStyle: focusStyle,
-    tintType
-  });
-  const withHaloEffect = tintType === 'default' && haloEffect;
-  const {
     onKeyUpPressHandler,
     onKeyDownPressHandler
-  } = useKeyboardPress({
+  } = useKeyboardFocusContainer({
+    onFocusChange,
+    containerFocusStyle: focusStyle,
     onKeyUpPress,
     onKeyDownPress,
     onPress,
     onLongPress,
-    triggerCodes,
-    disabled: props?.disabled
+    triggerCodes
   });
-  const HoverComonent = useMemo(() => {
-    if (FocusHoverComponent) return FocusHoverComponent;
-    if (tintType === 'hover') return /*#__PURE__*/_jsx(View, {
-      style: [hoverColor, styles.absolute, styles.opacity]
-    });
-    return undefined;
-  }, [FocusHoverComponent, hoverColor, tintType]);
-  const a11y = useMemo(() => {
-    return Platform.OS === 'android' && withView && accessible !== false || accessible;
-  }, [accessible, withView]);
+  const a11y = Platform.OS === 'android' && withView && accessible !== false || accessible;
+  const containerStyleArr = useMemo(() => [style, containerFocusedStyle], [style, containerFocusedStyle]);
   return /*#__PURE__*/_jsx(IsViewFocusedContext.Provider, {
     value: focused,
-    children: /*#__PURE__*/_jsxs(BaseKeyboardView, {
-      style: [style, containerFocusedStyle],
+    children: /*#__PURE__*/_jsx(BaseKeyboardView, {
+      style: containerStyleArr,
       ref: ref,
       onKeyUpPress: onKeyUpPressHandler,
       onKeyDownPress: onKeyDownPressHandler,
@@ -78,32 +56,17 @@ export const KeyboardFocusView = /*#__PURE__*/React.forwardRef(({
       onBlur: onBlur,
       onFocusChange: onFocusChangeHandler,
       onContextMenuPress: onLongPress,
-      haloEffect: withHaloEffect,
+      haloEffect: haloEffect,
       defaultFocusHighlightEnabled: defaultFocusHighlightEnabled,
       autoFocus: autoFocus,
-      canBeFocused: canBeFocused,
       focusable: focusable,
       tintColor: tintColor,
-      group: group,
+      focusableWrapper: focusableWrapper,
       accessible: a11y,
       enableContextMenu: Boolean(onLongPress),
       ...props,
-      children: [children, focused && HoverComonent && /*#__PURE__*/_jsx(RenderPropComponent, {
-        render: HoverComonent
-      })]
+      children: children
     })
   });
 });
-const styles = StyleSheet.create({
-  absolute: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0
-  },
-  opacity: {
-    opacity: 0.3
-  }
-});
 //# sourceMappingURL=KeyboardFocusView.js.map

package/lib/module/components/KeyboardFocusView/KeyboardFocusView.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","View","StyleSheet","Platform","BaseKeyboardView","RenderPropComponent","useFocusStyle","useKeyboardPress","IsViewFocusedContext","jsx","_jsx","jsxs","_jsxs","KeyboardFocusView","forwardRef","tintType","autoFocus","focusStyle","style","onFocusChange","onPress","onLongPress","onKeyUpPress","onKeyDownPress","group","haloEffect","canBeFocused","focusable","withView","tintColor","onFocus","onBlur","FocusHoverComponent","children","accessible","triggerCodes","defaultFocusHighlightEnabled","props","ref","focused","containerFocusedStyle","onFocusChangeHandler","hoverColor","containerFocusStyle","withHaloEffect","onKeyUpPressHandler","onKeyDownPressHandler","disabled","HoverComonent","styles","absolute","opacity","undefined","a11y","OS","Provider","value","onContextMenuPress","enableContextMenu","Boolean","render","create","position","top","left","right","bottom"],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","Platform","BaseKeyboardView","useKeyboardFocusContainer","IsViewFocusedContext","jsx","_jsx","KeyboardFocusView","forwardRef","autoFocus","focusStyle","style","onFocusChange","onPress","onLongPress","onKeyUpPress","onKeyDownPress","focusableWrapper","haloEffect","focusable","withView","tintColor","onFocus","onBlur","children","accessible","triggerCodes","defaultFocusHighlightEnabled","props","ref","focused","containerFocusedStyle","onFocusChangeHandler","onKeyUpPressHandler","onKeyDownPressHandler","containerFocusStyle","a11y","OS","containerStyleArr","Provider","value","onContextMenuPress","enableContextMenu","Boolean"],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,SAASC,QAAQ,QAAQ,cAAc;AAMvC,SAASC,gBAAgB,QAAQ,sCAAsC;AACvE,SAASC,yBAAyB,QAAQ,uCAAuC;AACjF,SAASC,oBAAoB,QAAQ,oCAAoC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAE1E,OAAO,MAAMC,iBAAiB,gBAAGR,KAAK,CAACS,UAAU,CAI/C,CACE;EACEC,SAAS;EACTC,UAAU;EACVC,KAAK;EACLC,aAAa;EACbC,OAAO;EACPC,WAAW;EACXC,YAAY;EACZC,cAAc;EACdC,gBAAgB,GAAG,KAAK;EACxBC,UAAU,GAAG,IAAI;EACjBC,SAAS;EACTC,QAAQ,GAAG,IAAI;EACfC,SAAS;EACTC,OAAO;EACPC,MAAM;EACNC,QAAQ;EACRC,UAAU;EACVC,YAAY;EACZC,4BAA4B,GAAG,IAAI;EACnC,GAAGC;AACL,CAAC,EACDC,GAAG,KACA;EACH,MAAM;IACJC,OAAO;IACPC,qBAAqB;IACrBC,oBAAoB;IACpBC,mBAAmB;IACnBC;EACF,CAAC,GAAG/B,yBAAyB,CAAC;IAC5BS,aAAa;IACbuB,mBAAmB,EAAEzB,UAAU;IAC/BK,YAAY;IACZC,cAAc;IACdH,OAAO;IACPC,WAAW;IACXY;EACF,CAAC,CAAC;EAEF,MAAMU,IAAI,GACPnC,QAAQ,CAACoC,EAAE,KAAK,SAAS,IAAIjB,QAAQ,IAAIK,UAAU,KAAK,KAAK,IAC9DA,UAAU;EAEZ,MAAMa,iBAAiB,GAAGtC,OAAO,CAC/B,MAAM,CAACW,KAAK,EAAEoB,qBAAqB,CAAC,EACpC,CAACpB,KAAK,EAAEoB,qBAAqB,CAC/B,CAAC;EAED,oBACEzB,IAAA,CAACF,oBAAoB,CAACmC,QAAQ;IAACC,KAAK,EAAEV,OAAQ;IAAAN,QAAA,eAC5ClB,IAAA,CAACJ,gBAAgB;MACfS,KAAK,EAAE2B,iBAAkB;MACzBT,GAAG,EAAEA,GAAuC;MAC5Cd,YAAY,EAAEkB,mBAAoB;MAClCjB,cAAc,EAAEkB,qBAAsB;MACtCZ,OAAO,EAAEA,OAAQ;MACjBC,MAAM,EAAEA,MAAO;MACfX,aAAa,EAAEoB,oBAAqB;MACpCS,kBAAkB,EAAE3B,WAAY;MAChCI,UAAU,EAAEA,UAAW;MACvBS,4BAA4B,EAAEA,4BAA6B;MAC3DlB,SAAS,EAAEA,SAAU;MACrBU,SAAS,EAAEA,SAAU;MACrBE,SAAS,EAAEA,SAAU;MACrBJ,gBAAgB,EAAEA,gBAAiB;MACnCQ,UAAU,EAAEW,IAAK;MACjBM,iBAAiB,EAAEC,OAAO,CAAC7B,WAAW,CAAE;MAAA,GACpCc,KAAK;MAAAJ,QAAA,EAERA;IAAQ,CACO;EAAC,CACU,CAAC;AAEpC,CACF,CAAC","ignoreList":[]}

package/lib/module/components/index.js

@@ -2,4 +2,9 @@
 
 export { BaseKeyboardView as ExternalKeyboardView, BaseKeyboardView as KeyboardExtendedBaseView, BaseKeyboardView } from './BaseKeyboardView/BaseKeyboardView';
 export { KeyboardFocusView, KeyboardFocusView as KeyboardExtendedView } from './KeyboardFocusView';
+export { KeyboardFocusGroup } from './KeyboardFocusGroup/KeyboardFocusGroup';
+export { KeyboardExtendedInput, KeyboardExtendedInput as TextInput } from './KeyboardExtendedInput/KeyboardExtendedInput';
+export { Pressable, Pressable as KeyboardExtendedPressable } from './Touchable/Pressable';
+export { FocusFrame } from './KeyboardFocusLock/FocusFrame/FocusFrame';
+export { FocusTrap } from './KeyboardFocusLock/FocusTrap/FocusTrap';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["BaseKeyboardView","ExternalKeyboardView","KeyboardExtendedBaseView","KeyboardFocusView","KeyboardExtendedView"],"sourceRoot":"../../../src","sources":["components/index.ts"],"mappings":";;AAAA,SACEA,gBAAgB,IAAIC,oBAAoB,EACxCD,gBAAgB,IAAIE,wBAAwB,EAC5CF,gBAAgB,QACX,qCAAqC;AAC5C,SACEG,iBAAiB,EACjBA,iBAAiB,IAAIC,oBAAoB,QACpC,qBAAqB","ignoreList":[]}
+{"version":3,"names":["BaseKeyboardView","ExternalKeyboardView","KeyboardExtendedBaseView","KeyboardFocusView","KeyboardExtendedView","KeyboardFocusGroup","KeyboardExtendedInput","TextInput","Pressable","KeyboardExtendedPressable","FocusFrame","FocusTrap"],"sourceRoot":"../../../src","sources":["components/index.ts"],"mappings":";;AAAA,SACEA,gBAAgB,IAAIC,oBAAoB,EACxCD,gBAAgB,IAAIE,wBAAwB,EAC5CF,gBAAgB,QACX,qCAAqC;AAC5C,SACEG,iBAAiB,EACjBA,iBAAiB,IAAIC,oBAAoB,QACpC,qBAAqB;AAC5B,SAASC,kBAAkB,QAAQ,yCAAyC;AAC5E,SACEC,qBAAqB,EACrBA,qBAAqB,IAAIC,SAAS,QAC7B,+CAA+C;AACtD,SACEC,SAAS,EACTA,SAAS,IAAIC,yBAAyB,QAEjC,uBAAuB;AAC9B,SAASC,UAAU,QAAQ,2CAA2C;AACtE,SAASC,SAAS,QAAQ,yCAAyC","ignoreList":[]}

package/lib/module/index.js

@@ -1,19 +1,32 @@
 "use strict";
 
-import { FocusFrame } from './components/KeyboardFocusLock/FocusFrame/FocusFrame';
-import { FocusTrap } from './components/KeyboardFocusLock/FocusTrap/FocusTrap';
+import { FocusFrame, FocusTrap, KeyboardFocusView, KeyboardExtendedInput, Pressable } from './components';
+import * as Keyboard from './modules/Keyboard';
+
+// Native spec
 export { ExternalKeyboardViewNative, TextInputFocusWrapperNative } from './nativeSpec';
-export { BaseKeyboardView, KeyboardFocusView, ExternalKeyboardView, KeyboardExtendedView, KeyboardExtendedBaseView } from './components';
-export { Pressable, Pressable as KeyboardExtendedPressable } from './components/Touchable/Pressable';
-export { KeyboardExtendedInput, KeyboardExtendedInput as TextInput } from './components/KeyboardExtendedInput/KeyboardExtendedInput';
-export { KeyboardFocusGroup } from './components/KeyboardFocusGroup/KeyboardFocusGroup';
+
+// Components
+export { BaseKeyboardView, BaseKeyboardView as ExternalKeyboardView, BaseKeyboardView as KeyboardExtendedBaseView, KeyboardFocusView, KeyboardFocusView as KeyboardExtendedView, KeyboardFocusGroup, KeyboardExtendedInput, KeyboardExtendedInput as TextInput, Pressable, Pressable as KeyboardExtendedPressable } from './components';
+
+// Types
+export { LockComponentType } from './types';
+// Hooks & context
 export { withKeyboardFocus } from './utils/withKeyboardFocus';
 export { useIsViewFocused } from './context/IsViewFocusedContext';
 export { KeyboardOrderFocusGroup, OrderFocusGroupContext, useOrderFocusGroup } from './context/OrderFocusContext';
-import * as Keyboard from './modules/Keyboard';
+
+// Modules
 export { Keyboard };
+
+// Namespaces
 export const Focus = {
   Frame: FocusFrame,
   Trap: FocusTrap
 };
+export const K = {
+  Input: KeyboardExtendedInput,
+  View: KeyboardFocusView,
+  Pressable
+};
 //# sourceMappingURL=index.js.map

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["FocusFrame","FocusTrap","ExternalKeyboardViewNative","TextInputFocusWrapperNative","BaseKeyboardView","KeyboardFocusView","ExternalKeyboardView","KeyboardExtendedView","KeyboardExtendedBaseView","Pressable","KeyboardExtendedPressable","KeyboardExtendedInput","TextInput","KeyboardFocusGroup","withKeyboardFocus","useIsViewFocused","KeyboardOrderFocusGroup","OrderFocusGroupContext","useOrderFocusGroup","Keyboard","Focus","Frame","Trap"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,sDAAsD;AACjF,SAASC,SAAS,QAAQ,oDAAoD;AAE9E,SACEC,0BAA0B,EAC1BC,2BAA2B,QAEtB,cAAc;AAerB,SACEC,gBAAgB,EAChBC,iBAAiB,EACjBC,oBAAoB,EACpBC,oBAAoB,EACpBC,wBAAwB,QACnB,cAAc;AACrB,SACEC,SAAS,EACTA,SAAS,IAAIC,yBAAyB,QAEjC,kCAAkC;AAEzC,SACEC,qBAAqB,EACrBA,qBAAqB,IAAIC,SAAS,QAC7B,0DAA0D;AAOjE,SAASC,kBAAkB,QAAQ,oDAAoD;AACvF,SAASC,iBAAiB,QAAQ,2BAA2B;AAC7D,SAASC,gBAAgB,QAAQ,gCAAgC;AACjE,SACEC,uBAAuB,EACvBC,sBAAsB,EACtBC,kBAAkB,QACb,6BAA6B;AACpC,OAAO,KAAKC,QAAQ,MAAM,oBAAoB;AAC9C,SAASA,QAAQ;AAEjB,OAAO,MAAMC,KAAK,GAAG;EACnBC,KAAK,EAAErB,UAAU;EACjBsB,IAAI,EAAErB;AACR,CAAC","ignoreList":[]}
+{"version":3,"names":["FocusFrame","FocusTrap","KeyboardFocusView","KeyboardExtendedInput","Pressable","Keyboard","ExternalKeyboardViewNative","TextInputFocusWrapperNative","BaseKeyboardView","ExternalKeyboardView","KeyboardExtendedBaseView","KeyboardExtendedView","KeyboardFocusGroup","TextInput","KeyboardExtendedPressable","LockComponentType","withKeyboardFocus","useIsViewFocused","KeyboardOrderFocusGroup","OrderFocusGroupContext","useOrderFocusGroup","Focus","Frame","Trap","K","Input","View"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SACEA,UAAU,EACVC,SAAS,EACTC,iBAAiB,EACjBC,qBAAqB,EACrBC,SAAS,QACJ,cAAc;AACrB,OAAO,KAAKC,QAAQ,MAAM,oBAAoB;;AAE9C;AACA,SACEC,0BAA0B,EAC1BC,2BAA2B,QAEtB,cAAc;;AAErB;AACA,SACEC,gBAAgB,EAChBA,gBAAgB,IAAIC,oBAAoB,EACxCD,gBAAgB,IAAIE,wBAAwB,EAC5CR,iBAAiB,EACjBA,iBAAiB,IAAIS,oBAAoB,EACzCC,kBAAkB,EAClBT,qBAAqB,EACrBA,qBAAqB,IAAIU,SAAS,EAClCT,SAAS,EACTA,SAAS,IAAIU,yBAAyB,QACjC,cAAc;;AAErB;AACA,SACEC,iBAAiB,QAcZ,SAAS;AAGhB;AACA,SAASC,iBAAiB,QAAQ,2BAA2B;AAC7D,SAASC,gBAAgB,QAAQ,gCAAgC;AACjE,SACEC,uBAAuB,EACvBC,sBAAsB,EACtBC,kBAAkB,QACb,6BAA6B;;AAEpC;AACA,SAASf,QAAQ;;AAEjB;AACA,OAAO,MAAMgB,KAAK,GAAG;EACnBC,KAAK,EAAEtB,UAAU;EACjBuB,IAAI,EAAEtB;AACR,CAAC;AAED,OAAO,MAAMuB,CAAC,GAAG;EACfC,KAAK,EAAEtB,qBAAqB;EAC5BuB,IAAI,EAAExB,iBAAiB;EACvBE;AACF,CAAC","ignoreList":[]}

package/lib/module/nativeSpec/ExternalKeyboardLockViewNativeComponent.ts

@@ -1,7 +1,5 @@
-import type { ViewProps } from 'react-native';
+import { codegenNativeComponent, type ViewProps } from 'react-native';
 import type { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-// eslint-disable-next-line @react-native/no-deep-imports
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export interface ExternalKeyboardLockViewNativeComponentProps
   extends ViewProps {

package/lib/module/nativeSpec/ExternalKeyboardViewNativeComponent.ts

@@ -1,4 +1,9 @@
-import type { ColorValue, ViewProps } from 'react-native';
+import {
+  codegenNativeComponent,
+  codegenNativeCommands,
+  type ColorValue,
+  type ViewProps,
+} from 'react-native';
 import type {
   BubblingEventHandler,
   DirectEventHandler,
@@ -6,10 +11,6 @@ import type {
   Int32,
 } from 'react-native/Libraries/Types/CodegenTypes';
 import type { ComponentType } from 'react';
-// eslint-disable-next-line @react-native/no-deep-imports
-import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands';
-// eslint-disable-next-line @react-native/no-deep-imports
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export type FocusChange = Readonly<{
   isFocused: boolean;
@@ -48,10 +49,10 @@ export interface ExternalKeyboardNativeProps extends ViewProps {
   haloCornerRadius?: Float;
   haloExpendX?: Float;
   haloExpendY?: Float;
+  roundedHaloFix?: boolean;
   tintColor?: ColorValue;
-  group?: boolean;
+  focusableWrapper?: boolean;
   groupIdentifier?: string;
-  enableA11yFocus?: boolean;
   screenAutoA11yFocus?: boolean;
   screenAutoA11yFocusDelay?: Int32;
   orderGroup?: string;
@@ -71,11 +72,13 @@ export interface ExternalKeyboardNativeProps extends ViewProps {
 
 export interface NativeCommands {
   // @ts-ignore
-  focus: (viewRef: React.ElementRef<ComponentType>) => void;
+  rnekKeyboardFocus: (viewRef: React.ElementRef<ComponentType>) => void;
+  // @ts-ignore
+  rnekScreenReaderFocus: (viewRef: React.ElementRef<ComponentType>) => void;
 }
 
 export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
-  supportedCommands: ['focus'],
+  supportedCommands: ['rnekKeyboardFocus', 'rnekScreenReaderFocus'],
 });
 
 export default codegenNativeComponent<ExternalKeyboardNativeProps>(

package/lib/module/nativeSpec/KeyboardFocusGroupNativeComponent.ts

@@ -1,7 +1,9 @@
-import type { ViewProps, ColorValue } from 'react-native';
+import {
+  codegenNativeComponent,
+  type ViewProps,
+  type ColorValue,
+} from 'react-native';
 import type { DirectEventHandler } from 'react-native/Libraries/Types/CodegenTypes';
-// eslint-disable-next-line @react-native/no-deep-imports
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export type FocusChange = Readonly<{
   isFocused: boolean;

package/lib/module/nativeSpec/TextInputFocusWrapperNativeComponent.ts

@@ -1,11 +1,13 @@
-import type { ViewProps, ColorValue } from 'react-native';
+import {
+  codegenNativeComponent,
+  type ViewProps,
+  type ColorValue,
+} from 'react-native';
 import type {
   DirectEventHandler,
   Float,
   Int32,
 } from 'react-native/Libraries/Types/CodegenTypes';
-// eslint-disable-next-line @react-native/no-deep-imports
-import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent';
 
 export type FocusChange = Readonly<{
   isFocused: boolean;
@@ -21,10 +23,12 @@ export interface TextInputFocusWrapperNativeComponent extends ViewProps {
   focusType?: Int32;
   blurType?: Int32;
   canBeFocused?: boolean;
+  hasOnFocusChanged?: boolean;
   haloEffect?: boolean;
   haloCornerRadius?: Float;
   haloExpendX?: Float;
   haloExpendY?: Float;
+  roundedHaloFix?: boolean;
   tintColor?: ColorValue;
   blurOnSubmit?: boolean;
   multiline?: boolean;

package/lib/module/types/KeyboardFocusLock.types.js

@@ -1,4 +1,15 @@
 "use strict";
 
-export {};
+/**
+ * Native role for a KeyboardFocusLock component on Android.
+ * iOS does not consume this value.
+ *
+ * Values must match the constants in
+ * `android/src/main/java/com/externalkeyboard/views/ExternalKeyboardLockView/ExternalKeyboardLockView.java`.
+ */
+export let LockComponentType = /*#__PURE__*/function (LockComponentType) {
+  LockComponentType[LockComponentType["Trap"] = 0] = "Trap";
+  LockComponentType[LockComponentType["Frame"] = 1] = "Frame";
+  return LockComponentType;
+}({});
 //# sourceMappingURL=KeyboardFocusLock.types.js.map

package/lib/module/types/KeyboardFocusLock.types.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/KeyboardFocusLock.types.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["LockComponentType"],"sourceRoot":"../../../src","sources":["types/KeyboardFocusLock.types.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAYA,iBAAiB,0BAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;EAAjBA,iBAAiB,CAAjBA,iBAAiB;EAAA,OAAjBA,iBAAiB;AAAA","ignoreList":[]}

package/lib/module/types/baseKeyboardView.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=baseKeyboardView.types.js.map

package/lib/module/types/baseKeyboardView.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/baseKeyboardView.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/types/focus.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=focus.types.js.map

package/lib/module/types/{FocusStyle.js.map → focus.types.js.map}

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/FocusStyle.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/focus.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/types/focusOrder.types.js

@@ -0,0 +1,31 @@
+"use strict";
+
+/**
+ * Directions in which keyboard focus movement can be locked via {@link CommonFocusProps.lockFocus}.
+ *
+ * - `Up` / `Down` / `Left` / `Right` — block directional (arrow / DPad) movement.
+ * - `Forward` / `Backward` — block `Tab` and `Shift + Tab` movement.
+ * - `First` / `Last` — block jumping to the first / last focusable element.
+ */
+export let LockFocusEnum = /*#__PURE__*/function (LockFocusEnum) {
+  LockFocusEnum["Up"] = "up";
+  LockFocusEnum["Down"] = "down";
+  LockFocusEnum["Right"] = "right";
+  LockFocusEnum["Left"] = "left";
+  LockFocusEnum["Forward"] = "forward";
+  LockFocusEnum["Backward"] = "backward";
+  LockFocusEnum["First"] = "first";
+  LockFocusEnum["Last"] = "last";
+  return LockFocusEnum;
+}({});
+
+/** String-literal form of {@link LockFocusEnum} — `'up' | 'down' | 'left' | …`. */
+
+/**
+ * Link-based focus ordering props. Each `order*` target names the {@link FocusOrderProps.orderId orderId}
+ * of the element that should receive focus when moving in that direction.
+ *
+ * > `orderId` values are global. In repeated content (lists, cards) duplicate IDs cause
+ * > incorrect focus jumps — namespace them with `orderPrefix` or a `KeyboardOrderFocusGroup`.
+ */
+//# sourceMappingURL=focusOrder.types.js.map

package/lib/module/types/focusOrder.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["LockFocusEnum"],"sourceRoot":"../../../src","sources":["types/focusOrder.types.ts"],"mappings":";;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,WAAYA,aAAa,0BAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAA,OAAbA,aAAa;AAAA;;AAWzB;;AAGA;AACA;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}

package/lib/module/types/focusStyle.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=focusStyle.types.js.map

package/lib/module/types/focusStyle.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/focusStyle.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/types/index.js

@@ -1,2 +1,5 @@
 "use strict";
+
+export { LockComponentType } from './KeyboardFocusLock.types';
+export { LockFocusEnum } from './focusOrder.types';
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/index.ts"],"mappings":"","ignoreList":[]}
+{"version":3,"names":["LockComponentType","LockFocusEnum"],"sourceRoot":"../../../src","sources":["types/index.ts"],"mappings":";;AAKA,SAASA,iBAAiB,QAAQ,2BAA2B;AAU7D,SAASC,aAAa,QAAQ,oBAAoB","ignoreList":[]}

package/lib/module/types/keyPress.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=keyPress.types.js.map

package/lib/module/types/keyPress.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/keyPress.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/types/keyboardInput.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=keyboardInput.types.js.map

package/lib/module/types/keyboardInput.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/keyboardInput.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/types/withKeyboardFocus.types.js

@@ -0,0 +1,4 @@
+"use strict";
+
+export {};
+//# sourceMappingURL=withKeyboardFocus.types.js.map

package/lib/module/types/withKeyboardFocus.types.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../src","sources":["types/withKeyboardFocus.types.ts"],"mappings":"","ignoreList":[]}

package/lib/module/utils/mapLockFocus.js

@@ -0,0 +1,32 @@
+"use strict";
+
+import { LockFocusEnum } from '../types';
+var BITS = /*#__PURE__*/function (BITS) {
+  BITS[BITS["BIT_01"] = 1] = "BIT_01";
+  BITS[BITS["BIT_02"] = 2] = "BIT_02";
+  BITS[BITS["BIT_03"] = 4] = "BIT_03";
+  BITS[BITS["BIT_04"] = 8] = "BIT_04";
+  BITS[BITS["BIT_05"] = 16] = "BIT_05";
+  BITS[BITS["BIT_06"] = 32] = "BIT_06";
+  BITS[BITS["BIT_07"] = 64] = "BIT_07";
+  BITS[BITS["BIT_08"] = 128] = "BIT_08";
+  BITS[BITS["BIT_09"] = 256] = "BIT_09";
+  BITS[BITS["BIT_10"] = 512] = "BIT_10";
+  return BITS;
+}(BITS || {});
+const focusBinaryValue = {
+  [LockFocusEnum.Up]: BITS.BIT_01,
+  [LockFocusEnum.Down]: BITS.BIT_02,
+  [LockFocusEnum.Left]: BITS.BIT_03,
+  [LockFocusEnum.Right]: BITS.BIT_04,
+  [LockFocusEnum.Forward]: BITS.BIT_05,
+  [LockFocusEnum.Backward]: BITS.BIT_06,
+  [LockFocusEnum.First]: BITS.BIT_09,
+  [LockFocusEnum.Last]: BITS.BIT_10
+};
+export const mapLockFocus = values => {
+  if (!values || !values.length) return 0;
+  // eslint-disable-next-line no-bitwise
+  return values.reduce((acc, item) => acc | focusBinaryValue[item], 0);
+};
+//# sourceMappingURL=mapLockFocus.js.map

package/lib/module/utils/mapLockFocus.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["LockFocusEnum","BITS","focusBinaryValue","Up","BIT_01","Down","BIT_02","Left","BIT_03","Right","BIT_04","Forward","BIT_05","Backward","BIT_06","First","BIT_09","Last","BIT_10","mapLockFocus","values","length","reduce","acc","item"],"sourceRoot":"../../../src","sources":["utils/mapLockFocus.ts"],"mappings":";;AAAA,SAASA,aAAa,QAA4B,UAAU;AAAC,IAExDC,IAAI,0BAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAJA,IAAI,CAAJA,IAAI;EAAA,OAAJA,IAAI;AAAA,EAAJA,IAAI;AAaT,MAAMC,gBAA+C,GAAG;EACtD,CAACF,aAAa,CAACG,EAAE,GAAGF,IAAI,CAACG,MAAM;EAC/B,CAACJ,aAAa,CAACK,IAAI,GAAGJ,IAAI,CAACK,MAAM;EACjC,CAACN,aAAa,CAACO,IAAI,GAAGN,IAAI,CAACO,MAAM;EACjC,CAACR,aAAa,CAACS,KAAK,GAAGR,IAAI,CAACS,MAAM;EAClC,CAACV,aAAa,CAACW,OAAO,GAAGV,IAAI,CAACW,MAAM;EACpC,CAACZ,aAAa,CAACa,QAAQ,GAAGZ,IAAI,CAACa,MAAM;EACrC,CAACd,aAAa,CAACe,KAAK,GAAGd,IAAI,CAACe,MAAM;EAClC,CAAChB,aAAa,CAACiB,IAAI,GAAGhB,IAAI,CAACiB;AAC7B,CAAC;AAED,OAAO,MAAMC,YAAY,GAAIC,MAAmC,IAAa;EAC3E,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,MAAM,EAAE,OAAO,CAAC;EACvC;EACA,OAAOD,MAAM,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAKD,GAAG,GAAGrB,gBAAgB,CAACsB,IAAI,CAAC,EAAE,CAAC,CAAC;AACtE,CAAC","ignoreList":[]}

package/lib/module/utils/useFocusStyle.js

@@ -1,20 +1,12 @@
 "use strict";
 
 import { useState, useMemo, useCallback } from 'react';
-import { Pressable } from 'react-native';
-const backgroundTintMap = {
-  background: true
-};
-const DEFAULT_BACKGROUND_TINT = '#dce3f9';
 export const useFocusStyle = ({
   focusStyle,
   onFocusChange,
   containerFocusStyle,
-  tintColor,
-  tintType = 'default',
   style,
-  Component,
-  withPressedStyle = false
+  pressedStyleSignature = false
 }) => {
   const [focused, setFocusStatus] = useState(false);
   const onFocusChangeHandler = useCallback(isFocused => {
@@ -27,22 +19,14 @@ export const useFocusStyle = ({
     }) : focusStyle;
     return focused ? specificStyle : undefined;
   }, [focusStyle, focused]);
-  const hoverColor = useMemo(() => ({
-    backgroundColor: tintColor
-  }), [tintColor]);
   const containerFocusedStyle = useMemo(() => {
-    if (backgroundTintMap[tintType] && !containerFocusStyle) {
-      return focused ? {
-        backgroundColor: tintColor ?? DEFAULT_BACKGROUND_TINT
-      } : undefined;
-    }
     if (!containerFocusStyle) return undefined;
     const specificStyle = typeof containerFocusStyle === 'function' ? containerFocusStyle({
       focused
     }) : containerFocusStyle;
     return focused ? specificStyle : undefined;
-  }, [containerFocusStyle, focused, tintColor, tintType]);
-  const dafaultComponentStyle = useMemo(() => [style, componentFocusedStyle], [style, componentFocusedStyle]);
+  }, [containerFocusStyle, focused]);
+  const defaultComponentStyle = useMemo(() => pressedStyleSignature ? undefined : [style, componentFocusedStyle], [pressedStyleSignature, style, componentFocusedStyle]);
   const styleHandlerPressable = useCallback(({
     pressed
   }) => {
@@ -54,13 +38,12 @@ export const useFocusStyle = ({
       return [style, componentFocusedStyle];
     }
   }, [componentFocusedStyle, style]);
-  const componentStyleViewStyle = Component === Pressable || withPressedStyle ? styleHandlerPressable : dafaultComponentStyle;
+  const componentStyleViewStyle = pressedStyleSignature ? styleHandlerPressable : defaultComponentStyle;
   return {
     componentStyleViewStyle,
     componentFocusedStyle,
     containerFocusedStyle,
     onFocusChangeHandler,
-    hoverColor,
     focused
   };
 };

package/lib/module/utils/useFocusStyle.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useMemo","useCallback","Pressable","backgroundTintMap","background","DEFAULT_BACKGROUND_TINT","useFocusStyle","focusStyle","onFocusChange","containerFocusStyle","tintColor","tintType","style","Component","withPressedStyle","focused","setFocusStatus","onFocusChangeHandler","isFocused","componentFocusedStyle","specificStyle","undefined","hoverColor","backgroundColor","containerFocusedStyle","dafaultComponentStyle","styleHandlerPressable","pressed","componentStyleViewStyle"],"sourceRoot":"../../../src","sources":["utils/useFocusStyle.tsx"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,WAAW,QAAQ,OAAO;AACtD,SAA+CC,SAAS,QAAQ,cAAc;AAI9E,MAAMC,iBAAqD,GAAG;EAC5DC,UAAU,EAAE;AACd,CAAC;AAED,MAAMC,uBAAuB,GAAG,SAAS;AAczC,OAAO,MAAMC,aAAa,GAAGA,CAAe;EAC1CC,UAAU;EACVC,aAAa;EACbC,mBAAmB;EACnBC,SAAS;EACTC,QAAQ,GAAG,SAAS;EACpBC,KAAK;EACLC,SAAS;EACTC,gBAAgB,GAAG;AACE,CAAC,KAAK;EAC3B,MAAM,CAACC,OAAO,EAAEC,cAAc,CAAC,GAAGjB,QAAQ,CAAC,KAAK,CAAC;EAEjD,MAAMkB,oBAAoB,GAAGhB,WAAW,CACrCiB,SAAkB,IAAK;IACtBF,cAAc,CAACE,SAAS,CAAC;IACzBV,aAAa,GAAGU,SAAS,CAAC;EAC5B,CAAC,EACD,CAACV,aAAa,CAChB,CAAC;EAED,MAAMW,qBAAqB,GAAGnB,OAAO,CAAC,MAAM;IAC1C,MAAMoB,aAAa,GACjB,OAAOb,UAAU,KAAK,UAAU,GAAGA,UAAU,CAAC;MAAEQ;IAAQ,CAAC,CAAC,GAAGR,UAAU;IACzE,OAAOQ,OAAO,GAAGK,aAAa,GAAGC,SAAS;EAC5C,CAAC,EAAE,CAACd,UAAU,EAAEQ,OAAO,CAAC,CAAC;EAEzB,MAAMO,UAAU,GAAGtB,OAAO,CACxB,OAAO;IACLuB,eAAe,EAAEb;EACnB,CAAC,CAAC,EACF,CAACA,SAAS,CACZ,CAAC;EAED,MAAMc,qBAAqB,GAAGxB,OAAO,CAAC,MAAM;IAC1C,IAAIG,iBAAiB,CAACQ,QAAQ,CAAC,IAAI,CAACF,mBAAmB,EAAE;MACvD,OAAOM,OAAO,GACV;QAAEQ,eAAe,EAAEb,SAAS,IAAIL;MAAwB,CAAC,GACzDgB,SAAS;IACf;IACA,IAAI,CAACZ,mBAAmB,EAAE,OAAOY,SAAS;IAE1C,MAAMD,aAAa,GACjB,OAAOX,mBAAmB,KAAK,UAAU,GACrCA,mBAAmB,CAAC;MAAEM;IAAQ,CAAC,CAAC,GAChCN,mBAAmB;IAEzB,OAAOM,OAAO,GAAGK,aAAa,GAAGC,SAAS;EAC5C,CAAC,EAAE,CAACZ,mBAAmB,EAAEM,OAAO,EAAEL,SAAS,EAAEC,QAAQ,CAAC,CAAC;EAEvD,MAAMc,qBAAqB,GAAGzB,OAAO,CACnC,MAAM,CAACY,KAAK,EAAEO,qBAAqB,CAAC,EACpC,CAACP,KAAK,EAAEO,qBAAqB,CAC/B,CAAC;EACD,MAAMO,qBAAqB,GAAGzB,WAAW,CACvC,CAAC;IAAE0B;EAA8B,CAAC,KAAK;IACrC,IAAI,OAAOf,KAAK,KAAK,UAAU,EAAE;MAC/B,OAAO,CAACA,KAAK,CAAC;QAAEe;MAAQ,CAAC,CAAC,EAAER,qBAAqB,CAAC;IACpD,CAAC,MAAM;MACL,OAAO,CAACP,KAAK,EAAEO,qBAAqB,CAAC;IACvC;EACF,CAAC,EACD,CAACA,qBAAqB,EAAEP,KAAK,CAC/B,CAAC;EAED,MAAMgB,uBAAuB,GAC3Bf,SAAS,KAAKX,SAAS,IAAIY,gBAAgB,GACvCY,qBAAqB,GACrBD,qBAAqB;EAE3B,OAAO;IACLG,uBAAuB;IACvBT,qBAAqB;IACrBK,qBAAqB;IACrBP,oBAAoB;IACpBK,UAAU;IACVP;EACF,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useState","useMemo","useCallback","useFocusStyle","focusStyle","onFocusChange","containerFocusStyle","style","pressedStyleSignature","focused","setFocusStatus","onFocusChangeHandler","isFocused","componentFocusedStyle","specificStyle","undefined","containerFocusedStyle","defaultComponentStyle","styleHandlerPressable","pressed","componentStyleViewStyle"],"sourceRoot":"../../../src","sources":["utils/useFocusStyle.tsx"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,OAAO,EAAEC,WAAW,QAAQ,OAAO;AAYtD,OAAO,MAAMC,aAAa,GAAGA,CAAC;EAC5BC,UAAU;EACVC,aAAa;EACbC,mBAAmB;EACnBC,KAAK;EACLC,qBAAqB,GAAG;AACN,CAAC,KAAK;EACxB,MAAM,CAACC,OAAO,EAAEC,cAAc,CAAC,GAAGV,QAAQ,CAAC,KAAK,CAAC;EAEjD,MAAMW,oBAAoB,GAAGT,WAAW,CACrCU,SAAkB,IAAK;IACtBF,cAAc,CAACE,SAAS,CAAC;IACzBP,aAAa,GAAGO,SAAS,CAAC;EAC5B,CAAC,EACD,CAACP,aAAa,CAChB,CAAC;EAED,MAAMQ,qBAAqB,GAAGZ,OAAO,CAAC,MAAM;IAC1C,MAAMa,aAAa,GACjB,OAAOV,UAAU,KAAK,UAAU,GAAGA,UAAU,CAAC;MAAEK;IAAQ,CAAC,CAAC,GAAGL,UAAU;IACzE,OAAOK,OAAO,GAAGK,aAAa,GAAGC,SAAS;EAC5C,CAAC,EAAE,CAACX,UAAU,EAAEK,OAAO,CAAC,CAAC;EAEzB,MAAMO,qBAAqB,GAAGf,OAAO,CAAC,MAAM;IAC1C,IAAI,CAACK,mBAAmB,EAAE,OAAOS,SAAS;IAE1C,MAAMD,aAAa,GACjB,OAAOR,mBAAmB,KAAK,UAAU,GACrCA,mBAAmB,CAAC;MAAEG;IAAQ,CAAC,CAAC,GAChCH,mBAAmB;IAEzB,OAAOG,OAAO,GAAGK,aAAa,GAAGC,SAAS;EAC5C,CAAC,EAAE,CAACT,mBAAmB,EAAEG,OAAO,CAAC,CAAC;EAElC,MAAMQ,qBAAqB,GAAGhB,OAAO,CACnC,MAAOO,qBAAqB,GAAGO,SAAS,GAAG,CAACR,KAAK,EAAEM,qBAAqB,CAAE,EAC1E,CAACL,qBAAqB,EAAED,KAAK,EAAEM,qBAAqB,CACtD,CAAC;EACD,MAAMK,qBAAqB,GAAGhB,WAAW,CACvC,CAAC;IAAEiB;EAA8B,CAAC,KAAK;IACrC,IAAI,OAAOZ,KAAK,KAAK,UAAU,EAAE;MAC/B,OAAO,CAACA,KAAK,CAAC;QAAEY;MAAQ,CAAC,CAAC,EAAEN,qBAAqB,CAAC;IACpD,CAAC,MAAM;MACL,OAAO,CAACN,KAAK,EAAEM,qBAAqB,CAAC;IACvC;EACF,CAAC,EACD,CAACA,qBAAqB,EAAEN,KAAK,CAC/B,CAAC;EAED,MAAMa,uBAAuB,GAAGZ,qBAAqB,GACjDU,qBAAqB,GACrBD,qBAAqB;EAEzB,OAAO;IACLG,uBAAuB;IACvBP,qBAAqB;IACrBG,qBAAqB;IACrBL,oBAAoB;IACpBF;EACF,CAAC;AACH,CAAC","ignoreList":[]}