react-native-keyboard-controller 1.18.0 → 1.18.2

package/android/src/main/java/com/reactnativekeyboardcontroller/managers/KeyboardControllerViewManagerImpl.kt

@@ -22,6 +22,7 @@ class KeyboardControllerViewManagerImpl {
 
   fun invalidate() {
     listener?.detachListener()
+    listener = null
   }
 
   fun setEnabled(

package/android/src/main/java/com/reactnativekeyboardcontroller/views/background/KeyboardBackgroundViewGroup.kt

@@ -3,7 +3,6 @@ package com.reactnativekeyboardcontroller.views.background
 import android.annotation.SuppressLint
 import android.content.res.Configuration
 import android.view.WindowInsets
-import com.facebook.react.uimanager.BackgroundStyleApplicator
 import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 
@@ -14,18 +13,18 @@ class KeyboardBackgroundViewGroup(
   // view mounted
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    BackgroundStyleApplicator.setBackgroundColor(this, reactContext.getInputMethodColor())
+    super.setBackgroundColor(reactContext.getInputMethodColor())
   }
 
   // theme changed
   override fun onConfigurationChanged(newConfig: Configuration?) {
     super.onConfigurationChanged(newConfig)
-    BackgroundStyleApplicator.setBackgroundColor(this, reactContext.getInputMethodColor())
+    super.setBackgroundColor(reactContext.getInputMethodColor())
   }
 
   // keyboard changed
   override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
-    BackgroundStyleApplicator.setBackgroundColor(this, reactContext.getInputMethodColor())
+    super.setBackgroundColor(reactContext.getInputMethodColor())
     return super.onApplyWindowInsets(insets)
   }
 

package/ios/protocols/TextInput.swift

@@ -39,13 +39,17 @@ extension TextInput {
     case .light:
       return "light"
     case .default:
-      switch traitCollection.userInterfaceStyle {
-      case .dark:
-        return "dark"
-      case .light, .unspecified:
-        return "light"
-      @unknown default:
-        return "light"
+      if #available(iOS 12.0, *) {
+        switch traitCollection.userInterfaceStyle {
+        case .dark:
+          return "dark"
+        case .light, .unspecified:
+          return "light"
+        @unknown default:
+          return "light"
+        }
+      } else {
+        return "light" // Default fallback for iOS < 12
       }
     @unknown default:
       return "light"

package/ios/views/KeyboardBackgroundViewManager.mm

@@ -165,4 +165,11 @@ RCT_EXPORT_MODULE(KeyboardBackgroundViewManager)
   }
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+Class<RCTComponentViewProtocol> KeyboardBackgroundViewCls(void)
+{
+  return KeyboardBackgroundView.class;
+}
+#endif
+
 @end

package/ios/views/OverKeyboardViewManager.mm

@@ -158,10 +158,9 @@ RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
-  const auto &oldViewProps = *std::static_pointer_cast<const OverKeyboardViewProps>(_props);
   const auto &newViewProps = *std::static_pointer_cast<const OverKeyboardViewProps>(props);
 
-  if (newViewProps.visible != oldViewProps.visible) {
+  if (newViewProps.visible != _visible) {
     if (newViewProps.visible) {
       [self show];
     } else {
@@ -207,13 +206,14 @@ RCT_EXPORT_VIEW_PROPERTY(visible, BOOL)
   if (_visible) {
     return;
   }
+
+  UIWindow *topWindow = [UIWindow topWindow];
   _visible = true;
-  _contentView.frame = self.window.bounds;
+  _contentView.frame = topWindow.bounds;
   _contentView.autoresizingMask =
       UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-  [_touchHandler attachToView:_contentView];
 
-  UIWindow *topWindow = [UIWindow topWindow];
+  [_touchHandler attachToView:_contentView];
   [topWindow addSubview:_contentView];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-controller",
-  "version": "1.18.0",
+  "version": "1.18.2",
   "description": "Keyboard manager which works in identical way on both iOS and Android",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",