react-native-external-keyboard 0.2.6 → 0.2.7

package/ios/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.h

@@ -1,6 +1,5 @@
 #ifndef RNCEKVExternalKeyboardViewNativeComponent_h
 #define RNCEKVExternalKeyboardViewNativeComponent_h
-
 #import "RNCEKVKeyboardKeyPressHandler.h"
 #import <UIKit/UIKit.h>
 
@@ -15,6 +14,12 @@ NS_ASSUME_NONNULL_BEGIN
 }
 @property BOOL canBeFocused;
 @property UIView* myPreferredFocusedView;
+
+
+- (void)onFocusChange:(BOOL)isFocused;
+- (void)onKeyDownPress:(NSDictionary*)dictionary;
+- (void)onKeyUpPress:(NSDictionary*)dictionary;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -34,104 +34,119 @@ using namespace facebook::react;
 
 @end
 
-@implementation RNCEKVExternalKeyboardView {
-    RNCEKVFocusWrapper * _view;
-}
+@implementation RNCEKVExternalKeyboardView 
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
 {
     return concreteComponentDescriptorProvider<ExternalKeyboardViewComponentDescriptor>();
 }
 
+- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
+    if (self.myPreferredFocusedView == nil) {
+        return @[];
+    }
+    return @[self.myPreferredFocusedView];
+}
+- (BOOL)canBecomeFocused {
+    return self.canBeFocused;
+}
+
+
+- (void)onFocusChange:(BOOL) isFocused {
+    if (_eventEmitter) {
+        auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
+        facebook::react::ExternalKeyboardViewEventEmitter::OnFocusChange data = {
+            .isFocused = isFocused,
+        };
+        viewEventEmitter->onFocusChange(data);
+    };
+}
+
+- (void)onKeyDownPress:(NSDictionary*) dictionary {
+    if (_eventEmitter) {
+        auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
+        facebook::react::ExternalKeyboardViewEventEmitter::OnKeyDownPress data = {
+            .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
+            .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
+            .isAltPressed = [[dictionary valueForKey:@"isAltPressed"] boolValue],
+            .isShiftPressed = [[dictionary valueForKey:@"isShiftPressed"] boolValue],
+            .isCtrlPressed = [[dictionary valueForKey:@"isCtrlPressed"] boolValue],
+            .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
+            .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
+        };
+        viewEventEmitter->onKeyDownPress(data);
+    };
+}
+
+
+- (void)onKeyUpPress:(NSDictionary*) dictionary {
+    if (_eventEmitter) {
+        auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
+        facebook::react::ExternalKeyboardViewEventEmitter::OnKeyUpPress data = {
+            .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
+            .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
+            .isAltPressed = [[dictionary valueForKey:@"isAltPressed"] boolValue],
+            .isShiftPressed = [[dictionary valueForKey:@"isShiftPressed"] boolValue],
+            .isCtrlPressed = [[dictionary valueForKey:@"isCtrlPressed"] boolValue],
+            .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
+            .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
+        };
+        viewEventEmitter->onKeyUpPress(data);
+    };
+}
+
+
+- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
+       withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator {
+
+    if(context.nextFocusedView == self) {
+        [self onFocusChange: YES];
+    } else if (context.previouslyFocusedView == self) {
+        [self onFocusChange: NO];
+    }
+}
+
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
     
     if (self = [super initWithFrame:frame]) {
         static const auto defaultProps = std::make_shared<const ExternalKeyboardViewProps>();
         _props = defaultProps;
-        
-        _view = [[RNCEKVFocusWrapper alloc] init];
-        _view.onFocusChange = [self](NSDictionary* dictionary) {
-            if (_eventEmitter) {
-                auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
-                facebook::react::ExternalKeyboardViewEventEmitter::OnFocusChange data = {
-                    .isFocused = [[dictionary valueForKey:@"isFocused"] boolValue],
-                };
-                viewEventEmitter->onFocusChange(data);
-            };
-        };
-        
-        _view.onKeyDownPress = [self](NSDictionary* dictionary) {
-            if (_eventEmitter) {
-                auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
-                
-                std::string unicodeChar = convertNSStringToStdString([dictionary valueForKey:@"unicodeChar"]);
-                facebook::react::ExternalKeyboardViewEventEmitter::OnKeyDownPress data = {
-                    .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
-                    .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
-                    .unicode = [[dictionary valueForKey:@"unicode"] intValue],
-                    .unicodeChar = unicodeChar,
-                    .isAltPressed = [[dictionary valueForKey:@"isAltPressed"] boolValue],
-                    .isShiftPressed = [[dictionary valueForKey:@"isShiftPressed"] boolValue],
-                    .isCtrlPressed = [[dictionary valueForKey:@"isCtrlPressed"] boolValue],
-                    .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
-                    .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
-                };
-                viewEventEmitter->onKeyDownPress(data);
-            };
-        };
-        
-        
-        _view.onKeyUpPress = [self](NSDictionary* dictionary) {
-            if (_eventEmitter) {
-                auto viewEventEmitter = std::static_pointer_cast<ExternalKeyboardViewEventEmitter const>(_eventEmitter);
-                std::string unicodeChar = convertNSStringToStdString([dictionary valueForKey:@"unicodeChar"]);
-                facebook::react::ExternalKeyboardViewEventEmitter::OnKeyUpPress data = {
-                    .keyCode = [[dictionary valueForKey:@"keyCode"] intValue],
-                    .unicode = [[dictionary valueForKey:@"unicode"] intValue],
-                    .unicodeChar = unicodeChar,
-                    .isLongPress = [[dictionary valueForKey:@"isLongPress"] boolValue],
-                    .isAltPressed = [[dictionary valueForKey:@"isAltPressed"] boolValue],
-                    .isShiftPressed = [[dictionary valueForKey:@"isShiftPressed"] boolValue],
-                    .isCtrlPressed = [[dictionary valueForKey:@"isCtrlPressed"] boolValue],
-                    .isCapsLockOn = [[dictionary valueForKey:@"isCapsLockOn"] boolValue],
-                    .hasNoModifiers = [[dictionary valueForKey:@"hasNoModifiers"] boolValue],
-                };
-                viewEventEmitter->onKeyUpPress(data);
-            };
-        };
-        
-        self.contentView = _view;
+        _keyboardKeyPressHandler = [[RNCEKVKeyboardKeyPressHandler alloc] init];
     }
     
     return self;
 }
 
-- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
-    if (self.myPreferredFocusedView == nil) {
-        return @[];
-    }
-    return @[self.myPreferredFocusedView];
+- (void)pressesBegan:(NSSet<UIPress *> *)presses
+           withEvent:(UIPressesEvent *)event {
+    NSDictionary *eventInfo = [_keyboardKeyPressHandler actionDownHandler:presses withEvent:event];
+    [self onKeyDownPress: eventInfo];
+}
+
+- (void)pressesEnded:(NSSet<UIPress *> *)presses
+           withEvent:(UIPressesEvent *)event {
+    NSDictionary *eventInfo = [_keyboardKeyPressHandler actionUpHandler:presses withEvent:event];
+    [self onKeyUpPress: eventInfo];
 }
 
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
     const auto &oldViewProps = *std::static_pointer_cast<ExternalKeyboardViewProps const>(_props);
     const auto &newViewProps = *std::static_pointer_cast<ExternalKeyboardViewProps const>(props);
-    
-    if (@available(iOS 14.0, *)) {
-        if(_view.focusGroupIdentifier == nil) {
-            _view.focusGroupIdentifier =  [NSString stringWithFormat:@"app.group.%ld", self.tag];
-        }
-    }
-    
-    [super updateProps:props oldProps:oldProps];
-    
+    [super updateProps
+     :props oldProps:oldProps];
     
     if(oldViewProps.canBeFocused != newViewProps.canBeFocused) {
-        [_view setCanBeFocused: newViewProps.canBeFocused];
+        [self setCanBeFocused: newViewProps.canBeFocused];
     }
     
+    if (@available(iOS 14.0, *)) {
+        if(self.focusGroupIdentifier == nil) {
+            self.focusGroupIdentifier =  [NSString stringWithFormat:@"app.group.%ld", self.tag];
+        }
+    }
 }
 
 Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void)

