react-native-external-keyboard 0.8.0 → 0.8.2-rc

package/README.md

@@ -506,6 +506,37 @@ The map of aliases is provided below: <br />
 `KeyboardFocusView` -> `KeyboardExtendedView` <br />
 `ExternalKeyboardView` -> `KeyboardExtendedBaseView` <br />
 
+# Migration 0.7.x to 0.8.0
+
+React and React Native packages have been updated in `react-native-external-keyboard@0.8.0`.
+
+Unfortunately, the latest React Native versions (0.83.x and 0.84.x) have different types compared to previous versions, and the Pressable as well as KeyboardExtendedPressable props could be incompatible with local types because they have static TypeScript declarations based on the React Native 0.83.4 dependency.
+
+In some cases, you may experience the following TypeScript problem:
+<img width="759" height="81" alt="image" src="https://github.com/user-attachments/assets/d47992ce-d3df-473b-bd96-5f2ba53ab889" />
+
+
+It can be resolved by using a HOC, as it provides dynamic typing.
+```tsx
+const KeyboardPressable = withKeyboardFocus(Pressable)
+
+export const K = (props: PressableProps) => {
+  return <KeyboardPressable {...props} />;
+}
+```
+
+As well, it could be resolved by component redeclaration:
+```ts
+export {};
+
+declare module 'react-native-external-keyboard' {
+    import type { PressableProps, ViewProps } from 'react-native';
+    import type { WithKeyboardFocusDeclaration } from 'react-native-external-keyboard/lib/typescript/src/types/WithKeyboardFocus';
+
+    export const Pressable: WithKeyboardFocusDeclaration<PressableProps, ViewProps['style']>
+    export const KeyboardExtendedPressable: WithKeyboardFocusDeclaration<PressableProps, ViewProps['style']>
+}
+```
 
 # API
 ToDo

package/ios/Views/RNCEKVExternalKeyboardView/Helpers/RNCEKVFabricEventHelper/RNCEKVFabricEventHelper.mm

