craft-native 0.0.394 → 0.0.395

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

@@ -96,6 +96,12 @@ internal class CraftNativeFlatList(context: Context) : RecyclerView(context) {
     }
 
     private var renderItem: CraftNativeRenderItem? = null
+    /**
+     * The `fontFamily` the rows inherit from the list's ancestors. Rows are
+     * rebound only when their own node changes, so the screen redraws them
+     * when this changes (`reconcileFlatList` in MainActivity).
+     */
+    var inheritedFontFamily: String? = null
     private var recycleItem: ((String) -> Unit)? = null
     private var removeItem: ((String) -> Unit)? = null
     private var endReached: (() -> Unit)? = null

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

@@ -2389,6 +2389,31 @@ private class CraftNativeKeyboardAvoidingView(context: Context) : FrameLayout(co
     }
 }
 
+/**
+ * The `fontFamily` a node passes to its children: its own, which already
+ * carries any family it inherited (see [craftNativeInheritFontFamily]).
+ */
+internal fun craftNativeInheritableFontFamily(style: JSONObject): String? =
+    craftNativeOptionalString(style.opt("fontFamily"))?.takeUnless { it == "inherit" }
+
+/**
+ * CSS-style `fontFamily` inheritance: a node that sets no family (or
+ * `inherit`) takes its nearest ancestor's, so a brand face set on a screen's
+ * root reaches every label, button and input below it. Returns [style]
+ * itself when nothing is inherited or the node sets its own family, else a
+ * shallow copy carrying the inherited one; the protocol document's style is
+ * never written to, so an ancestor's later change still reaches the node.
+ */
+internal fun craftNativeInheritFontFamily(style: JSONObject, inherited: String?): JSONObject {
+    if (inherited == null) return style
+    val own = craftNativeOptionalString(style.opt("fontFamily"))
+    if (own != null && own != "inherit") return style
+    return JSONObject().also { copy ->
+        style.keys().forEach { key -> copy.put(key, style.opt(key)) }
+        copy.put("fontFamily", inherited)
+    }
+}
+
 /** CSS family fallback order, using bundled app fonts before platform families. */
 internal fun craftNativeFontFamily(family: String?, bundledFonts: Map<String, Typeface> = emptyMap()): Typeface =
     family?.split(',')?.asSequence()?.map { it.trim().trim('"', '\'') }?.mapNotNull { name ->
@@ -4210,6 +4235,12 @@ class MainActivity : AppCompatActivity() {
         // the original tree path without manufacturing a detached view.
         val nodeViews = mutableMapOf<String, View>()
         val nodePaths = mutableMapOf<String, String>()
+        /**
+         * The `fontFamily` a protocol node inherited from its ancestors when
+         * drawn, so a targeted update of its subtree keeps it. Only nodes that
+         * inherit one are recorded: a screen with no family keeps it empty.
+         */
+        val inheritedFontFamilies = mutableMapOf<String, String>()
         val protocolIds = mutableMapOf<View, String>()
         val handlers = mutableMapOf<View, String>()
         val linkTargets = mutableMapOf<View, String>()
@@ -5497,7 +5528,7 @@ class MainActivity : AppCompatActivity() {
             val document = screen.mutations.node(target) ?: return false
             val path = screen.nodePaths[target] ?: return false
             if (screen.nodeViews[target] == null) return false
-            makeView(screen, document, path, screen.controls)
+            makeView(screen, document, path, screen.controls, inheritedFontFamily = screen.inheritedFontFamilies[target])
             val updated = screen.nodeViews[target] ?: return false
             screen.lastLayoutBounds.remove(updated)
             if (!updateParentLayoutStyle(updated, document.optJSONObject("style") ?: JSONObject())) return false
@@ -5584,6 +5615,7 @@ class MainActivity : AppCompatActivity() {
         val next = mutableMapOf<String, View>()
         screen.nodeViews.clear()
         screen.nodePaths.clear()
+        screen.inheritedFontFamilies.clear()
         val tree = makeView(screen, document, "root", next)
         if (screen.view.getChildAt(0) !== tree) {
             (tree.parent as? ViewGroup)?.removeView(tree)
@@ -5673,6 +5705,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.clear()
         screen.nodeViews.clear()
         screen.nodePaths.clear()
+        screen.inheritedFontFamilies.clear()
         screen.protocolIds.clear()
         screen.handlers.clear()
         screen.linkTargets.clear()
@@ -5681,16 +5714,22 @@ class MainActivity : AppCompatActivity() {
         screen.flatListOwnerByView.clear()
     }
 
+    /**
+     * [inheritedFontFamily]: the nearest ancestor's `fontFamily`, which the
+     * node takes when it sets none ([craftNativeInheritFontFamily]) and
+     * passes on to its children and list rows.
+     */
     private fun makeView(
         screen: Screen,
         node: JSONObject,
         path: String,
         next: MutableMap<String, View>,
         previousControls: Map<String, View> = screen.controls,
+        inheritedFontFamily: String? = null,
     ): View {
         val type = canonicalType(node.optString("type", "View"))
         val props = node.optJSONObject("props") ?: JSONObject()
-        val style = node.optJSONObject("style") ?: JSONObject()
+        val style = craftNativeInheritFontFamily(node.optJSONObject("style") ?: JSONObject(), inheritedFontFamily)
         val events = node.optJSONObject("events") ?: JSONObject()
         val children = node.optJSONArray("children") ?: JSONArray()
         val protocolId = node.optString("id").takeIf { it.isNotBlank() }
@@ -6477,7 +6516,7 @@ class MainActivity : AppCompatActivity() {
                     (getSystemService(INPUT_METHOD_SERVICE) as? android.view.inputmethod.InputMethodManager)
                         ?.hideSoftInputFromWindow(windowToken, 0)
                 }
-                reconcileFlatList(screen, nativeList, children, identity, protocolId ?: identity, props, events)
+                reconcileFlatList(screen, nativeList, children, identity, protocolId ?: identity, props, events, craftNativeInheritableFontFamily(style))
             }
             "View", "SafeAreaView" -> (previous as? CraftNativeFlexLayout ?: CraftNativeFlexLayout(this)).apply {
                 configureContainer(this, style)
@@ -6622,6 +6661,11 @@ class MainActivity : AppCompatActivity() {
             }
         }
         protocolId?.let {
+            if (inheritedFontFamily != null) {
+                screen.inheritedFontFamilies[it] = inheritedFontFamily
+            } else if (screen.inheritedFontFamilies.isNotEmpty()) {
+                screen.inheritedFontFamilies.remove(it)
+            }
             screen.nodeViews[it] = control
             screen.nodePaths[it] = path
         }
@@ -6742,10 +6786,12 @@ class MainActivity : AppCompatActivity() {
         }
         val desired = mutableListOf<View>()
         val desiredOrder = mutableMapOf<View, Int>()
+        // `style` is the parent's effective style, its inherited family included.
+        val fontFamily = craftNativeInheritableFontFamily(style)
         for (index in 0 until children.length()) {
             val child = children.opt(index)
             val childView = when (child) {
-                is JSONObject -> makeView(screen, child, "$path.$index", next, previousControls)
+                is JSONObject -> makeView(screen, child, "$path.$index", next, previousControls, fontFamily)
                 is String -> TextView(this).apply {
                     includeFontPadding = false
                     configureText(this, child, craftNativeTypography(style))
@@ -6790,6 +6836,7 @@ class MainActivity : AppCompatActivity() {
         owner: String,
         props: JSONObject,
         events: JSONObject,
+        fontFamily: String?,
     ) {
         screen.flatListOwners.entries.removeAll { it.value == owner }
         screen.flatListOwnerByView[list] = owner
@@ -6819,6 +6866,10 @@ class MainActivity : AppCompatActivity() {
         val threshold = craftNativeNonNegativeDouble(props, "threshold", 0.1)
         val authoredThreshold = craftNativeNonNegativeDouble(props, "onEndReachedThreshold", threshold)
         val horizontal = craftNativeBoolean(props.opt("horizontal"))
+        // A row redraws when its own node changes; an ancestor's new family
+        // leaves every node as it was, so rows drawn before are redrawn below.
+        val familyChanged = list.inheritedFontFamily != fontFamily
+        val rowsDrawnBefore = familyChanged && screen.flatListRows[list]?.isNotEmpty() == true
         list.apply(
             nodes = nodes,
             horizontal = horizontal,
@@ -6829,7 +6880,9 @@ class MainActivity : AppCompatActivity() {
                 val rows = screen.flatListRows.getOrPut(list) { mutableMapOf() }
                 val previous = rows[itemIdentity].orEmpty()
                 val next = mutableMapOf<String, View>()
-                val view = makeView(screen, node, "$path.$itemIdentity", next, previous)
+                // Rows are drawn later, as they scroll in: each takes the
+                // list's family from this render's closure.
+                val view = makeView(screen, node, "$path.$itemIdentity", next, previous, fontFamily)
                 releaseViewState(screen, previous.values.filter { it !in next.values })
                 rows[itemIdentity] = next
                 view
@@ -6858,6 +6911,10 @@ class MainActivity : AppCompatActivity() {
             craftNativeBoolean(props.opt("alwaysBounceVertical"), !horizontal),
             craftNativeBoolean(props.opt("alwaysBounceHorizontal"), horizontal),
         )
+        if (familyChanged) {
+            list.inheritedFontFamily = fontFamily
+            if (rowsDrawnBefore) list.refreshThemeDefaults()
+        }
     }
 
     private fun registerFlatListOwnership(screen: Screen, node: JSONObject, owner: String) {
@@ -8358,6 +8415,7 @@ class MainActivity : AppCompatActivity() {
         screen.controls.clear()
         screen.nodeViews.clear()
         screen.nodePaths.clear()
+        screen.inheritedFontFamilies.clear()
         screen.protocolIds.clear()
         screen.handlers.clear()
         screen.pressInHandlers.clear()

package/dist/cli.js

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

package/dist/ios/templates/CraftNativeFlatList.swift

@@ -188,6 +188,10 @@ final class CraftNativeFlatList: UICollectionView, UICollectionViewDelegateFlowL
     private var recycleItem: ((String) -> Void)?
     private var removeItem: ((String) -> Void)?
     private var endReached: (() -> Void)?
+    /// The `fontFamily` the list's rows inherit from its ancestors. Rows are
+    /// reconfigured when only their node changes, so the screen redraws them
+    /// itself when this changes (`CraftNativeScreenController.reconcileFlatList`).
+    var inheritedFontFamily: String?
     var onScrollEvent: ((UIScrollView) -> Void)?
     /// Called as the visible rows move, for a screen that lays out around them.
     var onLayoutChanged: (() -> Void)?

package/dist/ios/templates/CraftNativeScreen.swift

@@ -5895,7 +5895,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let type: String
         let view: UIView
         var protocolId: String?
+        /// The node's effective style: its own, plus the `fontFamily` it
+        /// inherited when it sets none (see `reconcile`).
         var style: [String: Any] = [:]
+        /// The nearest ancestor's `fontFamily` when this node was drawn, so a
+        /// targeted update of this subtree inherits it without its ancestors.
+        var inheritedFontFamily: String?
         var children: [RenderedNode] = []
         var widthConstraint: NSLayoutConstraint?
         var heightConstraint: NSLayoutConstraint?
@@ -8380,7 +8385,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             // its parent's to swap in: a targeted update only redraws in
             // place, and the new view was made and never attached.
             guard canReuseView(document, previous: previous) else { return false }
-            let next = reconcile(document, identity: previous.identity, path: target, previous: previous)
+            let next = reconcile(document, identity: previous.identity, path: target, previous: previous, inheritedFontFamily: previous.inheritedFontFamily)
             // A style patch is applied in place, layout included: the parent
             // reads the node's new layout style on its next pass.
             CraftNativeFlexLayout.invalidateAncestors(of: next.view)
@@ -8521,10 +8526,22 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
 
     /// `adopting`: `previous` is a recycled list row's root, whose views may
     /// show this row instead (`identity` is the new row's).
-    private func reconcile(_ node: [String: Any], identity: String, path: String, previous: RenderedNode?, adopting: Bool = false) -> RenderedNode {
+    ///
+    /// `inheritedFontFamily`: the nearest ancestor's `fontFamily`. As in CSS,
+    /// a node that sets none (or `inherit`) takes it, and its children inherit
+    /// in turn, so a brand face set on a screen's root reaches every label,
+    /// button and input below it. It is written into the node's effective
+    /// style, which every font computed from that style (Dynamic Type
+    /// re-renders included) reads. With no ancestor family this costs one nil
+    /// check and copies nothing.
+    private func reconcile(_ node: [String: Any], identity: String, path: String, previous: RenderedNode?, adopting: Bool = false, inheritedFontFamily: String? = nil) -> RenderedNode {
         let type = canonicalType(node["type"] as? String ?? "View")
         let props = node["props"] as? [String: Any] ?? [:]
-        let style = node["style"] as? [String: Any] ?? [:]
+        var style = node["style"] as? [String: Any] ?? [:]
+        if let inheritedFontFamily {
+            let own = style["fontFamily"] as? String
+            if own == nil || own == "inherit" { style["fontFamily"] = inheritedFontFamily }
+        }
         let events = node["events"] as? [String: String] ?? [:]
         let children = node["children"] as? [Any] ?? []
         let protocolId = node["id"] as? String
@@ -8545,6 +8562,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let result = current.view
         current.protocolId = protocolId
         current.style = style
+        current.inheritedFontFamily = inheritedFontFamily
         let linkTarget = ["href", "to"].lazy.compactMap { props[$0] as? String }
             .first(where: { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty })?
             .trimmingCharacters(in: .whitespacesAndNewlines)
@@ -9091,7 +9109,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                 parent: current,
                 path: path,
                 props: props,
-                events: events
+                events: events,
+                fontFamily: style["fontFamily"] as? String
             )
         default:
             let stack = result as! CraftNativeFlowView
@@ -9319,6 +9338,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         let counts = Dictionary(keys.map { ($0, 1) }, uniquingKeysWith: +)
         let old = Dictionary(uniqueKeysWithValues: parent.children.map { ($0.identity, $0) })
         var next: [RenderedNode] = []
+        // `style` is the parent's effective style, its inherited family included.
+        let fontFamily = style["fontFamily"] as? String
 
         for (index, node) in nodes.enumerated() {
             let key = explicitKey(node, props: node["props"] as? [String: Any] ?? [:])
@@ -9331,7 +9352,7 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             let identity = parent.identity.hasPrefix("list:") || parent.identity.hasPrefix("key:")
                 ? "\(parent.identity)/\(localIdentity)"
                 : localIdentity
-            let child = reconcile(node, identity: identity, path: "\(path).\(index)", previous: old[identity])
+            let child = reconcile(node, identity: identity, path: "\(path).\(index)", previous: old[identity], inheritedFontFamily: fontFamily)
             next.append(child)
         }
         if (style["flexDirection"] as? String)?.hasSuffix("-reverse") == true { next.reverse() }
@@ -9376,7 +9397,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         parent: RenderedNode,
         path: String,
         props: [String: Any],
-        events: [String: String]
+        events: [String: String],
+        fontFamily: String?
     ) {
         let listKey = ObjectIdentifier(list)
         let owner = parent.protocolId ?? path
@@ -9420,6 +9442,8 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
             0,
             Double(number(props["onEndReachedThreshold"]) ?? number(props["threshold"]) ?? 0.1)
         )
+        let familyChanged = list.inheritedFontFamily != fontFamily
+        let rowsDrawnBefore = familyChanged && flatListRows[listKey]?.isEmpty == false
         list.apply(
             nodes: children,
             horizontal: props["horizontal"] as? Bool == true,
@@ -9444,7 +9468,10 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
                     identity: "list:\(identity)",
                     path: "\(path).\(identity)",
                     previous: previous,
-                    adopting: adopting
+                    adopting: adopting,
+                    // Rows are drawn later, as they scroll in: each takes the
+                    // list's family from this render's closure.
+                    inheritedFontFamily: fontFamily
                 )
                 // A recycled row's handlers went when it was recycled.
                 if let previous, previous.view !== next.view, !adopting {
@@ -9489,6 +9516,12 @@ final class CraftNativeScreenController: UIViewController, UIScrollViewDelegate,
         list.setScrollTarget(props["scrollTarget"])
         list.alwaysBounceVertical = props["alwaysBounceVertical"] as? Bool ?? !horizontal
         list.alwaysBounceHorizontal = props["alwaysBounceHorizontal"] as? Bool ?? horizontal
+        // A row redraws when its own node changes; an ancestor's new family
+        // leaves every node as it was, so rows drawn before are redrawn here.
+        if familyChanged {
+            list.inheritedFontFamily = fontFamily
+            if rowsDrawnBefore { list.refreshThemeDefaults() }
+        }
         parent.children = []
     }
 

package/package.json

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