charming 0.2.0 → 0.2.1

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "unicode/display_width"
-
 module Charming
   module Components
     # Viewport is a scrollable region over multi-line content. Supports keyboard scrolling
@@ -12,9 +10,6 @@ module Charming
     class Viewport < Component
       include KeyboardHandler
 
-      # Matches an ANSI SGR escape sequence (e.g., "\e[31m" for red foreground).
-      ANSI_PATTERN = /\e\[[0-9;]*m/
-
       # Maps scroll keys to the instance methods that perform them via KeyboardHandler.
       KEY_ACTIONS = {
         up: :scroll_up,
@@ -27,9 +22,6 @@ module Charming
         right: :scroll_right
       }.freeze
 
-      # The current top-visible row and left-visible column, respectively.
-      attr_reader :offset, :column
-
       # *content* may be a string, an array of lines, or any object responding to `render`.
       # *width* and *height* constrain the visible window; *offset* is the top-visible row
       # and *column* is the left-visible column. *wrap* enables soft-wrapping of long lines.
@@ -38,11 +30,10 @@ module Charming
         @content = content
         @width = width
         @height = height
-        @offset = offset
-        @column = column
+        @position = Position.new(offset: offset, column: column)
         @wrap = wrap
         @keymap = keymap
-        clamp_position
+        position.clamp(bounds)
       end
 
       # Renders the visible window of content as a multi-line string.
@@ -50,6 +41,16 @@ module Charming
         visible_lines.map { |line| render_line(line) }.join("\n")
       end
 
+      # The current top-visible row.
+      def offset
+        @position.offset
+      end
+
+      # The current left-visible column.
+      def column
+        @position.column
+      end
+
       # Handles mouse events: scroll wheel adjusts the row offset, click moves the top
       # visible row to the clicked position. Returns :handled on success.
       def handle_mouse(event)
@@ -57,77 +58,61 @@ module Charming
 
         if event.scroll?
           scroll_delta = (event.button_name == :scroll_up) ? -1 : 1
-          @offset += scroll_delta
-          clamp_position
+          position.move_to(offset + scroll_delta, bounds)
           return :handled
         end
 
         return nil unless event.click?
 
         clicked_row = event.y
-        return nil if clicked_row < offset || clicked_row >= offset + viewport_height
+        return nil if clicked_row < 0 || clicked_row >= viewport_height
 
-        @offset = clicked_row
-        clamp_position
+        position.move_to(offset + clicked_row, bounds)
         :handled
       end
 
       private
 
-      attr_reader :content, :width, :height
+      attr_reader :content, :width, :height, :position
 
       # Scrolls the viewport up by one row.
       def scroll_up
-        @offset -= 1
-        clamp_position
+        position.scroll_up(bounds)
       end
 
       # Scrolls the viewport down by one row.
       def scroll_down
-        @offset += 1
-        clamp_position
+        position.scroll_down(bounds)
       end
 
       # Scrolls up by one viewport page.
       def page_up
-        @offset -= page_size
-        clamp_position
+        position.page_up(page_size, bounds)
       end
 
       # Scrolls down by one viewport page.
       def page_down
-        @offset += page_size
-        clamp_position
+        position.page_down(page_size, bounds)
       end
 
       # Scrolls to the top-left of the content.
       def scroll_home
-        @offset = 0
-        @column = 0
+        position.home
       end
 
       # Scrolls to the bottom-right of the content.
       def scroll_end
-        @offset = max_offset
-        @column = max_column
+        position.end_at(bounds)
       end
 
       # Scrolls one column left.
       def scroll_left
-        @column -= 1
-        clamp_position
+        position.scroll_left(bounds)
       end
 
       # Scrolls one column right.
       def scroll_right
-        @column += 1
-        clamp_position
-      end
-
-      # Clamps both the row offset and the column to their valid ranges.
-      def clamp_position
-        @offset = offset.clamp(0, max_offset)
-        @column = column.clamp(0, max_column)
+        position.scroll_right(bounds)
       end
 
       # Returns the slice of content lines visible in the current viewport, padded to *height*.
@@ -141,89 +126,12 @@ module Charming
       # Renders a single line according to the configured width and wrap mode: clips to the
       # visible column window when not wrapping, otherwise wraps the line to the width.
       def render_line(line)
-        return line unless width
-        return pad_line(line, width) if wrap?
-
-        pad_line(clip_line(line), width)
-      end
-
-      # Clips *line* to the visible column window while preserving active ANSI styling.
-      def clip_line(line)
-        clipped = clip_tokens(line.to_s)
-        needs_reset?(clipped) ? "#{clipped}\e[0m" : clipped
-      end
-
-      # Walks *line* token-by-token, copying ANSI escapes through and emitting only the
-      # characters that fall inside the visible column window.
-      def clip_tokens(line)
-        state = {cursor: 0, output: +""}
-        line.scan(/#{ANSI_PATTERN}|./mo) do |token|
-          ansi?(token) ? append_ansi(state, token) : append_character(state, token)
-        end
-        state.fetch(:output)
-      end
-
-      # Appends an ANSI escape token to the output buffer unchanged.
-      def append_ansi(state, token)
-        state.fetch(:output) << token
-      end
-
-      # Appends a single character token to the output buffer when it falls inside the
-      # visible column window, advancing the visual cursor.
-      def append_character(state, char)
-        char_width = Unicode::DisplayWidth.of(char)
-        cursor = state.fetch(:cursor)
-        state.fetch(:output) << char if visible?(cursor, char_width)
-        state[:cursor] = cursor + char_width
-      end
-
-      # True when the character at *cursor* (with the given display *char_width*) is within
-      # the visible column window.
-      def visible?(cursor, char_width)
-        cursor >= column && cursor + char_width <= column + width
-      end
-
-      # True when *value* contains ANSI codes but does not end with a reset — needed because
-      # the clip may truncate styling in the middle of a styled run.
-      def needs_reset?(value)
-        value.match?(ANSI_PATTERN) && !value.end_with?("\e[0m")
-      end
-
-      # Pads *line* to *target_width* with trailing spaces, leaving the line itself unchanged.
-      def pad_line(line, target_width)
-        line + (" " * [target_width - UI::Width.measure(line), 0].max)
+        line_window.render(line)
       end
 
       # Returns the content lines, wrapped to *width* when wrap is enabled.
       def content_lines
-        return wrapped_content_lines if wrap?
-
-        rendered_content.lines(chomp: true)
-      end
-
-      # Wraps the content to *width* via UI::visible_slice, returning an array of wrapped lines.
-      def wrapped_content_lines
-        rendered_content.lines(chomp: true).flat_map { |line| wrap_line(line) }
-      end
-
-      # Wraps a single *line* into chunks of *width* display columns.
-      def wrap_line(line)
-        line_width = UI::Width.measure(line)
-        return [""] if line_width.zero?
-
-        start_column = 0
-        out = []
-        while start_column < line_width
-          out << UI.visible_slice(line, start_column, width)
-          start_column += width
-        end
-        out
-      end
-
-      # Returns the rendered content string, calling `render.to_s` on the content object when
-      # it responds to render.
-      def rendered_content
-        content.respond_to?(:render) ? content.render.to_s : content.to_s
+        content_source.lines
       end
 
       # Returns the visible row count (the configured *height* or the content's line count).
@@ -253,18 +161,25 @@ module Charming
 
       # Returns the maximum display width across all content lines.
       def content_width
-        content_lines.map { |line| UI::Width.measure(line) }.max || 0
+        content_source.display_width
       end
 
-      # True when *token* is an ANSI escape sequence.
-      def ansi?(token)
-        token.match?(ANSI_PATTERN)
+      def bounds
+        {max_offset: max_offset, max_column: max_column}
       end
 
       # True when soft-wrapping is enabled and a positive width is configured.
       def wrap?
         @wrap && width&.positive?
       end
+
+      def line_window
+        LineWindow.new(width: width, column: column, wrap: wrap?)
+      end
+
+      def content_source
+        ContentLines.new(content: content, width: width, wrap: @wrap)
+      end
     end
   end
 end

data/lib/charming/presentation/layout/builder.rb

@@ -41,7 +41,10 @@ module Charming
       def pane(name = nil, content = nil, **options, &block)
         node = Pane.new(
           name: name, content: content, block: block, view: view,
-          geometry: PaneGeometry.build(**options.slice(:width, :height, :grow, :border, :padding)),
+          geometry: PaneGeometry.build(**options.slice(
+            :width, :height, :grow, :border, :padding,
+            :min_width, :max_width, :min_height, :max_height
+          )),
           style: PaneStyle.build(**options.slice(:style, :focused_style)),
           behavior: PaneBehavior.build(**options.slice(:focus, :scroll, :clip, :wrap))
         )

data/lib/charming/presentation/layout/overlay.rb

@@ -8,13 +8,14 @@ module Charming
     # with an outer *style*.
     class Overlay
       # The vertical and horizontal offset (cell count or `:center`) of the overlay
-      # within the parent canvas.
-      attr_reader :top, :left
+      # within the parent canvas, and its stacking order (higher paints later/on top).
+      attr_reader :top, :left, :z_index
 
       # *content* (or a *block*) provides the body. *top*/*left* default to :center.
       # *width*/*height* fix the overlay's dimensions; when unset, the content's natural
-      # size is used. *style* wraps the rendered content in a UI::Style.
-      def initialize(content: nil, block: nil, view: nil, top: :center, left: :center, width: nil, height: nil, style: nil)
+      # size is used. *style* wraps the rendered content in a UI::Style. *z_index*
+      # controls stacking: higher values composite on top (ties keep registration order).
+      def initialize(content: nil, block: nil, view: nil, top: :center, left: :center, width: nil, height: nil, style: nil, z_index: 0)
         @content = content
         @block = block
         @view = view
@@ -23,6 +24,7 @@ module Charming
         @width = width
         @height = height
         @style = style
+        @z_index = z_index
       end
 
       # Renders the overlay's content; when *width* or *height* is set, places the rendered

data/lib/charming/presentation/layout/pane.rb

@@ -8,7 +8,8 @@ module Charming
     # focusable slots in the controller's focus ring.
     class Pane
       attr_reader :name
-      delegate :width, :height, :grow, to: :geometry
+      delegate :width, :height, :grow,
+        :min_width, :max_width, :min_height, :max_height, to: :geometry
 
       # *name* is the focus slot identifier. *content* (or a *block*) is the body; *view*
       # is the view used for instance_exec when the block is given. *geometry*, *style*, and

data/lib/charming/presentation/layout/pane_geometry.rb

@@ -2,19 +2,25 @@
 
 module Charming
   module Layout
-    # PaneGeometry holds a Pane's sizing (width, height, grow) and inset
-    # configuration (border + padding). It knows how to inset a Rect for the
+    # PaneGeometry holds a Pane's sizing (width, height, grow, min/max constraints)
+    # and inset configuration (border + padding). It knows how to inset a Rect for the
     # content area and how to expand CSS-style 1/2/4-value padding.
     class PaneGeometry
-      attr_reader :width, :height, :grow, :border, :padding
+      attr_reader :width, :height, :grow, :border, :padding,
+        :min_width, :max_width, :min_height, :max_height
 
-      def self.build(width: nil, height: nil, grow: nil, border: nil, padding: nil)
+      def self.build(width: nil, height: nil, grow: nil, border: nil, padding: nil,
+        min_width: nil, max_width: nil, min_height: nil, max_height: nil)
         new(width: width, height: height, grow: grow,
-          border: (border == true) ? :normal : border, padding: padding)
+          border: (border == true) ? :normal : border, padding: padding,
+          min_width: min_width, max_width: max_width,
+          min_height: min_height, max_height: max_height)
       end
 
-      def initialize(width:, height:, grow:, border:, padding:)
+      def initialize(width:, height:, grow:, border:, padding:,
+        min_width: nil, max_width: nil, min_height: nil, max_height: nil)
         @width, @height, @grow, @border, @padding = width, height, grow, border, padding
+        @min_width, @max_width, @min_height, @max_height = min_width, max_width, min_height, max_height
         @padding_values = padding ? expand_padding(Array(padding)) : [0, 0, 0, 0]
         freeze
       end
@@ -22,12 +28,14 @@ module Charming
       def ==(other)
         other.is_a?(PaneGeometry) &&
           width == other.width && height == other.height && grow == other.grow &&
-          border == other.border && padding == other.padding
+          border == other.border && padding == other.padding &&
+          min_width == other.min_width && max_width == other.max_width &&
+          min_height == other.min_height && max_height == other.max_height
       end
       alias_method :eql?, :==
 
       def hash
-        [width, height, grow, border, padding].hash
+        [width, height, grow, border, padding, min_width, max_width, min_height, max_height].hash
       end
 
       def border_top = border ? 1 : 0

data/lib/charming/presentation/layout/screen_layout.rb

@@ -39,12 +39,12 @@ module Charming
         child.mouse_targets(Rect.new(x: 0, y: 0, width: screen.width, height: screen.height))
       end
 
-      # Renders the child into the full-screen rect, then overlays each registered overlay
-      # on top in order.
+      # Renders the child into the full-screen rect, then composites each overlay on top —
+      # ordered by z_index (higher paints last), with registration order breaking ties.
       def render
         body = UI.place(render_child, width: screen.width, height: screen.height, background: background)
 
-        overlays.reduce(body) do |current, overlay|
+        stacked_overlays.reduce(body) do |current, overlay|
           UI.overlay(current, overlay.render, top: overlay.top, left: overlay.left)
         end
       end
@@ -60,6 +60,15 @@ module Charming
 
         child.render(Rect.new(x: 0, y: 0, width: screen.width, height: screen.height))
       end
+
+      # Overlays sorted by z_index (stable: registration order breaks ties). Overlays
+      # without a z_index reader (custom nodes) sort at 0.
+      def stacked_overlays
+        overlays.each_with_index.sort_by do |overlay, index|
+          z = overlay.respond_to?(:z_index) ? overlay.z_index.to_i : 0
+          [z, index]
+        end.map(&:first)
+      end
     end
   end
 end

data/lib/charming/presentation/layout/split.rb

@@ -90,8 +90,10 @@ module Charming
       end
 
       # Computes the size of each child along the *axis* given the *available* cells.
-      # Subtracts the total gap, allocates fixed sizes first, and distributes the remainder
-      # among flexible (non-fixed) children by their grow weights.
+      # Subtracts the total gap, allocates fixed sizes first, distributes the remainder
+      # among flexible (non-fixed) children by their grow weights, then clamps every
+      # child to its min/max constraints (re-balancing the difference onto flexible
+      # children with remaining slack).
       def child_sizes(axis:, available:)
         gap_size = gap * [children.length - 1, 0].max
         available_for_children = [available - gap_size, 0].max
@@ -100,7 +102,39 @@ module Charming
         sizes = fixed.map { |size| size&.to_i }
         remaining = [available_for_children - sizes.compact.sum, 0].max
 
-        distribute_remaining(sizes, flexible_indexes, remaining)
+        sizes = distribute_remaining(sizes, flexible_indexes, remaining)
+        apply_constraints(sizes, flexible_indexes, axis, available_for_children)
+      end
+
+      # Clamps each child's size to its min/max constraints, then pushes the resulting
+      # surplus or deficit onto the last flexible child that can absorb it without
+      # violating its own constraints.
+      def apply_constraints(sizes, flexible_indexes, axis, available)
+        constrained = sizes.each_with_index.map { |size, index| clamp_size(size, children[index], axis) }
+        difference = available - constrained.sum
+        return constrained if difference.zero?
+
+        absorber = flexible_indexes.rfind do |index|
+          adjusted = constrained[index] + difference
+          adjusted >= 0 && adjusted == clamp_size(adjusted, children[index], axis)
+        end
+        constrained[absorber] += difference if absorber
+        constrained
+      end
+
+      # Clamps *size* to the child's min/max constraint along *axis* (when declared).
+      def clamp_size(size, child, axis)
+        min = constraint(child, (axis == :horizontal) ? :min_width : :min_height)
+        max = constraint(child, (axis == :horizontal) ? :max_width : :max_height)
+        size = [size, min].max if min
+        size = [size, max].min if max
+        size
+      end
+
+      # Reads a constraint reader from *child* when it responds to it (Panes do, nested
+      # Splits currently don't).
+      def constraint(child, name)
+        child.respond_to?(name) ? child.public_send(name) : nil
       end
 
       # Returns the fixed size of *child* along *axis* (`:horizontal` reads width, `:vertical` reads height).