charming 0.2.0 → 0.2.2

data/lib/charming/presentation/components/table.rb

@@ -16,7 +16,9 @@ module Charming
         up: :move_up,
         down: :move_down,
         home: :move_home,
-        end: :move_end
+        end: :move_end,
+        page_up: :page_up,
+        page_down: :page_down
       }.freeze
 
       # Number of terminal rows occupied by the table's top border and header line. Used by
@@ -29,12 +31,15 @@ module Charming
       # *header* is an array of column labels. *rows* is the array of body rows (each either a
       # String, an Array, or a Hash of column-value pairs). *selected_index* defaults to 0.
       # *keymap* selects the keybinding style (`:vim` enables h/j/k/l → left/down/up/right).
-      def initialize(header:, rows: [], selected_index: 0, keymap: :vim)
-        super()
+      # *height* optionally limits the visible body rows; the window auto-scrolls to keep
+      # the selection in view, and page up/down move by a full window.
+      def initialize(header:, rows: [], selected_index: 0, keymap: :vim, theme: nil, height: nil)
+        super(theme: theme)
         @header = Array(header).map(&:to_s)
         @rows = Array(rows)
         @selected_index = clamp_index(selected_index)
         @keymap = keymap
+        @height = height
       end
 
       # Handles key events. Returns `[:selected, row]` on Enter; otherwise delegates to the
@@ -48,16 +53,17 @@ module Charming
         end
       end
 
-      # Handles mouse events: a click within the body area selects the clicked row.
+      # Handles mouse events: a click within the body area selects the clicked row
+      # (relative to the visible window when a height is set).
       # Returns :handled on a successful click.
       def handle_mouse(event)
         return nil if rows.empty?
         return nil unless event.respond_to?(:click?) && event.click?
 
         clicked = event.y - HEADER_HEIGHT
-        return nil if clicked.negative? || clicked >= rows.length
+        return nil if clicked.negative? || clicked >= visible_row_count
 
-        @selected_index = clicked
+        @selected_index = viewport_start + clicked
         :handled
       end
 
@@ -66,12 +72,30 @@ module Charming
         rows[selected_index]
       end
 
+      # Sorts the body rows by *column* (a header label or 0-based index).
+      # Numeric-looking cells compare numerically; everything else as strings.
+      # The sorted column is marked ▲/▼ in the rendered header. Returns self.
+      def sort_by!(column, direction: :asc)
+        @sort_column = column_index(column)
+        @sort_direction = direction
+        sorted = @rows.sort_by { |row| sort_key(row) }
+        @rows = (direction == :desc) ? sorted.reverse : sorted
+        self
+      end
+
+      # Sorts by *column*, flipping the direction on repeated calls for the same
+      # column (ascending first). Returns self.
+      def toggle_sort(column)
+        flipping = @sort_column == column_index(column) && @sort_direction == :asc
+        sort_by!(column, direction: flipping ? :desc : :asc)
+      end
+
       # Renders the table to a string. Returns a placeholder when both header and rows are empty.
       def render
         return "(empty table)" if header.empty? && rows.empty?
 
         normalized = rows.map { |row| normalize_row(row) }
-        lines = TTY::Table.new(header: header, rows: normalized)
+        lines = TTY::Table.new(header: sort_marked_header, rows: normalized)
           .render(:unicode)
           .lines(chomp: true)
 
@@ -95,7 +119,8 @@ module Charming
         kept + [merged]
       end
 
-      # Applies the selected-row highlight and trims unused body rows below the actual row count.
+      # Applies the selected-row highlight, windows the body to the configured height,
+      # and trims unused body rows below the actual row count.
       def compact_layout(lines)
         return lines.join("\n") if lines.length < 4
 
@@ -103,13 +128,37 @@ module Charming
         body = rest.first(rows.length)
         bottom = rest[rows.length]
 
-        highlighted = body.each_with_index.map do |line, index|
-          (index == selected_index) ? "\e[7m#{line}\e[m" : line
+        window = body[viewport_start, visible_row_count] || []
+        highlighted = window.each_with_index.map do |line, index|
+          ((viewport_start + index) == selected_index) ? theme.selected.render(line) : line
         end
 
         [top, header_line, *highlighted, bottom].compact.join("\n")
       end
 
