@craft-native/android 0.0.213 → 0.0.214

package/package.json

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

package/templates/CraftNativeShell.kt.template

@@ -395,6 +395,7 @@ internal object CraftNativePrelude {
         if (typeof globalThis.window === 'undefined') globalThis.window = globalThis;
         (function() {
           var forward = null;
+          var listeners = [];
           var queued = [];
           var sync = { storage: {}, secure: {}, snapshots: {} };
           var preload = $STORES;
@@ -445,7 +446,11 @@ internal object CraftNativePrelude {
           }
           function send(value) { if (typeof value !== 'string') value = JSON.stringify(value); $post }
           function emit(message) {
-            if (forward) forward(typeof message === 'string' ? message : JSON.stringify(message));
+            var raw = typeof message === 'string' ? message : JSON.stringify(message);
+            listeners.slice().forEach(function(callback) {
+              try { callback(raw); } catch (error) {}
+            });
+            if (forward) forward(raw);
             else queued.push(message);
           }
           function deliver(raw) {
@@ -515,6 +520,14 @@ internal object CraftNativePrelude {
               var pending = queued;
               queued = [];
               pending.forEach(emit);
+            },
+            addMessageListener: function(callback) {
+              if (typeof callback !== 'function') return function() {};
+              listeners.push(callback);
+              return function() {
+                var index = listeners.indexOf(callback);
+                if (index >= 0) listeners.splice(index, 1);
+              };
             }
           };
           $receiveSetup
@@ -563,6 +576,47 @@ internal object CraftNativePrelude {
               return value === undefined ? null : value;
             }
           });
+          // Older native bundles call the page-shaped `craft.dialog` API
+          // directly. Keep that API on the capability bridge so JavaScript
+          // Core/JavaScriptSandbox screens never fall back to a DOM sheet.
+          if (Array.isArray(__stxNativeBridge.capabilities) && __stxNativeBridge.capabilities.indexOf('dialog') >= 0 && !craft.dialog) {
+            var nextDialogRequest = 0;
+            function dialogRequest(method, args) {
+              return new Promise(function(resolve, reject) {
+                var id = 'craft-dialog-' + (++nextDialogRequest);
+                var remove = __stxNativeBridge.addMessageListener(function(raw) {
+                  var message;
+                  try { message = typeof raw === 'string' ? JSON.parse(raw) : raw; } catch (error) { return; }
+                  var payload = message && message.payload;
+                  if (!payload || payload.requestId !== id) return;
+                  remove();
+                  if (message.type === 'API_ERROR') {
+                    var failure = new Error(payload.message || 'Native dialog failed');
+                    failure.code = payload.code || 'NATIVE_CALL_FAILED';
+                    reject(failure);
+                  } else if (message.type === 'API_RESPONSE') {
+                    resolve(payload.data === undefined ? null : payload.data);
+                  }
+                });
+                __stxNativeBridge.postMessage(JSON.stringify({
+                  type: 'API_REQUEST',
+                  id: id,
+                  payload: {
+                    version: __stxNativeBridge.capabilityProtocolVersion || 1,
+                    module: 'Dialog',
+                    method: method,
+                    args: args,
+                    untimed: true,
+                  },
+                }));
+              });
+            }
+            craft.dialog = {
+              alert: function(options) { return dialogRequest('alert', [options || {}]).then(function() {}); },
+              confirm: function(options) { return dialogRequest('confirm', [options || {}]).then(Boolean); },
+              actionSheet: function(options) { return dialogRequest('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); },
+            };
+          }
         })();
     """.trimIndent()
 }

package/templates/MainActivityNative.kt.template

@@ -1327,9 +1327,9 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         return result
     }
 
-    private fun defaultFlexShrink(view: View): Double = when {
+    private fun defaultFlexShrink(view: View, horizontal: Boolean = orientation == HORIZONTAL): Double = when {
         view is ScrollView || view is HorizontalScrollView -> 1.0
-        view is TextView && view !is Button && view !is EditText && orientation == HORIZONTAL -> 1.0
+        view is TextView && view !is Button && view !is EditText && horizontal -> 1.0
         else -> 0.0
     }
 
@@ -1372,6 +1372,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val margins: IntArray,
         val grid: Boolean,
         val gridColumns: Int,
+        val gridAutoRows: CraftNativeLength?,
         val reverse: Boolean,
         val wrapReverse: Boolean,
         val children: List<SharedTreeNode>,
@@ -1383,14 +1384,8 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         val frames: FloatArray,
     )
 
-    /**
-     * Flatten a flex or equal-track grid subtree for the shared ABI. The local
-     * layout stays authoritative for grid-auto-rows,
-     * absolute/modal children, and scroll hosts; those cases cannot be
-     * represented without changing their native measurement contract.
-     */
+    /** Flatten a flex or equal-track grid subtree for the shared ABI. */
     private fun sharedTreeChildren(width: Int, height: Int): List<Entry>? {
-        if (gridAutoRows != null) return null
         if (grid) {
             val layout = gridLayout(width, height)
             if (layout.absolute.isNotEmpty()) return null
@@ -1428,6 +1423,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             margins = intArrayOf(lp?.leftMargin ?: 0, lp?.rightMargin ?: 0, lp?.topMargin ?: 0, lp?.bottomMargin ?: 0),
             grid = nested?.grid ?: false,
             gridColumns = nested?.gridColumns ?: 1,
+            gridAutoRows = nested?.gridAutoRows,
             reverse = nested?.reverse ?: false,
             wrapReverse = nested?.wrapReverse ?: false,
             children = children.map { child -> sharedTreeNode(child) ?: return null },
@@ -1435,7 +1431,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     }
 
     private fun sharedTreeFrames(entries: List<Entry>, width: Int, height: Int): SharedTreeResult? {
-        if (entries.isEmpty() || width < 0 || height < 0 || gridAutoRows != null) return null
+        if (entries.isEmpty() || width < 0 || height < 0) return null
         val children = entries.map { sharedTreeNode(it) ?: return null }
         val root = SharedTreeNode(
             view = null,
@@ -1455,6 +1451,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             margins = intArrayOf(0, 0, 0, 0),
             grid = grid,
             gridColumns = gridColumns,
+            gridAutoRows = gridAutoRows,
             reverse = reverse,
             wrapReverse = wrapReverse,
             children = children,
@@ -1470,14 +1467,19 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
         append(root, -1)
         val reverseAware = nodes.any { it.reverse || it.wrapReverse }
         val wrapReverseAware = nodes.any { it.wrapReverse }
-        val fields = if (reverseAware) 33 else 32
+        val autoRowsAware = nodes.any { it.gridAutoRows != null }
+        val fields = when {
+            autoRowsAware -> 34
+            reverseAware -> 33
+            else -> 32
+        }
         val nodeData = FloatArray(nodes.size * fields) { Float.NaN }
         val treeMeta = FloatArray(nodes.size * 2)
         fun enumBits(value: Int): Float = Float.fromBits(value)
         fun put(base: Int, index: Int, value: Float) { nodeData[base + index] = value }
         fun putEnum(base: Int, index: Int, value: Int) { put(base, index, enumBits(value)) }
         var cursor = 0
-        fun write(node: SharedTreeNode, parentWidth: Int, parentHeight: Int, rootNode: Boolean) {
+        fun write(node: SharedTreeNode, parentWidth: Int, parentHeight: Int, rootNode: Boolean, parentDirection: Int) {
             val index = cursor++
             val base = index * fields
             val measuredWidth = if (rootNode) width else node.style.width?.resolve(parentWidth) ?: node.intrinsicWidth.roundToInt()
@@ -1494,7 +1496,7 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 6, node.style.aspectRatio?.toFloat() ?: Float.NaN)
             put(base, 7, sharedLength(node.style.flexBasis, mainSize))
             put(base, 8, if (rootNode) 0f else node.style.flexGrow.toFloat().coerceAtLeast(0f))
-            put(base, 9, if (rootNode) 0f else (node.style.flexShrink ?: 0.0).toFloat().coerceAtLeast(0f))
+            put(base, 9, if (rootNode) 0f else (node.style.flexShrink ?: node.view?.let { defaultFlexShrink(it, parentDirection == 0) } ?: 0.0).toFloat().coerceAtLeast(0f))
             put(base, 10, sharedLength(node.style.minWidth, contentWidth))
             put(base, 11, sharedLength(node.style.maxWidth, contentWidth))
             put(base, 12, sharedLength(node.style.minHeight, contentHeight))
@@ -1517,14 +1519,17 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             put(base, 29, node.gridColumns.toFloat())
             put(base, 30, node.rowGap)
             put(base, 31, node.columnGap)
-            if (reverseAware) putEnum(base, 32, (if (node.reverse) 1 else 0) or (if (node.wrapReverse) 2 else 0))
+            if (fields >= 33) putEnum(base, 32, (if (node.reverse) 1 else 0) or (if (node.wrapReverse) 2 else 0))
+            if (autoRowsAware) put(base, 33, sharedLength(node.gridAutoRows, contentHeight))
             val firstChild = cursor
-            node.children.forEach { child -> write(child, contentWidth, contentHeight, false) }
+            node.children.forEach { child -> write(child, contentWidth, contentHeight, false, node.direction) }
             treeMeta[index * 2] = firstChild.toFloat()
             treeMeta[index * 2 + 1] = (cursor - firstChild).toFloat()
         }
-        write(root, width, height, true)
-        val frames = (if (wrapReverseAware) {
+        write(root, width, height, true, root.direction)
+        val frames = (if (autoRowsAware) {
+            CraftNative.layoutTreeV4(width.toFloat(), height.toFloat(), nodeData, treeMeta)
+        } else if (wrapReverseAware) {
             CraftNative.layoutTreeV3(width.toFloat(), height.toFloat(), nodeData, treeMeta)
         } else if (reverseAware) {
             CraftNative.layoutTreeV2(width.toFloat(), height.toFloat(), nodeData, treeMeta)
@@ -1537,9 +1542,9 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
     /**
      * Use the host-neutral tree ABI when platform measurements are complete:
      * definite direct-child containers, including wrapped flows, equal-track
-     * grids, and independent row and column gaps. Grid
-     * auto-rows, absolute children, missing runtimes, and malformed results
-     * deliberately fall through to the established Kotlin layout below.
+     * grids, independent row and column gaps, and grid-auto-rows. Absolute
+     * children, missing runtimes, and malformed results deliberately fall
+     * through to the established Kotlin layout below.
      */
     private fun sharedDirectFrames(entries: List<Entry>, width: Int, height: Int): FloatArray? {
         if (entries.isEmpty() || width < 0 || height < 0 || grid || reverse || wrapReverse || gridAutoRows != null) return null