craft-native 0.0.355 → 0.0.358

package/dist/android/templates/CraftNativeMutation.kt.template

@@ -162,6 +162,9 @@ class CraftNativeMutationDocument {
         )
     }
 
+    /** The committed root may have any protocol id supplied by the compiler. */
+    fun document(): JSONObject? = rootId?.let { materialize(it, nodes) }
+
     fun node(id: String): JSONObject? = materialize(id, nodes)
 
     /** Reserve surviving protocol nodes before reusing an authored keyed slot. */

package/dist/android/templates/MainActivityNative.kt.template

@@ -899,6 +899,7 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     private var wrapReverse = false
     private var unboundedWidth = false
     private var authoredPadding = intArrayOf(0, 0, 0, 0)
+    private var windowSafeAreaInsets = intArrayOf(0, 0, 0, 0)
     private var safeAreaPadding = intArrayOf(0, 0, 0, 0)
     private var applyingPadding = false
     private var safeAreaEdges = setOf("top", "right", "bottom", "left")
@@ -962,18 +963,20 @@ internal class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     }
 
     fun setWindowSafeInsets(left: Int, top: Int, right: Int, bottom: Int) {
-        val insets = intArrayOf(left, top, right, bottom)
-        safeAreaPadding = intArrayOf(
-            if ("left" in safeAreaEdges) insets[0] else 0,
-            if ("top" in safeAreaEdges) insets[1] else 0,
-            if ("right" in safeAreaEdges) insets[2] else 0,
-            if ("bottom" in safeAreaEdges) insets[3] else 0,
-        )
+        windowSafeAreaInsets = intArrayOf(left, top, right, bottom)
         applySafeAreaPadding()
         invalidateMeasurements()
     }
 
     private fun applySafeAreaPadding() {
+        // Keep the unfiltered insets so changing edges takes effect immediately,
+        // including restoring an edge without another platform inset dispatch.
+        safeAreaPadding = intArrayOf(
+            if ("left" in safeAreaEdges) windowSafeAreaInsets[0] else 0,
+            if ("top" in safeAreaEdges) windowSafeAreaInsets[1] else 0,
+            if ("right" in safeAreaEdges) windowSafeAreaInsets[2] else 0,
+            if ("bottom" in safeAreaEdges) windowSafeAreaInsets[3] else 0,
+        )
         setPadding(authoredPadding[0], authoredPadding[1], authoredPadding[2], authoredPadding[3])
     }
 
@@ -5147,7 +5150,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun refreshScreenTheme(screen: Screen) {
         applyScreenBackground(screen)
-        screen.mutations.node("root")?.let { renderCommitted(screen, it) }
+        screen.mutations.document()?.let { renderCommitted(screen, it) }
         screen.controls.values.mapNotNull {
             when (it) {
                 is CraftNativeRefreshableFlatList -> it.list
@@ -5165,7 +5168,7 @@ class MainActivity : AppCompatActivity() {
     private fun updateSafeAreaViews() {
         if (!::root.isInitialized) return
         val active = visibleScreen ?: screens.lastOrNull { it.active }
-        val rootNode = active?.mutations?.node("root")
+        val rootNode = active?.mutations?.document()
         val safeRoot = rootNode?.let { canonicalType(it.optString("type")) == "SafeAreaView" } == true
         root.setPadding(
             if (safeRoot) 0 else windowSafeInsets[0],
@@ -5184,7 +5187,7 @@ class MainActivity : AppCompatActivity() {
      * against zero insets.
      */
     private fun updateSafeAreaInsets(screen: Screen) {
-        val rootNode = screen.mutations.node("root")
+        val rootNode = screen.mutations.document()
         val safeRoot = rootNode?.let { canonicalType(it.optString("type")) == "SafeAreaView" } == true
         val tree = screen.view.getChildAt(0) as? CraftNativeFlexLayout
         if (safeRoot) tree?.setWindowSafeInsets(windowSafeInsets[0], windowSafeInsets[1], windowSafeInsets[2], windowSafeInsets[3])
@@ -5511,6 +5514,17 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun updateStatusBarProps(screen: Screen, props: JSONObject) {
+        val style = craftNativeOptionalString(props.opt("barStyle"))
+        val hidden = if (props.has("hidden") && !props.isNull("hidden")) craftNativeBoolean(props.opt("hidden")) else null
+        val changed = screen.statusBarStyle != style || screen.statusBarHidden != hidden
+        screen.statusBarStyle = style
+        screen.statusBarHidden = hidden
+        // MUTATE can reconcile this node without committing the whole screen.
+        // Retained screens keep their props until their next visible commit.
+        if (changed && visibleScreen === screen) applyStatusBar(screen)
+    }
+
     private fun applyStatusBar(screen: Screen) {
         val controller = WindowCompat.getInsetsController(window, window.decorView)
         val night = (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
@@ -5582,8 +5596,7 @@ class MainActivity : AppCompatActivity() {
                 isLongClickable = selectable
             }
             "StatusBar" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
-                screen.statusBarStyle = craftNativeOptionalString(props.opt("barStyle"))
-                screen.statusBarHidden = if (props.has("hidden") && !props.isNull("hidden")) craftNativeBoolean(props.opt("hidden")) else null
+                updateStatusBarProps(screen, props)
                 visibility = View.GONE
             }
             "RefreshControl" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {

package/dist/cli.js

@@ -3047,7 +3047,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.355";
+var version = "0.0.358";
 
 // bin/cli.ts
 var spawnedFrom = process6.env[CRAFT_CLI_SPAWN_MARKER];

package/dist/index.cjs

@@ -375,7 +375,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.355";
+var version = "0.0.358";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/index.js

@@ -117,7 +117,7 @@ function craftBinaryNotFoundMessage(triedPath) {
 `);
 }
 // package.json
-var version = "0.0.355";
+var version = "0.0.358";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "craft-native",
-  "version": "0.0.355",
+  "version": "0.0.358",
   "type": "module",
   "description": "Build desktop apps with web languages - TypeScript SDK for Craft",
   "author": "Chris Breuer <chris@stacksjs.org>",