react-native-external-keyboard 0.8.4 → 0.8.5-rc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-external-keyboard",
-  "version": "0.8.4",
+  "version": "0.8.5-rc",
   "description": "Toolkit for improving physical keyboard support in React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/components/KeyboardExtendedInput/KeyboardExtendedInput.tsx

@@ -6,8 +6,43 @@ import { useFocusStyle } from '../../utils/useFocusStyle';
 import { focusEventMapper } from '../../utils/focusEventMapper';
 import { RenderPropComponent } from '../RenderPropComponent/RenderPropComponent';
 import { useGroupIdentifierContext } from '../../context/GroupIdentifierContext';
+import { useOrderFocusGroup } from '../../context/OrderFocusContext';
 import type { KeyboardInputProps } from './KeyboardExtendedInput.types';
 import { blurMap, focusMap } from './KeyboardExtendedInput.consts';
+import {
+  LockFocusEnum,
+  type LockFocusType,
+} from '../../types/BaseKeyboardView';
+
+enum BITS {
+  BIT_01 = 0b1,
+  BIT_02 = 0b10,
+  BIT_03 = 0b100,
+  BIT_04 = 0b1000,
+  BIT_05 = 0b10000,
+  BIT_06 = 0b100000,
+  BIT_07 = 0b1000000,
+  BIT_08 = 0b10000000,
+  BIT_09 = 0b100000000,
+  BIT_10 = 0b1000000000,
+}
+
+const focusBinaryValue: Record<LockFocusEnum, number> = {
+  [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,
+};
+
+const mapLockFocus = (values: LockFocusType[] | undefined): number => {
+  if (!values || !values.length) return 0;
+  // eslint-disable-next-line no-bitwise
+  return values.reduce((acc, item) => acc | focusBinaryValue[item], 0);
+};
 
 const isIOS = Platform.OS === 'ios';
 
@@ -33,6 +68,16 @@ export const KeyboardExtendedInput = React.forwardRef<
       onSubmitEditing,
       submitBehavior,
       groupIdentifier,
+      lockFocus,
+      orderGroup,
+      orderIndex,
+      orderId,
+      orderForward,
+      orderBackward,
+      orderLeft,
+      orderRight,
+      orderUp,
+      orderDown,
       rejectResponderTermination,
       selectionHandleColor,
       cursorColor,
@@ -56,6 +101,7 @@ export const KeyboardExtendedInput = React.forwardRef<
     });
 
     const contextIdentifier = useGroupIdentifierContext();
+    const contextOrderGroup = useOrderFocusGroup();
 
     const withHaloEffect = tintType === 'default' && haloEffect;
 
@@ -89,6 +135,16 @@ export const KeyboardExtendedInput = React.forwardRef<
         canBeFocused={canBeFocusable && focusable}
         tintColor={isIOS ? tintColor : undefined}
         groupIdentifier={groupIdentifier ?? contextIdentifier}
+        lockFocus={mapLockFocus(lockFocus)}
+        orderGroup={orderGroup ?? contextOrderGroup}
+        orderIndex={orderIndex}
+        orderId={orderId}
+        orderForward={orderForward}
+        orderBackward={orderBackward}
+        orderLeft={orderLeft}
+        orderRight={orderRight}
+        orderUp={orderUp}
+        orderDown={orderDown}
       >
         <TextInput
           ref={ref as React.RefObject<any>}

package/src/components/KeyboardExtendedInput/KeyboardExtendedInput.types.ts

@@ -9,6 +9,7 @@ import type { FocusStyle } from '../../types/FocusStyle';
 import type { TintType } from '../../types/WithKeyboardFocus';
 import { type RenderProp } from '../RenderPropComponent/RenderPropComponent';
 import type { blurMap, focusMap } from './KeyboardExtendedInput.consts';
+import type { LockFocusType } from '../../types/BaseKeyboardView';
 
 export type ExtraKeyboardProps = {
   focusType?: keyof typeof focusMap;
@@ -25,6 +26,16 @@ export type ExtraKeyboardProps = {
   FocusHoverComponent?: RenderProp;
   submitBehavior?: string;
   groupIdentifier?: string;
+  lockFocus?: LockFocusType[];
+  orderGroup?: string;
+  orderIndex?: number;
+  orderId?: string;
+  orderForward?: string;
+  orderBackward?: string;
+  orderLeft?: string;
+  orderRight?: string;
+  orderUp?: string;
+  orderDown?: string;
 };
 
 type IgnoreForCompatibility =

package/src/nativeSpec/TextInputFocusWrapperNativeComponent.ts

@@ -25,6 +25,18 @@ export interface TextInputFocusWrapperNativeComponent extends ViewProps {
   blurOnSubmit?: boolean;
   multiline?: boolean;
   groupIdentifier?: string;
+  lockFocus?: Int32;
+  orderGroup?: string;
+  orderIndex?: Int32;
+  orderId?: string;
+  orderLeft?: string;
+  orderRight?: string;
+  orderUp?: string;
+  orderDown?: string;
+  orderForward?: string;
+  orderBackward?: string;
+  orderFirst?: string;
+  orderLast?: string;
 }
 
 export default codegenNativeComponent<TextInputFocusWrapperNativeComponent>(