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

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.util.Log
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.children
@@ -21,7 +22,7 @@ class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceMa
         // 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
-        val measuredWidth = this.getRootViewFirstChild()?.width
+        val measuredWidth = this.getLastRootViewChild()?.width
 
         return if (measuredWidth != null) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
             widthMeasureSpec
@@ -33,23 +34,26 @@ class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceMa
         // 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
+        val measuredHeight = this.getLastRootViewChild()?.height
 
         return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
             heightMeasureSpec
     }
 
-    private fun getRootViewFirstChild(): View? {
-        if (rootViewGroup.children.count() > 0) {
+    private fun getLastRootViewChild(): View? {
+        if (rootViewGroup.children.count() == 0) {
             return null
         }
-        var rootViewGroupFirstChild: View = rootViewGroup.children.first()
-        while(true) try {
-            (rootViewGroupFirstChild as ViewGroup).children.first().also { rootViewGroupFirstChild = it }
+        var rootViewGroupLastChild: View = rootViewGroup
+        var next = rootViewGroup as Any
+        while(next is ViewGroup && next.childCount > 0) try {
+            rootViewGroupLastChild = next
+            next.children.first().also { next = it }
+
         } catch (e: Exception) {
-            //
+            Log.i("TitleBarReactView", "getRootViewFirstChild: ${e.message}")
         }
         @Suppress("UNREACHABLE_CODE")
-        return rootViewGroupFirstChild
+        return rootViewGroupLastChild
     }
-}
+}

package/package.json

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