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

package/ios/Delegates/RNCEKVFocusDelegate/RNCEKVFocusDelegate.mm

@@ -13,46 +13,83 @@
 #import "RNCEKVFocusEffectUtility.h"
 
 @implementation RNCEKVFocusDelegate{
-    UIView<RNCEKVFocusProtocol>* _delegate;
+  UIView<RNCEKVFocusProtocol>* _delegate;
 }
 
 - (instancetype _Nonnull )initWithView:(UIView<RNCEKVFocusProtocol> *_Nonnull)delegate{
-    self = [super init];
-    if (self) {
-        _delegate = delegate;
+  self = [super init];
+  if (self) {
+    _delegate = delegate;
+  }
+  return self;
+}
+
+- (UIView*)getFirstFocusable:(UIView*)view {
+  if(view.subviews.count == 0) return nil;
+  UIView* child = view.subviews[0];
+  if(child.canBecomeFocused) {
+    return child;
+  } else {
+    return [self getFirstFocusable: child];
+  }
+}
+
+
+- (UIView *)focusingViewForGestureHandler {
+    UIView *view = _delegate.subviews.firstObject;
+    // Handle the special case for RNGestureHandlerButtonComponentView
+    if (view && [NSStringFromClass([view class]) isEqualToString:@"RNGestureHandlerButtonComponentView"] &&
+        view.subviews.count > 0) {
+        return view.subviews.firstObject;
+    }
+    return nil;
+}
+
+- (UIView *)firstObject {
+    UIView *firstChild = _delegate.subviews.firstObject;
+    if (firstChild && firstChild.canBecomeFocused) {
+        return firstChild;
     }
-    return self;
+    return nil;
 }
 
+
+
 // ToDo RNCEKV-2, Double check condition, count more then 1 means that a view can be a ViewGroup, bun when we use hover component it can be considered as ViewGroup instead of touchable component, it can be improved by flag, or by removing hover component from js implementation
-- (UIView*)getFocusingView {
-    if(_delegate.isGroup) {
+- (UIView *)getFocusingView {
+    if (_delegate.isGroup) {
         return _delegate;
     }
     
-    if(_delegate.subviews.count > 0 && _delegate.subviews[0].canBecomeFocused) {
-        return _delegate.subviews[0];
+    UIView *gestureHandlerView = [self focusingViewForGestureHandler];
+    if (gestureHandlerView) {
+        return gestureHandlerView;
+    }
+    
+    UIView *firstObject = [self firstObject];
+    if (firstObject) {
+        return firstObject;
     }
     
     return _delegate;
 }
 
 - (BOOL)canBecomeFocused {
-    if(!_delegate.canBeFocused) {
-        return false;
-    }
-    return [self getFocusingView] == _delegate;
+  if(!_delegate.canBeFocused) {
+    return false;
+  }
+  return [self getFocusingView] == _delegate;
 }
 
 - (NSNumber*)isFocusChanged:(UIFocusUpdateContext *)context {
-    UIView* view = [self getFocusingView];
-    if(context.nextFocusedView == view) {
-        return @YES;
-    } else if (context.previouslyFocusedView == view) {
-        return @NO;
-    }
-    
-    return nil;
+  UIView* view = [self getFocusingView];
+  if(context.nextFocusedView == view) {
+    return @YES;
+  } else if (context.previouslyFocusedView == view) {
+    return @NO;
+  }
+  
+  return nil;
 }
 
 

package/ios/Extensions/RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm

@@ -10,13 +10,23 @@
 
 #import "RCTEnhancedScrollView.h"
 #import "RNCEKVSwizzleInstanceMethod.h"
+#import "RCTScrollViewComponentView.h"
 
 @implementation RCTEnhancedScrollView (RNCEKVExternalKeyboard)
 
 - (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-  if(self.subviews.count) {
-    return @[self.subviews[0]];
+  @try {
+    BOOL isScrollViewComponent = self.superview &&
+    [self.superview isKindOfClass:[RCTScrollViewComponentView class]];
+    
+    if (isScrollViewComponent) {
+      RCTScrollViewComponentView *scrollViewComponent = (RCTScrollViewComponentView *)self.superview;
+      return @[scrollViewComponent.containerView];
+    }
   }
+  @catch (NSException *exception) {
+  }
+  
   return [super preferredFocusEnvironments];
 }
 

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

@@ -9,6 +9,15 @@ 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 useDebouncedCallback = (callback, delay) => {
+  const timeoutRef = (0, _react.useRef)();
+  return (0, _react.useCallback)((...args) => {
+    if (timeoutRef.current) clearTimeout(timeoutRef.current);
+    timeoutRef.current = setTimeout(() => {
+      callback(...args);
+    }, delay);
+  }, [callback, delay]);
+};
 const useKeyboardPress = ({
   onKeyUpPress,
   onKeyDownPress,
@@ -18,22 +27,15 @@ const useKeyboardPress = ({
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES
 }) => {
-  const pressInRef = (0, _react.useRef)(undefined);
-  const onPressHandler = (0, _react.useCallback)(event => {
-    if (!onLongPress || !pressInRef.current) {
+  const isLongPressRef = (0, _react.useRef)(false);
+  const debouncedOnPress = useDebouncedCallback(event => {
+    if (isLongPressRef.current) {
+      onLongPress === null || onLongPress === void 0 || onLongPress();
+    } else {
       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]);
+    isLongPressRef.current = false;
+  }, 40);
   const onKeyUpPressHandler = (0, _react.useCallback)(e => {
     const {
       nativeEvent: {
@@ -45,17 +47,28 @@ const useKeyboardPress = ({
     onKeyUpPress === null || onKeyUpPress === void 0 || onKeyUpPress(e);
     if (triggerCodes.includes(keyCode)) {
       if (isLongPress) {
-        onLongPress === null || onLongPress === void 0 || onLongPress({});
-      } else {
-        onPress === null || onPress === void 0 || onPress();
+        isLongPressRef.current = true;
+        debouncedOnPress();
       }
     }
-    pressInRef.current = undefined;
-  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]);
+  }, [onPressOut, onKeyUpPress, triggerCodes, debouncedOnPress]);
+  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 => {
+    debouncedOnPress(event);
+  }, [debouncedOnPress]);
+  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
   return {
-    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
+    onKeyUpPressHandler: hasHandler ? onKeyUpPressHandler : undefined,
     onKeyDownPressHandler,
-    onKeyUpPressHandler
+    onPressHandler: onPress ? onPressHandler : undefined
   };
 };
 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","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":[]}
+{"version":3,"names":["_react","require","ANDROID_SPACE_KEY_CODE","exports","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","useDebouncedCallback","callback","delay","timeoutRef","useRef","useCallback","args","current","clearTimeout","setTimeout","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","isLongPressRef","debouncedOnPress","event","onKeyUpPressHandler","e","nativeEvent","keyCode","isLongPress","includes","onKeyDownPressHandler","useMemo","onPressHandler","hasHandler","undefined"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":"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","ignoreList":[]}

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

@@ -3,6 +3,15 @@ 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 useDebouncedCallback = (callback, delay) => {
+  const timeoutRef = useRef();
+  return useCallback((...args) => {
+    if (timeoutRef.current) clearTimeout(timeoutRef.current);
+    timeoutRef.current = setTimeout(() => {
+      callback(...args);
+    }, delay);
+  }, [callback, delay]);
+};
 export const useKeyboardPress = ({
   onKeyUpPress,
   onKeyDownPress,
@@ -12,22 +21,15 @@ export const useKeyboardPress = ({
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES
 }) => {
-  const pressInRef = useRef(undefined);
-  const onPressHandler = useCallback(event => {
-    if (!onLongPress || !pressInRef.current) {
+  const isLongPressRef = useRef(false);
+  const debouncedOnPress = useDebouncedCallback(event => {
+    if (isLongPressRef.current) {
+      onLongPress === null || onLongPress === void 0 || onLongPress();
+    } else {
       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]);
+    isLongPressRef.current = false;
+  }, 40);
   const onKeyUpPressHandler = useCallback(e => {
     const {
       nativeEvent: {
@@ -39,17 +41,28 @@ export const useKeyboardPress = ({
     onKeyUpPress === null || onKeyUpPress === void 0 || onKeyUpPress(e);
     if (triggerCodes.includes(keyCode)) {
       if (isLongPress) {
-        onLongPress === null || onLongPress === void 0 || onLongPress({});
-      } else {
-        onPress === null || onPress === void 0 || onPress();
+        isLongPressRef.current = true;
+        debouncedOnPress();
       }
     }
-    pressInRef.current = undefined;
-  }, [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]);
+  }, [onPressOut, onKeyUpPress, triggerCodes, debouncedOnPress]);
+  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 => {
+    debouncedOnPress(event);
+  }, [debouncedOnPress]);
+  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
   return {
-    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
+    onKeyUpPressHandler: hasHandler ? onKeyUpPressHandler : undefined,
     onKeyDownPressHandler,
-    onKeyUpPressHandler
+    onPressHandler: onPress ? onPressHandler : undefined
   };
 };
 //# 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","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":[]}
+{"version":3,"names":["useCallback","useMemo","useRef","ANDROID_SPACE_KEY_CODE","ANDROID_DPAD_CENTER_CODE","ANDROID_ENTER_CODE","ANDROID_TRIGGER_CODES","useDebouncedCallback","callback","delay","timeoutRef","args","current","clearTimeout","setTimeout","useKeyboardPress","onKeyUpPress","onKeyDownPress","onPressIn","onPressOut","onPress","onLongPress","triggerCodes","isLongPressRef","debouncedOnPress","event","onKeyUpPressHandler","e","nativeEvent","keyCode","isLongPress","includes","onKeyDownPressHandler","onPressHandler","hasHandler","undefined"],"sourceRoot":"../../../../src","sources":["utils/useKeyboardPress/useKeyboardPress.android.ts"],"mappings":"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","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>) => {
-    onPressHandler: ((event: GestureResponderEvent) => void) | undefined;
+    onKeyUpPressHandler: OnKeyPressFn | undefined;
     onKeyDownPressHandler: OnKeyPressFn | undefined;
-    onKeyUpPressHandler: OnKeyPressFn;
+    onPressHandler: ((event: GestureResponderEvent) => void) | undefined;
 };
 //# 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;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"}
+{"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;AAkBF,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;;;6BA6ClB,qBAAqB;CAYhC,CAAC"}

package/package.json

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

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

@@ -13,6 +13,22 @@ export const ANDROID_TRIGGER_CODES = [
   ANDROID_ENTER_CODE,
 ];
 
+const useDebouncedCallback = <T extends (...args: any[]) => void>(
+  callback: T,
+  delay: number
+) => {
+  const timeoutRef = useRef<ReturnType<typeof setTimeout>>();
+  return useCallback(
+    (...args: Parameters<T>) => {
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      timeoutRef.current = setTimeout(() => {
+        callback(...args);
+      }, delay);
+    },
+    [callback, delay]
+  );
+};
+
 export const useKeyboardPress = <
   T extends (event?: any) => void,
   K extends (event?: any) => void,
@@ -25,28 +41,20 @@ export const useKeyboardPress = <
   onLongPress,
   triggerCodes = ANDROID_TRIGGER_CODES,
 }: UseKeyboardPressProps<T, K>) => {
-  const pressInRef = useRef<number | undefined>(undefined);
+  const isLongPressRef = useRef(false);
 
-  const onPressHandler = useCallback(
-    (event: GestureResponderEvent) => {
-      if (!onLongPress || !pressInRef.current) {
+  const debouncedOnPress = useDebouncedCallback(
+    (event?: GestureResponderEvent) => {
+      if (isLongPressRef.current) {
+        onLongPress?.();
+      } else {
         onPress?.(event);
       }
+      isLongPressRef.current = false;
     },
-    [onLongPress, onPress]
+    40
   );
 
-  const onKeyDownPressHandler = useMemo(() => {
-    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, onLongPress, onPressIn, triggerCodes]);
-
   const onKeyUpPressHandler = useCallback<OnKeyPressFn>(
     (e) => {
       const {
@@ -58,19 +66,35 @@ export const useKeyboardPress = <
 
       if (triggerCodes.includes(keyCode)) {
         if (isLongPress) {
-          onLongPress?.({} as GestureResponderEvent);
-        } else {
-          onPress?.();
+          isLongPressRef.current = true;
+          debouncedOnPress();
         }
       }
-      pressInRef.current = undefined;
     },
-    [onPressOut, onKeyUpPress, triggerCodes, onLongPress, onPress]
+    [onPressOut, onKeyUpPress, triggerCodes, debouncedOnPress]
+  );
+
+  const onKeyDownPressHandler = useMemo(() => {
+    if (!onPressIn) return onKeyDownPress;
+    return (e: OnKeyPress) => {
+      onKeyDownPress?.(e);
+      if (triggerCodes.includes(e.nativeEvent.keyCode)) {
+        onPressIn?.(e as unknown as GestureResponderEvent);
+      }
+    };
+  }, [onKeyDownPress, onPressIn, triggerCodes]);
+
+  const onPressHandler = useCallback(
+    (event: GestureResponderEvent) => {
+      debouncedOnPress(event);
+    },
+    [debouncedOnPress]
   );
 
+  const hasHandler = onPressOut || onKeyUpPress || onLongPress || onPress;
   return {
-    onPressHandler: onPress && onLongPress ? onPressHandler : onPress,
+    onKeyUpPressHandler: hasHandler ? onKeyUpPressHandler : undefined,
     onKeyDownPressHandler,
-    onKeyUpPressHandler,
+    onPressHandler: onPress ? onPressHandler : undefined,
   };
 };