react-native-external-keyboard 0.6.3 → 0.6.5

package/ios/Extensions/RCTCustomScrollView+RNCEKVExternalKeyboard.mm

@@ -0,0 +1,34 @@
+//
+//  RCTCustomScrollView+RNCEKVExternalKeyboard.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 12/08/2025.
+//
+#ifndef RCT_NEW_ARCH_ENABLED
+
+#import "RCTScrollView.h"
+#import "RNCEKVSwizzleInstanceMethod.h"
+
+@implementation RCTScrollView (RNCEKVExternalKeyboard)
+
++ (void)load {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    RNCEKVSwizzleInstanceMethod([self class], @selector(initWithEventDispatcher:), @selector(rncekvInitWithEventDispatcher:));
+  });
+}
+
+- (instancetype)rncekvInitWithEventDispatcher:(CGRect)frame {
+  RCTScrollView *rctView = [self rncekvInitWithEventDispatcher:frame];
+  
+  if (@available(iOS 17.0, *)) {
+    rctView.scrollView.allowsKeyboardScrolling = YES;
+  }
+  
+  return rctView;
+}
+
+
+@end
+
+#endif

package/ios/Extensions/RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm

@@ -9,6 +9,7 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "RCTEnhancedScrollView.h"
+#import "RNCEKVSwizzleInstanceMethod.h"
 
 @implementation RCTEnhancedScrollView (RNCEKVExternalKeyboard)
 
@@ -19,6 +20,24 @@
   return [super preferredFocusEnvironments];
 }
 
++ (void)load {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    RNCEKVSwizzleInstanceMethod([self class], @selector(initWithFrame:), @selector(rncekvInitWithFrame:));
+  });
+}
+
+- (instancetype)rncekvInitWithFrame:(CGRect)frame {
+  RCTEnhancedScrollView *scrollView = [self rncekvInitWithFrame:frame];
+  
+  if (@available(iOS 17.0, *)) {
+    scrollView.allowsKeyboardScrolling = YES;
+  }
+  
+  return scrollView;
+}
+
+
 @end
 
 #endif

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.h

@@ -8,6 +8,8 @@
 #ifndef UIView_RNCEKVExternalKeyboard_h
 #define UIView_RNCEKVExternalKeyboard_h
 
+#ifdef RCT_NEW_ARCH_ENABLED
+
 #import <React/RCTViewComponentView.h>
 
 @interface RCTViewComponentView (RNCEKVExternalKeyboard)
@@ -16,5 +18,6 @@
 
 @end
 
+#endif
 
 #endif /* UIView_RNCEKVExternalKeyboard_h */

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.mm

@@ -5,6 +5,8 @@
 //  Created by Artur Kalach on 12/08/2025.
 //
 
+#ifdef RCT_NEW_ARCH_ENABLED
+
 #import <Foundation/Foundation.h>
 
 #import "RCTViewComponentView+RNCEKVExternalKeyboard.h"
@@ -18,7 +20,6 @@ static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
     return objc_getAssociatedObject(self, RNCEKVCustomGroupKey);
 }
 
-// Setter for `rctekvCustomGroup`
 - (void)setRncekvCustomGroup:(NSString *)rncekvCustomGroup {
     objc_setAssociatedObject(self, RNCEKVCustomGroupKey, rncekvCustomGroup, OBJC_ASSOCIATION_COPY_NONATOMIC);
 }
@@ -32,3 +33,5 @@ static const void *RNCEKVCustomGroupKey = &RNCEKVCustomGroupKey;
 }
 
 @end
+
+#endif

package/ios/Extensions/UIViewController+RNCEKVExternalKeyboard.mm

@@ -8,27 +8,11 @@
 #import <Foundation/Foundation.h>
 
 #import "UIViewController+RNCEKVExternalKeyboard.h"
+#import "RNCEKVSwizzleInstanceMethod.h"
 #import <objc/runtime.h>
 
 
 
-void SwizzleInstanceMethod(Class swizzleClass, SEL originalSelector, SEL swizzledSelector) {
-    Method originalMethod = class_getInstanceMethod(swizzleClass, originalSelector);
-    Method swizzledMethod = class_getInstanceMethod(swizzleClass, swizzledSelector);
-    BOOL didAddMethod = class_addMethod(swizzleClass,
-                                        originalSelector,
-                                        method_getImplementation(swizzledMethod),
-                                        method_getTypeEncoding(swizzledMethod));
-    
-    if (didAddMethod) {
-        class_replaceMethod(swizzleClass,
-                            swizzledSelector,
-                            method_getImplementation(originalMethod),
-                            method_getTypeEncoding(originalMethod));
-    } else {
-        method_exchangeImplementations(originalMethod, swizzledMethod);
-    }
-}
 
 static char kCustomFocusViewKey;
 
@@ -47,12 +31,8 @@ static char kCustomFocusViewKey;
     static dispatch_once_t once_token;
     
     dispatch_once(&once_token, ^{
-        SwizzleInstanceMethod([self class], @selector(viewDidAppear:), @selector(keyboardedViewDidAppear:));
-        
-        method_exchangeImplementations(
-                                       class_getInstanceMethod(self, @selector(preferredFocusEnvironments)),
-                                       class_getInstanceMethod(self, @selector(keyboardedPreferredFocusEnvironments))
-                                       );
+      RNCEKVSwizzleInstanceMethod([self class], @selector(viewDidAppear:), @selector(keyboardedViewDidAppear:));
+      RNCEKVSwizzleInstanceMethod([self class], @selector(preferredFocusEnvironments), @selector(keyboardedPreferredFocusEnvironments));
     });
 }
 

package/ios/Helpers/RNCEKVSwizzleInstanceMethod/RNCEKVSwizzleInstanceMethod.h

@@ -0,0 +1,16 @@
+//
+//  RNCEKVSwizzleInstanceMethod.h
+//  Pods
+//
+//  Created by Artur Kalach on 12/08/2025.
+//
+
+#ifndef RNCEKVSwizzleInstanceMethod_h
+#define RNCEKVSwizzleInstanceMethod_h
+
+#import <Foundation/Foundation.h>
+#import <objc/runtime.h>
+
+void RNCEKVSwizzleInstanceMethod(Class swizzleClass, SEL originalSelector, SEL swizzledSelector);
+
+#endif /* RNCEKVSwizzleInstanceMethod_h */

package/ios/Helpers/RNCEKVSwizzleInstanceMethod/RNCEKVSwizzleInstanceMethod.mm

@@ -0,0 +1,26 @@
+//
+//  RNCEKVSwizzleInstanceMethod.m
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 12/08/2025.
+//
+
+#import "RNCEKVSwizzleInstanceMethod.h"
+
+void RNCEKVSwizzleInstanceMethod(Class swizzleClass, SEL originalSelector, SEL swizzledSelector) {
+    Method originalMethod = class_getInstanceMethod(swizzleClass, originalSelector);
+    Method swizzledMethod = class_getInstanceMethod(swizzleClass, swizzledSelector);
+    BOOL didAddMethod = class_addMethod(swizzleClass,
+                                        originalSelector,
+                                        method_getImplementation(swizzledMethod),
+                                        method_getTypeEncoding(swizzledMethod));
+    
+    if (didAddMethod) {
+        class_replaceMethod(swizzleClass,
+                            swizzledSelector,
+                            method_getImplementation(originalMethod),
+                            method_getTypeEncoding(originalMethod));
+    } else {
+        method_exchangeImplementations(originalMethod, swizzledMethod);
+    }
+}

package/package.json

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