react-native-external-keyboard 0.6.7 → 0.6.8-rc

package/README.md

@@ -97,7 +97,7 @@ Linking is one of the best ways to set up focus order. However, there may be cas
   </View>
 </KeyboardOrderFocusGroup>
 ```
-Indexing requres `orderGroup` param for proper order set,  you can use `KeyboardOrderFocusGroup` or provide `orderGroup` to the component.
+Indexing requires `orderGroup` param for proper order set,  you can use `KeyboardOrderFocusGroup` or provide `orderGroup` to the component.
 
 ```tsx
  <Pressable
@@ -324,7 +324,7 @@ containerStyle | Style for the container | StyleProp<ViewStyle>
 containerFocusStyle?: | Style applied to the container when focused | `FocusStyle`
 tintType?: | Tint behavior type | `'default' \\| 'hover' \\| 'background' \\| 'none'`
 FocusHoverComponent?: | Component displayed on focus | `\\| ReactElement  \\| FunctionComponent  \\| (() => ReactElement);`
-onSubmitEditing?: | Extended `onSubmitEditing` for mulitline input | `(e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void)`
+onSubmitEditing?: | Extended `onSubmitEditing` for multiline input | `(e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void)`
 ...rest | Remaining TextInput props  | `TextInputProps`
 
 
@@ -336,7 +336,7 @@ import { KeyboardExtendedBaseView } from 'react-native-external-keyboard';
   <KeyboardExtendedBaseView
     onKeyDownPress={...}
     onKeyUpPress={...}
-    focussable
+    focusable
   >
     <Text>Content</Text>
   </KeyboardExtendedBaseView>

package/lib/commonjs/utils/useKeyboardPress/useKeyboardPress.android.js

@@ -9,7 +9,6 @@ const ANDROID_SPACE_KEY_CODE = exports.ANDROID_SPACE_KEY_CODE = 62;
 const ANDROID_DPAD_CENTER_CODE = exports.ANDROID_DPAD_CENTER_CODE = 23;
 const ANDROID_ENTER_CODE = exports.ANDROID_ENTER_CODE = 66;
 const ANDROID_TRIGGER_CODES = exports.ANDROID_TRIGGER_CODES = [ANDROID_SPACE_KEY_CODE, ANDROID_DPAD_CENTER_CODE, ANDROID_ENTER_CODE];