+      # The top body row of the visible window (0 when no height is set), keeping the
+      # selection in view.
+      def viewport_start
+        return 0 unless @height
+
+        Layout.selected_window_start(selected_index: selected_index, item_count: rows.length, window_size: @height)
+      end
+
+      # The number of body rows shown at once.
+      def visible_row_count
+        @height ? [@height, rows.length].min : rows.length
+      end
+
+      # Moves the selection up by one window.
+      def page_up
+        @selected_index = [selected_index - visible_row_count, 0].max
+      end
+
+      # Moves the selection down by one window.
+      def page_down
+        @selected_index = [selected_index + visible_row_count, rows.length - 1].min
+      end
+
       # Moves the selection up one row.
       def move_up
         @selected_index -= 1 if selected_index.positive?
@@ -130,6 +179,29 @@ module Charming
         @selected_index = rows.length - 1
       end
 
+      # Resolves *column* (label or 0-based index) to a column index.
+      def column_index(column)
+        return column if column.is_a?(Integer) && column.between?(0, header.length - 1)
+
+        header.index(column.to_s) ||
+          raise(ArgumentError, "unknown column: #{column.inspect} (columns: #{header.join(", ")})")
+      end
+
+      # The comparable key for *row* at the active sort column: [0, number] for
+      # numeric-looking cells, [1, string] otherwise, so mixed columns still sort.
+      def sort_key(row)
+        cell = normalize_row(row)[@sort_column].to_s
+        cell.match?(/\A-?\d+(\.\d+)?\z/) ? [0, cell.to_f] : [1, cell]
+      end
+
+      # The header with the sorted column marked ▲ (ascending) or ▼ (descending).
+      def sort_marked_header
+        return header unless @sort_column
+
+        marker = (@sort_direction == :desc) ? "▼" : "▲"
+        header.each_with_index.map { |label, index| (index == @sort_column) ? "#{label} #{marker}" : label }
+      end
+
       # Clamps *value* to the valid row range, defaulting to 0 when the table is empty.
       def clamp_index(value)
         return 0 if rows.empty?

data/lib/charming/presentation/components/text_area.rb

@@ -2,10 +2,11 @@
 
 module Charming
   module Components
-    # TextArea is a multi-line text editor component. Supports character insertion (with
-    # newline insertion via Shift+Enter or Ctrl+J), cursor movement (left/right/up/down,
-    # home/end, page up/down), deletion (backspace/delete), and scrolling for long buffers.
-    # Vertical movement preserves a "preferred column" so left/right navigation feels stable.
+    # TextArea is a multi-line text editor component. Supports character insertion, newline
+    # insertion (plain Enter by default, plus Shift+Enter/Ctrl+J/Ctrl+N), cursor movement
+    # (left/right/up/down, home/end, page up/down), deletion (backspace/delete), and scrolling
+    # for long buffers. Vertical movement preserves a "preferred column" so left/right
+    # navigation feels stable.
     class TextArea < Component
       # The current text value, cursor byte offset, top-visible row offset, and remembered
       # column for vertical navigation, respectively.
@@ -15,7 +16,9 @@ module Charming
       # *height* constrain the rendered output. *cursor* defaults to the end of the value.
       # *offset* is the top-visible row. *preferred_column* is the column to resume at on
       # vertical movement (defaults to the current column on first use).
-      def initialize(value: "", placeholder: "", width: nil, height: nil, cursor: nil, offset: 0, preferred_column: nil)
+      # *enter_newline* (default true) makes plain Enter insert a newline — set false when a
+      # host widget wants Enter for itself (the key then falls through unhandled).
+      def initialize(value: "", placeholder: "", width: nil, height: nil, cursor: nil, offset: 0, preferred_column: nil, enter_newline: true)
         super()
         @value = value.dup
         @placeholder = placeholder
@@ -24,10 +27,16 @@ module Charming
         @cursor = cursor || @value.length
         @offset = offset
         @preferred_column = preferred_column
