craft-native 0.0.141 → 0.0.143

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

@@ -13,6 +13,7 @@ import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.DashPathEffect
+import android.graphics.Matrix
 import android.graphics.Paint
 import android.graphics.Path
 import android.graphics.Typeface
@@ -217,16 +218,36 @@ private class CraftNativeSvgView(context: Context) : View(context) {
         setMeasuredDimension(resolveSize(width, widthMeasureSpec), resolveSize(height, heightMeasureSpec))
     }
 
+    /** viewBox units to the view's pixels, set by each draw. */
+    private val viewTransform = Matrix()
+    private val inverseTransform = Matrix()
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val box = viewBox() ?: return
         if (box.first <= 0 || box.second <= 0) return
-        val scale = min(width.toFloat() / box.first, height.toFloat() / box.second)
-        if (!scale.isFinite() || scale <= 0f) return
+        // Centred at one scale (SVG's default, `xMidYMid meet`), or each axis
+        // stretched to fill (`preserveAspectRatio="none"`).
+        val stretch = drawing.optJSONObject("props")?.optString("preserveAspectRatio")?.trim() == "none"
+        var sx = width.toFloat() / box.first
+        var sy = height.toFloat() / box.second
+        var dx = 0f
+        var dy = 0f
+        if (!stretch) {
+            val scale = min(sx, sy)
+            sx = scale
+            sy = scale
+            dx = (width - box.first * scale) / 2f
+            dy = (height - box.second * scale) / 2f
+        }
+        if (!sx.isFinite() || !sy.isFinite() || sx <= 0f || sy <= 0f) return
+        viewTransform.reset()
+        viewTransform.postTranslate(-box.third, -box.fourth)
+        viewTransform.postScale(sx, sy)
+        viewTransform.postTranslate(dx, dy)
+        viewTransform.invert(inverseTransform)
         canvas.save()
-        canvas.translate((width - box.first * scale) / 2f, (height - box.second * scale) / 2f)
-        canvas.scale(scale, scale)
-        canvas.translate(-box.third, -box.fourth)
+        canvas.concat(viewTransform)
         drawNodes(canvas, drawing.optJSONArray("children") ?: JSONArray(), SvgPaint().merge(drawing))
         canvas.restore()
     }
@@ -310,7 +331,17 @@ private class CraftNativeSvgView(context: Context) : View(context) {
                     }
                 }
             }
-            canvas.drawPath(path, stroke)
+            // `vector-effect="non-scaling-stroke"`: the stroke is in the view's
+            // pixels, so a stretched chart's line keeps its width.
+            if (props.optString("vectorEffect") == "non-scaling-stroke") {
+                val line = Path(path).apply { transform(viewTransform) }
+                canvas.save()
+                canvas.concat(inverseTransform)
+                canvas.drawPath(line, stroke)
+                canvas.restore()
+            } else {
+                canvas.drawPath(path, stroke)
+            }
         }
     }
 
