react-native-external-keyboard 0.9.1 → 1.0.0

package/android/src/main/java/com/externalkeyboard/views/base/FocusableBase.java

@@ -0,0 +1,36 @@
+package com.externalkeyboard.views.base;
+
+import android.content.Context;
+import android.view.View;
+
+public class FocusableBase extends FocusHighlightBase {
+  protected boolean canBeFocused = true;
+
+  public FocusableBase(Context context) {
+    super(context);
+  }
+
+  public void setCanBeFocused (boolean isCanBeFocused) {
+    canBeFocused = isCanBeFocused;
+    syncFocusable();
+  }
+
+  @Override
+  public void setFocusableWrapper (boolean isFocusableWrapper) {
+    super.setFocusableWrapper(isFocusableWrapper);
+    syncFocusable();
+  }
+
+  @Override
+  public void linkAddView(View child) {
+    super.linkAddView(child);
+    syncFocusable();
+  }
+
+  protected void syncFocusable () {
+    View view = getFocusTargetView();
+    if (view != null) {
+      view.setFocusable(canBeFocused);
+    }
+  }
+}

package/android/src/main/java/com/externalkeyboard/views/base/keyboard/ViewFocusChangeBase.java

@@ -4,10 +4,10 @@ import android.content.Context;
 import android.view.View;
 
 import com.externalkeyboard.events.EventHelper;
-import com.externalkeyboard.views.base.FocusHighlightBase;
+import com.externalkeyboard.views.base.FocusableBase;
 import com.facebook.react.bridge.ReactContext;
 
