react-native-navigation 7.33.0-alpha.7 → 7.33.0-alpha.8

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

@@ -3,17 +3,28 @@ 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
 import com.facebook.react.ReactInstanceManager
 import com.reactnativenavigation.react.ReactView
+import com.reactnativenavigation.BuildConfig
 
 @SuppressLint("ViewConstructor")
 class TitleBarReactView(context: Context?, reactInstanceManager: ReactInstanceManager?, componentId: String?,
                         componentName: String?) : ReactView(context, reactInstanceManager, componentId, componentName) {
+
+    private var currentLeft = Int.MAX_VALUE
+    private var currentRight = 0
+    private var currentTop = Int.MAX_VALUE
+    private var currentBottom = 0
+    private var garbageViews = false
+
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec), interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
+        if (currentRight == 0) {
+            findSize(rootViewGroup)
+        }
+        super.onMeasure(interceptReactRootViewMeasureSpecWidth(widthMeasureSpec),
+                interceptReactRootViewMeasureSpecHeight(heightMeasureSpec))
     }
 
     private fun interceptReactRootViewMeasureSpecWidth(widthMeasureSpec: Int): Int {
@@ -22,9 +33,8 @@ 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.getLastRootViewChild()?.width
-
-        return if (measuredWidth != null) MeasureSpec.makeMeasureSpec(measuredWidth, MeasureSpec.EXACTLY) else
+        val width = currentRight - currentLeft
+        return if (width > 0) MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY) else
             widthMeasureSpec
     }
 
@@ -34,26 +44,57 @@ 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.getLastRootViewChild()?.height
 
-        return if (measuredHeight != null) MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.EXACTLY) else
+        val height = currentBottom - currentTop
+        return if (height > 0) MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY) else
             heightMeasureSpec
     }
 
-    private fun getLastRootViewChild(): View? {
-        if (rootViewGroup.children.count() == 0) {
-            return null
+    private fun findSize(viewGroup: ViewGroup) {
+        if (garbageViews) {
+            return
         }
-        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}")
+
+        for (child in viewGroup.children) {
+            if (child.isShown) {
+                if (child is ViewGroup) {
+                    findSize(child)
+                } else {
+                    val location = IntArray(2)
+                    child.getLocationOnScreen(location)
+                    val childLeft = location[0]
+                    val childRight = childLeft + child.measuredWidth
+                    val childTop = location[1]
+                    val childBottom = childTop + child.measuredHeight
+
+                    if (childTop >= 50 || !BuildConfig.DEBUG) { // To filter garbage views, such as debug warning messages
+                        currentLeft = currentLeft.coerceAtMost(childLeft)
+                        currentRight = currentRight.coerceAtLeast(childRight)
+                        currentTop = currentTop.coerceAtMost(childTop)
+                        currentBottom = currentBottom.coerceAtLeast(childBottom)
+
+                        Log.d("TitleBarReactView", "current ViewGroup = $viewGroup")
+                        Log.d("TitleBarReactView", "child.measuredWidth = ${child.measuredWidth}")
+                        Log.d("TitleBarReactView", "child.measuredHeight = ${child.measuredHeight}")
+                        Log.d("TitleBarReactView", "currentLeft = $currentLeft")
+                        Log.d("TitleBarReactView", "currentRight = $currentRight")
+                        Log.d("TitleBarReactView", "currentWidth = ${currentRight - currentLeft}")
+                        Log.d("TitleBarReactView", "currentTop = $currentTop")
+                        Log.d("TitleBarReactView", "currentBottom = $currentBottom")
+                        Log.d("TitleBarReactView", "currentHeight = ${currentBottom - currentTop}")
+                        Log.d("TitleBarReactView", "---------------------------------------------")
+                    } else {
+
+                        Log.d("TitleBarReactView", "current ViewGroup (garbage) = $viewGroup")
+                        Log.d("TitleBarReactView", "child (garbage) = ${child.toString()}")
+                        Log.d("TitleBarReactView", "child.type (garbage) = ${child.javaClass.name}")
+                        Log.d("TitleBarReactView", "child.id (garbage) = ${child.id}")
+
+                        garbageViews = true
+                        return
+                    }
+                }
+            }
         }
-        @Suppress("UNREACHABLE_CODE")
-        return rootViewGroupLastChild
     }
-}
+}

package/package.json

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