fix: paper arch

Author: kirillzyusko

android/src/fabric/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

@@ -18,12 +18,9 @@ class KeyboardControllerViewManager(
   KeyboardControllerViewManagerInterface<ReactViewGroup> {
   private val manager = KeyboardControllerViewManagerImpl(mReactContext)
   private val mDelegate = KeyboardControllerViewManagerDelegate(this)
-  private var listener : WindowDimensionListener? = null
-
-  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate
-
-  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  private var listener: WindowDimensionListener? = null
 
+  // region Lifecycle
   override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
     if (listener == null) {
       listener = WindowDimensionListener(context)
@@ -42,6 +39,14 @@ class KeyboardControllerViewManager(
     manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
   }
 
+  override fun onDropViewInstance(view: ReactViewGroup) {
+    super.onDropViewInstance(view)
+    (view as EdgeToEdgeReactViewGroup).setActive(false)
+    view.removeWindowInsetsListener()
+  }
+  // endregion
+
+  // region Props setters
   @ReactProp(name = "statusBarTranslucent")
   override fun setStatusBarTranslucent(
     view: ReactViewGroup,
@@ -65,13 +70,14 @@ class KeyboardControllerViewManager(
     view: ReactViewGroup,
     value: Boolean,
   ) = manager.setEnabled(view as EdgeToEdgeReactViewGroup, value)
+  // endregion
 
-  override fun onDropViewInstance(view: ReactViewGroup) {
-    super.onDropViewInstance(view)
-    (view as EdgeToEdgeReactViewGroup).setActive(false)
-    view.removeWindowInsetsListener()
-  }
-
+  // region Constants
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
     manager.getExportedCustomDirectEventTypeConstants()
+
+  override fun getDelegate(): ViewManagerDelegate<ReactViewGroup> = mDelegate
+
+  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // endregion
 }

android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt

@@ -10,7 +10,6 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.events.EventDispatcher
-import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
 import com.reactnativekeyboardcontroller.log.Logger
 
 fun ThemedReactContext?.dispatchEvent(

android/src/main/java/com/reactnativekeyboardcontroller/listeners/WindowDimensionListener.kt

@@ -17,7 +17,7 @@ class WindowDimensionListener(
   private val context: ThemedReactContext?,
 ) {
   private var lastDispatchedDimensions = Dimensions(0.0, 0.0)
-  private var layoutListener : ViewTreeObserver.OnGlobalLayoutListener? = null
+  private var layoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
 
   public fun attachListener() {
     // attach to content view only once per app instance
@@ -28,9 +28,10 @@ class WindowDimensionListener(
 
       updateWindowDimensions(content)
 
-      layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        updateWindowDimensions(content)
-      }
+      layoutListener =
+        ViewTreeObserver.OnGlobalLayoutListener {
+          updateWindowDimensions(content)
+        }
 
       content?.viewTreeObserver?.addOnGlobalLayoutListener(layoutListener)
     }

android/src/paper/java/com/reactnativekeyboardcontroller/KeyboardControllerViewManager.kt

@@ -5,24 +5,43 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.ReactViewManager
+import com.reactnativekeyboardcontroller.listeners.WindowDimensionListener
 import com.reactnativekeyboardcontroller.managers.KeyboardControllerViewManagerImpl
 import com.reactnativekeyboardcontroller.views.EdgeToEdgeReactViewGroup
 
 class KeyboardControllerViewManager(
   mReactContext: ReactApplicationContext,
 ) : ReactViewManager() {
   private val manager = KeyboardControllerViewManagerImpl(mReactContext)
+  private var listener: WindowDimensionListener? = null
 
-  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // region Lifecycle
+  override fun createViewInstance(context: ThemedReactContext): ReactViewGroup {
+    if (listener == null) {
+      listener = WindowDimensionListener(context)
+      listener?.attachListener()
+    }
+    return manager.createViewInstance(context)
+  }
 
-  override fun createViewInstance(reactContext: ThemedReactContext): EdgeToEdgeReactViewGroup =
-    manager.createViewInstance(reactContext)
+  override fun invalidate() {
+    super.invalidate()
+    listener?.detachListener()
+  }
 
   override fun onAfterUpdateTransaction(view: ReactViewGroup) {
     super.onAfterUpdateTransaction(view)
     manager.setEdgeToEdge(view as EdgeToEdgeReactViewGroup)
   }
 
+  override fun onDropViewInstance(view: ReactViewGroup) {
+    super.onDropViewInstance(view)
+    (view as EdgeToEdgeReactViewGroup).setActive(false)
+    view.removeWindowInsetsListener()
+  }
+  // endregion
+
+  // region Props setters
   @ReactProp(name = "enabled")
   fun setEnabled(
     view: EdgeToEdgeReactViewGroup,
@@ -54,7 +73,12 @@ class KeyboardControllerViewManager(
   ) {
     manager.setPreserveEdgeToEdge(view, isPreservingEdgeToEdge)
   }
+  // endregion
 
+  // region Constants
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =
     manager.getExportedCustomDirectEventTypeConstants()
+
+  override fun getName(): String = KeyboardControllerViewManagerImpl.NAME
+  // endregion
 }