-const MILLISECOND_THRESHOLD = 20;
 const useKeyboardPress = ({
   onKeyUpPress,
   onKeyDownPress,
@@ -19,7 +18,22 @@ const useKeyboardPress = ({
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES
 }) => {
-  const thresholdTime = (0, _react.useRef)(0);
+  const pressInRef = (0, _react.useRef)(undefined);
+  const onPressHandler = (0, _react.useCallback)(event => {
+    if (!onLongPress || !pressInRef.current) {
+      onPress === null || onPress === void 0 || onPress(event);
+    }
+  }, [onLongPress, onPress]);
+  const onKeyDownPressHandler = (0, _react.useMemo)(() => {
+    if (!onPressIn && !onLongPress) return onKeyDownPress;
+    return e => {
+      pressInRef.current = new Date().getTime();
+      onKeyDownPress === null || onKeyDownPress === void 0 || onKeyDownPress(e);
+      if (triggerCodes.includes(e.nativeEvent.keyCode)) {
+        onPressIn === null || onPressIn === void 0 || onPressIn(e);
+      }
+    };
+  }, [onKeyDownPress, onLongPress, onPressIn, triggerCodes]);
   const onKeyUpPressHandler = (0, _react.useCallback)(e => {
     const {
       nativeEvent: {
@@ -31,31 +45,17 @@ const useKeyboardPress = ({
     onKeyUpPress === null || onKeyUpPress === void 0 || onKeyUpPress(e);
     if (triggerCodes.includes(keyCode)) {
       if (isLongPress) {
-        thresholdTime.current = e === null || e === void 0 ? void 0 : e.timeStamp;
         onLongPress === null || onLongPress === void 0 || onLongPress({});
+      } else {
+        onPress === null || onPress === void 0 || onPress();
       }
     }
-  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress]);
-  const onKeyDownPressHandler = (0, _react.useMemo)(() => {
-    if (!onPressIn) return onKeyDownPress;
-    return e => {
-      onKeyDownPress === null || onKeyDownPress === void 0 || onKeyDownPress(e);
-      if (triggerCodes.includes(e.nativeEvent.keyCode)) {
-        onPressIn === null || onPressIn === void 0 || onPressIn(e);
-      }
-    };
-  }, [onKeyDownPress, onPressIn, triggerCodes]);
-  const onPressHandler = (0, _react.useCallback)(event => {
-    const pressThreshold = ((event === null || event === void 0 ? void 0 : event.timeStamp) ?? 0) - thresholdTime.current;
-    if (pressThreshold > MILLISECOND_THRESHOLD) {
-      onPress === null || onPress === void 0 || onPress(event);
-    }
-  }, [onPress]);
-  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
+    pressInRef.current = undefined;
+  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]);
   return {
-    onKeyUpPressHandler: hasHandler && onKeyUpPressHandler,
+    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
     onKeyDownPressHandler,
-    onPressHandler: onPress && onPressHandler
+    onKeyUpPressHandler
   };
 };
 exports.useKeyboardPress = useKeyboardPress;

package/lib/commonjs/utils/useKeyboardPress/useKeyboardPress.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","ANDROID_SPACE_KEY_CODE","exports","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","MILLISECOND_THRESHOLD","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","thresholdTime","useRef","onKeyUpPressHandler","useCallback","e","nativeEvent","keyCode","isLongPress","includes","current","timeStamp","onKeyDownPressHandler","useMemo","onPressHandler","event","pressThreshold","hasHandler"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAKO,MAAMC,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,EAAE;AACjC,MAAME,wBAAwB,GAAAD,OAAA,CAAAC,wBAAA,GAAG,EAAE;AACnC,MAAMC,kBAAkB,GAAAF,OAAA,CAAAE,kBAAA,GAAG,EAAE;AAE7B,MAAMC,qBAAqB,GAAAH,OAAA,CAAAG,qBAAA,GAAG,CACnCJ,sBAAsB,EACtBE,wBAAwB,EACxBC,kBAAkB,CACnB;AAED,MAAME,qBAAqB,GAAG,EAAE;AAEzB,MAAMC,gBAAgB,GAAGA,CAG9B;EACAC,YAAY;EACZC,cAAc;EACdC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC,WAAW;EACXC,YAAY,GAAGT;AACY,CAAC,KAAK;EACjC,MAAMU,aAAa,GAAG,IAAAC,aAAM,EAAC,CAAC,CAAC;EAC/B,MAAMC,mBAAmB,GAAG,IAAAC,kBAAW,EACpCC,CAAC,IAAK;IACL,MAAM;MACJC,WAAW,EAAE;QAAEC,OAAO;QAAEC;MAAY;IACtC,CAAC,GAAGH,CAAC;IAELR,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAGQ,CAAqC,CAAC;IACnDX,YAAY,aAAZA,YAAY,eAAZA,YAAY,CAAGW,CAAC,CAAC;IAEjB,IAAIL,YAAY,CAACS,QAAQ,CAACF,OAAO,CAAC,EAAE;MAClC,IAAIC,WAAW,EAAE;QACfP,aAAa,CAACS,OAAO,GAAGL,CAAC,aAADA,CAAC,uBAADA,CAAC,CAAEM,SAAS;QACpCZ,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAG,CAAC,CAA0B,CAAC;MAC5C;IACF;EACF,CAAC,EACD,CAACF,UAAU,EAAEH,YAAY,EAAEM,YAAY,EAAED,WAAW,CACtD,CAAC;EAED,MAAMa,qBAAqB,GAAG,IAAAC,cAAO,EAAC,MAAM;IAC1C,IAAI,CAACjB,SAAS,EAAE,OAAOD,cAAc;IACrC,OAAQU,CAAa,IAAK;MACxBV,cAAc,aAAdA,cAAc,eAAdA,cAAc,CAAGU,CAAC,CAAC;MACnB,IAAIL,YAAY,CAACS,QAAQ,CAACJ,CAAC,CAACC,WAAW,CAACC,OAAO,CAAC,EAAE;QAChDX,SAAS,aAATA,SAAS,eAATA,SAAS,CAAGS,CAAqC,CAAC;MACpD;IACF,CAAC;EACH,CAAC,EAAE,CAACV,cAAc,EAAEC,SAAS,EAAEI,YAAY,CAAC,CAAC;EAE7C,MAAMc,cAAc,GAAG,IAAAV,kBAAW,EAC/BW,KAA4B,IAAK;IAChC,MAAMC,cAAc,GAAG,CAAC,CAAAD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEJ,SAAS,KAAI,CAAC,IAAIV,aAAa,CAACS,OAAO;IACtE,IAAIM,cAAc,GAAGxB,qBAAqB,EAAE;MAC1CM,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAGiB,KAAK,CAAC;IAClB;EACF,CAAC,EACD,CAACjB,OAAO,CACV,CAAC;EAED,MAAMmB,UAAU,GAAGpB,UAAU,IAAIH,YAAY,IAAIK,WAAW,IAAID,OAAO;EACvE,OAAO;IACLK,mBAAmB,EAAEc,UAAU,IAAId,mBAAmB;IACtDS,qBAAqB;IACrBE,cAAc,EAAEhB,OAAO,IAAIgB;EAC7B,CAAC;AACH,CAAC;AAAC1B,OAAA,CAAAK,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_react","require","ANDROID_SPACE_KEY_CODE","exports","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","pressInRef","useRef","undefined","onPressHandler","useCallback","event","current","onKeyDownPressHandler","useMemo","e","Date","getTime","includes","nativeEvent","keyCode","onKeyUpPressHandler","isLongPress"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAKO,MAAMC,sBAAsB,GAAAC,OAAA,CAAAD,sBAAA,GAAG,EAAE;AACjC,MAAME,wBAAwB,GAAAD,OAAA,CAAAC,wBAAA,GAAG,EAAE;AACnC,MAAMC,kBAAkB,GAAAF,OAAA,CAAAE,kBAAA,GAAG,EAAE;AAE7B,MAAMC,qBAAqB,GAAAH,OAAA,CAAAG,qBAAA,GAAG,CACnCJ,sBAAsB,EACtBE,wBAAwB,EACxBC,kBAAkB,CACnB;AAEM,MAAME,gBAAgB,GAAGA,CAG9B;EACAC,YAAY;EACZC,cAAc;EACdC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC,WAAW;EACXC,YAAY,GAAGR;AACY,CAAC,KAAK;EACjC,MAAMS,UAAU,GAAG,IAAAC,aAAM,EAAqBC,SAAS,CAAC;EAExD,MAAMC,cAAc,GAAG,IAAAC,kBAAW,EAC/BC,KAA4B,IAAK;IAChC,IAAI,CAACP,WAAW,IAAI,CAACE,UAAU,CAACM,OAAO,EAAE;MACvCT,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAGQ,KAAK,CAAC;IAClB;EACF,CAAC,EACD,CAACP,WAAW,EAAED,OAAO,CACvB,CAAC;EAED,MAAMU,qBAAqB,GAAG,IAAAC,cAAO,EAAC,MAAM;IAC1C,IAAI,CAACb,SAAS,IAAI,CAACG,WAAW,EAAE,OAAOJ,cAAc;IACrD,OAAQe,CAAa,IAAK;MACxBT,UAAU,CAACM,OAAO,GAAG,IAAII,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC;MACzCjB,cAAc,aAAdA,cAAc,eAAdA,cAAc,CAAGe,CAAC,CAAC;MACnB,IAAIV,YAAY,CAACa,QAAQ,CAACH,CAAC,CAACI,WAAW,CAACC,OAAO,CAAC,EAAE;QAChDnB,SAAS,aAATA,SAAS,eAATA,SAAS,CAAGc,CAAqC,CAAC;MACpD;IACF,CAAC;EACH,CAAC,EAAE,CAACf,cAAc,EAAEI,WAAW,EAAEH,SAAS,EAAEI,YAAY,CAAC,CAAC;EAE1D,MAAMgB,mBAAmB,GAAG,IAAAX,kBAAW,EACpCK,CAAC,IAAK;IACL,MAAM;MACJI,WAAW,EAAE;QAAEC,OAAO;QAAEE;MAAY;IACtC,CAAC,GAAGP,CAAC;IAELb,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAGa,CAAqC,CAAC;IACnDhB,YAAY,aAAZA,YAAY,eAAZA,YAAY,CAAGgB,CAAC,CAAC;IAEjB,IAAIV,YAAY,CAACa,QAAQ,CAACE,OAAO,CAAC,EAAE;MAClC,IAAIE,WAAW,EAAE;QACflB,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAG,CAAC,CAA0B,CAAC;MAC5C,CAAC,MAAM;QACLD,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAG,CAAC;MACb;IACF;IACAG,UAAU,CAACM,OAAO,GAAGJ,SAAS;EAChC,CAAC,EACD,CAACN,UAAU,EAAEH,YAAY,EAAEM,YAAY,EAAED,WAAW,EAAED,OAAO,CAC/D,CAAC;EAED,OAAO;IACLM,cAAc,EAAEN,OAAO,IAAIC,WAAW,GAAGK,cAAc,GAAGN,OAAO;IACjEU,qBAAqB;IACrBQ;EACF,CAAC;AACH,CAAC;AAAC3B,OAAA,CAAAI,gBAAA,GAAAA,gBAAA","ignoreList":[]}

package/lib/module/utils/useKeyboardPress/useKeyboardPress.android.js

@@ -3,7 +3,6 @@ export const ANDROID_SPACE_KEY_CODE = 62;
 export const ANDROID_DPAD_CENTER_CODE = 23;
 export const ANDROID_ENTER_CODE = 66;
 export const ANDROID_TRIGGER_CODES = [ANDROID_SPACE_KEY_CODE, ANDROID_DPAD_CENTER_CODE, ANDROID_ENTER_CODE];
-const MILLISECOND_THRESHOLD = 20;
 export const useKeyboardPress = ({
   onKeyUpPress,
   onKeyDownPress,
@@ -13,7 +12,22 @@ export const useKeyboardPress = ({
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES
 }) => {
-  const thresholdTime = useRef(0);
+  const pressInRef = useRef(undefined);
+  const onPressHandler = useCallback(event => {
+    if (!onLongPress || !pressInRef.current) {
+      onPress === null || onPress === void 0 || onPress(event);
+    }
+  }, [onLongPress, onPress]);
+  const onKeyDownPressHandler = useMemo(() => {
+    if (!onPressIn && !onLongPress) return onKeyDownPress;
+    return e => {
+      pressInRef.current = new Date().getTime();
+      onKeyDownPress === null || onKeyDownPress === void 0 || onKeyDownPress(e);
+      if (triggerCodes.includes(e.nativeEvent.keyCode)) {
+        onPressIn === null || onPressIn === void 0 || onPressIn(e);
+      }
+    };
+  }, [onKeyDownPress, onLongPress, onPressIn, triggerCodes]);
   const onKeyUpPressHandler = useCallback(e => {
     const {
       nativeEvent: {
@@ -25,31 +39,17 @@ export const useKeyboardPress = ({
     onKeyUpPress === null || onKeyUpPress === void 0 || onKeyUpPress(e);
     if (triggerCodes.includes(keyCode)) {
       if (isLongPress) {
-        thresholdTime.current = e === null || e === void 0 ? void 0 : e.timeStamp;
         onLongPress === null || onLongPress === void 0 || onLongPress({});
+      } else {
+        onPress === null || onPress === void 0 || onPress();
       }
     }
-  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress]);
-  const onKeyDownPressHandler = useMemo(() => {
-    if (!onPressIn) return onKeyDownPress;
-    return e => {
-      onKeyDownPress === null || onKeyDownPress === void 0 || onKeyDownPress(e);
-      if (triggerCodes.includes(e.nativeEvent.keyCode)) {
-        onPressIn === null || onPressIn === void 0 || onPressIn(e);
-      }
-    };
-  }, [onKeyDownPress, onPressIn, triggerCodes]);
-  const onPressHandler = useCallback(event => {
-    const pressThreshold = ((event === null || event === void 0 ? void 0 : event.timeStamp) ?? 0) - thresholdTime.current;
-    if (pressThreshold > MILLISECOND_THRESHOLD) {
-      onPress === null || onPress === void 0 || onPress(event);
-    }
-  }, [onPress]);
-  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
+    pressInRef.current = undefined;
+  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]);
   return {
-    onKeyUpPressHandler: hasHandler && onKeyUpPressHandler,
+    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
     onKeyDownPressHandler,
-    onPressHandler: onPress && onPressHandler
+    onKeyUpPressHandler
   };
 };
 //# sourceMappingURL=useKeyboardPress.android.js.map

package/lib/module/utils/useKeyboardPress/useKeyboardPress.android.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useMemo","useRef","ANDROID_SPACE_KEY_CODE","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","MILLISECOND_THRESHOLD","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","thresholdTime","onKeyUpPressHandler","e","nativeEvent","keyCode","isLongPress","includes","current","timeStamp","onKeyDownPressHandler","onPressHandler","event","pressThreshold","hasHandler"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":"AAAA,SAASA,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AAKpD,OAAO,MAAMC,sBAAsB,GAAG,EAAE;AACxC,OAAO,MAAMC,wBAAwB,GAAG,EAAE;AAC1C,OAAO,MAAMC,kBAAkB,GAAG,EAAE;AAEpC,OAAO,MAAMC,qBAAqB,GAAG,CACnCH,sBAAsB,EACtBC,wBAAwB,EACxBC,kBAAkB,CACnB;AAED,MAAME,qBAAqB,GAAG,EAAE;AAEhC,OAAO,MAAMC,gBAAgB,GAAGA,CAG9B;EACAC,YAAY;EACZC,cAAc;EACdC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC,WAAW;EACXC,YAAY,GAAGT;AACY,CAAC,KAAK;EACjC,MAAMU,aAAa,GAAGd,MAAM,CAAC,CAAC,CAAC;EAC/B,MAAMe,mBAAmB,GAAGjB,WAAW,CACpCkB,CAAC,IAAK;IACL,MAAM;MACJC,WAAW,EAAE;QAAEC,OAAO;QAAEC;MAAY;IACtC,CAAC,GAAGH,CAAC;IAELN,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAGM,CAAqC,CAAC;IACnDT,YAAY,aAAZA,YAAY,eAAZA,YAAY,CAAGS,CAAC,CAAC;IAEjB,IAAIH,YAAY,CAACO,QAAQ,CAACF,OAAO,CAAC,EAAE;MAClC,IAAIC,WAAW,EAAE;QACfL,aAAa,CAACO,OAAO,GAAGL,CAAC,aAADA,CAAC,uBAADA,CAAC,CAAEM,SAAS;QACpCV,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAG,CAAC,CAA0B,CAAC;MAC5C;IACF;EACF,CAAC,EACD,CAACF,UAAU,EAAEH,YAAY,EAAEM,YAAY,EAAED,WAAW,CACtD,CAAC;EAED,MAAMW,qBAAqB,GAAGxB,OAAO,CAAC,MAAM;IAC1C,IAAI,CAACU,SAAS,EAAE,OAAOD,cAAc;IACrC,OAAQQ,CAAa,IAAK;MACxBR,cAAc,aAAdA,cAAc,eAAdA,cAAc,CAAGQ,CAAC,CAAC;MACnB,IAAIH,YAAY,CAACO,QAAQ,CAACJ,CAAC,CAACC,WAAW,CAACC,OAAO,CAAC,EAAE;QAChDT,SAAS,aAATA,SAAS,eAATA,SAAS,CAAGO,CAAqC,CAAC;MACpD;IACF,CAAC;EACH,CAAC,EAAE,CAACR,cAAc,EAAEC,SAAS,EAAEI,YAAY,CAAC,CAAC;EAE7C,MAAMW,cAAc,GAAG1B,WAAW,CAC/B2B,KAA4B,IAAK;IAChC,MAAMC,cAAc,GAAG,CAAC,CAAAD,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEH,SAAS,KAAI,CAAC,IAAIR,aAAa,CAACO,OAAO;IACtE,IAAIK,cAAc,GAAGrB,qBAAqB,EAAE;MAC1CM,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAGc,KAAK,CAAC;IAClB;EACF,CAAC,EACD,CAACd,OAAO,CACV,CAAC;EAED,MAAMgB,UAAU,GAAGjB,UAAU,IAAIH,YAAY,IAAIK,WAAW,IAAID,OAAO;EACvE,OAAO;IACLI,mBAAmB,EAAEY,UAAU,IAAIZ,mBAAmB;IACtDQ,qBAAqB;IACrBC,cAAc,EAAEb,OAAO,IAAIa;EAC7B,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useMemo","useRef","ANDROID_SPACE_KEY_CODE","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","pressInRef","undefined","onPressHandler","event","current","onKeyDownPressHandler","e","Date","getTime","includes","nativeEvent","keyCode","onKeyUpPressHandler","isLongPress"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":"AAAA,SAASA,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAQ,OAAO;AAKpD,OAAO,MAAMC,sBAAsB,GAAG,EAAE;AACxC,OAAO,MAAMC,wBAAwB,GAAG,EAAE;AAC1C,OAAO,MAAMC,kBAAkB,GAAG,EAAE;AAEpC,OAAO,MAAMC,qBAAqB,GAAG,CACnCH,sBAAsB,EACtBC,wBAAwB,EACxBC,kBAAkB,CACnB;AAED,OAAO,MAAME,gBAAgB,GAAGA,CAG9B;EACAC,YAAY;EACZC,cAAc;EACdC,SAAS;EACTC,UAAU;EACVC,OAAO;EACPC,WAAW;EACXC,YAAY,GAAGR;AACY,CAAC,KAAK;EACjC,MAAMS,UAAU,GAAGb,MAAM,CAAqBc,SAAS,CAAC;EAExD,MAAMC,cAAc,GAAGjB,WAAW,CAC/BkB,KAA4B,IAAK;IAChC,IAAI,CAACL,WAAW,IAAI,CAACE,UAAU,CAACI,OAAO,EAAE;MACvCP,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAGM,KAAK,CAAC;IAClB;EACF,CAAC,EACD,CAACL,WAAW,EAAED,OAAO,CACvB,CAAC;EAED,MAAMQ,qBAAqB,GAAGnB,OAAO,CAAC,MAAM;IAC1C,IAAI,CAACS,SAAS,IAAI,CAACG,WAAW,EAAE,OAAOJ,cAAc;IACrD,OAAQY,CAAa,IAAK;MACxBN,UAAU,CAACI,OAAO,GAAG,IAAIG,IAAI,CAAC,CAAC,CAACC,OAAO,CAAC,CAAC;MACzCd,cAAc,aAAdA,cAAc,eAAdA,cAAc,CAAGY,CAAC,CAAC;MACnB,IAAIP,YAAY,CAACU,QAAQ,CAACH,CAAC,CAACI,WAAW,CAACC,OAAO,CAAC,EAAE;QAChDhB,SAAS,aAATA,SAAS,eAATA,SAAS,CAAGW,CAAqC,CAAC;MACpD;IACF,CAAC;EACH,CAAC,EAAE,CAACZ,cAAc,EAAEI,WAAW,EAAEH,SAAS,EAAEI,YAAY,CAAC,CAAC;EAE1D,MAAMa,mBAAmB,GAAG3B,WAAW,CACpCqB,CAAC,IAAK;IACL,MAAM;MACJI,WAAW,EAAE;QAAEC,OAAO;QAAEE;MAAY;IACtC,CAAC,GAAGP,CAAC;IAELV,UAAU,aAAVA,UAAU,eAAVA,UAAU,CAAGU,CAAqC,CAAC;IACnDb,YAAY,aAAZA,YAAY,eAAZA,YAAY,CAAGa,CAAC,CAAC;IAEjB,IAAIP,YAAY,CAACU,QAAQ,CAACE,OAAO,CAAC,EAAE;MAClC,IAAIE,WAAW,EAAE;QACff,WAAW,aAAXA,WAAW,eAAXA,WAAW,CAAG,CAAC,CAA0B,CAAC;MAC5C,CAAC,MAAM;QACLD,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAG,CAAC;MACb;IACF;IACAG,UAAU,CAACI,OAAO,GAAGH,SAAS;EAChC,CAAC,EACD,CAACL,UAAU,EAAEH,YAAY,EAAEM,YAAY,EAAED,WAAW,EAAED,OAAO,CAC/D,CAAC;EAED,OAAO;IACLK,cAAc,EAAEL,OAAO,IAAIC,WAAW,GAAGI,cAAc,GAAGL,OAAO;IACjEQ,qBAAqB;IACrBO;EACF,CAAC;AACH,CAAC","ignoreList":[]}

package/lib/typescript/src/utils/useKeyboardPress/useKeyboardPress.android.d.ts

@@ -6,8 +6,8 @@ export declare const ANDROID_DPAD_CENTER_CODE = 23;
 export declare const ANDROID_ENTER_CODE = 66;
 export declare const ANDROID_TRIGGER_CODES: number[];
 export declare const useKeyboardPress: <T extends (event?: any) => void, K extends (event?: any) => void>({ onKeyUpPress, onKeyDownPress, onPressIn, onPressOut, onPress, onLongPress, triggerCodes, }: UseKeyboardPressProps<T, K>) => {
-    onKeyUpPressHandler: OnKeyPressFn | undefined;
-    onKeyDownPressHandler: OnKeyPressFn | undefined;
     onPressHandler: ((event: GestureResponderEvent) => void) | undefined;
+    onKeyDownPressHandler: OnKeyPressFn | undefined;
+    onKeyUpPressHandler: OnKeyPressFn;
 };
 //# sourceMappingURL=useKeyboardPress.android.d.ts.map

package/lib/typescript/src/utils/useKeyboardPress/useKeyboardPress.android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useKeyboardPress.android.d.ts","sourceRoot":"","sources":["../../../../../src/utils/useKeyboardPress/useKeyboardPress.android.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE7E,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,qBAAqB,UAIjC,CAAC;AAIF,eAAO,MAAM,gBAAgB,GAC3B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,EAC/B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,EAC/B,8FAQC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;;;6BAgClB,qBAAqB;CAehC,CAAC"}
+{"version":3,"file":"useKeyboardPress.android.d.ts","sourceRoot":"","sources":["../../../../../src/utils/useKeyboardPress/useKeyboardPress.android.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EAAc,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE7E,eAAO,MAAM,sBAAsB,KAAK,CAAC;AACzC,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,qBAAqB,UAIjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,EAC/B,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,EAC/B,8FAQC,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;6BAIlB,qBAAqB;;;CA6ChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-external-keyboard",
-  "version": "0.6.7",
+  "version": "0.6.8-rc",
   "description": "Toolkit for improving physical keyboard support in React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -62,7 +62,7 @@
     "@evilmartians/lefthook": "^1.5.0",
     "@react-native-community/cli": "15.0.1",
     "@react-native/eslint-config": "^0.73.1",
-    "@release-it/conventional-changelog": "^9.0.2",
+    "@release-it/conventional-changelog": "^10.0.1",
     "@types/jest": "^29.5.5",
     "@types/react": "^18.2.44",
     "commitlint": "^17.0.2",
@@ -75,7 +75,7 @@
     "react": "18.3.1",
     "react-native": "0.76.5",
     "react-native-builder-bob": "^0.20.4",
-    "release-it": "^17.10.0",
+    "release-it": "^19.0.5",
     "turbo": "^1.10.7",
     "typescript": "^5.2.2"
   },

package/src/utils/useKeyboardPress/useKeyboardPress.android.ts

@@ -13,8 +13,6 @@ export const ANDROID_TRIGGER_CODES = [
   ANDROID_ENTER_CODE,
 ];
 
-const MILLISECOND_THRESHOLD = 20;
-
 export const useKeyboardPress = <
   T extends (event?: any) => void,
   K extends (event?: any) => void,
@@ -27,50 +25,52 @@ export const useKeyboardPress = <
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES,
 }: UseKeyboardPressProps<T, K>) => {
-  const thresholdTime = useRef(0);
-  const onKeyUpPressHandler = useCallback<OnKeyPressFn>(
-    (e) => {
-      const {
-        nativeEvent: { keyCode, isLongPress },
-      } = e;
-
-      onPressOut?.(e as unknown as GestureResponderEvent);
-      onKeyUpPress?.(e);
+  const pressInRef = useRef<number | undefined>(undefined);
 
-      if (triggerCodes.includes(keyCode)) {
-        if (isLongPress) {
-          thresholdTime.current = e?.timeStamp;
-          onLongPress?.({} as GestureResponderEvent);
-        }
+  const onPressHandler = useCallback(
+    (event: GestureResponderEvent) => {
+      if (!onLongPress || !pressInRef.current) {
+        onPress?.(event);
       }
     },
-    [onPressOut, onKeyUpPress, triggerCodes, onLongPress]
+    [onLongPress, onPress]
   );
 
   const onKeyDownPressHandler = useMemo(() => {
-    if (!onPressIn) return onKeyDownPress;
+    if (!onPressIn && !onLongPress) return onKeyDownPress;
     return (e: OnKeyPress) => {
+      pressInRef.current = new Date().getTime();
       onKeyDownPress?.(e);
       if (triggerCodes.includes(e.nativeEvent.keyCode)) {
         onPressIn?.(e as unknown as GestureResponderEvent);
       }
     };
-  }, [onKeyDownPress, onPressIn, triggerCodes]);
+  }, [onKeyDownPress, onLongPress, onPressIn, triggerCodes]);
 
-  const onPressHandler = useCallback(
-    (event: GestureResponderEvent) => {
-      const pressThreshold = (event?.timeStamp ?? 0) - thresholdTime.current;
-      if (pressThreshold > MILLISECOND_THRESHOLD) {
-        onPress?.(event);
+  const onKeyUpPressHandler = useCallback<OnKeyPressFn>(
+    (e) => {
+      const {
+        nativeEvent: { keyCode, isLongPress },
+      } = e;
+
+      onPressOut?.(e as unknown as GestureResponderEvent);
+      onKeyUpPress?.(e);
+
+      if (triggerCodes.includes(keyCode)) {
+        if (isLongPress) {
+          onLongPress?.({} as GestureResponderEvent);
+        } else {
+          onPress?.();
+        }
       }
+      pressInRef.current = undefined;
     },
-    [onPress]
+    [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]
   );
 
-  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
   return {
-    onKeyUpPressHandler: hasHandler && onKeyUpPressHandler,
+    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
     onKeyDownPressHandler,
-    onPressHandler: onPress && onPressHandler,
+    onKeyUpPressHandler,
   };
 };