react-native-external-keyboard 0.9.1 → 0.11.1

package/lib/commonjs/utils/useRenderedChildren.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useRenderedChildren = void 0;
+var _react = require("react");
+/**
+ * Resolves the `children` override for the wrapped component.
+ * - `renderContent` stays a function so the component can call it with its own state + `focused`
+ *   (keyboard activation forces `pressed` when `keyboardPressed` is set)
+ * - `renderFocusable` is evaluated immediately and returned as a static node
+ * Returns `undefined` when neither prop is provided.
+ */
+const useRenderedChildren = ({
+  focused,
+  keyboardPressed = false,
+  renderContent,
+  renderFocusable
+}) => {
+  const contentChildren = (0, _react.useMemo)(() => renderContent ? state => renderContent({
+    ...state,
+    ...(keyboardPressed ? {
+      pressed: true
+    } : null),
+    focused
+  }) : undefined, [renderContent, focused, keyboardPressed]);
+  const focusableChildren = (0, _react.useMemo)(() => renderFocusable?.({
+    focused
+  }), [renderFocusable, focused]);
+  return contentChildren ?? focusableChildren;
+};
+exports.useRenderedChildren = useRenderedChildren;
+//# sourceMappingURL=useRenderedChildren.js.map

package/lib/commonjs/utils/useRenderedChildren.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","useRenderedChildren","focused","keyboardPressed","renderContent","renderFocusable","contentChildren","useMemo","state","pressed","undefined","focusableChildren","exports"],"sourceRoot":"../../../src","sources":["utils/useRenderedChildren.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AASA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,mBAAmB,GAAGA,CAAC;EAClCC,OAAO;EACPC,eAAe,GAAG,KAAK;EACvBC,aAAa;EACbC;AACwB,CAAC,KAAK;EAC9B,MAAMC,eAAe,GAAG,IAAAC,cAAO,EAC7B,MACEH,aAAa,GACRI,KAA8B,IAC7BJ,aAAa,CAAC;IACZ,GAAGI,KAAK;IACR,IAAIL,eAAe,GAAG;MAAEM,OAAO,EAAE;IAAK,CAAC,GAAG,IAAI,CAAC;IAC/CP;EACF,CAAC,CAAC,GACJQ,SAAS,EACf,CAACN,aAAa,EAAEF,OAAO,EAAEC,eAAe,CAC1C,CAAC;EAED,MAAMQ,iBAAiB,GAAG,IAAAJ,cAAO,EAC/B,MAAMF,eAAe,GAAG;IAAEH;EAAQ,CAAC,CAAC,EACpC,CAACG,eAAe,EAAEH,OAAO,CAC3B,CAAC;EAED,OAAOI,eAAe,IAAIK,iBAAiB;AAC7C,CAAC;AAACC,OAAA,CAAAX,mBAAA,GAAAA,mBAAA","ignoreList":[]}

package/lib/commonjs/utils/useWrappedOrderProps.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useWrappedOrderProps = void 0;
+var _react = require("react");
+var _wrapOrderPrefix = require("./wrapOrderPrefix");
+const useWrappedOrderProps = ({
+  orderPrefix = '',
+  orderId,
+  orderForward,
+  orderBackward,
+  orderFirst,
+  orderLast,
+  orderLeft,
+  orderRight,
+  orderUp,
+  orderDown
+}) => {
+  const wrapPrefix = (0, _react.useMemo)(() => (0, _wrapOrderPrefix.wrapOrderPrefix)(orderPrefix), [orderPrefix]);
+  return (0, _react.useMemo)(() => ({
+    orderId: wrapPrefix(orderId),
+    orderForward: wrapPrefix(orderForward),
+    orderBackward: wrapPrefix(orderBackward),
+    orderLeft: wrapPrefix(orderLeft),
+    orderRight: wrapPrefix(orderRight),
+    orderUp: wrapPrefix(orderUp),
+    orderDown: wrapPrefix(orderDown),
+    orderFirst: wrapPrefix(orderFirst === null ? undefined : orderFirst ?? orderForward),
+    orderLast: wrapPrefix(orderLast === null ? undefined : orderLast ?? orderBackward)
+  }), [wrapPrefix, orderId, orderForward, orderBackward, orderFirst, orderLast, orderLeft, orderRight, orderUp, orderDown]);
+};
+exports.useWrappedOrderProps = useWrappedOrderProps;
+//# sourceMappingURL=useWrappedOrderProps.js.map

