@swiftbrowser/swift 0.5.3 → 0.5.4

package/Sources/SwiftUI/Runtime/Reconciler.swift

@@ -11,6 +11,9 @@ struct _Element {
     /// `accessibilityLabel` / `accessibilityIdentifier`, for event scripts (the
     /// label is in `props` too, Runtime.swift).
     var accessibility: _AccessibilityMark?
+    /// The `accessibilityLabel` prop was taken from the content (a control
+    /// named by its icon-only label): a label set on the control replaces it.
+    var labelFromContent = false
     /// `.layoutValue(key:value:)` above this element, by key type: what a
     /// custom layout's subview reads (CustomLayout.swift).
     var layoutValues: [ObjectIdentifier: Any]?

package/Sources/SwiftUI/Runtime/Runtime.swift

@@ -1676,6 +1676,17 @@ public final class _Runtime {
                 children: children,
                 handler: node.handler ?? hostView._handler
             )
+            // A control whose content shows no text (an icon-only `Label`) is
+            // named by the label its content carries, on the control itself:
+            // browsers and screen readers do not all take a name from an
+            // inner element (a menu's content is its label, the first child).
+            if kind == "button" || kind == "navlink" || kind == "menu", case .object(var fields) = element.props,
+               fields["accessibilityLabel"] == nil,
+               let label = _contentLabel(of: kind == "menu" ? Array(children.prefix(1)) : children) {
+                fields["accessibilityLabel"] = .string(label)
+                element.props = .object(fields)
+                element.labelFromContent = true
+            }
             if traits.contains(.navigationValueLink), let link = node.view as? any _NavigationValueLinkView, let value = link._value {
                 element.row = _RowMark(linkValue: value, linkHandler: element.handler)
             }
@@ -1727,9 +1738,11 @@ public final class _Runtime {
                 // it already. The innermost label wins; a changed element is a
                 // new value, so the reconciler does not skip it as cached.
                 if let label = mark.label, !label.isEmpty, case .object(var props) = produced[index].props,
-                   props["accessibilityLabel"] == nil, !_showsText(label, in: produced[index]) {
+                   props["accessibilityLabel"] == nil || produced[index].labelFromContent,
+                   !_showsText(label, in: produced[index]) {
                     props["accessibilityLabel"] = .string(label)
                     produced[index].props = .object(props)
+                    produced[index].labelFromContent = false
                     produced[index].token = _Element.nextToken()
                 }
             }
@@ -1748,6 +1761,22 @@ public final class _Runtime {
         return produced
     }
 
+    /// The accessibility label content carries when it shows no text (the
+    /// first, depth first), else nil.
+    private func _contentLabel(of elements: [_Element]) -> String? {
+        func showsText(_ element: _Element) -> Bool {
+            element.kind == "text" || element.children.contains(where: showsText)
+        }
+        func label(_ element: _Element) -> String? {
+            if case .object(let props) = element.props, case .string(let label)? = props["accessibilityLabel"], !label.isEmpty {
+                return label
+            }
+            return element.children.lazy.compactMap(label).first
+        }
+        guard !elements.contains(where: showsText) else { return nil }
+        return elements.lazy.compactMap(label).first
+    }
+
     /// Whether `element` or an element under it is a `text` showing `text`.
     private func _showsText(_ text: String, in element: _Element) -> Bool {
         if element.kind == "text", case .object(let props) = element.props, case .string(let shown)? = props["text"], shown == text {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftbrowser/swift",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "The SwiftBrowser Swift package (the SwiftUI shim, Charts, SwiftData and FoundationBridge) as an npm package, so @swiftbrowser/cli builds apps against the exact version it ships with.",
   "repository": {
     "type": "git",