+        @enter_newline = enter_newline
         clamp_position
         ensure_cursor_visible
       end
 
+      # Free-typed characters belong to this component while it is focused.
+      def captures_text?
+        true
+      end
+
       # Routes key events to the appropriate cursor/text mutation. Returns :handled when the
       # event was consumed, nil otherwise.
       def handle_key(event)
@@ -52,6 +61,14 @@ module Charming
         :handled
       end
 
+      # Inserts pasted text at the cursor. Newlines are preserved; other control
+      # characters (and CRLF carriage returns) are stripped. Returns :handled.
+      def handle_paste(event)
+        sanitized = event.text.to_s.tr("\r", "").gsub(/[^[:print:]\n]/, "")
+        insert(sanitized) unless sanitized.empty?
+        :handled
+      end
+
       # Renders the visible portion of the text buffer (scrolled to `offset`), with each
       # visible line either clipped to `width` or padded to it.
       def render
@@ -62,11 +79,17 @@ module Charming
 
       attr_reader :placeholder, :width, :height
 
-      # True when the event represents an explicit newline request: Shift+Enter or Ctrl+J.
+      # True when the event represents a newline request. Plain Enter inserts a newline
+      # by default (the natural expectation in a text editor); Shift+Enter, Ctrl+J, and
+      # Ctrl+N always work, even when `enter_newline: false` reserves plain Enter for the
+      # host widget. (Shift+Enter is indistinguishable from Enter in many terminals, so
+      # Ctrl+N remains the TTY-safe fallback in that mode.)
       def newline_event?(event)
         key = Charming.key_of(event)
+        return true if key == :enter && @enter_newline
         return true if key == :enter && event.respond_to?(:shift) && event.shift
         return true if key == :j && event.respond_to?(:ctrl) && event.ctrl
+        return true if key == :n && event.respond_to?(:ctrl) && event.ctrl
 
         false
       end
@@ -162,12 +185,13 @@ module Charming
       end
 
       # Moves the cursor vertically by *delta* rows. Stays within the line count and uses
-      # `preferred_column` so up/down movement feels stable on short lines.
+      # `preferred_column` (in display columns) so up/down movement feels stable on short lines.
       def move_vertical(delta)
         row, column = cursor_position
         target_row = (row + delta).clamp(0, lines.length - 1)
         @preferred_column ||= column
-        @cursor = line_start(target_row) + [@preferred_column, line_length(target_row)].min
+        target_line = lines.fetch(target_row, "")
+        @cursor = line_start(target_row) + char_offset_at_display_col(target_line, @preferred_column)
         ensure_cursor_visible
       end
 
@@ -177,12 +201,14 @@ module Charming
       end
 
       # Returns the cursor's current position as `[row, column]`, where row is the zero-based
-      # line index and column is the character offset within that line.
+      # line index and column is the *display-column* offset within that line (wide characters
+      # such as emoji or CJK occupy two display columns each).
       def cursor_position
         before = value[0...cursor].to_s
         row = before.count("\n")
         last_newline = before.rindex("\n")
-        column = last_newline ? before.length - last_newline - 1 : before.length
+        line_before_cursor = last_newline ? before[(last_newline + 1)..] : before
+        column = UI::Width.measure(line_before_cursor)
         [row, column]
       end
 
@@ -196,6 +222,17 @@ module Charming
         lines.fetch(row, "").length
       end
 
+      # Returns the character offset within *line* where the display column reaches *display_col*.
+      # Stops at the last character when the line is shorter than *display_col*.
+      def char_offset_at_display_col(line, display_col)
+        col = 0
+        line.each_char.with_index do |char, idx|
+          return idx if col >= display_col
+          col += UI::Width.measure(char)
+        end
+        line.length
+      end
+
       # Splits the value into an array of lines (preserving trailing empty lines).
       def lines
         value.empty? ? [""] : value.split("\n", -1)
@@ -222,8 +259,7 @@ module Charming
       def render_line(line)
         return line unless width
 