-public class ViewFocusChangeBase extends FocusHighlightBase {
+public class ViewFocusChangeBase extends FocusableBase {
   private View listeningView;
   private final Context context;
 
@@ -22,7 +22,6 @@ public class ViewFocusChangeBase extends FocusHighlightBase {
     super.onAttachedToWindow();
 
     this.listeningView = getFocusingView();
-    setFocusable(this.listeningView == this);
 
     this.listeningView.setOnFocusChangeListener((focusedView, hasFocus) -> {
       EventHelper.focusChanged((ReactContext) context, this.getId(), hasFocus);

package/android/src/main/java/com/externalkeyboard/views/base/keyboard/ViewFocusRequestBase.java

@@ -5,17 +5,9 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
 
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.uimanager.UIManagerHelper;
-import com.facebook.react.uimanager.common.ViewUtil;
-import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.EventDispatcherListener;
-
 
 public class ViewFocusRequestBase extends ViewFocusChangeBase {
   public boolean autoFocus = false;
-  public boolean enableA11yFocus = false;
   public boolean hasBeenFocused = false;
   public boolean hasBeenA11yFocused = false;
 
@@ -23,50 +15,17 @@ public class ViewFocusRequestBase extends ViewFocusChangeBase {
 
   public int screenAutoA11yFocusDelay = 500;
 
-  private EventDispatcher a11yViewAppearDispatcher = null;
-  private EventDispatcherListener eventA11yViewAppearListener = null;
-  private final Context context;
-
   public ViewFocusRequestBase(Context context) {
     super(context);
-    this.context = context;
   }
 
   private void onRnScreenViewAppear() {
-    boolean a11yAutoFocus = autoFocus && enableA11yFocus && !hasBeenA11yFocused && screenAutoA11yFocus;
+    boolean a11yAutoFocus = autoFocus && !hasBeenA11yFocused && screenAutoA11yFocus;
     if (!a11yAutoFocus) return;
 
-    try {
-      int reactTag = this.getId();
-      int uiManagerType = ViewUtil.getUIManagerType(reactTag);
-      a11yViewAppearDispatcher = UIManagerHelper.getEventDispatcher((ReactContext) context, uiManagerType);
-      if (a11yViewAppearDispatcher == null) return;
-      View focusingView = this.getFocusingView();
-
-
-      eventA11yViewAppearListener = new EventDispatcherListener() {
-        @Override
-        public void onEventDispatch(Event event) {
-          if ("topClick".equals(event.getEventName())) {
-            a11yViewAppearDispatcher.removeListener(this);
-            eventA11yViewAppearListener = null;
-            hasBeenA11yFocused = true;
-          }
-          if ("topFinishTransitioning".equals(event.getEventName()) || "topShow".equals(event.getEventName())) {
-            if (hasBeenA11yFocused) return;
-            hasBeenA11yFocused = true;
-
-            focusingView.postDelayed(() -> {
-              focus(false, true);
-              a11yViewAppearDispatcher.removeListener(this);
-              eventA11yViewAppearListener = null;
-            }, screenAutoA11yFocusDelay);
-          }
-        }
-      };
-      a11yViewAppearDispatcher.addListener(eventA11yViewAppearListener);
-    } catch (Exception ignored) {
-    }
+    hasBeenA11yFocused = true;
+    View focusingView = this.getFocusingView();
+    focusingView.postDelayed(() -> focus(false, true), screenAutoA11yFocusDelay);
   }
 
   @Override
@@ -79,16 +38,6 @@ public class ViewFocusRequestBase extends ViewFocusChangeBase {
     }
   }
 
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    if (this.a11yViewAppearDispatcher != null && this.eventA11yViewAppearListener != null) {
-      this.a11yViewAppearDispatcher.removeListener(this.eventA11yViewAppearListener);
-      a11yViewAppearDispatcher = null;
-      eventA11yViewAppearListener = null;
-    }
-  }
-
   private void autoFocusOnDraw() {
     getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
       @Override
@@ -102,9 +51,9 @@ public class ViewFocusRequestBase extends ViewFocusChangeBase {
     });
   }
 
-  private void a11yFocus(View view) {
-    if (!enableA11yFocus) return;
-    view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+  public void a11yFocus() {
+    View focusingView = this.getFocusingView();
+    focusingView.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
   }
 
   public void focus(boolean keyboard, boolean a11y) {
@@ -112,9 +61,9 @@ public class ViewFocusRequestBase extends ViewFocusChangeBase {
     if (keyboard) {
       focusingView.requestFocus();
     }
-    if (a11y) {
-      a11yFocus(focusingView);
-    }
+   if (a11y) {
+     a11yFocus();
+   }
   }
 
 

package/android/src/newarch/ExternalKeyboardLockViewManagerInterface.java

@@ -0,0 +1,11 @@
+package com.externalkeyboard;
+
+import android.view.View;
+
+// Marker-free copy of the codegen com.facebook.react.viewmanagers interface.
+// See ExternalKeyboardViewManagerInterface for rationale.
+public interface ExternalKeyboardLockViewManagerInterface<T extends View> {
+  void setComponentType(T view, int value);
+  void setLockDisabled(T view, boolean value);
+  void setForceLock(T view, boolean value);
+}

package/android/src/newarch/ExternalKeyboardLockViewManagerSpec.java

@@ -1,6 +1,5 @@
 package com.externalkeyboard;
 
-import com.facebook.react.viewmanagers.ExternalKeyboardLockViewManagerInterface;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
 

package/android/src/newarch/ExternalKeyboardViewManagerInterface.java

@@ -0,0 +1,42 @@
+package com.externalkeyboard;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+// Marker-free copy of the codegen com.facebook.react.viewmanagers interface.
+// Intentionally does NOT extend ViewManagerWithGeneratedInterface so that
+// ViewManager#getDelegate() takes its default (reflection-based) path instead of
+// logging a ReactNoCrashSoftException, while still covering the full @ReactProp
+// hierarchy (BaseViewManager + ReactViewManager extras + our props).
+public interface ExternalKeyboardViewManagerInterface<T extends View> {
+  void setCanBeFocused(T view, boolean value);
+  void setHasKeyDownPress(T view, boolean value);
+  void setHasKeyUpPress(T view, boolean value);
+  void setHasOnFocusChanged(T view, boolean value);
+  void setAutoFocus(T view, boolean value);
+  void setHaloEffect(T view, boolean value);
+  void setHaloCornerRadius(T view, float value);
+  void setHaloExpendX(T view, float value);
+  void setHaloExpendY(T view, float value);
+  void setRoundedHaloFix(T view, boolean value);
+  void setTintColor(T view, @Nullable Integer value);
+  void setFocusableWrapper(T view, boolean value);
+  void setGroupIdentifier(T view, @Nullable String value);
+  void setScreenAutoA11yFocus(T view, boolean value);
+  void setScreenAutoA11yFocusDelay(T view, int value);
+  void setOrderGroup(T view, @Nullable String value);
+  void setOrderIndex(T view, int value);
+  void setLockFocus(T view, int value);
+  void setOrderId(T view, @Nullable String value);
+  void setOrderLeft(T view, @Nullable String value);
+  void setOrderRight(T view, @Nullable String value);
+  void setOrderUp(T view, @Nullable String value);
+  void setOrderDown(T view, @Nullable String value);
+  void setOrderForward(T view, @Nullable String value);
+  void setOrderBackward(T view, @Nullable String value);
+  void setOrderFirst(T view, @Nullable String value);
+  void setOrderLast(T view, @Nullable String value);
+  void setEnableContextMenu(T view, boolean value);
+  void rnekKeyboardFocus(T view);
+  void rnekScreenReaderFocus(T view);
+}

package/android/src/newarch/ExternalKeyboardViewManagerSpec.java

@@ -1,6 +1,5 @@
 package com.externalkeyboard;
 
-import com.facebook.react.viewmanagers.ExternalKeyboardViewManagerInterface;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
 

package/android/src/newarch/KeyboardFocusGroupManagerInterface.java

@@ -0,0 +1,12 @@
+package com.externalkeyboard;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+// Marker-free copy of the codegen com.facebook.react.viewmanagers interface.
+// See ExternalKeyboardViewManagerInterface for rationale.
+public interface KeyboardFocusGroupManagerInterface<T extends View> {
+  void setTintColor(T view, @Nullable Integer value);
+  void setGroupIdentifier(T view, @Nullable String value);
+  void setOrderGroup(T view, @Nullable String value);
+}

package/android/src/newarch/KeyboardFocusGroupManagerSpec.java

@@ -1,6 +1,5 @@
 package com.externalkeyboard;
 
-import com.facebook.react.viewmanagers.KeyboardFocusGroupManagerInterface;
 import com.facebook.react.views.view.ReactViewGroup;
 import com.facebook.react.views.view.ReactViewManager;
 

package/android/src/newarch/TextInputFocusWrapperManagerInterface.java

@@ -0,0 +1,34 @@
+package com.externalkeyboard;
+
+import android.view.View;
+import androidx.annotation.Nullable;
+
+// Marker-free copy of the codegen com.facebook.react.viewmanagers interface.
+// See ExternalKeyboardViewManagerInterface for rationale.
+public interface TextInputFocusWrapperManagerInterface<T extends View> {
+  void setFocusType(T view, int value);
+  void setBlurType(T view, int value);
+  void setCanBeFocused(T view, boolean value);
+  void setHasOnFocusChanged(T view, boolean value);
+  void setHaloEffect(T view, boolean value);
+  void setHaloCornerRadius(T view, float value);
+  void setHaloExpendX(T view, float value);
+  void setHaloExpendY(T view, float value);
+  void setRoundedHaloFix(T view, boolean value);
+  void setTintColor(T view, @Nullable Integer value);
+  void setBlurOnSubmit(T view, boolean value);
+  void setMultiline(T view, boolean value);
+  void setGroupIdentifier(T view, @Nullable String value);
+  void setLockFocus(T view, int value);
+  void setOrderGroup(T view, @Nullable String value);
+  void setOrderIndex(T view, int value);
+  void setOrderId(T view, @Nullable String value);
+  void setOrderLeft(T view, @Nullable String value);
+  void setOrderRight(T view, @Nullable String value);
+  void setOrderUp(T view, @Nullable String value);
+  void setOrderDown(T view, @Nullable String value);
+  void setOrderForward(T view, @Nullable String value);
+  void setOrderBackward(T view, @Nullable String value);
+  void setOrderFirst(T view, @Nullable String value);
+  void setOrderLast(T view, @Nullable String value);
+}

package/android/src/newarch/TextInputFocusWrapperManagerSpec.java

@@ -2,17 +2,7 @@ package com.externalkeyboard;
 
 import android.view.ViewGroup;
 
-import androidx.annotation.Nullable;
-
 import com.facebook.react.views.view.ReactViewManager;
-import com.facebook.react.uimanager.ViewManagerDelegate;
-import com.facebook.react.viewmanagers.TextInputFocusWrapperManagerDelegate;
-import com.facebook.react.viewmanagers.TextInputFocusWrapperManagerInterface;
 
 public abstract class TextInputFocusWrapperManagerSpec<T extends ViewGroup> extends ReactViewManager implements TextInputFocusWrapperManagerInterface<T> {
-  private final ViewManagerDelegate<T> mDelegate;
-
-  public TextInputFocusWrapperManagerSpec() {
-    mDelegate = new TextInputFocusWrapperManagerDelegate(this);
-  }
 }

package/android/src/newarch/helper/ReactNativeEventDispatcher.java

@@ -0,0 +1,28 @@
+package com.externalkeyboard.helper;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.uimanager.events.EventDispatcherProvider;
+
+/**
+ * New Architecture implementation. Prefers the bridgeless {@link EventDispatcherProvider}
+ * path — the way RN 0.85+'s {@code UIManagerHelper.getEventDispatcher(context)} works,
+ * without the deprecated reactTag. Fabric can still run on the legacy Bridge (e.g. on
+ * rn < 0.79, or whenever bridgeless is disabled), where the context is not an
+ * {@link EventDispatcherProvider}; that case falls back to the reactTag lookup.
+ */
+public class ReactNativeEventDispatcher {
+  @SuppressWarnings("deprecation")
+  public static EventDispatcher getEventDispatcher(ReactContext context, int id) {
+    ReactContext reactContext = context;
+    if (reactContext instanceof ThemedReactContext) {
+      reactContext = ((ThemedReactContext) reactContext).getReactApplicationContext();
+    }
+    if (reactContext instanceof EventDispatcherProvider) {
+      return ((EventDispatcherProvider) reactContext).getEventDispatcher();
+    }
+    return UIManagerHelper.getEventDispatcherForReactTag(context, id);
+  }
+}

package/android/src/oldarch/ExternalKeyboardViewManagerSpec.java

@@ -15,7 +15,9 @@ public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> exten
 
   public abstract void setHasKeyUpPress(T view, boolean value);
 
-  public abstract void focus(ExternalKeyboardView view);
+  public abstract void rnekKeyboardFocus(ExternalKeyboardView view);
+
+  public abstract void rnekScreenReaderFocus(ExternalKeyboardView view);
 
   public abstract void setAutoFocus(ExternalKeyboardView view, @Nullable boolean value);
 
@@ -25,7 +27,7 @@ public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> exten
 
   public abstract void setHaloEffect(ExternalKeyboardView view, boolean value);
 
-  public abstract void setGroup(ExternalKeyboardView view, boolean value);
+  public abstract void setFocusableWrapper(ExternalKeyboardView view, boolean value);
 
   public abstract void setHaloCornerRadius(ExternalKeyboardView view, float value);
 
@@ -33,9 +35,9 @@ public abstract class ExternalKeyboardViewManagerSpec<T extends ViewGroup> exten
 
   public abstract void setHaloExpendY(ExternalKeyboardView view, float value);
 
-  public abstract void setGroupIdentifier(ExternalKeyboardView view, @Nullable String value);
+  public abstract void setRoundedHaloFix(ExternalKeyboardView view, boolean value);
 
-  public abstract void setEnableA11yFocus(ExternalKeyboardView wrapper, boolean enableA11yFocus);
+  public abstract void setGroupIdentifier(ExternalKeyboardView view, @Nullable String value);
 
   public abstract void setScreenAutoA11yFocus(ExternalKeyboardView wrapper, boolean enableA11yFocus);
 

package/android/src/oldarch/TextInputFocusWrapperManagerSpec.java

@@ -10,6 +10,8 @@ import com.facebook.react.views.view.ReactViewManager;
 public abstract class TextInputFocusWrapperManagerSpec<T extends ViewGroup> extends ReactViewManager {
   public abstract void setCanBeFocused(T wrapper, boolean canBeFocused);
 
+  public abstract void setHasOnFocusChanged(T wrapper, boolean value);
+
   public abstract void setFocusType(T wrapper, int focusType);
 
   public abstract void setBlurType(T wrapper, int blurType);
@@ -53,4 +55,6 @@ public abstract class TextInputFocusWrapperManagerSpec<T extends ViewGroup> exte
   public abstract void setHaloExpendX(TextInputFocusWrapper view, float value);
 
   public abstract void setHaloCornerRadius(TextInputFocusWrapper view, float value);
+
+  public abstract void setRoundedHaloFix(TextInputFocusWrapper view, boolean value);
 }

package/android/src/oldarch/helper/ReactNativeEventDispatcher.java

@@ -0,0 +1,15 @@
+package com.externalkeyboard.helper;
+
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.EventDispatcher;
+
+/**
+ * Legacy (Bridge / old architecture) implementation. The non-bridgeless context is not
+ * an {@code EventDispatcherProvider}, so the dispatcher is resolved by reactTag.
+ */
+public class ReactNativeEventDispatcher {
+  public static EventDispatcher getEventDispatcher(ReactContext context, int id) {
+    return UIManagerHelper.getEventDispatcherForReactTag(context, id);
+  }
+}

package/ios/Delegates/RNCEKVFocusDelegate/RNCEKVFocusDelegate.mm

@@ -57,7 +57,7 @@
 
 // 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) {
+    if (!_delegate.focusableWrapper) {
         return _delegate;
     }
     

package/ios/Delegates/RNCEKVFocusDelegate/RNCEKVFocusProtocol.h

@@ -12,7 +12,7 @@
 
 @protocol RNCEKVFocusProtocol <NSObject>
 - (BOOL)canBeFocused;
-- (BOOL)isGroup;
+- (BOOL)focusableWrapper;
 @end
 
 #endif /* RNCEKVFocusProtocol_h */

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.h

@@ -15,7 +15,8 @@
 
 - (instancetype _Nonnull)initWithView:(UIView<RNCEKVHaloProtocol> *_Nonnull)view;
 
-@property (nonatomic, readonly, nullable) UIFocusEffect *focusEffect;
+@property (nonatomic, readonly, nullable) UIFocusEffect *focusEffect API_AVAILABLE(ios(15.0));
+- (void)observeCornerRadius:(CGFloat)radius;
 - (void)invalidate;
 - (void)clear;
 

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloDelegate.mm

@@ -19,6 +19,11 @@
   UIFocusEffect *_currentEffect;
   BOOL _isDirty;
   CGRect _prevBounds;
+  CGFloat _prevRadius;
+  // Last non-zero layer.cornerRadius we observed. RN's invalidateLayer toggles
+  // the live cornerRadius between the styled value and 0 (its two border-render
+  // paths); we pin the halo to this stable value so it stops following the 0.
+  CGFloat _stableRadius;
 }
 
 - (instancetype _Nonnull)initWithView:(UIView<RNCEKVHaloProtocol> *_Nonnull)delegate {
@@ -28,36 +33,65 @@
     _currentEffect = nil;
     _isDirty = YES;
     _prevBounds = CGRectZero;
+    _prevRadius = -1;
+    _stableRadius = 0;
   }
   return self;
 }
 
-- (UIFocusEffect *)focusEffect {
+- (UIFocusEffect *)focusEffect API_AVAILABLE(ios(15.0)) {
   if (_delegate.isHaloHidden) {
     return [RNCEKVFocusEffectUtility emptyFocusEffect];
   }
 
+  UIView *focusingView = [_delegate getFocusTargetView];
+
+  // Track the view's intended corner radius, ignoring the transient 0 RN sets
+  // while it draws the image-based border. The view also feeds us this value
+  // from its layout passes (see -observeCornerRadius:), so by the time UIKit
+  // queries the effect _stableRadius is already correct even if RN happens to
+  // have the live radius at 0 right now.
+  [self observeCornerRadius:focusingView.layer.cornerRadius];
+
+  // Explicit haloCornerRadius wins; otherwise pin to the view's stable radius.
+  CGFloat cornerRadius = _delegate.haloCornerRadius > 0 ? _delegate.haloCornerRadius
+                                                        : _stableRadius;
+
+  // With roundedHaloFix on we always supply our own halo (a fixed rounded rect)
+  // rather than returning nil and falling back to the system halo — that system
+  // halo follows the squared layer, which is what caused the blink and the
+  // square/"default" halo.
   BOOL hasCustomSettings = _delegate.haloExpendX || _delegate.haloExpendY || _delegate.haloCornerRadius;
-  if (!hasCustomSettings) {
+  if (!hasCustomSettings && !_delegate.roundedHaloFix) {
     return nil;
   }
 
-  UIView *focusingView = [_delegate getFocusTargetView];
   BOOL boundsChanged = !CGRectEqualToRect(_prevBounds, focusingView.bounds);
+  BOOL radiusChanged = _prevRadius != cornerRadius;
 
-  if (_isDirty || boundsChanged) {
+  if (_isDirty || boundsChanged || radiusChanged) {
     _isDirty = NO;
     _prevBounds = focusingView.bounds;
+    _prevRadius = cornerRadius;
 
     _currentEffect = [RNCEKVFocusEffectUtility getFocusEffect:focusingView
                                                 withExpandedX:_delegate.haloExpendX
                                                 withExpandedY:_delegate.haloExpendY
-                                             withCornerRadius:_delegate.haloCornerRadius];
+                                             withCornerRadius:cornerRadius];
   }
 
   return _currentEffect;
 }
 
+- (void)observeCornerRadius:(CGFloat)radius {
+  // Remember the last non-zero radius so the transient 0 from RN's image-border
+  // path never reaches the halo.
+  if (radius > 0 && radius != _stableRadius) {
+    _stableRadius = radius;
+    _isDirty = YES; // force the effect to be rebuilt at the new radius
+  }
+}
+
 - (void)invalidate {
   _isDirty = YES;
 }
@@ -66,6 +100,8 @@
   _currentEffect = nil;
   _isDirty = YES;
   _prevBounds = CGRectZero;
+  _prevRadius = -1;
+  _stableRadius = 0;
 }
 
 @end

package/ios/Delegates/RNCEKVHaloDelegate/RNCEKVHaloProtocol.h

@@ -14,6 +14,7 @@
 - (CGFloat) haloCornerRadius;
 - (CGFloat) haloExpendX;
 - (CGFloat) haloExpendY;
+- (BOOL) roundedHaloFix;
 - (UIView*) getFocusTargetView;
 
 @end

package/ios/Extensions/RCTCustomScrollView+RNCEKVExternalKeyboard.mm

@@ -9,14 +9,13 @@
 #import "RCTScrollView.h"
 #import "RNCEKVSwizzleInstanceMethod.h"
 
+static void RNCEKVRCTScrollViewSwizzle(void) {
+  RNCEKVSwizzleInstanceMethod([RCTScrollView class], @selector(initWithEventDispatcher:), @selector(rncekvInitWithEventDispatcher:));
+}
+
 @implementation RCTScrollView (RNCEKVExternalKeyboard)
 
-+ (void)load {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    RNCEKVSwizzleInstanceMethod([self class], @selector(initWithEventDispatcher:), @selector(rncekvInitWithEventDispatcher:));
-  });
-}
+RNCEKV_INSTALL_SWIZZLES(RNCEKVRCTScrollViewSwizzle)
 
 - (instancetype)rncekvInitWithEventDispatcher:(CGRect)frame {
   RCTScrollView *rctView = [self rncekvInitWithEventDispatcher:frame];

package/ios/Extensions/RCTEnhancedScrollView+RNCEKVExternalKeyboard.mm

@@ -12,13 +12,19 @@
 #import "RNCEKVSwizzleInstanceMethod.h"
 #import "RCTScrollViewComponentView.h"
 
+static void RNCEKVEnhancedScrollViewSwizzle(void) {
+  RNCEKVSwizzleInstanceMethod([RCTEnhancedScrollView class], @selector(initWithFrame:), @selector(rncekvInitWithFrame:));
+}
+
 @implementation RCTEnhancedScrollView (RNCEKVExternalKeyboard)
 
+RNCEKV_INSTALL_SWIZZLES(RNCEKVEnhancedScrollViewSwizzle)
+
 - (NSArray<id<UIFocusEnvironment>> *)preferredFocusEnvironments {
   @try {
     BOOL isScrollViewComponent = self.superview &&
     [self.superview isKindOfClass:[RCTScrollViewComponentView class]];
-    
+
     if (isScrollViewComponent) {
       RCTScrollViewComponentView *scrollViewComponent = (RCTScrollViewComponentView *)self.superview;
       return @[scrollViewComponent.containerView];
@@ -26,15 +32,8 @@
   }
   @catch (NSException *exception) {
   }
-  
-  return [super preferredFocusEnvironments];
-}
 
-+ (void)load {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    RNCEKVSwizzleInstanceMethod([self class], @selector(initWithFrame:), @selector(rncekvInitWithFrame:));
-  });
+  return [super preferredFocusEnvironments];
 }
 
 - (instancetype)rncekvInitWithFrame:(CGRect)frame {

package/ios/Extensions/RCTTextInputComponentView+RNCEKVExternalKeyboard.mm

@@ -30,7 +30,7 @@
 @end
 
 @implementation RCTUITextField (RNCEKVExternalKeyboard)
-  - (UIFocusEffect*)focusEffect {
+  - (UIFocusEffect*)focusEffect API_AVAILABLE(ios(15.0)) {
     id superParent = self.superview.superview;
     if (superParent != nil && [superParent conformsToProtocol:@protocol(RNCEKVCustomFocusEffectProtocol)]) {
       id<RNCEKVCustomFocusEffectProtocol> parent = (id<RNCEKVCustomFocusEffectProtocol>)superParent;

package/ios/Extensions/RCTViewComponentView+RNCEKVExternalKeyboard.h

@@ -8,7 +8,6 @@
 #ifndef UIView_RNCEKVExternalKeyboard_h
 #define UIView_RNCEKVExternalKeyboard_h
 
-#import <React/RCTViewComponentView.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
   #import <React/RCTViewComponentView.h>