package/lib/commonjs/components/KeyboardFocusView/KeyboardFocusView.js

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.KeyboardFocusView = void 0;
+var _reactNative = require("react-native");
+const KeyboardFocusView = exports.KeyboardFocusView = _reactNative.View;
+//# sourceMappingURL=KeyboardFocusView.js.map

package/lib/commonjs/components/KeyboardFocusView/KeyboardFocusView.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","KeyboardFocusView","exports","View"],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAIO,MAAMC,iBAAiB,GAAAC,OAAA,CAAAD,iBAAA,GAC5BE,iBAEC"}

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

@@ -0,0 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Pressable = void 0;
+var _reactNative = require("react-native");
+const Pressable = exports.Pressable = _reactNative.View;
+//# sourceMappingURL=Pressable.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","Pressable","exports","View"],"sourceRoot":"../../../../src","sources":["components/Pressable/Pressable.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAIO,MAAMC,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAGE,iBAExB"}

package/lib/module/components/KeyboardFocusView/KeyboardFocusView.js

@@ -0,0 +1,3 @@
+import { View } from 'react-native';
+export const KeyboardFocusView = View;
+//# sourceMappingURL=KeyboardFocusView.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["View","KeyboardFocusView"],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.tsx"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AAInC,OAAO,MAAMC,iBAAiB,GAC5BD,IAEC"}

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

@@ -0,0 +1,3 @@
+import { View } from 'react-native';
+export const Pressable = View;
+//# sourceMappingURL=Pressable.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["View","Pressable"],"sourceRoot":"../../../../src","sources":["components/Pressable/Pressable.tsx"],"mappings":"AAAA,SAASA,IAAI,QAAwB,cAAc;AAInD,OAAO,MAAMC,SAAS,GAAGD,IAExB"}

package/lib/typescript/components/KeyboardFocusView/KeyboardFocusView.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import { View } from 'react-native';
+export declare const KeyboardFocusView: import("react").ForwardRefExoticComponent<import("react-native").ViewProps & {
+    onFocusChange?: import("../../types").OnFocusChangeFn | undefined;
+    onKeyUpPress?: import("../../types").OnKeyPressFn | undefined;
+    onKeyDownPress?: import("../../types").OnKeyPressFn | undefined;
+    canBeFocused?: boolean | undefined;
+} & {
+    focusStyle?: import("../../types").FocusStyle;
+    onPress?: ((e: import("../../types/KeyboardFocusView.types").OnKeyPress | import("react-native").GestureResponderEvent) => void) | undefined;
+    onLongPress?: ((e: import("../../types/KeyboardFocusView.types").OnKeyPress | import("react-native").GestureResponderEvent) => void) | undefined;
+    withView?: boolean | undefined;
+} & import("react").RefAttributes<View>>;
+//# sourceMappingURL=KeyboardFocusView.d.ts.map

package/lib/typescript/components/KeyboardFocusView/KeyboardFocusView.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KeyboardFocusView.d.ts","sourceRoot":"","sources":["../../../../src/components/KeyboardFocusView/KeyboardFocusView.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAIpC,eAAO,MAAM,iBAAiB;;;;;;;;;;wCAG3B,CAAC"}

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

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import { View, PressableProps } from 'react-native';
+export declare const Pressable: import("react").ForwardRefExoticComponent<PressableProps & import("react-native").ViewProps & {
+    onFocusChange?: import("../../types").OnFocusChangeFn | undefined;
+    onKeyUpPress?: import("../../types").OnKeyPressFn | undefined;
+    onKeyDownPress?: import("../../types").OnKeyPressFn | undefined;
+    canBeFocused?: boolean | undefined;
+} & {
+    focusStyle?: import("../../types").FocusStyle;
+    onPress?: ((e: import("../../types/KeyboardFocusView.types").OnKeyPress | import("react-native").GestureResponderEvent) => void) | undefined;
+    onLongPress?: ((e: import("../../types/KeyboardFocusView.types").OnKeyPress | import("react-native").GestureResponderEvent) => void) | undefined;
+    withView?: boolean | undefined;
+} & import("react").RefAttributes<View>>;
+//# sourceMappingURL=Pressable.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Pressable.d.ts","sourceRoot":"","sources":["../../../../src/components/Pressable/Pressable.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAIpD,eAAO,MAAM,SAAS;;;;;;;;;;wCAErB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-external-keyboard",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "test",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -59,8 +59,8 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@evilmartians/lefthook": "^1.2.2",
     "@commitlint/config-conventional": "^17.0.2",
