tuile 0.4.0 → 0.6.0

data/lib/tuile/component/list.rb

@@ -14,14 +14,9 @@ module Tuile
     #
     # Cursor is supported; call {#cursor=} to change cursor behavior. The
     # cursor responds to arrows, `jk`, Home/End, Ctrl+U/D and scrolls the
-    # list automatically. The cursor highlight overlays a dark background
-    # while preserving each span's foreground color.
+    # list automatically. The cursor highlight overlays
+    # {Theme#active_bg_color} while preserving each span's foreground color.
     class List < Component
-      # 256-color SGR index for the cursor-row background highlight. Matches
-      # what `Rainbow(...).bg(:darkslategray)` emits.
-      # @return [Integer]
-      CURSOR_BG = 59
-
       def initialize
         super
         @lines = []
@@ -135,11 +130,11 @@ module Tuile
         raise TypeError, "expected Array, got #{lines.inspect}" unless lines.is_a? Array
 
         @lines = parse_input_lines(lines)
-        @content_size = nil
         rebuild_padded_lines
         update_top_line_if_auto_scroll
         notify_cursor_changed
         invalidate
+        self.content_size = compute_content_size
       end
 
       # Without a block, returns the current lines. With a block, fully
@@ -181,20 +176,11 @@ module Tuile
         screen.check_locked
         new_lines = parse_input_lines(lines)
         @lines += new_lines
-        @content_size = nil
         @padded_lines += new_lines.map { |line| pad_to_row(line) }
         update_top_line_if_auto_scroll
         notify_cursor_changed
         invalidate
-      end
-
-      # @return [Size]
-      def content_size
-        @content_size ||= begin
-          content_w = @lines.map(&:display_width).max || 0
-          width = @lines.empty? ? 0 : content_w + 2
-          Size.new(width, @lines.size)
-        end
+        grow_content_size(new_lines)
       end
 
       def focusable? = true
@@ -508,6 +494,30 @@ module Tuile
 
       private
 
+      # Natural size from scratch: longest line's display width plus the two
+      # single-space gutters {#pad_to_row} adds, × line count. An empty list
+      # is {Size::ZERO} (no gutters for no content).
+      # @return [Size]
+      def compute_content_size
+        content_w = @lines.map(&:display_width).max || 0
+        width = @lines.empty? ? 0 : content_w + 2
+        Size.new(width, @lines.size)
+      end
+
+      # Incremental {#content_size} update for appends: folds just the
+      # appended lines into the running maximum, keeping {#add_lines}
+      # O(appended) instead of re-scanning the whole list (LogWindow appends
+      # a line per log statement).
+      # @param appended [Array<StyledString>] the just-appended lines
+      #   (already concatenated onto {@lines}).
+      # @return [void]
+      def grow_content_size(appended)
+        return if appended.empty?
+
+        appended_w = appended.map(&:display_width).max + 2
+        self.content_size = Size.new([content_size.width, appended_w].max, @lines.size)
+      end
+
       # Coerces and flattens a list of input entries into trimmed
       # {StyledString} lines. Each entry becomes a {StyledString} (String
       # via {StyledString.parse}, StyledString passed through, anything else
@@ -731,7 +741,7 @@ module Tuile
       def paintable_line(index, row_in_viewport, scrollbar)
         base = index < @lines.size ? @padded_lines[index] : @blank_padded
         is_cursor = (active? || @show_cursor_when_inactive) && index < @lines.size && @cursor.position == index
-        styled = is_cursor ? base.with_bg(CURSOR_BG) : base
+        styled = is_cursor ? base.with_bg(screen.theme.active_bg_color) : base
         out = styled.to_ansi
         out += scrollbar.scrollbar_char(row_in_viewport) if scrollbar
         out

data/lib/tuile/component/picker_window.rb

@@ -37,7 +37,7 @@ module Tuile
         @options = options.map { Option.new(it[0], it[1]) }
         @block = block
         list = Component::List.new
-        list.lines = @options.map { "#{it.key} #{Rainbow(it.caption).cadetblue}" }
+        list.lines = @options.map { "#{it.key} #{screen.theme.hint(it.caption)}" }
         list.cursor = Component::List::Cursor.new
         list.on_item_chosen = ->(index, _line) { select_option(@options[index].key) }
         self.content = list
@@ -65,7 +65,7 @@ module Tuile
 
       # @return [String]
       def keyboard_hint