package/lib/commonjs/utils/useWrappedOrderProps.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_react","require","_wrapOrderPrefix","useWrappedOrderProps","orderPrefix","orderId","orderForward","orderBackward","orderFirst","orderLast","orderLeft","orderRight","orderUp","orderDown","wrapPrefix","useMemo","wrapOrderPrefix","undefined","exports"],"sourceRoot":"../../../src","sources":["utils/useWrappedOrderProps.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAEA,IAAAC,gBAAA,GAAAD,OAAA;AAEO,MAAME,oBAAoB,GAAGA,CAAC;EACnCC,WAAW,GAAG,EAAE;EAChBC,OAAO;EACPC,YAAY;EACZC,aAAa;EACbC,UAAU;EACVC,SAAS;EACTC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC;AACe,CAAC,KAAK;EACrB,MAAMC,UAAU,GAAG,IAAAC,cAAO,EAAC,MAAM,IAAAC,gCAAe,EAACZ,WAAW,CAAC,EAAE,CAACA,WAAW,CAAC,CAAC;EAE7E,OAAO,IAAAW,cAAO,EACZ,OAAO;IACLV,OAAO,EAAES,UAAU,CAACT,OAAO,CAAC;IAC5BC,YAAY,EAAEQ,UAAU,CAACR,YAAY,CAAC;IACtCC,aAAa,EAAEO,UAAU,CAACP,aAAa,CAAC;IACxCG,SAAS,EAAEI,UAAU,CAACJ,SAAS,CAAC;IAChCC,UAAU,EAAEG,UAAU,CAACH,UAAU,CAAC;IAClCC,OAAO,EAAEE,UAAU,CAACF,OAAO,CAAC;IAC5BC,SAAS,EAAEC,UAAU,CAACD,SAAS,CAAC;IAChCL,UAAU,EAAEM,UAAU,CACpBN,UAAU,KAAK,IAAI,GAAGS,SAAS,GAAGT,UAAU,IAAIF,YAClD,CAAC;IACDG,SAAS,EAAEK,UAAU,CACnBL,SAAS,KAAK,IAAI,GAAGQ,SAAS,GAAGR,SAAS,IAAIF,aAChD;EACF,CAAC,CAAC,EACF,CACEO,UAAU,EACVT,OAAO,EACPC,YAAY,EACZC,aAAa,EACbC,UAAU,EACVC,SAAS,EACTC,SAAS,EACTC,UAAU,EACVC,OAAO,EACPC,SAAS,CAEb,CAAC;AACH,CAAC;AAACK,OAAA,CAAAf,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/lib/commonjs/utils/withKeyboardFocus.js

