zaniah 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386e75cb5db3d2027ed3c94ca7bbb3df1d1f7c1980df89bf108456da24993255
-  data.tar.gz: 7f546b6bda16e84eccd36310ff8bc1f065bead904ad8cd68c5ef26a45b6ef913
+  metadata.gz: 3650507aed861e96e016a6c2b33d629758512e9da2de9278122070a3a76151f9
+  data.tar.gz: de00322355b6736e94b7fe1f4856d2471c7838c3ed34e78db5169593a0e01b19
 SHA512:
-  metadata.gz: 1e8b40e41c9f23d9d954e83fa78e8929cddbbc1e651244a409c30c9cfb14943821aaaf096b41febeba568e912761cbf2da18f768efc4c5c83642d6fb74a223bf
-  data.tar.gz: adc23e2da904fff7f30520676dcf961f303f6295d3bb914fd994c928b97ef6091ce05981f85d4b8587f1048ff2fc0c13fb91f4739ff3fbc6d3d1821a8e049b4e
+  metadata.gz: 209714f65e39e7d50e9c47357de8bd9f20f970922e208c2dd4ba1624ff9c126aec4797b791e8955e0342e6ec41d170a0a49dd2862528e058ddba65d7c28e8bdf
+  data.tar.gz: 6022d62f59e2902e26ec232570f47a0221a5ee235820fb88d2cd5e4da68fa08fe0100927618385fec8a269f23225dc5449f4539750b855deadc8bd57faa955b7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.12.4 — 2026-10-02
+
+- Let applications name tables, trees, groups, and other components for screen readers, and announce property editor labels consistently.
+- Support localized dialog close buttons and command palette titles, with accessible close actions. Preserve nested controls in dialog and tab accessibility trees.
+- Show selected option captions in dropdowns and select fields while retaining their underlying values.
+- Restore keyboard focus immediately when a dialog is closed, and retain menu bar and command palette search focus across redraws.
+
 ## 0.12.3 — 2026-10-02
 
 - Improve redraw responsiveness in views with many styled controls.

data/lib/zaniah/ui/choice_fields.rb

@@ -11,12 +11,12 @@ module Zaniah
       def disabled(value = true) = (@disabled = !!value; self)
 
       def build(cx)
-        return Button.new(@value ? @value.to_s : @label, variant: :secondary).disabled if @disabled
+        return Button.new(selected_label, variant: :secondary).disabled if @disabled
         super
       end
 