+    "@evilmartians/lefthook": "^1.2.2",
     "@react-native-community/eslint-config": "^3.0.2",
     "@release-it/conventional-changelog": "^5.0.0",
     "@types/jest": "^28.1.2",
@@ -90,7 +90,7 @@
   "engines": {
     "node": ">= 16.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
+  "packageManager": "yarn@3.6.1",
   "jest": {
     "preset": "react-native",
     "modulePathIgnorePatterns": [

package/src/components/KeyboardFocusView/KeyboardFocusView.tsx

@@ -0,0 +1,8 @@
+import { View } from 'react-native';
+
+import type { KeyboardFocusViewProps } from '../../types';
+
+export const KeyboardFocusView =
+  View as unknown as React.ForwardRefExoticComponent<
+    KeyboardFocusViewProps & React.RefAttributes<View>
+  >;

package/src/components/Pressable/Pressable.tsx

@@ -0,0 +1,7 @@
+import { View, PressableProps } from 'react-native';
+
+import type { KeyboardFocusViewProps } from '../../types';
+
+export const Pressable = View as unknown as React.ForwardRefExoticComponent<
+  PressableProps & KeyboardFocusViewProps & React.RefAttributes<View>
+>;

package/ios/ExternalKeyboard.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-</Workspace>

package/ios/ExternalKeyboard.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

package/ios/ExternalKeyboard.xcodeproj/xcuserdata/Artur_Kalach.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   uuid = "6A472AA3-EDA7-4BBC-9834-125C45235935"
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "77A1ECE5-D456-4921-9000-0AE0262A99A5"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Modules/A11yKeyboardModule/A11yKeyboardModule.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "25"
-            endingLineNumber = "25"
-            landmarkName = "A11yKeyboardModule"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>

package/ios/ExternalKeyboard.xcodeproj/xcuserdata/Artur_Kalach.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>ExternalKeyboard.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>

package/lib/commonjs/components/KeyboardFocusView/KeyboardFocusView.d.js

@@ -1,6 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-//# sourceMappingURL=KeyboardFocusView.d.js.map

package/lib/commonjs/components/KeyboardFocusView/KeyboardFocusView.d.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.d.ts"],"mappings":""}

package/lib/commonjs/components/Pressable/Pressable.d.js

@@ -1,6 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-//# sourceMappingURL=Pressable.d.js.map

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

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["components/Pressable/Pressable.d.ts"],"mappings":""}

package/lib/module/components/KeyboardFocusView/KeyboardFocusView.d.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=KeyboardFocusView.d.js.map

package/lib/module/components/KeyboardFocusView/KeyboardFocusView.d.js.map

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["components/KeyboardFocusView/KeyboardFocusView.d.ts"],"mappings":""}

package/lib/module/components/Pressable/Pressable.d.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Pressable.d.js.map

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

@@ -1 +0,0 @@
-{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["components/Pressable/Pressable.d.ts"],"mappings":""}

package/src/components/KeyboardFocusView/KeyboardFocusView.d.ts

@@ -1,7 +0,0 @@
-import { View } from 'react-native';
-
-import { KeyboardFocusViewProps } from '../../types';
-
-declare const KeyboardFocusView: React.ForwardRefExoticComponent<
-  KeyboardFocusViewProps & React.RefAttributes<View>
->;

package/src/components/Pressable/Pressable.d.ts

@@ -1,7 +0,0 @@
-import { View, PressableProps } from 'react-native';
-
-import { KeyboardFocusViewProps } from '../KeyboardFocusView';
-
-declare const Pressable: React.ForwardRefExoticComponent<
-  PressableProps & KeyboardFocusViewProps & React.RefAttributes<View>
->;