@@ -7,49 +7,47 @@ exports.withKeyboardFocus = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _components = require("../components");
-var _useFocusStyle = require("./useFocusStyle");
-var _RenderPropComponent = require("../components/RenderPropComponent/RenderPropComponent");
-var _useKeyboardPress = require("./useKeyboardPress/useKeyboardPress");
+var _useKeyboardFocusContainer = require("./useKeyboardFocusContainer");
+var _useRenderedChildren = require("./useRenderedChildren");
 var _IsViewFocusedContext = require("../context/IsViewFocusedContext");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const withKeyboardFocus = Component => {
   const WithKeyboardFocus = /*#__PURE__*/_react.default.memo(/*#__PURE__*/_react.default.forwardRef((allProps, ref) => {
     const {
-      tintType = 'default',
-      autoFocus,
+      // Style
       focusStyle,
       style,
       containerStyle,
-      onFocusChange,
+      containerFocusStyle,
+      withPressedStyle = false,
+      // Press handlers
       onPress,
       onLongPress,
       onKeyUpPress,
       onKeyDownPress,
       onPressIn,
       onPressOut,
-      group = false,
+      triggerCodes,
+      // Focus config
+      autoFocus,
+      focusableWrapper = true,
       haloEffect = true,
-      canBeFocused = true,
       focusable = true,
       tintColor,
       onFocus,
       onBlur,
-      containerFocusStyle,
-      FocusHoverComponent,
-      viewRef,
-      componentRef,
+      onFocusChange,
+      groupIdentifier,
       haloCornerRadius,
       haloExpendX,
       haloExpendY,
-      groupIdentifier,
-      withPressedStyle = false,
-      triggerCodes,
-      exposeMethods,
-      enableA11yFocus,
       screenAutoA11yFocus,
-      screenAutoA11yFocusDelay = 300,
-      // ToDo align with BaseKeyboardView
+      screenAutoA11yFocusDelay,
+      lockFocus,
+      defaultFocusHighlightEnabled,
+      androidKeyboardPressState,
+      // Order
       orderIndex,
       orderGroup,
       orderId,
@@ -61,36 +59,37 @@ const withKeyboardFocus = Component => {
       orderBackward,
       orderFirst,
       orderLast,
-      lockFocus,
+      // Refs & render
+      componentRef,
       onComponentFocus,
       onComponentBlur,
       renderContent,
       renderFocusable,
-      defaultFocusHighlightEnabled,
+      roundedHaloFix,
+      tintType,
+      // Deprecated no-ops: discard so they never reach the wrapped component.
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      enableA11yFocus: _enableA11yFocus,
+      children: userChildren,
       ...props
     } = allProps;
     const {
       focused,
+      keyboardPressed,
       containerFocusedStyle,
       componentStyleViewStyle,
       onFocusChangeHandler,
-      hoverColor
-    } = (0, _useFocusStyle.useFocusStyle)({
+      onKeyUpPressHandler,
+      onKeyDownPressHandler,
+      onPressHandler,
+      onContextMenuHandler,
+      enableContextMenu
+    } = (0, _useKeyboardFocusContainer.useKeyboardFocusContainer)({
       onFocusChange,
-      tintColor,
       focusStyle,
       containerFocusStyle,
-      tintType,
       style,
-      withPressedStyle,
-      Component
-    });
-    const withHaloEffect = tintType === 'default' && haloEffect;
-    const {
-      onKeyUpPressHandler,
-      onKeyDownPressHandler,
-      onPressHandler
-    } = (0, _useKeyboardPress.useKeyboardPress)({
+      pressedStyleSignature: withPressedStyle || Component === _reactNative.Pressable,
       onKeyUpPress,
       onKeyDownPress,
       onPress: onPress,
@@ -98,71 +97,68 @@ const withKeyboardFocus = Component => {
       onPressIn: onPressIn,
       onPressOut: onPressOut,
       triggerCodes,
-      disabled: props?.disabled
+      androidKeyboardPressState
     });
-    const contentChildrenProp = (0, _react.useMemo)(() => renderContent ? state => renderContent({
-      ...state,
-      focused
-    }) : undefined, [renderContent, focused]);
-    const focusableChildrenProp = (0, _react.useMemo)(() => renderFocusable ? renderFocusable({
-      focused
-    }) : undefined, [renderFocusable, focused]);
-    const hoverContent = (0, _react.useMemo)(() => {
-      if (FocusHoverComponent) return FocusHoverComponent;
-      if (tintType === 'hover') {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-          style: [hoverColor, styles.absolute, styles.opacity]
+    const renderedChildren = (0, _useRenderedChildren.useRenderedChildren)({
+      focused,
+      keyboardPressed,
+      renderContent: renderContent,
+      renderFocusable
+    });
+    // `renderContent`/`renderFocusable` are handled above; for a plain
+    // children render prop, fold the keyboard press into its `pressed` too so
+    // it stays consistent. A no-op unless `keyboardPressed` is active.
+    const childContent = (0, _react.useMemo)(() => {
+      if (renderedChildren !== undefined) return renderedChildren;
+      if (keyboardPressed && typeof userChildren === 'function') {
+        const childrenFn = userChildren;
+        return state => childrenFn({
+          ...state,
+          pressed: true
         });
       }
-      return undefined;
-    }, [FocusHoverComponent, hoverColor, tintType]);
-    const focusOrderProps = {
-      orderIndex,
-      orderGroup,
-      orderId,
-      orderLeft,
-      orderRight,
-      orderUp,
-      orderDown,
-      orderForward,
-      orderBackward,
-      orderFirst,
-      orderLast
-    };
-    const onContextMenuHandler = (0, _react.useCallback)(() => {
-      onLongPress?.();
-    }, [onLongPress]);
+      return userChildren;
+    }, [renderedChildren, userChildren, keyboardPressed]);
+    const containerStyleArr = (0, _react.useMemo)(() => [containerStyle, containerFocusedStyle], [containerStyle, containerFocusedStyle]);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_IsViewFocusedContext.IsViewFocusedContext.Provider, {
       value: focused,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.BaseKeyboardView, {
-        style: [containerStyle, containerFocusedStyle],
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.BaseKeyboardView, {
+        style: containerStyleArr,
         defaultFocusHighlightEnabled: defaultFocusHighlightEnabled,
         ref: ref,
-        viewRef: viewRef,
         onKeyUpPress: onKeyUpPressHandler,
         onKeyDownPress: onKeyDownPressHandler,
-        onFocus: onFocus,
-        onBlur: onBlur,
+        onFocus: onFocus ?? undefined,
+        onBlur: onBlur ?? undefined,
         onFocusChange: onFocusChangeHandler,
         onContextMenuPress: onContextMenuHandler,
-        enableContextMenu: Boolean(onLongPress),
-        haloEffect: withHaloEffect,
+        enableContextMenu: enableContextMenu,
+        haloEffect: haloEffect,
+        tintType: tintType,
         haloCornerRadius: haloCornerRadius,
         haloExpendX: haloExpendX,
         haloExpendY: haloExpendY,
         autoFocus: autoFocus,
-        canBeFocused: canBeFocused,
         focusable: focusable,
         tintColor: tintColor,
-        group: group,
+        focusableWrapper: focusableWrapper,
         groupIdentifier: groupIdentifier,
-        exposeMethods: exposeMethods,
-        enableA11yFocus: enableA11yFocus,
         screenAutoA11yFocus: screenAutoA11yFocus,
         screenAutoA11yFocusDelay: screenAutoA11yFocusDelay,
         lockFocus: lockFocus,
-        ...focusOrderProps,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
+        roundedHaloFix: roundedHaloFix,
+        orderIndex: orderIndex,
+        orderGroup: orderGroup,
+        orderId: orderId,
+        orderLeft: orderLeft,
+        orderRight: orderRight,
+        orderUp: orderUp,
+        orderDown: orderDown,
+        orderForward: orderForward,
+        orderBackward: orderBackward,
+        orderFirst: orderFirst,
+        orderLast: orderLast,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, {
           ref: componentRef,
           style: componentStyleViewStyle,
           onPress: onPressHandler,
@@ -170,14 +166,15 @@ const withKeyboardFocus = Component => {
           onPressIn: onPressIn,
           onPressOut: onPressOut,
           onFocus: onComponentFocus,
-          onBlur: onComponentBlur,
+          onBlur: onComponentBlur
+          // forwarded to the child so Pressable-like components disable press handling when false
+          ,
+          focusable: focusable,
           ...props,
-          ...((contentChildrenProp || focusableChildrenProp) && {
-            children: contentChildrenProp ?? focusableChildrenProp
+          ...(childContent !== undefined && {
+            children: childContent
           })
-        }), focused && hoverContent && /*#__PURE__*/(0, _jsxRuntime.jsx)(_RenderPropComponent.RenderPropComponent, {
-          render: hoverContent
-        })]
+        })
       })
     });
   }));
@@ -186,16 +183,4 @@ const withKeyboardFocus = Component => {
   return WithKeyboardFocus;
 };
 exports.withKeyboardFocus = withKeyboardFocus;
-const styles = _reactNative.StyleSheet.create({
-  absolute: {
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    right: 0,
-    bottom: 0
-  },
-  opacity: {
-    opacity: 0.3
-  }
-});
 //# sourceMappingURL=withKeyboardFocus.js.map

package/lib/commonjs/utils/withKeyboardFocus.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_components","_useFocusStyle","_RenderPropComponent","_useKeyboardPress","_IsViewFocusedContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withKeyboardFocus","Component","WithKeyboardFocus","React","memo","forwardRef","allProps","ref","tintType","autoFocus","focusStyle","style","containerStyle","onFocusChange","onPress","onLongPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","group","haloEffect","canBeFocused","focusable","tintColor","onFocus","onBlur","containerFocusStyle","FocusHoverComponent","viewRef","componentRef","haloCornerRadius","haloExpendX","haloExpendY","groupIdentifier","withPressedStyle","triggerCodes","exposeMethods","enableA11yFocus","screenAutoA11yFocus","screenAutoA11yFocusDelay","orderIndex","orderGroup","orderId","orderLeft","orderRight","orderUp","orderDown","orderForward","orderBackward","orderFirst","orderLast","lockFocus","onComponentFocus","onComponentBlur","renderContent","renderFocusable","defaultFocusHighlightEnabled","props","focused","containerFocusedStyle","componentStyleViewStyle","onFocusChangeHandler","hoverColor","useFocusStyle","withHaloEffect","onKeyUpPressHandler","onKeyDownPressHandler","onPressHandler","useKeyboardPress","disabled","contentChildrenProp","useMemo","state","undefined","focusableChildrenProp","hoverContent","jsx","View","styles","absolute","opacity","focusOrderProps","onContextMenuHandler","useCallback","IsViewFocusedContext","Provider","value","children","jsxs","BaseKeyboardView","onContextMenuPress","enableContextMenu","Boolean","RenderPropComponent","render","wrappedComponentName","displayName","name","exports","StyleSheet","create","position","top","left","right","bottom"],"sourceRoot":"../../../src","sources":["utils/withKeyboardFocus.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_components","_useKeyboardFocusContainer","_useRenderedChildren","_IsViewFocusedContext","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withKeyboardFocus","Component","WithKeyboardFocus","React","memo","forwardRef","allProps","ref","focusStyle","style","containerStyle","containerFocusStyle","withPressedStyle","onPress","onLongPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","triggerCodes","autoFocus","focusableWrapper","haloEffect","focusable","tintColor","onFocus","onBlur","onFocusChange","groupIdentifier","haloCornerRadius","haloExpendX","haloExpendY","screenAutoA11yFocus","screenAutoA11yFocusDelay","lockFocus","defaultFocusHighlightEnabled","androidKeyboardPressState","orderIndex","orderGroup","orderId","orderLeft","orderRight","orderUp","orderDown","orderForward","orderBackward","orderFirst","orderLast","componentRef","onComponentFocus","onComponentBlur","renderContent","renderFocusable","roundedHaloFix","tintType","enableA11yFocus","_enableA11yFocus","children","userChildren","props","focused","keyboardPressed","containerFocusedStyle","componentStyleViewStyle","onFocusChangeHandler","onKeyUpPressHandler","onKeyDownPressHandler","onPressHandler","onContextMenuHandler","enableContextMenu","useKeyboardFocusContainer","pressedStyleSignature","RNPressable","renderedChildren","useRenderedChildren","childContent","useMemo","undefined","childrenFn","state","pressed","containerStyleArr","jsx","IsViewFocusedContext","Provider","value","BaseKeyboardView","onContextMenuPress","wrappedComponentName","displayName","name","exports"],"sourceRoot":"../../../src","sources":["utils/withKeyboardFocus.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/BaseKeyboardView/BaseKeyboardView.js

@@ -4,18 +4,17 @@ import React, { useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { Platform } from 'react-native';
 import { ExternalKeyboardViewNative } from '../../nativeSpec';
 import { Commands } from '../../nativeSpec/ExternalKeyboardViewNativeComponent';
-import { LockFocusEnum } from '../../types/BaseKeyboardView';
+import { LockFocusEnum } from '../../types';
 import { KeyPressContext } from '../../context/BubbledKeyPressContext';
 import { useBubbledInfo } from './BaseKeyboardView.hooks';
 import { useGroupIdentifierContext } from '../../context/GroupIdentifierContext';
 import { useOnFocusChange } from '../../utils/useOnFocusChange';
 import { useOrderFocusGroup } from '../../context/OrderFocusContext';
-import { wrapOrderPrefix } from '../../utils/wrapOrderPrefix';
+import { useWrappedOrderProps } from '../../utils/useWrappedOrderProps';
 
 // @ts-ignore
 import { jsx as _jsx } from "react/jsx-runtime";
 const isIOS = Platform.OS === 'ios';
-const DEFAULT_EXPOSE_METHODS = ['blur', 'measure', 'measureInWindow', 'measureLayout', 'setNativeProps'];
 var BITS = /*#__PURE__*/function (BITS) {
   BITS[BITS["BIT_01"] = 1] = "BIT_01";
   BITS[BITS["BIT_02"] = 2] = "BIT_02";
@@ -23,8 +22,6 @@ var BITS = /*#__PURE__*/function (BITS) {
   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;
@@ -52,18 +49,14 @@ export const BaseKeyboardView = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwa
   onBubbledContextMenuPress,
   haloEffect,
   autoFocus,
-  canBeFocused = true,
   focusable = true,
-  group = false,
+  focusableWrapper = false,
   onFocus,
   onBlur,
-  viewRef,
   groupIdentifier,
   tintColor,
-  ignoreGroupFocusHint,
-  exposeMethods = DEFAULT_EXPOSE_METHODS,
-  enableA11yFocus = false,
-  screenAutoA11yFocusDelay = 500,
+  // TODO: revisit screenAutoA11yFocusDelay default (currently 300ms)
+  screenAutoA11yFocusDelay = 300,
   lockFocus,
   orderIndex,
   orderForward,
@@ -78,11 +71,14 @@ export const BaseKeyboardView = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwa
   orderId,
   enableContextMenu,
   orderPrefix: _orderPrefix,
+  tintType,
+  // Deprecated no-ops: destructured out so they never reach the native view.
+  enableA11yFocus: _enableA11yFocus,
   defaultFocusHighlightEnabled = true,
+  roundedHaloFix = false,
   ...props
 }, ref) => {
-  const localRef = useRef(undefined);
-  const targetRef = viewRef ?? localRef;
+  const targetRef = useRef(null);
   const lockFocusValue = useMemo(() => mapFocusValues(lockFocus), [lockFocus]);
   const contextIdentifier = useGroupIdentifierContext();
   const contextGroupId = useOrderFocusGroup();
@@ -100,44 +96,53 @@ export const BaseKeyboardView = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwa
     }
   }, [orderId, orderForward, orderBackward, orderFirst, orderLast, orderLeft, orderRight, orderUp, orderDown, orderPrefix]);
   useImperativeHandle(ref, () => {
-    const actions = {};
-    exposeMethods.forEach(method => {
-      actions[method] = (...args) => {
-        const componentActions = targetRef?.current;
-        return componentActions?.[method]?.(...args);
-      };
-    });
-    actions.focus = () => {
-      if (targetRef?.current) {
-        Commands.focus(targetRef.current);
+    const nativeCommands = {
+      keyboardFocus: () => {
+        if (targetRef?.current) {
+          Commands.rnekKeyboardFocus(targetRef.current);
+        }
+      },
+      screenReaderFocus: () => {
+        if (targetRef?.current) {
+          Commands.rnekScreenReaderFocus(targetRef.current);
+        }
+      },
+      focus: () => {
+        if (targetRef?.current) {
+          Commands.rnekKeyboardFocus(targetRef.current);
+          Commands.rnekScreenReaderFocus(targetRef.current);
+        }
       }
     };
-    return actions;
-  }, [exposeMethods, targetRef]);
+    return new Proxy({}, {
+      get(_target, prop) {
+        if (prop in nativeCommands) {
+          return nativeCommands[prop];
+        }
+        return targetRef?.current?.[prop];
+      }
+    });
+  }, [targetRef]);
   const bubbled = useBubbledInfo(onBubbledContextMenuPress);
   const onFocusChangeHandler = useOnFocusChange({
     onFocusChange,
     onFocus,
     onBlur
   });
-  const hasOnFocusChanged = onFocusChange || onFocus || onBlur;
-  const ignoreFocusHint = Platform.OS !== 'ios' || !ignoreGroupFocusHint;
-  const wrapPrefix = useMemo(() => wrapOrderPrefix(orderPrefix), [orderPrefix]);
-  const wrappedOrderProps = useMemo(() => ({
-    orderId: wrapPrefix(orderId),
-    orderForward: wrapPrefix(orderForward),
-    orderBackward: wrapPrefix(orderBackward),
-    orderFirst: wrapPrefix(orderFirst === null ? undefined : orderFirst ?? orderForward),
-    orderLast: wrapPrefix(orderLast === null ? undefined : orderLast ?? orderBackward),
-    orderLeft: wrapPrefix(orderLeft),
-    orderRight: wrapPrefix(orderRight),
-    orderUp: wrapPrefix(orderUp),
-    orderDown: wrapPrefix(orderDown)
-  }), [wrapPrefix, orderId, orderForward, orderBackward, orderFirst, orderLast, orderLeft, orderRight, orderUp, orderDown]);
-  const platformSpecificHalo = useMemo(() => Platform.select({
-    ios: haloEffect,
-    android: defaultFocusHighlightEnabled
-  }) ?? true, [defaultFocusHighlightEnabled, haloEffect]);
+  const hasFocusListener = onFocusChange || onFocus || onBlur;
+  const wrappedOrderProps = useWrappedOrderProps({
+    orderPrefix,
+    orderId,
+    orderForward,
+    orderBackward,
+    orderFirst,
+    orderLast,
+    orderLeft,
+    orderRight,
+    orderUp,
+    orderDown
+  });
+  const platformSpecificHalo = tintType !== 'none' && (isIOS ? haloEffect ?? true : defaultFocusHighlightEnabled);
   return /*#__PURE__*/_jsx(KeyPressContext.Provider, {
     value: bubbled.context,
     children: /*#__PURE__*/_jsx(ExternalKeyboardViewNative, {
@@ -145,27 +150,24 @@ export const BaseKeyboardView = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwa
       haloEffect: platformSpecificHalo,
       ref: targetRef,
       enableContextMenu: enableContextMenu,
-      canBeFocused: ignoreFocusHint && focusable && canBeFocused,
+      canBeFocused: focusable,
       autoFocus: autoFocus,
-      onKeyDownPress: onKeyDownPress //ToDo update types
-      ,
-      onKeyUpPress: onKeyUpPress //ToDo update types
-      ,
+      onKeyDownPress: onKeyDownPress,
+      onKeyUpPress: onKeyUpPress,
       onBubbledContextMenuPress: bubbled.contextMenu,
       groupIdentifier: groupIdentifier ?? contextIdentifier,
       tintColor: isIOS ? tintColor : undefined,
-      onFocusChange: hasOnFocusChanged && onFocusChangeHandler //ToDo update types
-      ,
+      onFocusChange: hasFocusListener ? onFocusChangeHandler : undefined,
       hasKeyDownPress: Boolean(onKeyDownPress),
       hasKeyUpPress: Boolean(onKeyUpPress),
-      hasOnFocusChanged: Boolean(hasOnFocusChanged),
-      group: group,
+      hasOnFocusChanged: Boolean(hasFocusListener),
+      focusableWrapper: focusableWrapper,
       orderIndex: orderIndex ?? -1,
-      enableA11yFocus: enableA11yFocus,
       screenAutoA11yFocusDelay: screenAutoA11yFocusDelay,
       lockFocus: lockFocusValue,
       ...wrappedOrderProps,
-      orderGroup: groupId
+      orderGroup: groupId,
+      roundedHaloFix: roundedHaloFix
     })
   });
 }));

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useImperativeHandle","useMemo","useRef","Platform","ExternalKeyboardViewNative","Commands","LockFocusEnum","KeyPressContext","useBubbledInfo","useGroupIdentifierContext","useOnFocusChange","useOrderFocusGroup","wrapOrderPrefix","jsx","_jsx","isIOS","OS","DEFAULT_EXPOSE_METHODS","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","mapFocusValues","values","length","reduce","acc","item","BaseKeyboardView","memo","forwardRef","onFocusChange","onKeyUpPress","onKeyDownPress","onBubbledContextMenuPress","haloEffect","autoFocus","canBeFocused","focusable","group","onFocus","onBlur","viewRef","groupIdentifier","tintColor","ignoreGroupFocusHint","exposeMethods","enableA11yFocus","screenAutoA11yFocusDelay","lockFocus","orderIndex","orderForward","orderBackward","orderFirst","orderLast","orderGroup","orderLeft","orderRight","orderUp","orderDown","orderId","enableContextMenu","orderPrefix","_orderPrefix","defaultFocusHighlightEnabled","props","ref","localRef","undefined","targetRef","lockFocusValue","contextIdentifier","contextGroupId","groupId","__DEV__","console","warn","hasOrderLinkProp","actions","forEach","method","args","componentActions","current","focus","bubbled","onFocusChangeHandler","hasOnFocusChanged","ignoreFocusHint","wrapPrefix","wrappedOrderProps","platformSpecificHalo","select","ios","android","Provider","value","context","children","contextMenu","hasKeyDownPress","Boolean","hasKeyUpPress"],"sourceRoot":"../../../../src","sources":["components/BaseKeyboardView/BaseKeyboardView.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAEVC,SAAS,EACTC,mBAAmB,EACnBC,OAAO,EACPC,MAAM,QACD,OAAO;AACd,SAASC,QAAQ,QAAQ,cAAc;AACvC,SAASC,0BAA0B,QAAQ,kBAAkB;AAC7D,SAASC,QAAQ,QAAQ,sDAAsD;AAC/E,SACEC,aAAa,QAIR,8BAA8B;AAErC,SAASC,eAAe,QAAQ,sCAAsC;AACtE,SAASC,cAAc,QAAQ,0BAA0B;AACzD,SAASC,yBAAyB,QAAQ,sCAAsC;AAChF,SAASC,gBAAgB,QAAQ,8BAA8B;AAC/D,SAASC,kBAAkB,QAAQ,iCAAiC;AACpE,SAASC,eAAe,QAAQ,6BAA6B;;AAE7D;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAEA,MAAMC,KAAK,GAAGZ,QAAQ,CAACa,EAAE,KAAK,KAAK;AAEnC,MAAMC,sBAAsB,GAAG,CAC7B,MAAM,EACN,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,gBAAgB,CACjB;AAAC,IAEGC,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,CAACb,aAAa,CAACc,EAAE,GAAGF,IAAI,CAACG,MAAM;EAC/B,CAACf,aAAa,CAACgB,IAAI,GAAGJ,IAAI,CAACK,MAAM;EACjC,CAACjB,aAAa,CAACkB,IAAI,GAAGN,IAAI,CAACO,MAAM;EACjC,CAACnB,aAAa,CAACoB,KAAK,GAAGR,IAAI,CAACS,MAAM;EAClC,CAACrB,aAAa,CAACsB,OAAO,GAAGV,IAAI,CAACW,MAAM;EACpC,CAACvB,aAAa,CAACwB,QAAQ,GAAGZ,IAAI,CAACa,MAAM;EACrC,CAACzB,aAAa,CAAC0B,KAAK,GAAGd,IAAI,CAACe,MAAM;EAClC,CAAC3B,aAAa,CAAC4B,IAAI,GAAGhB,IAAI,CAACiB;AAC7B,CAAC;AAED,MAAMC,cAAc,GAAIC,MAAmC,IAAK;EAC9D,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,MAAM,EAAE,OAAO,CAAC;;EAEvC;EACA,OAAOD,MAAM,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAKD,GAAG,GAAGrB,gBAAgB,CAACsB,IAAI,CAAC,EAAE,CAAC,CAAC;AACtE,CAAC;AAED,OAAO,MAAMC,gBAAgB,gBAAG5C,KAAK,CAAC6C,IAAI,cACxC7C,KAAK,CAAC8C,UAAU,CACd,CACE;EACEC,aAAa;EACbC,YAAY;EACZC,cAAc;EACdC,yBAAyB;EACzBC,UAAU;EACVC,SAAS;EACTC,YAAY,GAAG,IAAI;EACnBC,SAAS,GAAG,IAAI;EAChBC,KAAK,GAAG,KAAK;EACbC,OAAO;EACPC,MAAM;EACNC,OAAO;EACPC,eAAe;EACfC,SAAS;EACTC,oBAAoB;EACpBC,aAAa,GAAG3C,sBAAsB;EACtC4C,eAAe,GAAG,KAAK;EACvBC,wBAAwB,GAAG,GAAG;EAC9BC,SAAS;EACTC,UAAU;EACVC,YAAY;EACZC,aAAa;EACbC,UAAU;EACVC,SAAS;EACTC,UAAU;EACVC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC,SAAS;EACTC,OAAO;EACPC,iBAAiB;EACjBC,WAAW,EAAEC,YAAY;EACzBC,4BAA4B,GAAG,IAAI;EACnC,GAAGC;AACL,CAAC,EACDC,GAAG,KACA;EACH,MAAMC,QAAQ,GAAG/E,MAAM,CAAOgF,SAAS,CAAC;EACxC,MAAMC,SAAS,GAAG3B,OAAO,IAAIyB,QAAQ;EACrC,MAAMG,cAAc,GAAGnF,OAAO,CAC5B,MAAMmC,cAAc,CAAC2B,SAAS,CAAC,EAC/B,CAACA,SAAS,CACZ,CAAC;EAED,MAAMsB,iBAAiB,GAAG5E,yBAAyB,CAAC,CAAC;EACrD,MAAM6E,cAAc,GAAG3E,kBAAkB,CAAC,CAAC;EAC3C,MAAM4E,OAAO,GAAGlB,UAAU,IAAIiB,cAAc;EAE5C,MAAMV,WAAW,GAAGC,YAAY,IAAIS,cAAc,IAAI,EAAE;EAExDvF,SAAS,CAAC,MAAM;IACd,IAAI,CAACyF,OAAO,EAAE;IACd,IAAIxB,UAAU,KAAKkB,SAAS,IAAI,CAACK,OAAO,EACtCE,OAAO,CAACC,IAAI,CACV,+KACF,CAAC;EACL,CAAC,EAAE,CAACH,OAAO,EAAEvB,UAAU,CAAC,CAAC;EAEzBjE,SAAS,CAAC,MAAM;IACd,IAAI,CAACyF,OAAO,EAAE;IACd,MAAMG,gBAAgB,GACpBjB,OAAO,KAAKQ,SAAS,IACrBjB,YAAY,KAAKiB,SAAS,IAC1BhB,aAAa,KAAKgB,SAAS,IAC3Bf,UAAU,KAAKe,SAAS,IACxBd,SAAS,KAAKc,SAAS,IACvBZ,SAAS,KAAKY,SAAS,IACvBX,UAAU,KAAKW,SAAS,IACxBV,OAAO,KAAKU,SAAS,IACrBT,SAAS,KAAKS,SAAS;IACzB,IAAIS,gBAAgB,IAAIf,WAAW,KAAK,EAAE,EAAE;MAC1Ca,OAAO,CAACC,IAAI,CACV,gGAAgG,GAC9F,gEAAgE,GAChE,4GACJ,CAAC;IACH;EACF,CAAC,EAAE,CACDhB,OAAO,EACPT,YAAY,EACZC,aAAa,EACbC,UAAU,EACVC,SAAS,EACTE,SAAS,EACTC,UAAU,EACVC,OAAO,EACPC,SAAS,EACTG,WAAW,CACZ,CAAC;EAEF5E,mBAAmB,CACjBgF,GAAG,EACH,MAAM;IACJ,MAAMY,OAAiC,GAAG,CAAC,CAAC;IAE5ChC,aAAa,CAACiC,OAAO,CAAEC,MAAM,IAAK;MAChCF,OAAO,CAACE,MAAM,CAAC,GAAG,CAAC,GAAGC,IAAW,KAAK;QACpC,MAAMC,gBAAgB,GAAGb,SAAS,EAAEc,OAGnC;QACD,OAAOD,gBAAgB,GAAGF,MAAM,CAAC,GAAG,GAAGC,IAAI,CAAC;MAC9C,CAAC;IACH,CAAC,CAAC;IAEFH,OAAO,CAACM,KAAK,GAAG,MAAM;MACpB,IAAIf,SAAS,EAAEc,OAAO,EAAE;QACtB5F,QAAQ,CAAC6F,KAAK,CAACf,SAAS,CAACc,OAA+B,CAAC;MAC3D;IACF,CAAC;IAED,OAAOL,OAAO;EAChB,CAAC,EACD,CAAChC,aAAa,EAAEuB,SAAS,CAC3B,CAAC;EAED,MAAMgB,OAAO,GAAG3F,cAAc,CAACwC,yBAAyB,CAAC;EAEzD,MAAMoD,oBAAoB,GAAG1F,gBAAgB,CAAC;IAC5CmC,aAAa;IACbS,OAAO;IACPC;EACF,CAAC,CAAC;EAEF,MAAM8C,iBAAiB,GAAGxD,aAAa,IAAIS,OAAO,IAAIC,MAAM;EAC5D,MAAM+C,eAAe,GAAGnG,QAAQ,CAACa,EAAE,KAAK,KAAK,IAAI,CAAC2C,oBAAoB;EAEtE,MAAM4C,UAAU,GAAGtG,OAAO,CACxB,MAAMW,eAAe,CAACgE,WAAW,CAAC,EAClC,CAACA,WAAW,CACd,CAAC;EAED,MAAM4B,iBAAiB,GAAGvG,OAAO,CAC/B,OAAO;IACLyE,OAAO,EAAE6B,UAAU,CAAC7B,OAAO,CAAC;IAC5BT,YAAY,EAAEsC,UAAU,CAACtC,YAAY,CAAC;IACtCC,aAAa,EAAEqC,UAAU,CAACrC,aAAa,CAAC;IACxCC,UAAU,EAAEoC,UAAU,CACpBpC,UAAU,KAAK,IAAI,GAAGe,SAAS,GAAGf,UAAU,IAAIF,YAClD,CAAC;IACDG,SAAS,EAAEmC,UAAU,CACnBnC,SAAS,KAAK,IAAI,GAAGc,SAAS,GAAGd,SAAS,IAAIF,aAChD,CAAC;IACDI,SAAS,EAAEiC,UAAU,CAACjC,SAAS,CAAC;IAChCC,UAAU,EAAEgC,UAAU,CAAChC,UAAU,CAAC;IAClCC,OAAO,EAAE+B,UAAU,CAAC/B,OAAO,CAAC;IAC5BC,SAAS,EAAE8B,UAAU,CAAC9B,SAAS;EACjC,CAAC,CAAC,EACF,CACE8B,UAAU,EACV7B,OAAO,EACPT,YAAY,EACZC,aAAa,EACbC,UAAU,EACVC,SAAS,EACTE,SAAS,EACTC,UAAU,EACVC,OAAO,EACPC,SAAS,CAEb,CAAC;EAED,MAAMgC,oBAAoB,GAAGxG,OAAO,CAClC,MACEE,QAAQ,CAACuG,MAAM,CAAC;IACdC,GAAG,EAAE1D,UAAU;IACf2D,OAAO,EAAE9B;EACX,CAAC,CAAC,IAAI,IAAI,EACZ,CAACA,4BAA4B,EAAE7B,UAAU,CAC3C,CAAC;EAED,oBACEnC,IAAA,CAACP,eAAe,CAACsG,QAAQ;IAACC,KAAK,EAAEX,OAAO,CAACY,OAAQ;IAAAC,QAAA,eAC/ClG,IAAA,CAACV,0BAA0B;MAAA,GACrB2E,KAAK;MACT9B,UAAU,EAAEwD,oBAAqB;MACjCzB,GAAG,EAAEG,SAAkC;MACvCR,iBAAiB,EAAEA,iBAAkB;MACrCxB,YAAY,EAAEmD,eAAe,IAAIlD,SAAS,IAAID,YAAa;MAC3DD,SAAS,EAAEA,SAAU;MACrBH,cAAc,EAAEA,cAA4B,CAAC;MAAA;MAC7CD,YAAY,EAAEA,YAA0B,CAAC;MAAA;MACzCE,yBAAyB,EAAEmD,OAAO,CAACc,WAAY;MAC/CxD,eAAe,EAAEA,eAAe,IAAI4B,iBAAkB;MACtD3B,SAAS,EAAE3C,KAAK,GAAG2C,SAAS,GAAGwB,SAAU;MACzCrC,aAAa,EACVwD,iBAAiB,IAAID,oBACvB,CAAC;MAAA;MACFc,eAAe,EAAEC,OAAO,CAACpE,cAAc,CAAE;MACzCqE,aAAa,EAAED,OAAO,CAACrE,YAAY,CAAE;MACrCuD,iBAAiB,EAAEc,OAAO,CAACd,iBAAiB,CAAE;MAC9ChD,KAAK,EAAEA,KAAM;MACbW,UAAU,EAAEA,UAAU,IAAI,CAAC,CAAE;MAC7BH,eAAe,EAAEA,eAAgB;MACjCC,wBAAwB,EAAEA,wBAAyB;MACnDC,SAAS,EAAEqB,cAAe;MAAA,GACtBoB,iBAAiB;MACrBnC,UAAU,EAAEkB;IAAQ,CACrB;EAAC,CACsB,CAAC;AAE/B,CACF,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useImperativeHandle","useMemo","useRef","Platform","ExternalKeyboardViewNative","Commands","LockFocusEnum","KeyPressContext","useBubbledInfo","useGroupIdentifierContext","useOnFocusChange","useOrderFocusGroup","useWrappedOrderProps","jsx","_jsx","isIOS","OS","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","mapFocusValues","values","length","reduce","acc","item","BaseKeyboardView","memo","forwardRef","onFocusChange","onKeyUpPress","onKeyDownPress","onBubbledContextMenuPress","haloEffect","autoFocus","focusable","focusableWrapper","onFocus","onBlur","groupIdentifier","tintColor","screenAutoA11yFocusDelay","lockFocus","orderIndex","orderForward","orderBackward","orderFirst","orderLast","orderGroup","orderLeft","orderRight","orderUp","orderDown","orderId","enableContextMenu","orderPrefix","_orderPrefix","tintType","enableA11yFocus","_enableA11yFocus","defaultFocusHighlightEnabled","roundedHaloFix","props","ref","targetRef","lockFocusValue","contextIdentifier","contextGroupId","groupId","__DEV__","undefined","console","warn","hasOrderLinkProp","nativeCommands","keyboardFocus","current","rnekKeyboardFocus","screenReaderFocus","rnekScreenReaderFocus","focus","Proxy","get","_target","prop","bubbled","onFocusChangeHandler","hasFocusListener","wrappedOrderProps","platformSpecificHalo","Provider","value","context","children","canBeFocused","contextMenu","hasKeyDownPress","Boolean","hasKeyUpPress","hasOnFocusChanged"],"sourceRoot":"../../../../src","sources":["components/BaseKeyboardView/BaseKeyboardView.tsx"],"mappings":"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","ignoreList":[]}