react-native-external-keyboard 0.6.1-rc → 0.6.2-rc

package/android/src/main/java/com/externalkeyboard/views/TextInputFocusWrapper/TextInputFocusWrapper.java

@@ -14,6 +14,7 @@ import com.externalkeyboard.events.EventHelper;
 import com.externalkeyboard.helper.ReactNativeVersionChecker;
 import com.externalkeyboard.modules.ExternalKeyboardModule;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.systeminfo.ReactNativeVersion;
 import com.facebook.react.views.textinput.ReactEditText;
 
 import java.lang.reflect.Field;
@@ -32,9 +33,14 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
   public boolean getIsFocusByPress() {
     return focusType == FOCUS_BY_PRESS;
   }
-
-  private boolean getIs80Version () {
-    return ReactNativeVersionChecker.isReactNative80OrLater();
+  private boolean getIsNativelyFixedVersion () {
+    try {
+      Object minorValue = ReactNativeVersion.VERSION.getOrDefault("minor", 0);
+      int minor = (minorValue instanceof Integer) ? (int) minorValue : 0;
+      return minor >= 79;
+    } catch (Exception e) {
+      return false;
+    }
   }
 
   public void setKeyboardFocusable(boolean canBeFocusable) {
@@ -46,8 +52,8 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
 
     this.setFocusable(keyboardFocusable);
     if (this.reactEditText != null) {
-      boolean is80 = getIs80Version();
-      this.reactEditText.setFocusable(is80);
+      boolean isAlreadyFixed = getIsNativelyFixedVersion();
+      this.reactEditText.setFocusable(isAlreadyFixed);
     }
   }
 
@@ -56,8 +62,8 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
       onAttachListener = new View.OnAttachStateChangeListener() {
         @Override
         public void onViewAttachedToWindow(@NonNull View view) {
-          boolean is80 = getIs80Version();
-          view.setFocusable(is80);
+          boolean isAlreadyFixed = getIsNativelyFixedVersion();
+          view.setFocusable(isAlreadyFixed);
         }
 
         @Override
@@ -83,14 +89,14 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
   public void setEditText(ReactEditText editText) {
     if (editText != null) {
       this.reactEditText = editText;
-      boolean is80 = getIs80Version();
-      if(is80) {
+      boolean isAlreadyFixed = getIsNativelyFixedVersion();
+      if(isAlreadyFixed) {
         this.setFocusable(false);
       }
 
       this.reactEditText.addOnAttachStateChangeListener(getOnAttachListener());
       if (focusType == FOCUS_BY_PRESS) {
-        this.reactEditText.setFocusable(is80);
+        this.reactEditText.setFocusable(isAlreadyFixed);
       }
       OnFocusChangeListener reactListener = this.reactEditText.getOnFocusChangeListener();
       this.reactEditText.setOnFocusChangeListener((textInput, hasTextEditFocus) -> {
@@ -105,8 +111,8 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
           ExternalKeyboardModule.setFocusedTextInput(textInput);
         }
         if (!hasTextEditFocus) {
-          this.setFocusable(!is80);
-          this.reactEditText.setFocusable(is80);
+          this.setFocusable(!isAlreadyFixed);
+          this.reactEditText.setFocusable(isAlreadyFixed);
         }
       });
       onMultiplyBlurSubmitHandle();
@@ -139,8 +145,8 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
     this.context = context;
 
     if (keyboardFocusable) {
-      boolean is80 = getIs80Version();
-      setFocusable(!is80);
+      boolean isAlreadyFixed = getIsNativelyFixedVersion();
+      setFocusable(!isAlreadyFixed);
     }
   }
 
@@ -166,8 +172,8 @@ public class TextInputFocusWrapper extends ViewGroup implements View.OnFocusChan
   }
 
   public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
-    boolean is80 = getIs80Version();
-    if(is80) {
+    boolean isAlreadyFixed = getIsNativelyFixedVersion();
+    if(isAlreadyFixed) {
       return super.requestFocus(direction, previouslyFocusedRect);
     }
     if ((direction == View.FOCUS_FORWARD || direction == View.FOCUS_BACKWARD) && focusType != FOCUS_BY_PRESS) {

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.mm

@@ -51,38 +51,38 @@
   if (@available(iOS 15.0, *)) {
     UIView *focusingView = [_delegate getFocusTargetView];
     UIFocusEffect *prevEffect = _focusEffect;
-
+    
     BOOL isHidden = [self isHaloHidden];
-
+    
     if (isHidden) {
       _focusEffect = [RNCEKVFocusEffectUtility emptyFocusEffect];
     }
-
+    
     BOOL hasHaloSettings = _delegate.haloExpendX || _delegate.haloExpendY ||
-                           _delegate.haloCornerRadius;
+    _delegate.haloCornerRadius;
     BOOL isDifferentBounds =
-        !CGRectEqualToRect(_prevBounds, focusingView.bounds);
+    !CGRectEqualToRect(_prevBounds, focusingView.bounds);
     BOOL isDifferent = _prevHaloExpendX != _delegate.haloExpendX ||
-                       _prevHaloExpendY != _delegate.haloExpendY ||
-                       _prevHaloCornerRadius != _delegate.haloCornerRadius ||
-                       isDifferentBounds;
-
+    _prevHaloExpendY != _delegate.haloExpendY ||
+    _prevHaloCornerRadius != _delegate.haloCornerRadius ||
+    isDifferentBounds;
+    
     // ToDo refactor for better halo setup RNCEKV-7, RNCEKV-8
     if (!isHidden && hasHaloSettings && isDifferent) {
       _prevHaloExpendX = _delegate.haloExpendX;
       _prevHaloExpendY = _delegate.haloExpendY;
       _prevHaloCornerRadius = _delegate.haloCornerRadius;
       _prevBounds = focusingView.bounds;
-
+      
       _focusEffect =
-          [RNCEKVFocusEffectUtility getFocusEffect:focusingView
-                                     withExpandedX:_delegate.haloExpendX
-                                     withExpandedY:_delegate.haloExpendY
-                                  withCornerRadius:_delegate.haloCornerRadius];
+      [RNCEKVFocusEffectUtility getFocusEffect:focusingView
+                                 withExpandedX:_delegate.haloExpendX
+                                 withExpandedY:_delegate.haloExpendY
+                              withCornerRadius:_delegate.haloCornerRadius];
     }
-
+    
     if ((_focusEffect == nil && _recycled) || (_focusEffect != nil && prevEffect != _focusEffect &&
-        focusingView.focusEffect != _focusEffect)) {
+                                               focusingView.focusEffect != _focusEffect)) {
       _recycled = false;
       focusingView.focusEffect = _focusEffect;
     }
@@ -94,24 +94,26 @@
     return;
   if (@available(iOS 15.0, *)) {
     BOOL shouldUpdate = _delegate.haloExpendX || _delegate.haloExpendY ||
-                        _delegate.haloCornerRadius;
+    _delegate.haloCornerRadius;
     if (!shouldUpdate)
       return;
-
+    
     UIView *focusingView = [_delegate getFocusTargetView];
     UIFocusEffect *focusEffect =
-        [RNCEKVFocusEffectUtility getFocusEffect:focusingView
-                                   withExpandedX:_delegate.haloExpendX
-                                   withExpandedY:_delegate.haloExpendY
-                                withCornerRadius:_delegate.haloCornerRadius];
-
+    [RNCEKVFocusEffectUtility getFocusEffect:focusingView
+                               withExpandedX:_delegate.haloExpendX
+                               withExpandedY:_delegate.haloExpendY
+                            withCornerRadius:_delegate.haloCornerRadius];
+    
     focusingView.focusEffect = focusEffect;
   }
 }
 
 - (void) clear {
   UIView *focusingView = [_delegate getFocusTargetView];
-  focusingView.focusEffect = nil;
+  if (@available(iOS 15.0, *)) {
+    focusingView.focusEffect = nil;
+  }
   _focusEffect = nil;
   _recycled = true;
   _prevBounds = CGRect();

package/ios/Extensions/RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm

@@ -0,0 +1,24 @@
+//
+//  RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm
+//  react-native-external-keyboard
+//
+//  Created by Artur Kalach on 09/08/2025.
+//
+
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RCTEnhancedScrollView.h"
+
+@implementation RCTEnhancedScrollView (RNCEKVExternalKeyboard)
+
+- (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
+  if(self.subviews.count) {
+    return @[self.subviews[0]];
+  }
+  return [super preferredFocusEnvironments];
+}
+
+@end
+
+#endif

package/ios/Views/RNCEKVExternalKeyboardView/RNCEKVExternalKeyboardView.mm

@@ -157,6 +157,10 @@ using namespace facebook::react;
   _orderRight = nil;
   _orderUp = nil;
   _orderDown = nil;
+  _orderForward = nil;
+  _orderBackward = nil;
+  _orderLast = nil;
+  _orderFirst = nil;
   _orderId = nil;
   _lockFocus = nil;
   _customGroupId = nil;
@@ -559,6 +563,9 @@ Class<RCTComponentViewProtocol> ExternalKeyboardViewCls(void) {
 
 - (void)subviewRecycle: (UIView *)subview {
   [_gIdDelegate clearSubview: subview];
+  if (@available(iOS 15.0, *)) {
+    subview.focusEffect = nil;
+  }
 }
 
 - (void)willRemoveSubview:(UIView *)subview {

package/package.json

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