-      def tui_cells(*) = "#{@label}: [#{@value || "choose"} ▾]"
-      def accessibility_node(_cx) = node(:combobox, label: @label, value: @value,
+      def tui_cells(*) = "#{@label}: [#{@value.nil? ? "choose" : selected_label} ▾]"
+      def accessibility_node(_cx) = node(:combobox, label: @label, value: @value.nil? ? nil : selected_label,
         states: {expanded: false, disabled: @disabled}, actions: @disabled ? [] : [:press])
     end
 

data/lib/zaniah/ui/component.rb

@@ -23,6 +23,7 @@ module Zaniah
         @window_control = kind
         self
       end
+      def accessibility_label(value) = (@accessibility_label = value&.to_s; self)
       def accessibility_node(_cx) = nil
       def tui_cells(_bounds = nil, _cx = nil) = nil
       def focus_handle = @root&.focus_handle
@@ -68,10 +69,19 @@ module Zaniah
 
       attr_writer :parent
 
+      def child_node(pane, cx)
+        semantic = pane.accessibility_node(cx) if pane.respond_to?(:accessibility_node)
+        return semantic if semantic.is_a?(Accessibility::Node)
+        children = pane.respond_to?(:children) ? pane.children : []
+        nodes = children.filter_map { |child| child_node(child, cx) }
+        Accessibility.node(role: :group, children: nodes) unless nodes.empty?
+      end
+
+
       private
 
-      def node(role, id: @test_id, label: nil, value: nil, states: {}, children: [], actions: [])
-        result = Accessibility.node(role: role, id: id, label: label, value: value,
+      def node(role, id: @test_id, label: @accessibility_label, value: nil, states: {}, children: [], actions: [])
+        result = Accessibility.node(role: role, id: id, label: @accessibility_label || label, value: value,
           bounds: @layout_node&.bounds, states: states, children: children, actions: actions)
         Accessibility::NODE_OWNERS[result] = self
         result

data/lib/zaniah/ui/feedback.rb

@@ -5,8 +5,9 @@ module Zaniah
     class SegmentedControl < Component
       attr_reader :value
 
-      def initialize(options, value: nil)
+      def initialize(options, value: nil, label: nil)
         super()
+        accessibility_label(label)
         @options = Array(options).map do |option|
           label, item = option.is_a?(Array) ? option : [option, option]
           [label.to_s, item]

data/lib/zaniah/ui/layout_components.rb

@@ -32,7 +32,7 @@ module Zaniah
 
       def tui_cells(*) = "#{text(@first)} #{@orientation == :horizontal ? "│" : "─"} #{text(@second)}"
       def accessibility_node(cx)
-        panes = [@first, @second].map { |pane| pane_node(pane, cx) }
+        panes = [@first, @second].map { |pane| child_node(pane, cx) }
         divider = Accessibility.node(role: :separator, value: @ratio,
           states: {orientation: @orientation}, actions: %i[increment decrement])
         node(:group, states: {orientation: @orientation}, children: [panes.first, divider, panes.last].compact)
@@ -40,14 +40,6 @@ module Zaniah
 
       private
 
-      def pane_node(pane, cx)
-        semantic = pane.accessibility_node(cx) if pane.respond_to?(:accessibility_node)
-        return semantic if semantic.is_a?(Accessibility::Node)
-        children = pane.respond_to?(:children) ? pane.children : []
-        nodes = children.filter_map { |child| pane_node(child, cx) }
-        Accessibility.node(role: :group, children: nodes) unless nodes.empty?
-      end
-
       def drag(event, cx)
         return false unless @bounds
         size = @orientation == :horizontal ? @bounds.width : @bounds.height

data/lib/zaniah/ui/modal.rb

@@ -3,9 +3,10 @@
 module Zaniah
   module UI
     class Modal < OverlayComponent
-      def initialize(content, title: nil, open: true, close_on_scrim: true, width: 440)
+      def initialize(content, title: nil, open: true, close_on_scrim: true, width: 440, close_label: "Close")
         super(open: open, modal: true)
         @content, @title, @close_on_scrim, @panel_width = content, title&.to_s, !!close_on_scrim, width
+        @close_label = close_label.to_s
         @focus_scope.on_action = ->(action) { action == :dismiss && dismiss(nil, @cx) }
       end
 
@@ -19,7 +20,7 @@ module Zaniah
         if @title
           panel.child(Div.new.flex_row.items_center.gap(cx.theme.spacing[2])
             .child(Label.new(@title, size: :lg).flex_1)
-            .child(IconButton.new(:close, label: "Close", variant: :ghost).on_click { |event, context| dismiss(event, context) }))
+            .child(@close_button ||= IconButton.new(:close, label: @close_label, variant: :ghost).on_click { |event, context| dismiss(event, context) }))
         end
         panel.child(@content)
         Overlay.new.items_center.justify_center.bg(cx.theme.colors.overlay_scrim)
@@ -28,7 +29,7 @@ module Zaniah
       end
 
       def tui_cells(*) = "┌ #{@title || "Dialog"} ┐\n#{@content.respond_to?(:tui_cells) ? @content.tui_cells : ""}\n└#{"─" * 8}┘"
-      def accessibility_node(cx) = @open && node(:dialog, label: @title, states: {modal: true}, children: [@content.respond_to?(:accessibility_node) ? @content.accessibility_node(cx) : nil].compact, actions: [:dismiss])
+      def accessibility_node(cx) = @open && node(:dialog, label: @title, states: {modal: true}, children: [child_node(@content, cx), @close_button&.accessibility_node(cx)].compact, actions: [:dismiss])
     end
 
     class Dialog < Modal; end
@@ -126,19 +127,19 @@ module Zaniah
         new(commands, **options)
       end
 
-      def initialize(commands, open: false, placeholder: "Type a command…", matcher: nil, keymap: nil)
+      def initialize(commands, open: false, placeholder: "Type a command…", matcher: nil, keymap: nil, title: "Command palette", close_label: "Close")
         @commands = commands.to_a.map { |label, callback, enabled, action| [label.to_s, callback, enabled, action] }
         @keymap = keymap
         @matcher = Matcher::Session.new(@commands.map(&:first), matcher || Zaniah.configuration.matcher || Matcher::Substring.new)
         @query, @placeholder, @selected_index = "", placeholder, 0
         @focus_search = !!open
-        super(Div.new, title: "Command palette", open: open, width: 520)
+        super(Div.new, title: title, open: open, width: 520, close_label: close_label)
         @focus_scope.context[:in_palette] = true
         @focus_scope.on_action = ->(action) { palette_action(action) }
       end
 
       def build(cx)
-        field = @search = SearchInput.new(@query, placeholder: @placeholder).on_change do |value, context|
+        field = @search ||= SearchInput.new(@query, placeholder: @placeholder).on_change do |value, context|
           @query = value
           @selected_index = 0
           context.window.request_frame
@@ -188,10 +189,11 @@ module Zaniah
           Accessibility.node(role: :listitem, id: "palette-option-#{match.index}", label: entry[0],
             states: {selected: index == @selected_index, disabled: !enabled}, actions: enabled ? [:press] : [])
         end
-        node(:dialog, label: "Command palette", states: {modal: true}, children: [
+        node(:dialog, label: @title, states: {modal: true}, children: [
           Accessibility.node(role: :searchbox, label: @placeholder, value: @query),
-          Accessibility.node(role: :list, states: {active_descendant: active && "palette-option-#{active}"}, children: items)
-        ], actions: [:dismiss])
+          @close_button&.accessibility_node(cx),
+          Accessibility.node(role: :list, label: @title, states: {active_descendant: active && "palette-option-#{active}"}, children: items)
+        ].compact, actions: [:dismiss])
       end
 
       def accessibility_action(item, action)

data/lib/zaniah/ui/overlays.rb

@@ -53,6 +53,7 @@ module Zaniah
           @visible, @entered = true, false
           @cx&.window&.request_frame
         else
+          release_focus
           @cx ? animate_close(@cx) : @visible = false
         end
         self
@@ -80,9 +81,7 @@ module Zaniah
           target = tree.next
           cx.dispatcher.focus(target, origin: :keyboard) if target && !focused_inside
         elsif @trapped
-          tree.release_trap(@focus_scope)
-          @dispatcher.focus(@return_focus) if @return_focus&.focusable
-          @trapped = false
+          release_focus
         end
       end
 
@@ -96,16 +95,21 @@ module Zaniah
       def dismiss(event = nil, cx = nil)
         return false unless @open
         @open = false
+        release_focus
         @on_close&.call(event, cx)
-        cx&.dispatcher&.focus_tree&.release_trap(@focus_scope)
-        cx&.dispatcher&.focus(@return_focus) if @return_focus&.focusable
-        @trapped = false
         animate_close(cx) if cx
         @visible = false unless cx
         cx&.window&.request_frame
         true
       end
 
+      def release_focus
+        return unless @trapped
+        @dispatcher.focus_tree.release_trap(@focus_scope)
+        @dispatcher.focus(@return_focus) if @return_focus&.focusable
+        @trapped = false
+      end
+
       def viewport(cx) = Bounds.new(0, 0, cx.window.content_size.width, cx.window.content_size.height)
 
       def visibility_key = [:overlay, object_id]
@@ -313,14 +317,16 @@ module Zaniah
         super()
         @model = menus if menus.is_a?(Zaniah::Menu)
         @menus = @model ? [] : menus.to_a
+        @buttons = []
       end
 
       def build(cx)
         return build_model(cx) if @model
 
-        Div.new.flex_row.items_center.gap(2).children(@menus.map do |label, items|
-          Button.new(label.to_s, size: :sm, variant: :ghost).on_click { |_event, context| context.window.context_menu(items, position: @bounds ? Point.new(@bounds.x, @bounds.bottom) : Point.new(0, 0)) }
-        end)
+        @buttons = @menus.map.with_index do |(label, items), index|
+          section_button(index, label.to_s).on_click { |_event, context| context.window.context_menu(items, position: @bounds ? Point.new(@bounds.x, @bounds.bottom) : Point.new(0, 0)) }
+        end
+        Div.new.flex_row.items_center.gap(2).children(@buttons)
       end
 
       def tui_cells(_bounds = nil, cx = nil)
@@ -336,6 +342,11 @@ module Zaniah
 
       private
 
+      def section_button(index, label)
+        button = @buttons[index]
+        button&.label == label ? button : Button.new(label, size: :sm, variant: :ghost)
+      end
+
       def resolved_sections(cx)
         @model.resolve(registry: cx&.window&.app&.actions, keymap: cx&.dispatcher&.keymap)
       end
@@ -357,9 +368,9 @@ module Zaniah
         @cx = cx
         sections = resolved_sections(cx)
         bar = Div.new.flex_row.items_center.gap(2).h(28)
-        sections.each_with_index do |section, index|
+        @buttons = sections.map.with_index do |section, index|
           next unless section.title
-          button = Button.new(section.title, size: :sm, variant: :ghost)
+          button = section_button(index, section.title).disabled(false)
           if section.submenu?
             button.on_click do |_event, context|
               target_focus = focus_target(context.dispatcher.previous_focused)
@@ -379,8 +390,9 @@ module Zaniah
                 context.dispatcher.perform(section.action, source: :menu)
               end
           end
-          bar.child(button)
+          button
         end
+        bar.children(@buttons.compact)
         bar.child(@active_menu) if @active_menu&.open?
         bar
       end
@@ -397,7 +409,7 @@ module Zaniah
       def on_change(&block) = (@on_change = block; self)
 
       def build(_cx)
-        Button.new(@value ? @value.to_s : @label, variant: :secondary).icon(:menu, position: :trailing).on_click do |_event, context|
+        Button.new(selected_label, variant: :secondary).icon(:menu, position: :trailing).on_click do |_event, context|
           pairs = @items.map do |label, value = label|
             [label.to_s, ->(event = nil, cx = context) { @value = value; @on_change&.call(value, event, cx); cx.window.request_frame }]
           end
@@ -405,8 +417,18 @@ module Zaniah
         end
       end
 
-      def tui_cells(*) = "#{@label}: #{@value || "▾"}"
-      def accessibility_node(_cx) = node(:button, label: @label, value: @value, states: {expanded: false}, actions: [:press])
+      def tui_cells(*) = "#{@label}: #{@value.nil? ? "▾" : selected_label}"
+      def accessibility_node(_cx) = node(:button, label: @label, value: @value.nil? ? nil : selected_label, states: {expanded: false}, actions: [:press])
+
+      protected
+
+      def selected_label
+        return @label if @value.nil?
+        @items.each do |label, value = label|
+          return label.to_s if value == @value
+        end
+        @value.to_s
+      end
     end
   end
 end

data/lib/zaniah/ui/property_grid.rb

@@ -8,8 +8,9 @@ module Zaniah
 
       attr_reader :values, :errors
 
-      def initialize(schema, values = {}, height: 320, row_height: 52)
+      def initialize(schema, values = {}, height: 320, row_height: 52, label: nil)
         super()
+        accessibility_label(label)
         @properties = Array(schema).map { |entry| normalize(entry) }.freeze
         raise ArgumentError, "property keys must be unique" unless @properties.map(&:key).uniq.length == @properties.length
         @values = values.to_h.transform_keys(&:to_sym)
@@ -63,7 +64,7 @@ module Zaniah
           Accessibility.node(role: :row, id: [:property, property.key].freeze,
             states: {selected: index == @selected_index, invalid: !!error},
             children: [Accessibility.node(role: :rowheader, label: property.label),
-              Accessibility.node(role: :cell, value: @drafts.fetch(property.key) { @values[property.key] },
+              Accessibility.node(role: :cell, label: property.label, value: @drafts.fetch(property.key) { @values[property.key] },
                 children: [control, (Accessibility.node(role: :alert, label: error.join(", ")) if error)].compact)])
         end
         node(:table, states: {size: @properties.length}, children: children)
@@ -113,6 +114,7 @@ module Zaniah
         when :date then DatePicker.new(value || Date.today, label: "")
         when :time then TimePicker.new(value || "00:00", label: "")
         end
+        control.accessibility_label(label)
         control.on_change do |changed, *_args|
           if property.type == :number
             begin

data/lib/zaniah/ui/structure.rb

@@ -28,7 +28,7 @@ module Zaniah
       def tui_cells(*) = "#{@items.map.with_index { |(label, _), index| index == @selected_index ? "[#{label}]" : label }.join(" ")}\n#{content_text}"
       def accessibility_node(cx)
         tabs = @items.map.with_index { |(label, _), index| Accessibility.node(role: :tab, label: label, states: {selected: index == @selected_index}, actions: [:select]) }
-        node(:group, children: tabs + [Accessibility.node(role: :tabpanel, children: [@items[@selected_index][1].respond_to?(:accessibility_node) ? @items[@selected_index][1].accessibility_node(cx) : nil].compact)])
+        node(:group, children: tabs + [Accessibility.node(role: :tabpanel, children: [child_node(@items[@selected_index][1], cx)].compact)])
       end
 
       private

data/lib/zaniah/ui/tree_view.rb

@@ -13,8 +13,9 @@ module Zaniah
 
       attr_reader :selected_id, :expanded
 
-      def initialize(items, height: 320, row_height: 28, selected: nil)
+      def initialize(items, height: 320, row_height: 28, selected: nil, label: nil)
         super()
+        accessibility_label(label)
         @source, @height, @row_height = items.to_a, Float(height), Float(row_height)
         raise ArgumentError, "tree dimensions must be positive" unless @height.positive? && @row_height.positive?
 

data/lib/zaniah/ui/virtual_table.rb

@@ -6,8 +6,9 @@ module Zaniah
     class VirtualTable < Component
       attr_reader :selection, :sort_key, :sort_direction, :body
 
-      def initialize(source, columns:, height: 320, row_height: 24, selection: :single, follow_tail: false)
+      def initialize(source, columns:, height: 320, row_height: 24, selection: :single, follow_tail: false, label: nil)
         super()
+        accessibility_label(label)
         raise ArgumentError, "source must provide count and cell" unless source.respond_to?(:count) && source.respond_to?(:cell)
         raise ArgumentError, "selection must be none, single, or multiple" unless %i[none single multiple].include?(selection)
         @source, @height, @row_height, @selection_mode = source, Float(height), Float(row_height), selection

data/lib/zaniah/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zaniah
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

data/sig/ui.rbs

@@ -20,6 +20,7 @@ module Zaniah
                  | (String value) -> self
       def style: (**Layout::style_value properties) -> self
       def window_control: (:close | :minimize | :maximize | :restore | :fullscreen kind) -> self
+      def accessibility_label: (String? value) -> self
       def accessibility_node: (FrameContext? context) -> Accessibility::Node?
       def tui_cells: (?Bounds? bounds, ?FrameContext? context) -> String?
       def focus_handle: () -> Input::FocusHandle?
@@ -138,7 +139,7 @@ module Zaniah
     end
     class SegmentedControl < Component
       attr_reader value: untyped
-      def initialize: (Array[untyped] options, ?value: untyped) -> void
+      def initialize: (Array[untyped] options, ?value: untyped, ?label: String?) -> void
       def on_change: () { (untyped, Input::MouseDown?, FrameContext?) -> void } -> self
     end
     class Alert < Component
@@ -447,7 +448,7 @@ module Zaniah
       end
       attr_reader values: Hash[Symbol, untyped]
       attr_reader errors: Hash[Symbol, Array[String]]
-      def initialize: (Array[untyped] schema, ?Hash[Symbol | String, untyped] values, ?height: Numeric, ?row_height: Numeric) -> void
+      def initialize: (Array[untyped] schema, ?Hash[Symbol | String, untyped] values, ?height: Numeric, ?row_height: Numeric, ?label: String?) -> void
       def on_change: () { (Symbol, untyped, Hash[Symbol, untyped], FrameContext?) -> void } -> self
       def set: (Symbol | String key, untyped value) -> bool
     end
@@ -461,7 +462,7 @@ module Zaniah
     end
 
     class Modal < OverlayComponent
-      def initialize: (_Renderable content, ?title: String?, ?open: bool, ?close_on_scrim: bool, ?width: dimension) -> void
+      def initialize: (_Renderable content, ?title: String?, ?open: bool, ?close_on_scrim: bool, ?width: dimension, ?close_label: String) -> void
     end
     class Dialog < Modal
     end
@@ -483,7 +484,7 @@ module Zaniah
     class CommandPalette < Modal
       attr_reader query: String
       def self.from: (Input::ActionRegistry registry, **untyped options) -> CommandPalette
-      def initialize: (Array[untyped] commands, ?open: bool, ?placeholder: String, ?matcher: Matcher::_Matcher?, ?keymap: Input::Keymap?) -> void
+      def initialize: (Array[untyped] commands, ?open: bool, ?placeholder: String, ?matcher: Matcher::_Matcher?, ?keymap: Input::Keymap?, ?title: String, ?close_label: String) -> void
       def accessibility_action: (Accessibility::Node item, Symbol action) -> bool?
     end
 
@@ -520,7 +521,7 @@ module Zaniah
       attr_reader sort_key: Symbol?
       attr_reader sort_direction: :asc | :desc
       attr_reader body: UniformList
-      def initialize: (_VirtualTableSource source, columns: Array[untyped], ?height: Numeric, ?row_height: Numeric, ?selection: :none | :single | :multiple, ?follow_tail: bool) -> void
+      def initialize: (_VirtualTableSource source, columns: Array[untyped], ?height: Numeric, ?row_height: Numeric, ?selection: :none | :single | :multiple, ?follow_tail: bool, ?label: String?) -> void
       def columns: () -> Array[Hash[Symbol, untyped]]
       def on_sort: () { (Symbol, :asc | :desc, FrameContext?) -> void } -> self
       def on_select: () { (Integer, Input::MouseDown?, FrameContext?) -> void } -> self
@@ -556,7 +557,7 @@ module Zaniah
       end
       attr_reader selected_id: untyped
       attr_reader expanded: Set[untyped]
-      def initialize: (Array[untyped] items, ?height: Numeric, ?row_height: Numeric, ?selected: untyped) -> void
+      def initialize: (Array[untyped] items, ?height: Numeric, ?row_height: Numeric, ?selected: untyped, ?label: String?) -> void
       def on_select: () { (untyped, Input::MouseDown?, FrameContext?) -> void } -> self
       def on_toggle: () { (untyped, bool) -> void } -> self
       def on_context_menu: () { (untyped, FrameContext) -> untyped } -> self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zaniah
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Yudai Takada