@@ -443,7 +474,8 @@ private class CraftNativeFlexLayout(context: Context) : LinearLayout(context) {
             }.toFloatArray()
             val sharedLineIds = CraftNative.flexLines(availableMain.toFloat(), gap.toFloat(), wrap, basis, margins)
             val lineIds = sharedLineIds?.takeIf { ids ->
-                ids.size >= pending.size && ids.firstOrNull() == 0 && ids.zipWithNext().all { (left, right) -> right >= left }
+                ids.size >= pending.size && ids.firstOrNull() == 0 &&
+                    ids.indices.drop(1).all { index -> ids[index] >= ids[index - 1] }
             }
             var line = Line()
             pending.forEachIndexed { index, entry ->
@@ -1896,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()) {
@@ -1908,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.
@@ -1929,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) {

package/dist/cli.js

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

package/dist/index.cjs

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

package/dist/index.js

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

package/dist/ios/templates/CraftNativeActions.swift

@@ -38,7 +38,7 @@ enum CraftNativeActions {
     private static let sqliteTransient = unsafeBitCast(-1, to: sqlite3_destructor_type.self)
 
     static func capabilities(config: CraftConfig) -> [String] {
-        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch"]
+        var values = ["device", "clipboard", "haptics", "storage", "lifecycle", "fetch", "dialog"]
         if config.enableBiometric { values.append("biometric") }
         if config.enableSecureStorage { values.append("secureStorage") }
         if config.enableLocalDatabase { values.append("database") }
@@ -146,6 +146,23 @@ enum CraftNativeActions {
             }
             databaseQueue.async { complete(requestToken, database(method: method, args: args), completion) }
             return
+        case ("Dialog", _):
+            // The system's own alert, confirmation and action sheet, the same
+            // ones a page gets (CraftNativeUI.swift), over the native screen.
+            let body = args.first as? [String: Any] ?? [:]
+            DispatchQueue.main.async {
+                switch method {
+                case "alert":
+                    CraftDialogs.alert(body, from: nil) { complete(requestToken, .success(NSNull()), completion) }
+                case "confirm":
+                    CraftDialogs.confirm(body, from: nil) { complete(requestToken, .success($0), completion) }
+                case "actionSheet":
+                    CraftDialogs.actionSheet(body, from: nil) { complete(requestToken, .success($0 ?? NSNull()), completion) }
+                default:
+                    complete(requestToken, failure("UNKNOWN_ACTION", "Unsupported Dialog method"), completion)
+                }
+            }
+            return
         case ("Health", _):
             // Apple Health, the same as a page's `craft.health` (CraftHealth.swift).
             guard config.enableHealthKit else {

package/dist/ios/templates/CraftNativeFlatList.swift

@@ -525,7 +525,7 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
 
     private static func identity(for node: [String: Any]) -> String? {
         let props = node["props"] as? [String: Any] ?? [:]
-        return [node["id"], node["key"], props["key"], props["testID"]]
+        return [node["key"], props["key"], props["testID"], node["id"]]
             .compactMap { $0 as? String }
             .first { !$0.isEmpty }
     }

package/dist/ios/templates/CraftNativeScreen.swift

@@ -1789,14 +1789,36 @@ private final class CraftNativeSvgView: UIView {
         }
     }
 
+    /// viewBox units to the view's points, set by each draw.
+    private var viewTransform = CGAffineTransform.identity
+
+    /// viewBox to view: centred at one scale (SVG's default, `xMidYMid meet`),
+    /// or each axis stretched to fill (`preserveAspectRatio="none"`), as a
+    /// chart a page sizes to its width and a fixed height asks for.
+    static func transform(box: CGRect, bounds: CGSize, preserveAspectRatio: String?) -> CGAffineTransform? {
+        var sx = bounds.width / box.width
+        var sy = bounds.height / box.height
+        var dx: CGFloat = 0
+        var dy: CGFloat = 0
+        if preserveAspectRatio?.trimmingCharacters(in: .whitespaces) != "none" {
+            let scale = min(sx, sy)
+            sx = scale
+            sy = scale
+            dx = (bounds.width - box.width * scale) / 2
+            dy = (bounds.height - box.height * scale) / 2
+        }
+        guard sx.isFinite, sy.isFinite, sx > 0, sy > 0 else { return nil }
+        return CGAffineTransform(translationX: dx, y: dy).scaledBy(x: sx, y: sy).translatedBy(x: -box.minX, y: -box.minY)
+    }
+
     override func draw(_ rect: CGRect) {
         guard let context = UIGraphicsGetCurrentContext() else { return }
+        viewTransform = .identity
         if let box = viewBox {
-            let scale = min(bounds.width / box.width, bounds.height / box.height)
-            guard scale.isFinite, scale > 0 else { return }
-            context.translateBy(x: (bounds.width - box.width * scale) / 2, y: (bounds.height - box.height * scale) / 2)
-            context.scaleBy(x: scale, y: scale)
-            context.translateBy(x: -box.minX, y: -box.minY)
+            let props = drawing["props"] as? [String: Any] ?? [:]
+            guard let transform = CraftNativeSvgView.transform(box: box, bounds: bounds.size, preserveAspectRatio: props["preserveAspectRatio"] as? String) else { return }
+            viewTransform = transform
+            context.concatenate(transform)
         }
         draw(children: drawing["children"] as? [Any] ?? [], paint: Paint().merged(drawing), in: context)
     }
@@ -1820,12 +1842,25 @@ private final class CraftNativeSvgView: UIView {
                     path.fill()
                 }
                 if let stroke = own.resolve(own.stroke), own.strokeWidth > 0 {
+                    // `vector-effect="non-scaling-stroke"`: the stroke is in the
+                    // view's points, so a stretched chart's line keeps its width
+                    // and a round cap stays a round dot.
+                    let nonScaling = (shape["props"] as? [String: Any])?["vectorEffect"] as? String == "non-scaling-stroke"
+                    let line: UIBezierPath
+                    if nonScaling, let copy = path.copy() as? UIBezierPath {
+                        copy.apply(viewTransform)
+                        context.concatenate(viewTransform.inverted())
+                        line = copy
+                    }
+                    else {
+                        line = path
+                    }
                     stroke.setStroke()
-                    path.lineWidth = own.strokeWidth
-                    path.lineCapStyle = own.linecap == "round" ? .round : own.linecap == "square" ? .square : .butt
-                    path.lineJoinStyle = own.linejoin == "round" ? .round : own.linejoin == "bevel" ? .bevel : .miter
-                    if let dashes = own.dashes, !dashes.isEmpty { path.setLineDash(dashes, count: dashes.count, phase: 0) }
-                    path.stroke()
+                    line.lineWidth = own.strokeWidth
+                    line.lineCapStyle = own.linecap == "round" ? .round : own.linecap == "square" ? .square : .butt
+                    line.lineJoinStyle = own.linejoin == "round" ? .round : own.linejoin == "bevel" ? .bevel : .miter
+                    if let dashes = own.dashes, !dashes.isEmpty { line.setLineDash(dashes, count: dashes.count, phase: 0) }
+                    line.stroke()
                 }
                 context.restoreGState()
             }
@@ -3493,7 +3528,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
     private func explicitKey(_ node: [String: Any], props: [String: Any]) -> String? {
         // The current @stacksjs/stx native compiler emits key in props; accept the IR
         // field too so keyed children keep working when the compiler adopts it.
-        [node["id"], node["key"], props["key"], props["testID"]]
+        [node["key"], props["key"], props["testID"], node["id"]]
             .compactMap { $0 as? String }
             .first { !$0.isEmpty }
     }
@@ -4293,7 +4328,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             view.accessibilityValue = nil
         }
         let role = props["accessibilityRole"] as? String
-        view.isAccessibilityElement = role != "none" && (view.accessibilityLabel != nil || role != nil || ["Text", "Button", "Link", "Image", "TextInput", "Picker", "Switch", "Slider"].contains(type))
+        view.isAccessibilityElement = role != "none" && (view.accessibilityLabel != nil || role != nil || ["Text", "Button", "Link", "Image", "Video", "TextInput", "Picker", "Switch", "Slider"].contains(type))
         var traits: UIAccessibilityTraits = []
         switch role ?? type.lowercased() {
         case "button": traits.insert(.button)

package/package.json

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