-        @options.map { "#{it.key} #{Rainbow(it.caption).cadetblue}" }.join("  ")
+        @options.map { "#{it.key} #{screen.theme.hint(it.caption)}" }.join("  ")
       end
 
       # Opens a picker as a popup. Picking an option fires `block`, then

data/lib/tuile/component/popup.rb

@@ -81,10 +81,20 @@ module Tuile
         update_rect unless new_content.nil?
       end
 
+      # Re-sizes (and recenters, when open) whenever the wrapped content's
+      # natural size changes — e.g. a {Label}'s `text=`, a {List}'s
+      # `add_line`, or a nested {Window} whose own content grew (the window
+      # recomputes its {Component#content_size} and the change bubbles here).
+      # @param _child [Component]
+      # @return [void]
+      def on_child_content_size_changed(_child)
+        update_rect
+      end
+
       # Hint for the status bar: own "q Close" plus the wrapped content's hint.
       # @return [String]
       def keyboard_hint
-        prefix = "q #{Rainbow("Close").cadetblue}"
+        prefix = "q #{screen.theme.hint("Close")}"
         child_hint = @content&.keyboard_hint.to_s
         child_hint.empty? ? prefix : "#{prefix}  #{child_hint}"
       end

data/lib/tuile/component/text_area.rb

@@ -70,7 +70,6 @@ module Tuile
       def repaint
         return if rect.empty?
 
-        bg = active? ? ACTIVE_BG_SGR : INACTIVE_BG_SGR
         rows = display_rows
         (0...rect.height).each do |screen_row|
           row_idx = screen_row + @top_display_row
@@ -81,7 +80,7 @@ module Tuile
                    chunk = @text[r[:start], r[:length]] || ""
                    chunk + (" " * (rect.width - r[:length]))
                  end
-          screen.print TTY::Cursor.move_to(rect.left, rect.top + screen_row), bg, line, Ansi::RESET
+          screen.print TTY::Cursor.move_to(rect.left, rect.top + screen_row), background(line)
         end
       end
 

data/lib/tuile/component/text_field.rb

@@ -59,9 +59,8 @@ module Tuile
       def repaint
         return if rect.empty?
 
-        bg = active? ? ACTIVE_BG_SGR : INACTIVE_BG_SGR
         padded = @text + (" " * (rect.width - @text.length))
-        screen.print TTY::Cursor.move_to(rect.left, rect.top), bg, padded, Ansi::RESET
+        screen.print TTY::Cursor.move_to(rect.left, rect.top), background(padded)
       end
 
       protected

data/lib/tuile/component/text_input.rb

@@ -88,21 +88,6 @@ module Tuile
         invalidate
       end
 
-      # 256-color SGR for the focused-button highlight (matches what
-      # `Rainbow(...).bg(:darkslategray)` emits, which is what
-      # {Component::Button#repaint} uses for its focused state).
-      # @return [String]
-      ACTIVE_BG_SGR = "\e[48;5;59m"
-      # 256-color SGR for the unfocused field's "well": index 238 sits in
-      # the grayscale ramp (~#444444), bright enough to stand out against
-      # non-pure-black terminal themes (Gruvbox/Solarized/OneDark base
-      # backgrounds sit in the #1d–#2d range), and still distinctly darker
-      # than the active highlight at index 59 (~#5f5f5f). Rainbow's
-      # RGB-to-256 mapping snaps everything dark to palette index 16
-      # (terminal black), so we emit the escape directly to reach the ramp.
-      # @return [String]
-      INACTIVE_BG_SGR = "\e[48;5;238m"
-
       # Handles a key. Returns false when the component is inactive. Otherwise
       # first runs the {Component#handle_key} shortcut search via `super`, then
       # delegates to {#handle_text_input_key}.
@@ -117,6 +102,16 @@ module Tuile
 
       protected
 
+      # Renders `text` on the field's background well, looked up from the
+      # current {Screen#theme} at paint time: {Theme#active_bg} when this
+      # input is on the active (focus) chain, {Theme#input_bg} otherwise —
+      # visibly a field either way, distinctly highlighted when active.
+      # @param text [String]
+      # @return [String] ANSI-rendered text.
+      def background(text)
+        active? ? screen.theme.active_bg(text) : screen.theme.input_bg(text)
+      end
+
       # Input filter for {#text=}. Subclasses override to truncate or reject
       # invalid input. Default coerces to String.
       # @param new_text [String]