react-native-navigation 7.33.0-alpha.2 → 7.33.0-alpha.4

package/lib/android/app/src/reactNative71/java/com/reactnativenavigation/views/stack/topbar/titlebar/TitleBarReactView.kt

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views.stack.topbar.titlebar
 
 import android.annotation.SuppressLint
 import android.content.Context
+import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
 import com.facebook.react.ReactInstanceManager
@@ -11,22 +12,44 @@ import com.reactnativenavigation.react.ReactView
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(interceptReactRootViewMeasureSpec(widthMeasureSpec), heightMeasureSpec)
+        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec), interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
     }
 
-    private fun interceptReactRootViewMeasureSpec(widthMeasureSpec: Int): Int {
+    private fun interceptReactRootViewMeasureSpecWidth(widthMeasureSpec: Int): Int {
         // This is a HACK.
         // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
         // It's causing infinite measurements, that hung up the UI.
         // Intercepting largest child by width, and use its width as (parent) ReactRootView width fixed that.
         // See for more details https://github.com/wix/react-native-navigation/pull/7096
-        var measuredWidth = 0
+        val measuredWidth = this.getRootViewFirstChild()?.width
 
+        return if (measuredWidth != null) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
+            widthMeasureSpec
+    }
+
+    private fun interceptReactRootViewMeasureSpecHeight(heightMeasureSpec: Int): Int {
+        // This is a HACK.
+        // ReactRootView has problematic behavior when setting width to WRAP_CONTENT,
+        // It's causing infinite measurements, that hung up the UI.
+        // Intercepting largest child by height, and use its height as (parent) ReactRootView width fixed that.
+        // See for more details https://github.com/wix/react-native-navigation/pull/7096
+        val measuredHeight = this.getRootViewFirstChild()?.height
+
+        return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
+            heightMeasureSpec
+    }
+
+    private fun getRootViewFirstChild(): View? {
         if (rootViewGroup.children.count() > 0) {
-            measuredWidth = (((rootViewGroup.children.first() as ViewGroup).children.first() as ViewGroup).children.first() as ViewGroup).width
+            return null
         }
-
-        return if (measuredWidth > 0) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
-            widthMeasureSpec
+        var rootViewGroupFirstChild: View = rootViewGroup.children.first()
+        while(true) try {
+            (rootViewGroupFirstChild as ViewGroup).children.first().also { rootViewGroupFirstChild = it }
+        } catch (e: Exception) {
+            //
+        }
+        @Suppress("UNREACHABLE_CODE")
+        return rootViewGroupFirstChild
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.33.0-alpha.2",
+  "version": "7.33.0-alpha.4",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,