craft-native 0.0.213 → 0.0.214

package/dist/android/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/dist/android/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

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftNativeFlatList.swift

@@ -308,7 +308,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
 
     func setContentContainerStyle(_ raw: [String: Any]?) {
         func nonNegative(_ value: Any?) -> CGFloat? {
-            guard let number = value as? NSNumber else { return nil }
+            guard !(value is Bool), let number = value as? NSNumber else { return nil }
             let points = CGFloat(truncating: number)
             guard points.isFinite, points >= 0 else { return nil }
             return points

package/dist/ios/templates/CraftNativeScreen.swift

@@ -16,7 +16,9 @@ private let craftNativeCapabilityTimeoutMilliseconds = 30_000
 /// which has its own: the keyboard-avoiding view and SVG text read theirs
 /// with it, and without it the template did not compile.
 private func number(_ value: Any?) -> CGFloat? {
-    guard let number = value as? NSNumber else { return nil }
+    // JavaScript booleans bridge to NSNumber on Apple platforms; they are
+    // invalid numeric styles and must stay unset like Android's Number cast.
+    guard !(value is Bool), let number = value as? NSNumber else { return nil }
     let value = CGFloat(truncating: number)
     return value.isFinite ? value : nil
 }
@@ -30,12 +32,12 @@ private func craftNativeFontWeight(_ value: Any?) -> String? {
 
 private func craftNativePickerValue(_ value: Any?) -> String? {
     if let value = value as? String, !value.isEmpty { return value }
-    if let value = value as? NSNumber, value.doubleValue.isFinite { return String(value.doubleValue) }
+    if !(value is Bool), let value = value as? NSNumber, value.doubleValue.isFinite { return String(value.doubleValue) }
     return nil
 }
 
 private func craftNativeGridColumnCount(_ value: Any?) -> Int {
-    if let number = value as? NSNumber { return max(1, number.intValue) }
+    if !(value is Bool), let number = value as? NSNumber { return max(1, number.intValue) }
     guard let text = value as? String else { return 1 }
     let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines)
     if trimmed.hasPrefix("repeat(") {
@@ -190,6 +192,49 @@ private enum CraftNativeTreeLayoutBridge {
         var childCount: UInt32
     }
 
+    private struct StyleInputV4 {
+        var direction: UInt32 = 0
+        var width: Float = .nan
+        var height: Float = .nan
+        var intrinsicWidth: Float = .nan
+        var intrinsicHeight: Float = .nan
+        var baseline: Float = .nan
+        var aspectRatio: Float = .nan
+        var flexBasis: Float = .nan
+        var flexGrow: Float = 0
+        var flexShrink: Float = 0
+        var minWidth: Float = .nan
+        var maxWidth: Float = .nan
+        var minHeight: Float = .nan
+        var maxHeight: Float = .nan
+        var gap: Float = 0
+        var justifyContent: UInt32 = 0
+        var alignItems: UInt32 = 3
+        var alignSelf: UInt32 = 0
+        var flexWrap: UInt32 = 0
+        var alignContent: UInt32 = 6
+        var marginTop: Float = 0
+        var marginRight: Float = 0
+        var marginBottom: Float = 0
+        var marginLeft: Float = 0
+        var paddingTop: Float = 0
+        var paddingRight: Float = 0
+        var paddingBottom: Float = 0
+        var paddingLeft: Float = 0
+        var grid: UInt32 = 0
+        var gridColumns: UInt32 = 1
+        var rowGap: Float = 0
+        var columnGap: Float = 0
+        var reverse: UInt32 = 0
+        var gridAutoRows: Float = .nan
+    }
+
+    private struct NodeInputV4 {
+        var style: StyleInputV4
+        var firstChild: UInt32
+        var childCount: UInt32
+    }
+
     fileprivate struct Frame {
         var x: Float
         var y: Float
@@ -213,6 +258,7 @@ private enum CraftNativeTreeLayoutBridge {
         let padding: UIEdgeInsets
         let grid: Bool
         let gridColumns: Int
+        let gridAutoRows: CraftNativeLength?
         let reverse: Bool
         let wrapReverse: Bool
         let children: [TreeNode]
@@ -247,6 +293,11 @@ private enum CraftNativeTreeLayoutBridge {
         return unsafeBitCast(symbol, to: FunctionV2.self)
     }()
 
+    private static let functionV4: FunctionV2? = {
+        guard let symbol = dlsym(UnsafeMutableRawPointer(bitPattern: -2), "craft_native_layout_tree_v4") else { return nil }
+        return unsafeBitCast(symbol, to: FunctionV2.self)
+    }()
+
     private static func finite(_ value: CGFloat?) -> Float {
         guard let value, value.isFinite else { return .nan }
         return Float(value)
@@ -359,6 +410,9 @@ private enum CraftNativeTreeLayoutBridge {
 
     fileprivate static func treeFrames(root: TreeNode, width: CGFloat, height: CGFloat) -> TreeResult? {
         guard let function, width.isFinite, height.isFinite, width >= 0, height >= 0, !root.children.isEmpty else { return nil }
+        if containsGridAutoRows(root) {
+            return treeFramesV4(root: root, width: width, height: height, function: functionV4)
+        }
         if containsWrapReverse(root) {
             return treeFramesV2(root: root, width: width, height: height, function: functionV3)
         }
@@ -375,7 +429,7 @@ private enum CraftNativeTreeLayoutBridge {
         }
         append(root, parent: -1)
 
-        func put(_ input: inout StyleInput, _ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool) {
+        func put(_ input: inout StyleInput, _ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
             let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
             let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
             let mainSize = node.direction == .horizontal ? contentWidth : contentHeight
@@ -388,7 +442,7 @@ private enum CraftNativeTreeLayoutBridge {
             input.aspectRatio = finite(node.style.aspectRatio)
             input.flexBasis = length(node.style.flexBasis, base: mainSize)
             input.flexGrow = rootNode ? 0 : Float(max(0, node.style.flexGrow))
-            let defaultShrink: CGFloat = node.view is UIScrollView || (node.view is UILabel && node.direction == .horizontal) ? 1 : 0
+            let defaultShrink: CGFloat = node.view is UIScrollView || (node.view is UILabel && parentDirection == .horizontal) ? 1 : 0
             input.flexShrink = rootNode ? 0 : Float(max(0, node.style.flexShrink ?? defaultShrink))
             input.minWidth = length(node.style.minWidth, base: contentWidth)
             input.maxWidth = length(node.style.maxWidth, base: contentWidth)
@@ -417,18 +471,18 @@ private enum CraftNativeTreeLayoutBridge {
         var styles = [StyleInput](repeating: StyleInput(), count: nodes.count)
         var metadata = [Float](repeating: 0, count: nodes.count * 2)
         var cursor = 0
-        func write(_ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool) {
+        func write(_ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
             let index = cursor
             cursor += 1
-            put(&styles[index], node, parentWidth: parentWidth, parentHeight: parentHeight, rootNode: rootNode)
+            put(&styles[index], node, parentWidth: parentWidth, parentHeight: parentHeight, rootNode: rootNode, parentDirection: parentDirection)
             let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
             let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
             let firstChild = cursor
-            node.children.forEach { write($0, parentWidth: contentWidth, parentHeight: contentHeight, rootNode: false) }
+            node.children.forEach { write($0, parentWidth: contentWidth, parentHeight: contentHeight, rootNode: false, parentDirection: node.direction) }
             metadata[index * 2] = Float(firstChild)
             metadata[index * 2 + 1] = Float(cursor - firstChild)
         }
-        write(root, parentWidth: width, parentHeight: height, rootNode: true)
+        write(root, parentWidth: width, parentHeight: height, rootNode: true, parentDirection: root.direction)
         let inputs = zip(styles, stride(from: 0, to: metadata.count, by: 2)).map { style, offset in
             NodeInput(style: style, firstChild: UInt32(metadata[offset]), childCount: UInt32(metadata[offset + 1]))
         }
@@ -460,6 +514,10 @@ private enum CraftNativeTreeLayoutBridge {
         node.wrapReverse || node.children.contains(where: containsWrapReverse)
     }
 
+    private static func containsGridAutoRows(_ node: TreeNode) -> Bool {
+        node.gridAutoRows != nil || node.children.contains(where: containsGridAutoRows)
+    }
+
     private static func treeFramesV2(root: TreeNode, width: CGFloat, height: CGFloat, function: FunctionV2?) -> TreeResult? {
         guard let function, width.isFinite, height.isFinite, width >= 0, height >= 0, !root.children.isEmpty else { return nil }
         var nodes: [TreeNode] = []
@@ -472,7 +530,7 @@ private enum CraftNativeTreeLayoutBridge {
         }
         append(root, parent: -1)
 
-        func put(_ input: inout StyleInputV2, _ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool) {
+        func put(_ input: inout StyleInputV2, _ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
             let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
             let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
             let mainSize = node.direction == .horizontal ? contentWidth : contentHeight
@@ -485,7 +543,7 @@ private enum CraftNativeTreeLayoutBridge {
             input.aspectRatio = finite(node.style.aspectRatio)
             input.flexBasis = length(node.style.flexBasis, base: mainSize)
             input.flexGrow = rootNode ? 0 : Float(max(0, node.style.flexGrow))
-            let defaultShrink: CGFloat = node.view is UIScrollView || (node.view is UILabel && node.direction == .horizontal) ? 1 : 0
+            let defaultShrink: CGFloat = node.view is UIScrollView || (node.view is UILabel && parentDirection == .horizontal) ? 1 : 0
             input.flexShrink = rootNode ? 0 : Float(max(0, node.style.flexShrink ?? defaultShrink))
             input.minWidth = length(node.style.minWidth, base: contentWidth)
             input.maxWidth = length(node.style.maxWidth, base: contentWidth)
@@ -515,18 +573,18 @@ private enum CraftNativeTreeLayoutBridge {
         var styles = [StyleInputV2](repeating: StyleInputV2(), count: nodes.count)
         var metadata = [Float](repeating: 0, count: nodes.count * 2)
         var cursor = 0
-        func write(_ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool) {
+        func write(_ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
             let index = cursor
             cursor += 1
-            put(&styles[index], node, parentWidth: parentWidth, parentHeight: parentHeight, rootNode: rootNode)
+            put(&styles[index], node, parentWidth: parentWidth, parentHeight: parentHeight, rootNode: rootNode, parentDirection: parentDirection)
             let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
             let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
             let firstChild = cursor
-            node.children.forEach { write($0, parentWidth: contentWidth, parentHeight: contentHeight, rootNode: false) }
+            node.children.forEach { write($0, parentWidth: contentWidth, parentHeight: contentHeight, rootNode: false, parentDirection: node.direction) }
             metadata[index * 2] = Float(firstChild)
             metadata[index * 2 + 1] = Float(cursor - firstChild)
         }
-        write(root, parentWidth: width, parentHeight: height, rootNode: true)
+        write(root, parentWidth: width, parentHeight: height, rootNode: true, parentDirection: root.direction)
         let inputs = zip(styles, stride(from: 0, to: metadata.count, by: 2)).map { style, offset in
             NodeInputV2(style: style, firstChild: UInt32(metadata[offset]), childCount: UInt32(metadata[offset + 1]))
         }
@@ -549,6 +607,100 @@ private enum CraftNativeTreeLayoutBridge {
         }) else { return nil }
         return TreeResult(nodes: nodes, parents: parents, frames: output)
     }
+
+    /// v4 is the reverse-aware tree payload with one resolved grid-auto-rows
+    /// value appended. Keeping this as a separate struct preserves the v1–v3
+    /// strides for runtimes that predate the shared auto-row contract.
+    private static func treeFramesV4(root: TreeNode, width: CGFloat, height: CGFloat, function: FunctionV2?) -> TreeResult? {
+        guard let function, width.isFinite, height.isFinite, width >= 0, height >= 0, !root.children.isEmpty else { return nil }
+        var nodes: [TreeNode] = []
+        var parents: [Int] = []
+        func append(_ node: TreeNode, parent: Int) {
+            let index = nodes.count
+            nodes.append(node)
+            parents.append(parent)
+            node.children.forEach { append($0, parent: index) }
+        }
+        append(root, parent: -1)
+
+        func put(_ input: inout StyleInputV4, _ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
+            let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
+            let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
+            let mainSize = node.direction == .horizontal ? contentWidth : contentHeight
+            input.direction = node.direction == .horizontal ? 0 : 1
+            input.width = rootNode ? Float(width) : length(node.style.width, base: parentWidth)
+            input.height = rootNode ? Float(height) : length(node.style.height, base: parentHeight)
+            input.intrinsicWidth = rootNode ? .nan : Float(max(0, node.intrinsic.width))
+            input.intrinsicHeight = rootNode ? .nan : Float(max(0, node.intrinsic.height))
+            input.baseline = rootNode ? .nan : Float(max(0, node.baseline))
+            input.aspectRatio = finite(node.style.aspectRatio)
+            input.flexBasis = length(node.style.flexBasis, base: mainSize)
+            input.flexGrow = rootNode ? 0 : Float(max(0, node.style.flexGrow))
+            let defaultShrink: CGFloat = node.view is UIScrollView || (node.view is UILabel && parentDirection == .horizontal) ? 1 : 0
+            input.flexShrink = rootNode ? 0 : Float(max(0, node.style.flexShrink ?? defaultShrink))
+            input.minWidth = length(node.style.minWidth, base: contentWidth)
+            input.maxWidth = length(node.style.maxWidth, base: contentWidth)
+            input.minHeight = length(node.style.minHeight, base: contentHeight)
+            input.maxHeight = length(node.style.maxHeight, base: contentHeight)
+            input.gap = Float(max(0, node.gap))
+            input.justifyContent = justify(node.justifyContent)
+            input.alignItems = alignment(node.alignItems)
+            input.alignSelf = rootNode ? 0 : alignSelf(node.style.alignSelf)
+            input.flexWrap = node.wrap ? 1 : 0
+            input.alignContent = craftNativeAlignContentCode(node.alignContent)
+            input.marginTop = Float(max(0, node.style.marginTop))
+            input.marginRight = Float(max(0, node.style.marginRight))
+            input.marginBottom = Float(max(0, node.style.marginBottom))
+            input.marginLeft = Float(max(0, node.style.marginLeft))
+            input.paddingTop = Float(max(0, node.padding.top))
+            input.paddingRight = Float(max(0, node.padding.right))
+            input.paddingBottom = Float(max(0, node.padding.bottom))
+            input.paddingLeft = Float(max(0, node.padding.left))
+            input.grid = node.grid ? 1 : 0
+            input.gridColumns = UInt32(max(1, node.gridColumns))
+            input.rowGap = Float(max(0, node.rowGap))
+            input.columnGap = Float(max(0, node.columnGap))
+            input.reverse = (node.reverse ? 1 : 0) | (node.wrapReverse ? 2 : 0)
+            input.gridAutoRows = node.gridAutoRows.map { length($0, base: contentHeight) } ?? .nan
+        }
+
+        var styles = [StyleInputV4](repeating: StyleInputV4(), count: nodes.count)
+        var metadata = [Float](repeating: 0, count: nodes.count * 2)
+        var cursor = 0
+        func write(_ node: TreeNode, parentWidth: CGFloat, parentHeight: CGFloat, rootNode: Bool, parentDirection: NSLayoutConstraint.Axis) {
+            let index = cursor
+            cursor += 1
+            put(&styles[index], node, parentWidth: parentWidth, parentHeight: parentHeight, rootNode: rootNode, parentDirection: parentDirection)
+            let contentWidth = max(0, (rootNode ? width : node.intrinsic.width) - node.padding.left - node.padding.right)
+            let contentHeight = max(0, (rootNode ? height : node.intrinsic.height) - node.padding.top - node.padding.bottom)
+            let firstChild = cursor
+            node.children.forEach { write($0, parentWidth: contentWidth, parentHeight: contentHeight, rootNode: false, parentDirection: node.direction) }
+            metadata[index * 2] = Float(firstChild)
+            metadata[index * 2 + 1] = Float(cursor - firstChild)
+        }
+        write(root, parentWidth: width, parentHeight: height, rootNode: true, parentDirection: root.direction)
+        let inputs = zip(styles, stride(from: 0, to: metadata.count, by: 2)).map { style, offset in
+            NodeInputV4(style: style, firstChild: UInt32(metadata[offset]), childCount: UInt32(metadata[offset + 1]))
+        }
+
+        var output = [Frame](repeating: Frame(x: 0, y: 0, width: 0, height: 0), count: nodes.count)
+        let frameCount = output.count
+        let status = inputs.withUnsafeBufferPointer { inputBuffer in
+            metadata.withUnsafeBufferPointer { metadataBuffer in
+                output.withUnsafeMutableBufferPointer { outputBuffer in
+                    function(
+                        Float(width), Float(height), UnsafeRawPointer(inputBuffer.baseAddress!), inputs.count,
+                        UnsafeMutableRawPointer(outputBuffer.baseAddress!), frameCount
+                    )
+                }
+            }
+        }
+        guard status == 0, output.allSatisfy({ frame in
+            frame.x.isFinite && frame.y.isFinite && frame.width.isFinite && frame.height.isFinite &&
+                frame.width >= 0 && frame.height >= 0
+        }) else { return nil }
+        return TreeResult(nodes: nodes, parents: parents, frames: output)
+    }
 }
 
 private enum CraftNativeFlexLineBridge {
@@ -1047,7 +1199,7 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
                 }
             } else if type == "mappolyline" || type == "polyline" {
                 guard points.count > 1 else { continue }
-                let authoredWidth = (childProps["strokeWidth"] as? NSNumber)?.doubleValue ?? 3
+                let authoredWidth = Self.numeric(childProps["strokeWidth"]) ?? 3
                 let width = CGFloat(authoredWidth)
                 guard authoredWidth.isFinite, width.isFinite, width > 0 else { continue }
                 nextPolylines[id] = (points, Self.color(childProps["strokeColor"] as? String), width)
@@ -1182,8 +1334,8 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
     }
 
     private static func coordinates(_ value: Any?) -> [CLLocationCoordinate2D] {
-        let numbers = (value as? [Any])?.compactMap { ($0 as? NSNumber)?.doubleValue }
-            ?? (value as? [NSNumber])?.map(\.doubleValue)
+        let numbers = (value as? [Any])?.compactMap(Self.numeric)
+            ?? (value as? [NSNumber])?.compactMap(Self.numeric)
             ?? []
         return stride(from: 0, to: numbers.count - 1, by: 2).compactMap {
             let latitude = numbers[$0]
@@ -1224,17 +1376,22 @@ private final class CraftNativeMapView: MKMapView, MKMapViewDelegate {
         guard let value = value as? [String: Any],
               let center = value["center"] as? [String: Any],
               let span = value["span"] as? [String: Any],
-              let latitude = (center["latitude"] as? NSNumber)?.doubleValue,
-              let longitude = (center["longitude"] as? NSNumber)?.doubleValue,
-              let latitudeDelta = (span["latitudeDelta"] as? NSNumber)?.doubleValue ?? (span["latitude_delta"] as? NSNumber)?.doubleValue,
-              let longitudeDelta = (span["longitudeDelta"] as? NSNumber)?.doubleValue ?? (span["longitude_delta"] as? NSNumber)?.doubleValue,
-              latitude.isFinite, longitude.isFinite, latitudeDelta.isFinite, longitudeDelta.isFinite,
+              let latitude = numeric(center["latitude"]),
+              let longitude = numeric(center["longitude"]),
+              let latitudeDelta = numeric(span["latitudeDelta"]) ?? numeric(span["latitude_delta"]),
+              let longitudeDelta = numeric(span["longitudeDelta"]) ?? numeric(span["longitude_delta"]),
               (-90...90).contains(latitude), (-180...180).contains(longitude),
               latitudeDelta > 0, latitudeDelta <= 180, longitudeDelta > 0, longitudeDelta <= 360,
               latitude - latitudeDelta / 2 >= -90, latitude + latitudeDelta / 2 <= 90 else { return nil }
         return MKCoordinateRegion(center: CLLocationCoordinate2D(latitude: latitude, longitude: longitude), span: MKCoordinateSpan(latitudeDelta: latitudeDelta, longitudeDelta: longitudeDelta))
     }
 
+    private static func numeric(_ value: Any?) -> Double? {
+        guard !(value is Bool), let number = value as? NSNumber else { return nil }
+        let value = number.doubleValue
+        return value.isFinite ? value : nil
+    }
+
     private func nonEmptyHandler(_ handler: String?) -> String? {
         guard let handler, !handler.isEmpty else { return nil }
         return handler
@@ -1299,7 +1456,9 @@ private enum CraftNativeLength: Equatable {
     case percent(CGFloat)
 
     init?(_ value: Any?) {
-        if let number = value as? NSNumber {
+        // JavaScript booleans can bridge to NSNumber on Apple platforms;
+        // they are invalid CSS lengths and must stay unset like Android.
+        if !(value is Bool), let number = value as? NSNumber {
             let points = CGFloat(truncating: number)
             guard points.isFinite else { return nil }
             self = .points(points)
@@ -1357,7 +1516,7 @@ private struct CraftNativeLayoutStyle {
 
     init(_ raw: [String: Any]) {
         func number(_ value: Any?) -> CGFloat? {
-            guard let number = value as? NSNumber else { return nil }
+            guard !(value is Bool), let number = value as? NSNumber else { return nil }
             let value = CGFloat(truncating: number)
             return value.isFinite ? value : nil
         }
@@ -1977,11 +2136,10 @@ private class CraftNativeFlowView: UIStackView {
     }
 
     /// Builds the eligible portion of this container for the host-neutral
-    /// tree ABI. The local algorithm remains authoritative for
-    /// grid-auto-rows, absolute children, and any subtree whose measurement
-    /// cannot be represented by the shared contract.
+    /// tree ABI. The local algorithm remains authoritative for absolute
+    /// children and any subtree whose measurement cannot be represented by
+    /// the shared contract.
     fileprivate func sharedTreeNode(parentWidth: CGFloat, parentHeight: CGFloat) -> CraftNativeTreeLayoutBridge.TreeNode? {
-        guard gridAutoRows == nil else { return nil }
         let children = visibleChildren
         let flow = children.filter { $0.craftLayoutStyle.position != "absolute" }
         guard flow.count == children.count else { return nil }
@@ -2025,6 +2183,7 @@ private class CraftNativeFlowView: UIStackView {
                 padding: nested?.effectivePadding ?? .zero,
                 grid: nested?.grid ?? false,
                 gridColumns: nested?.gridColumns ?? 1,
+                gridAutoRows: nested?.gridAutoRows,
                 reverse: nested?.reverse ?? false,
                 wrapReverse: nested?.wrapReverse ?? false,
                 children: nestedNode?.children ?? []
@@ -2047,6 +2206,7 @@ private class CraftNativeFlowView: UIStackView {
             padding: effectivePadding,
             grid: grid,
             gridColumns: gridColumns,
+            gridAutoRows: gridAutoRows,
             reverse: reverse,
             wrapReverse: wrapReverse,
             children: nodes.compactMap { $0 }
@@ -2054,7 +2214,7 @@ private class CraftNativeFlowView: UIStackView {
     }
 
     private func sharedTreeFrames(_ children: [UIView], width: CGFloat?, height: CGFloat?) -> CraftNativeTreeLayoutBridge.TreeResult? {
-        guard let width, let height, gridAutoRows == nil,
+        guard let width, let height,
               width.isFinite, height.isFinite, width >= 0, height >= 0 else { return nil }
         let nodes = children.map { child -> CraftNativeTreeLayoutBridge.TreeNode? in
             let style = child.craftLayoutStyle
@@ -2078,6 +2238,7 @@ private class CraftNativeFlowView: UIStackView {
                 padding: nested?.effectivePadding ?? .zero,
                 grid: nested?.grid ?? false,
                 gridColumns: nested?.gridColumns ?? 1,
+                gridAutoRows: nested?.gridAutoRows,
                 reverse: nested?.reverse ?? false,
                 wrapReverse: nested?.wrapReverse ?? false,
                 children: nestedNode?.children ?? []
@@ -2100,6 +2261,7 @@ private class CraftNativeFlowView: UIStackView {
             padding: effectivePadding,
             grid: grid,
             gridColumns: gridColumns,
+            gridAutoRows: gridAutoRows,
             reverse: reverse,
             wrapReverse: wrapReverse,
             children: nodes.compactMap { $0 }
@@ -3072,7 +3234,7 @@ private final class CraftNativeScrollView: UIScrollView, UIGestureRecognizerDele
     /// these indices stay at the top of the visible area once scrolled to,
     /// each pushed up by the next. Vertical scroll views only.
     func setStickyHeaderIndices(_ value: Any?) {
-        let next = Array(Set(((value as? [Any]) ?? []).compactMap { ($0 as? NSNumber)?.intValue }.filter { $0 >= 0 })).sorted()
+        let next = Array(Set(((value as? [Any]) ?? []).compactMap { number($0).map { Int($0) } }.filter { $0 >= 0 })).sorted()
         guard next != stickyIndices else { return }
         stickyIndices = next
         setNeedsLayout()
@@ -3302,7 +3464,7 @@ private final class CraftNativeSvgView: UIView {
     var viewBox: CGRect? {
         let props = drawing["props"] as? [String: Any] ?? [:]
         guard let box = props["viewBox"] as? [Any], box.count == 4 else { return nil }
-        let n = box.compactMap { ($0 as? NSNumber).map { CGFloat(truncating: $0) } }
+        let n = box.compactMap(number)
         guard n.count == 4, n.allSatisfy(\.isFinite), n[2] > 0, n[3] > 0 else { return nil }
         return CGRect(x: n[0], y: n[1], width: n[2], height: n[3])
     }
@@ -3339,9 +3501,7 @@ private final class CraftNativeSvgView: UIView {
             let style = node["style"] as? [String: Any] ?? [:]
             func value(_ key: String) -> Any? { style[key] ?? props[key] }
             func finite(_ raw: Any?) -> CGFloat? {
-                guard let number = raw as? NSNumber else { return nil }
-                let value = CGFloat(truncating: number)
-                return value.isFinite ? value : nil
+                return number(raw)
             }
             func string(_ raw: Any?) -> String? {
                 if let value = raw as? String { return value }
@@ -3500,7 +3660,7 @@ private final class CraftNativeSvgView: UIView {
 
     static func path(_ value: Any?) -> UIBezierPath? {
         guard let list = value as? [Any] else { return nil }
-        let n = list.compactMap { ($0 as? NSNumber).map { CGFloat(truncating: $0) } }
+        let n = list.compactMap(number)
         guard !n.isEmpty, n.count == list.count, n.allSatisfy(\.isFinite) else { return nil }
         let path = UIBezierPath()
         var i = 0
@@ -4330,6 +4490,74 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         jsContext.setObject(snapshotClear, forKeyedSubscript: "craftNativeSnapshotClear" as NSString)
         jsContext.setObject(secureGet, forKeyedSubscript: "craftNativeSecureGet" as NSString)
         jsContext.setObject(setOptions, forKeyedSubscript: "craftNativeSetOptions" as NSString)
+        // Older native bundles call the page-shaped `craft.dialog` API
+        // directly. Keep that API backed by the same capability protocol as
+        // current stx bundles, rather than letting their DOM fallback draw a
+        // fake sheet in a JavaScriptCore screen.
+        jsContext.evaluateScript("""
+            (function() {
+                var bridge = globalThis.__stxNativeBridge;
+                if (!bridge || typeof bridge.postMessage !== 'function') return;
+                var listeners = [];
+                var runtimeCallback = null;
+                bridge.onMessage = function(callback) {
+                    runtimeCallback = typeof callback === 'function' ? callback : null;
+                };
+                bridge.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);
+                    };
+                };
+                globalThis.__stxNativeCallback = function(raw) {
+                    listeners.slice().forEach(function(callback) {
+                        try { callback(raw); } catch (error) {}
+                    });
+                    if (runtimeCallback) runtimeCallback(raw);
+                };
+                var nextRequest = 0;
+                function request(method, args) {
+                    return new Promise(function(resolve, reject) {
+                        var id = 'craft-dialog-' + (++nextRequest);
+                        var remove = bridge.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);
+                            }
+                        });
+                        bridge.postMessage(JSON.stringify({
+                            type: 'API_REQUEST',
+                            id: id,
+                            payload: {
+                                version: bridge.capabilityProtocolVersion || 1,
+                                module: 'Dialog',
+                                method: method,
+                                args: args,
+                                untimed: true
+                            }
+                        }));
+                    });
+                }
+                var craft = globalThis.craft = globalThis.craft || {};
+                if (Array.isArray(bridge.capabilities) && bridge.capabilities.indexOf('dialog') >= 0 && !craft.dialog) {
+                    craft.dialog = {
+                        alert: function(options) { return request('alert', [options || {}]).then(function() {}); },
+                        confirm: function(options) { return request('confirm', [options || {}]).then(Boolean); },
+                        actionSheet: function(options) { return request('actionSheet', [options || {}]).then(function(id) { return typeof id === 'string' ? id : null; }); }
+                    };
+                }
+            })();
+        """)
         // `AudioContext` and the rest of Web Audio, rendered natively.
         audio.install(in: jsContext)
         // `crypto` for code shared with the page (a sign-in's nonce and its
@@ -4772,7 +5000,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         else if let symbol = spec["symbol"] as? String { button.setImage(UIImage(systemName: symbol, withConfiguration: UIImage.SymbolConfiguration(pointSize: 20, weight: .regular)), for: .normal) }
         button.accessibilityIdentifier = spec["id"] as? String
         button.accessibilityLabel = spec["accessibilityLabel"] as? String
-        if let value = spec["badge"] as? NSNumber, value.intValue > 0 {
+        if !(spec["badge"] is Bool), let value = spec["badge"] as? NSNumber, value.intValue > 0 {
             let dot = spec["badgeStyle"] as? String == "dot"
             let size: CGFloat = dot ? 9 : 18
             // The fill is a tinted symbol, not a background colour: on iOS 26
@@ -5524,7 +5752,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             result.isUserInteractionEnabled = false
         case "Text":
             let label = result as! UILabel
-            label.numberOfLines = max(0, (props["numberOfLines"] as? NSNumber)?.intValue ?? 0)
+            label.numberOfLines = max(0, Int(number(props["numberOfLines"]) ?? 0))
             label.lineBreakMode = textLineBreakMode(props["ellipsizeMode"])
             (label as? CraftNativeLabel)?.insets = paddingInsets(style)
             configureText(label, text: children.compactMap { $0 as? String }.joined(), style: style)
@@ -5598,7 +5826,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             field.tintColor = color(props["selectionColor"])
             let fieldId = ObjectIdentifier(field)
             inputIdentities[fieldId] = current.identity
-            if let maxLength = (props["maxLength"] as? NSNumber)?.intValue, maxLength > 0 {
+            let maxLength = Int(number(props["maxLength"]) ?? 0)
+            if maxLength > 0 {
                 textMaxLengths[fieldId] = maxLength
             } else {
                 textMaxLengths.removeValue(forKey: fieldId)
@@ -5681,7 +5910,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 if picker.preferredDatePickerStyle != display { picker.preferredDatePickerStyle = display }
             }
             // UIKit takes an interval that divides an hour, and ignores others.
-            let interval = (props["minuteInterval"] as? NSNumber)?.intValue ?? 1
+            let interval = Int(number(props["minuteInterval"]) ?? 1)
             picker.minuteInterval = (1...30).contains(interval) && 60 % interval == 0 ? interval : 1
             picker.minimumDate = Self.pickerDate(props["minimumDate"])
             picker.maximumDate = Self.pickerDate(props["maximumDate"])
@@ -5737,7 +5966,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             pressable.pressUnderlayColor = type == "TouchableHighlight" && !disabled ? color(props["underlayColor"]) : nil
         case "Switch":
             let toggle = result as! UISwitch
-            toggle.isOn = props["value"] as? Bool ?? props["checked"] as? Bool ?? false
+            let value = props["value"] as? Bool ?? props["checked"] as? Bool ?? false
+            // UIKit has already changed the value before emitting the event.
+            // Echoing it through the script must not restart its native animation.
+            if toggle.isOn != value { toggle.isOn = value }
             toggle.isEnabled = props["disabled"] as? Bool != true
             if let track = props["trackColor"] as? [String: Any] {
                 toggle.onTintColor = color(track["true"])
@@ -5751,13 +5983,13 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             updateHandler(nonEmptyHandler(events["onValueChange"]) ?? nonEmptyHandler(events["onChange"]), for: toggle)
         case "Slider":
             let slider = result as! UISlider
-            let minimum = (props["minimumValue"] as? NSNumber)?.floatValue ?? 0
+            let minimum = Float(number(props["minimumValue"]) ?? 0)
             slider.minimumValue = minimum.isFinite ? minimum : 0
-            let maximum = (props["maximumValue"] as? NSNumber)?.floatValue ?? 1
+            let maximum = Float(number(props["maximumValue"]) ?? 1)
             slider.maximumValue = max(slider.minimumValue + .leastNonzeroMagnitude, maximum.isFinite ? maximum : 1)
-            let authoredValue = (props["value"] as? NSNumber)?.floatValue ?? slider.minimumValue
+            let authoredValue = Float(number(props["value"]) ?? CGFloat(slider.minimumValue))
             let value = authoredValue.isFinite ? authoredValue : slider.minimumValue
-            if let step = (props["step"] as? NSNumber)?.floatValue, step.isFinite, step > 0 { sliderSteps[ObjectIdentifier(slider)] = step }
+            if let step = number(props["step"]).map(Float.init), step.isFinite, step > 0 { sliderSteps[ObjectIdentifier(slider)] = step }
             else { sliderSteps.removeValue(forKey: ObjectIdentifier(slider)) }
             slider.value = snappedSliderValue(value, for: slider)
             slider.minimumTrackTintColor = color(props["minimumTrackTintColor"])
@@ -5771,8 +6003,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             let requestedSize = props["size"]
             indicator.style = (requestedSize as? String) == "large" ? .large : .medium
             let scale: CGFloat
-            if let numericSize = requestedSize as? NSNumber {
-                let value = CGFloat(numericSize.doubleValue / 20.0)
+            if let numericSize = number(requestedSize) {
+                let value = numericSize / 20.0
                 scale = value.isFinite ? max(0.5, value) : 1
             } else if (requestedSize as? String) == "small" {
                 scale = 0.75
@@ -6230,7 +6462,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         list.apply(
             nodes: children,
             horizontal: props["horizontal"] as? Bool == true,
-            columns: (props["numColumns"] as? NSNumber)?.intValue ?? 1,
+            columns: Int(number(props["numColumns"]) ?? 1),
             inverted: props["inverted"] as? Bool == true,
             endReachedThreshold: threshold,
             renderItem: { [weak self] node, identity, _ in
@@ -6591,12 +6823,14 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             textView.textContainer.lineFragmentPadding = 0
         }
         textView.isScrollEnabled = false
-        if let numberOfLines = (props["numberOfLines"] as? NSNumber)?.intValue, numberOfLines > 0 {
+        let numberOfLines = Int(number(props["numberOfLines"]) ?? 0)
+        if numberOfLines > 0 {
             textView.textContainer.maximumNumberOfLines = numberOfLines
         } else {
             textView.textContainer.maximumNumberOfLines = 0
         }
-        if let maxLength = (props["maxLength"] as? NSNumber)?.intValue, maxLength > 0 {
+        let maxLength = Int(number(props["maxLength"]) ?? 0)
+        if maxLength > 0 {
             textMaxLengths[id] = maxLength
         } else {
             textMaxLengths.removeValue(forKey: id)
@@ -7617,7 +7851,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     }
 
     private func number(_ value: Any?) -> CGFloat? {
-        guard let number = value as? NSNumber else { return nil }
+        guard !(value is Bool), let number = value as? NSNumber else { return nil }
         let value = CGFloat(truncating: number)
         return value.isFinite ? value : nil
     }

package/dist/macos/templates/native_layout.zig

@@ -1778,6 +1778,43 @@ test "v4 tree layout applies a resolved grid auto-row minimum" {
     try std.testing.expectEqual(@as(f32, 20), frames[3].y);
 }
 
+test "v4 tree layout carries auto rows through nested grids" {
+    var root_style = emptyLayoutStyleInputV4();
+    root_style.width = 100;
+    root_style.height = 100;
+
+    var grid_style = emptyLayoutStyleInputV4();
+    grid_style.width = 100;
+    grid_style.height = 100;
+    grid_style.grid = 1;
+    grid_style.grid_columns = 2;
+    grid_style.grid_auto_rows = 18;
+
+    var first_style = emptyLayoutStyleInputV4();
+    first_style.intrinsic_width = 10;
+    first_style.intrinsic_height = 4;
+    var second_style = emptyLayoutStyleInputV4();
+    second_style.intrinsic_width = 10;
+    second_style.intrinsic_height = 6;
+    var third_style = emptyLayoutStyleInputV4();
+    third_style.intrinsic_width = 10;
+    third_style.intrinsic_height = 5;
+
+    const nodes = [_]LayoutNodeInputV4{
+        .{ .style = root_style, .first_child = 1, .child_count = 1 },
+        .{ .style = grid_style, .first_child = 2, .child_count = 3 },
+        .{ .style = first_style, .first_child = 0, .child_count = 0 },
+        .{ .style = second_style, .first_child = 0, .child_count = 0 },
+        .{ .style = third_style, .first_child = 0, .child_count = 0 },
+    };
+    var frames: [5]Frame = undefined;
+    try std.testing.expectEqual(@as(c_int, 0), craft_native_layout_tree_v4(100, 100, &nodes, nodes.len, &frames, frames.len));
+    try std.testing.expectEqual(@as(f32, 0), frames[1].x);
+    try std.testing.expectEqual(@as(f32, 0), frames[2].y);
+    try std.testing.expectEqual(@as(f32, 0), frames[3].y);
+    try std.testing.expectEqual(@as(f32, 18), frames[4].y);
+}
+
 test "lays out nested flat trees with absolute descendant frames" {
     var root_style = emptyLayoutStyleInput();
     root_style.width = 200;

package/package.json

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