wip: rough working state for android

okwasniewski · okwasniewski · commit 55f7ff7f8fda · 2025-03-20T18:31:23.000+01:00
diff --git a/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewPackage.kt b/packages/react-native-bottom-tabs/android/src/main/java/com/rcttabview/RCTTabViewPackage.kt
@@ -10,6 +10,7 @@ class RCTTabViewPackage : ReactPackage {
   override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
     val viewManagers: MutableList<ViewManager<*, *>> = ArrayList()
     viewManagers.add(RCTTabViewManager(reactContext))
+    viewManagers.add(RCTTabViewScreenManager(reactContext))
     return viewManagers
   }
 
diff --git a/packages/react-native-bottom-tabs/android/src/main/jni/RNCTabView.h b/packages/react-native-bottom-tabs/android/src/main/jni/RNCTabView.h
@@ -3,7 +3,7 @@
 #include <ReactCommon/JavaTurboModule.h>
 #include <ReactCommon/TurboModule.h>
 #include <jsi/jsi.h>
-#include <react/renderer/components/RNCTabView/RNCTabViewComponentDescriptor.h>
+#include <react/renderer/components/RNCTabView/RNCTabViewScreenComponentDescriptor.h>
 
 namespace facebook::react {
 JSI_EXPORT
diff --git a/packages/react-native-bottom-tabs/android/src/newarch/RCTTabViewManager.kt b/packages/react-native-bottom-tabs/android/src/newarch/RCTTabViewManager.kt
@@ -1,7 +1,9 @@
 package com.rcttabview
 
+import android.util.Log
 import android.view.View
-import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.core.view.children
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.module.annotations.ReactModule
@@ -11,7 +13,6 @@ import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.ViewManagerDelegate
 import com.facebook.react.viewmanagers.RNCTabViewManagerDelegate
 import com.facebook.react.viewmanagers.RNCTabViewManagerInterface
-import com.rcttabview.events.OnNativeLayoutEvent
 import com.rcttabview.events.PageSelectedEvent
 import com.rcttabview.events.TabLongPressEvent
 
@@ -37,7 +38,27 @@ class RCTTabViewManager(context: ReactApplicationContext) :
     }
 
     view.onNativeLayoutListener = { width, height ->
-      eventDispatcher?.dispatchEvent(OnNativeLayoutEvent(viewTag = view.id, width, height))
+      val childCount = tabViewImpl.getChildCount(view)
+      for (i in 0 until childCount) {  // Use 'until' instead of '..' to exclude childCount
+        val child = tabViewImpl.getChildAt(view, i)
+
+        // Safe cast for FrameLayout
+        if (child is FrameLayout) {
+          val innerChildren = child.children
+          if (innerChildren.any()) {
+            val innerChild = innerChildren.first()
+
+            // Safe cast for RCTTabViewScreen
+            if (innerChild is RCTTabViewScreen) {
+              innerChild.updateFrame(width, height)
+            }
+          }
+
+          Log.w("TAB_VIEW", "CHILD: ${child}")
+        }
+      }
+
+//      eventDispatcher?.dispatchEvent(OnNativeLayoutEvent(viewTag = view.id, width, height))
     }
     return view
 