-        clipped = UI.visible_slice(line, 0, width)
-        clipped + (" " * [width - UI::Width.measure(clipped), 0].max)
+        UI::Width.pad_to(UI.visible_slice(line, 0, width), width)
       end
 
       # Adjusts the top-visible offset so the cursor row is in view. Scrolling is performed

data/lib/charming/presentation/components/text_input.rb

@@ -6,6 +6,10 @@ module Charming
     # cursor movement (left/right/home/end), and deletion (backspace/delete). The component
     # exposes its `value` and `cursor` positions as reader methods; when an explicit `width:`
     # is given, the rendered output is padded to that width via a UI::Style.
+    #
+    # Options:
+    # - `masked: true` renders every character as `*` (password entry)
+    # - `history: [...]` enables REPL-style recall — up/down cycle through prior values
     class TextInput < Component
       include KeyboardHandler
 
@@ -26,23 +30,49 @@ module Charming
 
       # *value* is the initial text. *placeholder* is shown when the value is empty.
       # *width* optionally constrains the rendered output width; *cursor* defaults to the end.
-      def initialize(value: "", placeholder: "", width: nil, cursor: nil)
+      # *masked* renders characters as `*`. *history* is an array of prior values cycled
+      # with up/down (most recent last, like a shell).
+      def initialize(value: "", placeholder: "", width: nil, cursor: nil, masked: false, history: nil)
         super()
         @value = value.dup
         @placeholder = placeholder
         @width = width
         @cursor = cursor || @value.length
+        @masked = masked
+        @history = history
+        @history_index = nil
+        @draft = nil
         clamp_position
       end
 
-      # Handles key events. Inserts printable characters, otherwise dispatches via KEY_ACTIONS.
-      # Returns :handled when the event was consumed, nil otherwise.
+      # Free-typed characters belong to this component while it is focused.
+      def captures_text?
+        true
+      end
+
+      # Handles key events. Inserts printable characters, submits on Enter
+      # (returning `[:submitted, value]` so a focused slot dispatches
+      # `<slot>_submitted(value)`), recalls history on up/down (when enabled),
+      # otherwise dispatches via KEY_ACTIONS.
+      # Returns :handled or `[:submitted, value]` when the event was consumed, nil otherwise.
       def handle_key(event)
         return :handled if character_event?(event) && insert(event.char)
 
+        key = Charming.key_of(event)
+        return [:submitted, value] if key == :enter
+        return :handled if history_event(key)
+
         super
       end
 
+      # Inserts pasted text at the cursor (newlines and control characters are
+      # stripped — this is a single-line input). Returns :handled.
+      def handle_paste(event)
+        sanitized = event.text.to_s.gsub(/[[:cntrl:]]/, "")
+        insert(sanitized) unless sanitized.empty?
+        :handled
+      end
+
       # Renders the value with a cursor marker. When *width* was given at construction, the
       # output is padded to that width via the configured style.
       def render
@@ -105,12 +135,62 @@ module Charming
         @value = value[0...cursor] + value[(cursor + 1)..]
       end
 
+      # Cycles through history on :up / :down. Returns true when the event was consumed.
+      def history_event(key)
+        return false unless @history && !@history.empty?
+
+        case key
+        when :up then recall_previous
+        when :down then recall_next
+        else false
+        end
+      end
+
+      # Steps back through history (saving the in-progress draft first).
+      def recall_previous
+        if @history_index.nil?
+          @draft = value
+          @history_index = @history.length - 1
+        elsif @history_index.positive?
+          @history_index -= 1
+        end
+        replace_value(@history[@history_index])
+        true
+      end
+
+      # Steps forward through history; past the newest entry restores the draft.
+      def recall_next
+        return false if @history_index.nil?
+
+        @history_index += 1
+        if @history_index >= @history.length
+          @history_index = nil
+          replace_value(@draft.to_s)
+        else
+          replace_value(@history[@history_index])
+        end
+        true
+      end
+
+      # Replaces the value and moves the cursor to the end.
+      def replace_value(new_value)
+        @value = new_value.dup
+        @cursor = @value.length
+      end
+
       # Renders the value with a "|" cursor marker at the current position. When the value is
