craft-native 0.0.170 → 0.0.171

package/dist/cli.js

@@ -3303,7 +3303,7 @@ function pinCraftNativeDependency(packagePath, craftVersion) {
 `);
 }
 // package.json
-var version = "0.0.170";
+var version = "0.0.171";
 
 // 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.170";
+var version = "0.0.171";
 
 // 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.170";
+var version = "0.0.171";
 
 // src/sdk-version.ts
 var SDK_VERSION = version;

package/dist/ios/templates/CraftNativeMutation.swift

@@ -150,6 +150,11 @@ final class CraftNativeMutationDocument {
         materialize(id, nodes: nodes)
     }
 
+    /// The committed parent of a node: nil for the root or a node it does not hold.
+    func parentId(of id: String) -> String? {
+        nodes[id]?.parent
+    }
+
     private func createNode(
         _ operation: [String: Any],
         nodes: inout [String: Node],
@@ -291,8 +296,21 @@ final class CraftNativeMutationDocument {
         return values.compactMap { $0 as? String }
     }
 
+    /// Every type the renderer draws children of (CraftNativeScreen's
+    /// reconcile), by the names it accepts (`canonicalType`, so `svg` is
+    /// `Svg`). Only View, SafeAreaView and ScrollView used to be here, so a
+    /// drawing revealed after the first paint (an `:if` around an `<svg>`)
+    /// had its shapes refused as INVALID_PARENT, and the whole screen was
+    /// drawn again; Android's host already took the same list.
+    static let containerTypes: Set<String> = [
+        "View", "SafeAreaView", "ScrollView", "KeyboardAvoidingView", "Modal", "Pressable",
+        "TouchableOpacity", "TouchableHighlight", "ImageBackground", "FlatList", "SectionList",
+        "Fragment", "Svg", "G",
+    ]
+    private static let containerTypeKeys = Set(containerTypes.map { $0.lowercased() })
+
     private func acceptsChildren(_ type: String) -> Bool {
-        type == "View" || type == "SafeAreaView" || type == "ScrollView"
+        Self.containerTypeKeys.contains(type.lowercased())
     }
 
     private func descendants(of id: String, nodes: [String: Node]) -> Set<String> {

package/dist/ios/templates/CraftNativeScreen.swift

@@ -3816,7 +3816,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let focused = firstResponder(in: rootStack) ?? lastFocusedInput
         var applied = Set<String>()
         for id in ids {
-            let target = flatListOwners[id] ?? svgOwners[id] ?? id
+            guard let target = drawnTarget(id) else { return false }
             guard applied.insert(target).inserted else { continue }
             guard let document = mutationDocument.node(target), let previous = renderedNode(target) else { return false }
             let next = reconcile(document, identity: previous.identity, path: target, previous: previous)
@@ -3828,6 +3828,21 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         return true
     }
 
+    /// The drawn node a change to `id` redraws: the list or drawing a row or
+    /// shape belongs to, else the node itself. A node this batch created is
+    /// not drawn yet (a drawing an `:if` just revealed, its shapes inserted
+    /// into it), so its nearest drawn ancestor draws it, rather than the whole
+    /// screen being reconciled again for want of it.
+    private func drawnTarget(_ id: String) -> String? {
+        var current: String? = id
+        while let candidate = current {
+            let target = flatListOwners[candidate] ?? svgOwners[candidate] ?? candidate
+            if renderedNode(target) != nil { return target }
+            current = mutationDocument.parentId(of: candidate)
+        }
+        return nil
+    }
+
     private func renderedNode(_ id: String, below node: RenderedNode? = nil) -> RenderedNode? {
         guard let node = node ?? renderedRoot else { return nil }
         if node.protocolId == id { return node }

package/package.json

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