diff --git a/packages/react-native-bottom-tabs/android/src/newarch/RCTTabViewScreenManager.kt b/packages/react-native-bottom-tabs/android/src/newarch/RCTTabViewScreenManager.kt
@@ -0,0 +1,80 @@
+package com.rcttabview
+
+import android.content.Context
+import android.util.Log
+import android.view.View
+import android.widget.FrameLayout
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.ViewManagerDelegate
+import com.facebook.react.viewmanagers.RNCTabViewScreenManagerDelegate
+import com.facebook.react.viewmanagers.RNCTabViewScreenManagerInterface
+
+class RCTTabViewScreen(context: Context): FrameLayout(context) {
+  private var stateWrapper: StateWrapper? = null
+
+  public fun setStateWrapper(stateWrapper: StateWrapper?) {
+    this.stateWrapper = stateWrapper
+  }
+
+  public fun updateFrame(width: Double, height: Double) {
+    Log.w("TABVIEW_SCREEN", "UPDATE FRAME, ${width} ${height}")
+    stateWrapper?.updateState(Arguments.createMap().apply {
+      putInt("width", width.toInt())
+      putInt("height", height.toInt())
+    })
+  }
+}
+
+
+@ReactModule(name = "RNCTabViewScreen")
+class RCTTabViewScreenManager(context: ReactApplicationContext) :
+  ViewGroupManager<RCTTabViewScreen>(),
+  RNCTabViewScreenManagerInterface<RCTTabViewScreen> {
+
+  private val delegate: RNCTabViewScreenManagerDelegate<RCTTabViewScreen, RCTTabViewScreenManager> =
+    RNCTabViewScreenManagerDelegate(this)
+
+
+  override fun createViewInstance(context: ThemedReactContext): RCTTabViewScreen {
+    return RCTTabViewScreen(context);
+  }
+
+  override fun updateState(
+    view: RCTTabViewScreen,
+    props: ReactStylesDiffMap?,
+    stateWrapper: StateWrapper?
+  ): Any? {
+    view.setStateWrapper(stateWrapper)
+    return super.updateState(view, props, stateWrapper)
+  }
+
+  override fun getDelegate(): ViewManagerDelegate<RCTTabViewScreen> {
+    return delegate
+  }
+
+  override fun getName(): String {
+    return "RNCTabViewScreen"
+  }
+
+  override fun addView(parent: RCTTabViewScreen, child: View, index: Int) {
+    parent.addView(child, index)
+  }
+
+  override fun removeViewAt(parent: RCTTabViewScreen, index: Int) {
+    parent.removeViewAt(index)
+  }
+
+  override fun getChildCount(parent: RCTTabViewScreen): Int {
+    return parent.childCount
+  }
+
+  override fun getChildAt(parent: RCTTabViewScreen, index: Int): View {
+    return parent.getChildAt(index)
+  }
+}
diff --git a/packages/react-native-bottom-tabs/common/cpp/react/renderer/components/RNCTabView/RNCTabViewScreenComponentDescriptor.h b/packages/react-native-bottom-tabs/common/cpp/react/renderer/components/RNCTabView/RNCTabViewScreenComponentDescriptor.h
@@ -13,17 +13,17 @@ class RNCTabViewScreenComponentDescriptor final : public ConcreteComponentDescri
   RNCTabViewScreenComponentDescriptor(const ComponentDescriptorParameters &parameters)
   : ConcreteComponentDescriptor(parameters) {}
 
-  
+
   /**
    Retrieve shadow node's state and update it's layout size accordingly.
    This is needed because we need to accomodate for bottom bar / sidebar size.
    */
   void adopt(ShadowNode &shadowNode) const override {
     auto& layoutableShadowNode = static_cast<RNCTabViewScreenShadowNode&>(shadowNode);
     auto& stateData = layoutableShadowNode.getStateData();
-    
+
     layoutableShadowNode.setSize(stateData.frameSize);
-    
+
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
 };
diff --git a/packages/react-native-bottom-tabs/common/cpp/react/renderer/components/RNCTabView/RNCTabViewScreenState.h b/packages/react-native-bottom-tabs/common/cpp/react/renderer/components/RNCTabView/RNCTabViewScreenState.h
@@ -4,8 +4,6 @@
 #include <react/renderer/graphics/Size.h>
 #ifdef ANDROID
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
 namespace facebook::react {
@@ -17,6 +15,14 @@ class RNCTabViewScreenState
   RNCTabViewScreenState(Size frameSize): frameSize(frameSize) {};
 
   Size frameSize;
+
+#ifdef ANDROID
+  RNCTabViewScreenState(RNCTabViewScreenState const &previousState, folly::dynamic data)
+    : frameSize((int)data["width"].getInt(), (int)data["height"].getInt()) {};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+#endif
 };
 
 }
diff --git a/packages/react-native-bottom-tabs/react-native.config.js b/packages/react-native-bottom-tabs/react-native.config.js
@@ -3,7 +3,7 @@ module.exports = {
     platforms: {
       android: {
         libraryName: 'RNCTabView',
-        componentDescriptors: ['RNCTabViewComponentDescriptor'],
+        componentDescriptors: ['RNCTabViewScreenComponentDescriptor'],
         cmakeListsPath: 'src/main/jni/CMakeLists.txt',
       },
     },

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class RCTTabViewPackage : ReactPackage {`
`10`	`10`	`override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<, >> {`
`11`	`11`	`val viewManagers: MutableList<ViewManager<, >> = ArrayList()`
`12`	`12`	`viewManagers.add(RCTTabViewManager(reactContext))`
	`13`	`+ viewManagers.add(RCTTabViewScreenManager(reactContext))`
`13`	`14`	`return viewManagers`
`14`	`15`	`}`
`15`	`16`