-      # empty, the placeholder is rendered instead, preceded by the cursor marker.
+      # empty, the placeholder is rendered instead, preceded by the cursor marker. Masked
+      # inputs render `*` per character.
       def render_value
         return cursor_marker + placeholder if value.empty?
 
-        value[0...cursor] + cursor_marker + value[cursor..]
+        shown = display_value
+        shown[0...cursor] + cursor_marker + shown[cursor..]
+      end
+
+      # The value as displayed: masked inputs substitute `*` for every character.
+      def display_value
+        @masked ? "*" * value.length : value
       end
 
       # The literal character used to mark the cursor position in `render`.

data/lib/charming/presentation/components/time_display.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Charming
+  module Components
+    # TimeDisplay formats whole-second durations as clock strings: "mm:ss", or
+    # "h:mm:ss" once an hour is reached. Shared by Timer and Stopwatch.
+    module TimeDisplay
+      module_function
+
+      def clock(total_seconds)
+        seconds = [total_seconds.to_i, 0].max
+        hours, remainder = seconds.divmod(3600)
+        minutes, secs = remainder.divmod(60)
+        return format("%d:%02d:%02d", hours, minutes, secs) if hours.positive?
+
+        format("%02d:%02d", minutes, secs)
+      end
+    end
+  end
+end

data/lib/charming/presentation/components/timer.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Charming
+  module Components
+    # Timer is a countdown display. Drive it from a controller timer: call
+    # `tick` per interval and check `expired?` to act when time runs out.
+    class Timer < Component
+      attr_reader :duration, :remaining, :label
+
+      # *duration* is the countdown length in seconds. *label* is an optional
+      # suffix shown after the time.
+      def initialize(duration:, label: nil, theme: nil)
+        super(theme: theme)
+        @duration = [duration.to_i, 0].max
+        @remaining = @duration
+        @label = label
+      end
+
+      # Counts down by *seconds* (default 1), clamping at zero. Returns self.
+      def tick(seconds = 1)
+        @remaining = [@remaining - seconds.to_i, 0].max
+        self
+      end
+
+      # True once the countdown has reached zero.
+      def expired?
+        remaining.zero?
+      end
+
+      # Restores the full duration. Returns self.
+      def reset
+        @remaining = duration
+        self
+      end
+
+      # Renders the remaining time (with the label appended when present).
+      def render
+        clock = TimeDisplay.clock(remaining)
+        label ? "#{clock} #{label}" : clock
+      end
+    end
+  end
+end

data/lib/charming/presentation/components/toast.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Charming
+  module Components
+    # Toast is a small auto-dismissing notification panel, usually composited as an
+    # overlay anchored to a screen corner. Controllers manage its lifetime with the
+    # `show_toast` / `dismiss_toast` helpers (which pair it with a timer); the component
+    # itself just renders the styled box.
+    #
+    #   Toast.new(message: "Saved!", kind: :success)
+    #
+    # *kind* picks the accent style: :info (default), :success, :warn, or :error.
+    class Toast < Component
+      KINDS = %i[info success warn error].freeze
+
+      attr_reader :message, :kind
+
+      # *message* is the toast text. *kind* is the visual accent. *width* optionally
+      # fixes the box width (otherwise it hugs the message).
+      def initialize(message:, kind: :info, width: nil, theme: nil)
+        super(theme: theme)
+        @message = message.to_s
+        @kind = KINDS.include?(kind) ? kind : :info
+        @width = width
+      end
+
+      # Renders the bordered toast box with a kind-colored border.
+      def render
+        box(message, style: toast_style)
+      end
+
+      private
+
+      # A rounded-border box accented by the kind's theme style.
+      def toast_style
+        base = style.border(:rounded, foreground: accent_color).padding(0, 1)
+        @width ? base.width(@width) : base
+      end
+
+      # Maps the kind to a border color: info/cyan-ish, success/green, warn/yellow, error/red.
+      def accent_color
+        case kind
+        when :success then :green
+        when :warn then :yellow
+        when :error then :red
+        else :cyan
+        end
+      end
+    end
+  end
+end