@craft-native/android 0.0.142 → 0.0.143

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@craft-native/android",
-  "version": "0.0.142",
+  "version": "0.0.143",
   "homepage": "https://github.com/craft-native/craft/tree/main/packages/android#readme",
   "repository": {
     "type": "git",

package/templates/MainActivityNative.kt.template

@@ -1928,6 +1928,7 @@ class MainActivity : AppCompatActivity() {
             if (!screen.controls.containsKey("id:$target")) return false
             makeView(screen, document, target, screen.controls)
             val updated = screen.controls["id:$target"] ?: return false
+            screen.lastLayoutBounds.remove(updated)
             if (!updateParentLayoutStyle(updated, document.optJSONObject("style") ?: JSONObject())) return false
         }
         if (applied.isNotEmpty()) {
@@ -1940,14 +1941,16 @@ class MainActivity : AppCompatActivity() {
         if (!screen.active) return
         val observer = screen.view.viewTreeObserver
         if (observer.isAlive) {
-            val listener = object : ViewTreeObserver.OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    if (observer.isAlive) observer.removeOnGlobalLayoutListener(this)
+            val listener = object : ViewTreeObserver.OnPreDrawListener {
+                override fun onPreDraw(): Boolean {
+                    if (observer.isAlive) observer.removeOnPreDrawListener(this)
                     if (screen.active) emitLayoutEvents(screen)
+                    return true
                 }
             }
-            observer.addOnGlobalLayoutListener(listener)
+            observer.addOnPreDrawListener(listener)
         }
+        screen.view.forceLayout()
         screen.view.requestLayout()
         // A tree that is already settled may not produce a global-layout
         // callback; keep the event path live for that case as well.
@@ -1961,15 +1964,23 @@ class MainActivity : AppCompatActivity() {
      */
     private fun updateParentLayoutStyle(view: View, style: JSONObject): Boolean {
         var parent = view.parent
+        var found = false
         while (parent != null) {
-            if (parent is CraftNativeFlexLayout) {
-                parent.setChildStyle(view, style, resources.displayMetrics.density)
-                parent.requestLayout()
-                return true
+            when (parent) {
+                is CraftNativeFlexLayout -> {
+                    if (!found) parent.setChildStyle(view, style, resources.displayMetrics.density)
+                    parent.forceLayout()
+                    parent.requestLayout()
+                    found = true
+                }
+                is CraftNativeScrollView -> {
+                    parent.forceLayout()
+                    parent.requestLayout()
+                }
             }
             parent = parent.parent
         }
-        return false
+        return found
     }
 
     private fun renderCommitted(screen: Screen, document: JSONObject) {