@@ -21,7 +21,8 @@ using namespace facebook::react;
 + (void)onKeyDownPressEventEmmiter:(NSDictionary*) dictionary withEmitter:(facebook::react::SharedViewEventEmitter) _eventEmitter {
     if (_eventEmitter) {
         auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
-        
+
+        NSString* unicodeChar = [dictionary valueForKey:@"unicodeChar"];
         facebook::react::ExternalKeyboardViewEventEmitter::OnKeyDownPress data = {
             .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
             .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
@@ -31,7 +32,7 @@ using namespace facebook::react;
             .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
             .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
             .unicode = [[dictionary valueForKey:@"unicode"] intValue],
-            .unicodeChar = [[[dictionary valueForKey:@"unicodeChar"] stringValue] UTF8String],
+            .unicodeChar = [unicodeChar UTF8String],
         };
         viewEventEmitter->onKeyDownPress(data);
     };
@@ -40,7 +41,8 @@ using namespace facebook::react;
 + (void)onKeyUpPressEventEmmiter:(NSDictionary*) dictionary withEmitter:(facebook::react::SharedViewEventEmitter) _eventEmitter {
     if (_eventEmitter) {
         auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
-        
+
+        NSString* unicodeChar = [dictionary valueForKey:@"unicodeChar"];
         facebook::react::ExternalKeyboardViewEventEmitter::OnKeyUpPress data = {
             .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
             .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
@@ -50,7 +52,7 @@ using namespace facebook::react;
             .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
             .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
             .unicode = [[dictionary valueForKey:@"unicode"] intValue],
-            .unicodeChar = [[[dictionary valueForKey:@"unicodeChar"] stringValue] UTF8String],
+            .unicodeChar = [unicodeChar UTF8String],
         };
         viewEventEmitter->onKeyUpPress(data);
     };

package/lib/commonjs/components/Touchable/Pressable.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_withKeyboardFocus","Pressable","exports","withKeyboardFocus","RNPressable"],"sourceRoot":"../../../../src","sources":["components/Touchable/Pressable.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAMA,IAAAC,kBAAA,GAAAD,OAAA;AAGO,MAAME,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAG,IAAAE,oCAAiB,EAACC,sBAAW,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","_withKeyboardFocus","Pressable","exports","withKeyboardFocus","RNPressable"],"sourceRoot":"../../../../src","sources":["components/Touchable/Pressable.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOA,IAAAC,kBAAA,GAAAD,OAAA;AAGO,MAAME,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAG,IAAAE,oCAAiB,EAACC,sBAAW,CAAC","ignoreList":[]}

package/lib/module/components/Touchable/Pressable.js.map

@@ -1 +1 @@
-{"version":3,"names":["Pressable","RNPressable","withKeyboardFocus"],"sourceRoot":"../../../../src","sources":["components/Touchable/Pressable.tsx"],"mappings":";;AAAA,SACEA,SAAS,IAAIC,WAAW,QAGnB,cAAc;AAErB,SAASC,iBAAiB,QAAQ,+BAA+B;AAGjE,OAAO,MAAMF,SAAS,GAAGE,iBAAiB,CAACD,WAAW,CAAC","ignoreList":[]}
+{"version":3,"names":["Pressable","RNPressable","withKeyboardFocus"],"sourceRoot":"../../../../src","sources":["components/Touchable/Pressable.tsx"],"mappings":";;AAAA,SACEA,SAAS,IAAIC,WAAW,QAInB,cAAc;AAErB,SAASC,iBAAiB,QAAQ,+BAA+B;AAGjE,OAAO,MAAMF,SAAS,GAAGE,iBAAiB,CAACD,WAAW,CAAC","ignoreList":[]}

package/lib/typescript/src/components/Touchable/Pressable.d.ts

@@ -1,4 +1,4 @@
-import { type PressableProps, type ViewProps } from 'react-native';
+import { type PressableProps, type ViewProps, type View } from 'react-native';
 import type { WithKeyboardPropsTypeDeclaration } from '../../types/WithKeyboardFocus';
 export declare const Pressable: import("react").NamedExoticComponent<Omit<import("../..").WithKeyboardFocus<Omit<Readonly<Omit<Omit<Readonly<Omit<Readonly<{
     onAccessibilityAction?: ((event: import("react-native").AccessibilityActionEvent) => unknown) | undefined;
@@ -148,11 +148,11 @@ export declare const Pressable: import("react").NamedExoticComponent<Omit<import
     testOnly_pressed?: boolean | undefined;
     unstable_pressDelay?: number | undefined;
 }>, never>>, "ref"> & {
-    ref?: React.Ref<React.ComponentRef<typeof import("react-native").View>>;
+    ref?: React.Ref<React.ComponentRef<typeof View>>;
 }, unknown>, "ref"> & import("react").RefAttributes<((props: Omit<ViewProps, keyof {
     ref?: React.Ref<React.ComponentRef<typeof import("react-native").unstable_NativeView>>;
 }> & {
     ref?: React.Ref<React.ComponentRef<typeof import("react-native").unstable_NativeView>>;
 }) => React.ReactNode) | import("../..").KeyboardFocus>>;
-export type KeyboardPressableProps = WithKeyboardPropsTypeDeclaration<PressableProps, ViewProps['style']>;
+export type KeyboardPressableProps = WithKeyboardPropsTypeDeclaration<PressableProps, ViewProps['style'], View>;
 //# sourceMappingURL=Pressable.d.ts.map

package/lib/typescript/src/components/Touchable/Pressable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Pressable.d.ts","sourceRoot":"","sources":["../../../../../src/components/Touchable/Pressable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,SAAS,EACf,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAEtF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAM+X,CAAC;;OAAyE,CAAC;wDANza,CAAC;AAExD,MAAM,MAAM,sBAAsB,GAAG,gCAAgC,CACnE,cAAc,EACd,SAAS,CAAC,OAAO,CAAC,CACnB,CAAC"}
+{"version":3,"file":"Pressable.d.ts","sourceRoot":"","sources":["../../../../../src/components/Touchable/Pressable.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,SAAS,EACd,KAAK,IAAI,EACV,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,+BAA+B,CAAC;AAEtF,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAO0W,CAAC;;OAAyE,CAAC;wDAPpZ,CAAC;AAExD,MAAM,MAAM,sBAAsB,GAAG,gCAAgC,CACnE,cAAc,EACd,SAAS,CAAC,OAAO,CAAC,EAClB,IAAI,CACL,CAAC"}

package/lib/typescript/src/types/WithKeyboardFocus.d.ts

@@ -1,4 +1,4 @@
-import type { PressableProps, ViewProps } from 'react-native';
+import type { PressableProps, View, ViewProps } from 'react-native';
 import type { FocusStyle } from './FocusStyle';
 import type { KeyboardFocus, OnKeyPress } from './BaseKeyboardView';
 import type { FocusViewProps } from './KeyboardFocusView.types';
@@ -16,12 +16,12 @@ export type KeyboardPressType<ComponentProps extends object> = {
     onComponentFocus?: PickProp<ComponentProps, 'onFocus'>;
     onComponentBlur?: PickProp<ComponentProps, 'onBlur'>;
 };
-export type WithKeyboardProps<R = unknown, ViewStyleType = unknown> = {
+export type WithKeyboardProps<ViewType = View, ViewStyleType = unknown> = {
     withPressedStyle?: boolean;
     containerStyle?: ViewStyleType | ViewProps['style'];
     containerFocusStyle?: FocusStyle;
     tintType?: TintType;
-    componentRef?: React.RefObject<R>;
+    componentRef?: React.RefObject<ViewType>;
     FocusHoverComponent?: RenderProp;
     style?: PressableProps['style'];
     onBlur?: (() => void) | ((e: any) => void) | null;
@@ -29,10 +29,10 @@ export type WithKeyboardProps<R = unknown, ViewStyleType = unknown> = {
 };
 type KeyboardFocusBaseProps = Omit<FocusViewProps, 'onPress' | 'onLongPress' | 'onBlur' | 'onFocus'>;
 type MergeProps<BaseProps extends object, OverrideProps extends object> = Omit<BaseProps, keyof OverrideProps> & OverrideProps;
-type KeyboardFocusOverrideProps<ComponentProps extends object, ViewStyleType> = KeyboardPressType<ComponentProps> & KeyboardFocusBaseProps & WithKeyboardProps<ComponentProps, ViewStyleType>;
-export type WithKeyboardFocus<ComponentProps extends object, ViewStyleType> = MergeProps<ComponentProps, KeyboardFocusOverrideProps<ComponentProps, ViewStyleType>>;
-export type WithKeyboardPropsTypeDeclaration<ComponentProps extends object, ViewStyleType> = WithKeyboardFocus<ComponentProps, ViewStyleType> & RefAttributes<KeyboardFocus>;
-export type WithKeyboardFocusDeclaration<ComponentProps extends object, ViewStyleType> = React.JSXElementConstructor<WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType>> | React.ForwardRefExoticComponent<WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType>>;
+type KeyboardFocusOverrideProps<ComponentProps extends object, ViewStyleType, ViewType = View> = KeyboardPressType<ComponentProps> & KeyboardFocusBaseProps & WithKeyboardProps<ViewType, ViewStyleType>;
+export type WithKeyboardFocus<ComponentProps extends object, ViewStyleType, ViewType = View> = MergeProps<ComponentProps, KeyboardFocusOverrideProps<ComponentProps, ViewStyleType, ViewType>>;
+export type WithKeyboardPropsTypeDeclaration<ComponentProps extends object, ViewStyleType, ViewType = View> = WithKeyboardFocus<ComponentProps, ViewStyleType, ViewType> & RefAttributes<KeyboardFocus>;
+export type WithKeyboardFocusDeclaration<ComponentProps extends object, ViewStyleType, ViewType = View> = React.JSXElementConstructor<WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType, ViewType>> | React.ForwardRefExoticComponent<WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType, ViewType>>;
 export type TintType = 'default' | 'hover' | 'background' | 'none';
 export {};
 //# sourceMappingURL=WithKeyboardFocus.d.ts.map

package/lib/typescript/src/types/WithKeyboardFocus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WithKeyboardFocus.d.ts","sourceRoot":"","sources":["../../../../src/types/WithKeyboardFocus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WithKeyboardFocus.d.ts","sourceRoot":"","sources":["../../../../src/types/WithKeyboardFocus.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/components/Touchable/Pressable.tsx

@@ -2,6 +2,7 @@ import {
   Pressable as RNPressable,
   type PressableProps,
   type ViewProps,
+  type View,
 } from 'react-native';
 
 import { withKeyboardFocus } from '../../utils/withKeyboardFocus';
@@ -11,5 +12,6 @@ export const Pressable = withKeyboardFocus(RNPressable);
 
 export type KeyboardPressableProps = WithKeyboardPropsTypeDeclaration<
   PressableProps,
-  ViewProps['style']
+  ViewProps['style'],
+  View
 >;

package/src/types/WithKeyboardFocus.ts

@@ -1,4 +1,4 @@
-import type { PressableProps, ViewProps } from 'react-native';
+import type { PressableProps, View, ViewProps } from 'react-native';
 import type { FocusStyle } from './FocusStyle';
 import type { KeyboardFocus, OnKeyPress } from './BaseKeyboardView';
 import type { FocusViewProps } from './KeyboardFocusView.types';
@@ -36,12 +36,12 @@ export type KeyboardPressType<ComponentProps extends object> = {
   onComponentBlur?: PickProp<ComponentProps, 'onBlur'>;
 };
 
-export type WithKeyboardProps<R = unknown, ViewStyleType = unknown> = {
+export type WithKeyboardProps<ViewType = View, ViewStyleType = unknown> = {
   withPressedStyle?: boolean;
   containerStyle?: ViewStyleType | ViewProps['style'];
   containerFocusStyle?: FocusStyle;
   tintType?: TintType;
-  componentRef?: React.RefObject<R>;
+  componentRef?: React.RefObject<ViewType>;
   FocusHoverComponent?: RenderProp;
   style?: PressableProps['style'];
   onBlur?: (() => void) | ((e: any) => void) | null;
@@ -61,34 +61,38 @@ type MergeProps<BaseProps extends object, OverrideProps extends object> = Omit<
 
 type KeyboardFocusOverrideProps<
   ComponentProps extends object,
-  ViewStyleType
+  ViewStyleType,
+  ViewType = View
 > = KeyboardPressType<ComponentProps> &
   KeyboardFocusBaseProps &
-  WithKeyboardProps<ComponentProps, ViewStyleType>;
+  WithKeyboardProps<ViewType, ViewStyleType>;
 
 export type WithKeyboardFocus<
   ComponentProps extends object,
-  ViewStyleType
+  ViewStyleType,
+  ViewType = View
 > = MergeProps<
   ComponentProps,
-  KeyboardFocusOverrideProps<ComponentProps, ViewStyleType>
+  KeyboardFocusOverrideProps<ComponentProps, ViewStyleType, ViewType>
 >;
 
 export type WithKeyboardPropsTypeDeclaration<
   ComponentProps extends object,
-  ViewStyleType
-> = WithKeyboardFocus<ComponentProps, ViewStyleType> &
+  ViewStyleType,
+  ViewType = View
+> = WithKeyboardFocus<ComponentProps, ViewStyleType, ViewType> &
   RefAttributes<KeyboardFocus>;
 
 export type WithKeyboardFocusDeclaration<
   ComponentProps extends object,
-  ViewStyleType
+  ViewStyleType,
+  ViewType = View
 > =
   | React.JSXElementConstructor<
-      WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType>
+      WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType, ViewType>
     >
   | React.ForwardRefExoticComponent<
-      WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType>
+      WithKeyboardPropsTypeDeclaration<ComponentProps, ViewStyleType, ViewType>
     >;
 
 export type TintType = 'default' | 'hover' | 'background' | 'none';