ruby_rich 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9110486cfde27e4e77705f6daa78bd07a66fd9665dcfa3cdb7bbbb13ab1cac82
-  data.tar.gz: 46cb92c2621846bab87f0b0cb2c45dfd6bdba6c3f3547ac64bae3f2d2c779333
+  metadata.gz: 50bb2ebd116fd55abbe618cbd351ad1b73dab3a040d5df2f43011aff77a608bf
+  data.tar.gz: be41ae4ba9c0d4754c3eb9de3070d914e6dba23dd383f5fc81ee72c848f8e4a6
 SHA512:
-  metadata.gz: c9e7643688bb98f73aa309238413535539448bc20b5ddb05fbdc83c476b8696c09df3990cbae1beb36095f6fd18c8228876026237ca6a934af7e4be1a0ff29d3
-  data.tar.gz: 7b9fb1f6844b45679079474aad5a54ef97e343bc56459a873ccdaad7ef4f0e1b080fc1141dcce3647d47c152b9bd2443f164d266cfdaaa66f6dd78dbf6c6e44e
+  metadata.gz: c71f39b536218b86f9ce58e15ab476d7927bc086be78ec46f36629e9d3007972f5b4c727a924fad3729666362ae3fb600445ff0acd265e58bac9d266097b4edf
+  data.tar.gz: 2424396618c67fdad4568d77917424377c70e0284572ceb8e2735a53ccf9d10d217f1273cbc337ffd9063b70c9cfe60b310deb34278b619232ef8302140d8dc4

data/lib/ruby_rich/app_shell.rb

@@ -23,11 +23,11 @@ module RubyRich
       @progress_text = nil
 
       @transcript = Transcript.new
-      @progress_manager = ProgressManager.new(on_change: ->(text) { @progress_text = text })
+      @progress_manager = ProgressManager.new(on_change: ->(text) { update_progress_text(text) })
       @viewport = Viewport.new(@transcript, scrollbar: true, auto_scroll: true)
       @sidebar = Sidebar.new
       @composer = Composer.new(
-        placeholder: "编写任务或使用 /。",
+        placeholder: "Create a task or enter /",
         commands: commands,
         on_submit: method(:handle_submit),
         on_select: method(:handle_select)
@@ -104,6 +104,12 @@ module RubyRich
       self
     end
 
+    def update_progress_text(text)
+      @progress_text = text
+      @live&.refresh
+      self
+    end
+
     def start_progress(message = nil, owner: Thread.current.object_id, style: :primary, quiet_on_fast_finish: false)
       _ = style
       _ = quiet_on_fast_finish

data/lib/ruby_rich/composer.rb

@@ -433,6 +433,8 @@ module RubyRich
     def colorize_input(line)
       color = AnsiCode.color(:white, true)
       reset = AnsiCode.reset
+      return line.to_s if line.to_s.include?(AnsiCode.inverse)
+
       "#{color}#{line.to_s.gsub(reset, "#{reset}#{color}")}#{reset}"
     end
 

data/lib/ruby_rich/line_editor.rb

@@ -15,18 +15,24 @@ module RubyRich
       @history_index = nil
       @chars = []
       @cursor = 0
+      @value_cache = nil
+      @lines_cache = nil
+      @line_starts_cache = nil
+      @cursor_line_col_cache_key = nil
+      @cursor_line_col_cache = nil
       load_history
       history.each { |item| add_history(item, persist: false) }
     end
 
     def value
-      @chars.join
+      @value_cache ||= @chars.join
     end
 
     def value=(text)
       @chars = text.to_s.chars
       @cursor = @chars.length
       @history_index = nil
+      invalidate_content_cache
       self
     end
 
@@ -38,6 +44,7 @@ module RubyRich
       @chars.clear
       @cursor = 0
       @history_index = nil
+      invalidate_content_cache
       self
     end
 
@@ -49,6 +56,7 @@ module RubyRich
       @chars.insert(@cursor, *new_chars)
       @cursor += new_chars.length
       @history_index = nil
+      invalidate_content_cache
       self
     end
 
@@ -62,6 +70,7 @@ module RubyRich
 
       @chars.delete_at(@cursor - 1)
       @cursor -= 1
+      invalidate_content_cache
       true
     end
 
@@ -69,36 +78,43 @@ module RubyRich
       return false if @cursor >= @chars.length
 
       @chars.delete_at(@cursor)
+      invalidate_content_cache
       true
     end
 
     def move_left
       @cursor = [@cursor - 1, 0].max
+      invalidate_cursor_cache
       self
     end
 
     def move_right
       @cursor = [@cursor + 1, @chars.length].min
+      invalidate_cursor_cache
       self
     end
 
     def home
       @cursor = current_line_start
+      invalidate_cursor_cache
       self
     end
 
     def end
       @cursor = current_line_end
+      invalidate_cursor_cache
       self
     end
 
     def buffer_start
       @cursor = 0
+      invalidate_cursor_cache
       self
     end
 
     def buffer_end
       @cursor = @chars.length
+      invalidate_cursor_cache
       self
     end
 
@@ -118,6 +134,7 @@ module RubyRich
       return false if @cursor >= @chars.length
 
       @chars.slice!(@cursor...current_line_end)
+      invalidate_content_cache
       true
     end
 
@@ -127,6 +144,7 @@ module RubyRich
 
       @chars.slice!(start...@cursor)
       @cursor = start
+      invalidate_content_cache
       true
     end
 
@@ -136,6 +154,7 @@ module RubyRich
       start = previous_word_start
       @chars.slice!(start...@cursor)
       @cursor = start
+      invalidate_content_cache
       true
     end
 
@@ -158,14 +177,19 @@ module RubyRich
     end
 
     def lines
-      text = value
-      text.empty? ? [""] : text.split("\n", -1)
+      @lines_cache ||= begin
+        text = value
+        text.empty? ? [""] : text.split("\n", -1)
+      end
     end
 
     def cursor_line_col
-      before = @chars[0...@cursor].join
-      parts = before.empty? ? [""] : before.split("\n", -1)
-      [parts.length - 1, parts.last.to_s.chars.length]
+      cache_key = [@cursor, @chars.length]
+      return @cursor_line_col_cache if @cursor_line_col_cache_key == cache_key && @cursor_line_col_cache
+
+      line_index = line_index_for_cursor
+      @cursor_line_col_cache_key = cache_key
+      @cursor_line_col_cache = [line_index, @cursor - line_starts[line_index]]
     end
 
     def render_lines(width:, placeholder: nil, focused: true)
@@ -183,6 +207,18 @@ module RubyRich
 
     private
 
+    def invalidate_content_cache
+      @value_cache = nil
+      @lines_cache = nil
+      @line_starts_cache = nil
+      invalidate_cursor_cache
+    end
+
+    def invalidate_cursor_cache
+      @cursor_line_col_cache_key = nil
+      @cursor_line_col_cache = nil
+    end
+
     def normalize_insert_text(text)
       incoming = text.to_s.gsub(/\r\n?/, "\n")
       return incoming if @multiline
@@ -191,23 +227,13 @@ module RubyRich
     end
 
     def current_line_start
-      index = @cursor - 1
-      while index >= 0
-        return index + 1 if @chars[index] == "\n"
-
-        index -= 1
-      end
-      0
+      line_starts[line_index_for_cursor]
     end
 
     def current_line_end
-      index = @cursor
-      while index < @chars.length
-        return index if @chars[index] == "\n"
-
-        index += 1
-      end
-      @chars.length
+      line_index = line_index_for_cursor
+      next_start = line_starts[line_index + 1]
+      next_start ? next_start - 1 : @chars.length
     end
 
     def move_vertical(delta)
@@ -216,18 +242,43 @@ module RubyRich
       return self if target_line.negative? || target_line >= lines.length
 
       @cursor = index_for_line_col(target_line, current_col)
+      invalidate_cursor_cache
       self
     end
 
     def index_for_line_col(line_index, col)
-      index = 0
-      lines.each_with_index do |line, current|
-        line_length = line.chars.length
-        return index + [col, line_length].min if current == line_index
+      line_start = line_starts[line_index]
+      return @chars.length unless line_start
 
-        index += line_length + 1
+      line_length = lines[line_index].chars.length
+      line_start + [col, line_length].min
+    end
+
+    def line_starts
+      @line_starts_cache ||= begin
+        starts = [0]
+        @chars.each_with_index do |char, index|
+          starts << index + 1 if char == "\n"
+        end
+        starts
       end
-      @chars.length
+    end
+
+    def line_index_for_cursor
+      starts = line_starts
+      low = 0
+      high = starts.length - 1
+
+      while low <= high
+        mid = (low + high) / 2
+        if starts[mid] <= @cursor
+          low = mid + 1
+        else
+          high = mid - 1
+        end
+      end
+
+      [high, 0].max
     end
 
     def previous_word_start
@@ -288,34 +339,23 @@ module RubyRich
       current_width = 0
       chars = line.chars
       chars.each_with_index do |char, index|
-        if marker_col == index
-          cursor = cursor_marker
-          if current_width + 1 > width
-            segments << current
-            current = +""
-            current_width = 0
-          end
-          current << cursor
-          current_width += 1
-        end
-
         char_width = display_width(char)
         if current_width + char_width > width
           segments << current
           current = +""
           current_width = 0
         end
-        current << char
+        current << (marker_col == index ? cursor_marker(char) : char)
         current_width += char_width
       end
 
-      current << cursor_marker if marker_col == chars.length
+      current << cursor_marker(" ") if marker_col == chars.length
       segments << current
       segments
     end
 
-    def cursor_marker
-      "#{AnsiCode.color(:blue, true)}_#{AnsiCode.reset}"
+    def cursor_marker(char)
+      "#{AnsiCode.inverse}#{char}#{AnsiCode.reset}"
     end
 
     def display_width(char)

data/lib/ruby_rich/live.rb

@@ -12,9 +12,9 @@ module RubyRich
       @cache = nil
     end
     
-    def print_with_pos(x,y,char)
+    def print_with_pos(x,y,text)
       print "\e[#{y};#{x}H"   # Move cursor to top-left
-      print char
+      print text
     end
     
     def draw(buffer)
@@ -23,19 +23,37 @@ module RubyRich
         draw_full(buffer)
         @cache = buffer
       else
-        buffer.each_with_index do |arr, y|
-          arr.each_with_index do |char, x|
-            if @cache[y][x] != char
-              print_with_pos(x + 1 , y + 1 , char)
-              @cache[y][x] = char
-            end
-          end
-        end
+        draw_changes(buffer)
       end
     end
 
     private
 
+    def draw_changes(buffer)
+      buffer.each_with_index do |line, y|
+        cache_line = @cache[y] ||= []
+        x = 0
+        while x < line.length
+          if cache_line[x] == line[x]
+            x += 1
+            next
+          end
+
+          start = x
+          parts = []
+          while x < line.length && cache_line[x] != line[x]
+            char = line[x]
+            parts << char unless char.nil?
+            cache_line[x] = char
+            x += 1
+          end
+
+          print_with_pos(start + 1, y + 1, parts.join) unless parts.empty?
+        end
+      end
+      $stdout.flush
+    end
+
     def draw_full(buffer)
       buffer.each_with_index do |line, y|
         print_with_pos(1, y + 1, line.compact.join(""))
@@ -45,6 +63,8 @@ module RubyRich
   end
 
   class Live
+    RESIZE_POLL_INTERVAL = 0.25
+
     attr_accessor :params, :app, :listening, :layout
     class << self
       def start(layout, refresh_rate: 30, mouse: false, alt_screen: false, autowrap: false, &proc)
@@ -87,6 +107,10 @@ module RubyRich
       @event_queue = Queue.new
       @action_queue = Queue.new
       @event_thread = nil
+      @wake_mutex = Mutex.new
+      @wake_condition = ConditionVariable.new
+      @dirty = true
+      @last_terminal_size = nil
       @params = {}
       if (log_path = ENV["RUBY_RICH_LOG"]).to_s.strip != ""
         FileUtils.mkdir_p(File.dirname(log_path))
@@ -97,12 +121,15 @@ module RubyRich
     def run(proc = nil)
       start_event_thread if @listening
       while @running
-        drain_action_queue
+        action_processed = drain_action_queue
         break unless @running
 
-        render_frame
-        drain_event_queue if @listening
-        sleep 1.0 / @refresh_rate
+        event_processed = @listening ? drain_event_queue : false
+        if consume_dirty || action_processed || event_processed || terminal_size_changed?
+          render_frame
+        else
+          wait_for_activity
+        end
       end
     rescue Interrupt
       @running = false
@@ -113,11 +140,21 @@ module RubyRich
       return false unless @running
 
       @action_queue << block
+      wake
+      true
+    end
+
+    def refresh
+      return false unless @running
+
+      mark_dirty
+      wake
       true
     end
 
     def stop
       @running = false
+      wake
       shutdown
       RubyRich::Terminal.clear
     end
@@ -150,7 +187,10 @@ module RubyRich
         while @running
           begin
             event_data = @console.get_event
-            @event_queue << event_data if event_data
+            if event_data
+              @event_queue << event_data
+              wake
+            end
           rescue IOError, SystemCallError
             break
           rescue Interrupt
@@ -164,30 +204,73 @@ module RubyRich
     end
 
     def drain_event_queue
+      processed = false
       until @event_queue.empty?
         event_data = @event_queue.pop(true)
         @layout.notify_listeners(event_data)
+        processed = true
       end
+      processed
     rescue ThreadError
-      nil
+      processed
     end
 
     def drain_action_queue
+      processed = false
       until @action_queue.empty?
         action = @action_queue.pop(true)
         action.call(self)
+        processed = true
       end
+      processed
     rescue ThreadError
-      nil
+      processed
     rescue => e
       RubyRich.logger.error("UI action failed: #{e.class}: #{e.message}")
+      true
     end
 
     def render_frame
-      @layout.calculate_dimensions(terminal_width, terminal_height)
+      width = terminal_width
+      height = terminal_height
+      @last_terminal_size = [width, height]
+      @layout.calculate_dimensions(width, height)
       @render.draw(@layout.render_to_buffer)
     end
 
+    def wait_for_activity
+      @wake_mutex.synchronize do
+        return unless @running
+        return unless @action_queue.empty?
+        return if @listening && !@event_queue.empty?
+
+        @wake_condition.wait(@wake_mutex, RESIZE_POLL_INTERVAL)
+      end
+    end
+
+    def wake
+      @wake_mutex.synchronize { @wake_condition.signal }
+    end
+
+    def mark_dirty
+      @wake_mutex.synchronize { @dirty = true }
+    end
+
+    def consume_dirty
+      @wake_mutex.synchronize do
+        dirty = @dirty
+        @dirty = false
+        dirty
+      end
+    end
+
+    def terminal_size_changed?
+      current_size = [terminal_width, terminal_height]
+      changed = @last_terminal_size != current_size
+      @last_terminal_size = current_size
+      changed
+    end
+
     def terminal_width
       TTY::Screen.width
     end

data/lib/ruby_rich/panel.rb

@@ -1,7 +1,8 @@
 module RubyRich
   class Panel
-    attr_accessor :width, :height, :content, :line_pos, :border_style, :title
+    attr_accessor :height, :content, :line_pos, :border_style, :title
     attr_accessor :title_align, :content_changed
+    attr_reader :width
 
     def initialize(content = "", title: nil, border_style: :white, title_align: :center)
       @content = content
@@ -11,6 +12,14 @@ module RubyRich
       @height = 0
       @line_pos = 0
       @title_align = title_align
+      @wrapped_content_cache_key = nil
+      @wrapped_content_cache = nil
+    end
+
+    def width=(new_width)
+      new_width = new_width.to_i
+      invalidate_wrap_cache if @width != new_width
+      @width = new_width
     end
 
     def inner_width
@@ -117,6 +126,7 @@ module RubyRich
 
     def content=(new_content)
       @content = new_content
+      invalidate_wrap_cache
       content_lines = wrap_content(@content)
       if content_lines.size > @height - 2
         @line_pos = content_lines.size - @height + 2
@@ -126,6 +136,11 @@ module RubyRich
 
     private
 
+    def invalidate_wrap_cache
+      @wrapped_content_cache_key = nil
+      @wrapped_content_cache = nil
+    end
+
     def split_text_by_width(text)
       result = []
       current_line = ""
@@ -165,9 +180,13 @@ module RubyRich
     end
 
     def wrap_content(text)
+      key = [text, @width]
+      return @wrapped_content_cache if @wrapped_content_cache_key == key && @wrapped_content_cache
+
+      @wrapped_content_cache_key = key
       text.split("\n").flat_map do |line|
         split_text_by_width(line)
-      end
+      end.tap { |lines| @wrapped_content_cache = lines }
     end
   end
 end

data/lib/ruby_rich/table.rb

@@ -126,7 +126,8 @@ module RubyRich
       border_chars = BORDER_STYLES[@border_style]
       
       row_content = row.map.with_index do |cell, i|
-        content = bold ? cell.render : align_cell(cell.render, column_widths[i])
+        rendered = cell.render
+        content = bold ? rendered : align_cell(rendered, column_widths[i])
         aligned_content = align_cell(content, column_widths[i])
         " #{aligned_content} "
       end.join(border_chars[:vertical])
@@ -143,12 +144,13 @@ module RubyRich
       
       # Prepare each cell's lines
       row_lines = row.map.with_index do |cell, i|
+        rendered = cell.render
         # 获取单元格的样式序列
-        style_sequence = cell.render.match(/\e\[[0-9;]*m/)&.to_s || ""
+        style_sequence = rendered.match(/\e\[[0-9;]*m/)&.to_s || ""
         reset_sequence = style_sequence.empty? ? "" : "\e[0m"
         
         # 分割成多行并保持样式
-        cell_content = cell.render.split("\n")
+        cell_content = rendered.split("\n")
         
         # 为每一行添加样式
         cell_content.map! { |line| 
@@ -165,8 +167,8 @@ module RubyRich
 
       # Normalize row height
       max_height = row_lines.map(&:size).max
-      row_lines.each do |lines|
-        width = column_widths[row_lines.index(lines)]
+      row_lines.each_with_index do |lines, index|
+        width = column_widths[index]
         style_sequence = lines.first.match(/\e\[[0-9;]*m/)&.to_s || ""
         reset_sequence = style_sequence.empty? ? "" : "\e[0m"
         lines.fill(style_sequence + " " * width + reset_sequence, lines.size...max_height)
@@ -188,7 +190,7 @@ module RubyRich
       
       # Calculate widths from headers
       @headers.each_with_index do |header, i|
-        header_text = header.respond_to?(:render) ? header.render : header.to_s
+        header_text = render_cell(header)
         header_width = Unicode::DisplayWidth.of(header_text.gsub(/\e\[[0-9;]*m/, ''))
         widths[i] = [widths[i], header_width].max
       end
@@ -196,7 +198,7 @@ module RubyRich
       # Calculate widths from rows
       @rows.each do |row|
         row.each_with_index do |cell, i|
-          cell_lines = cell.render.split("\n")
+          cell_lines = render_cell(cell).split("\n")
           cell_lines.each do |line|
             # Remove ANSI escape sequences before calculating width
             plain_line = line.gsub(/\e\[[0-9;]*m/, '')
@@ -211,7 +213,8 @@ module RubyRich
   
     def render_row(row, column_widths, bold: false)
       row.map.with_index do |cell, i|
-        content = bold ? cell.render : align_cell(cell.render, column_widths[i])
+        rendered = cell.render
+        content = bold ? rendered : align_cell(rendered, column_widths[i])
         align_cell(content, column_widths[i])
       end.join(" | ").prepend("| ").concat(" |")
     end
@@ -219,12 +222,13 @@ module RubyRich
     def render_multiline_row(row, column_widths)
       # Prepare each cell's lines
       row_lines = row.map.with_index do |cell, i|
+        rendered = cell.render
         # Get cell style sequence
-        style_sequence = cell.render.match(/\e\[[0-9;]*m/)&.to_s || ""
+        style_sequence = rendered.match(/\e\[[0-9;]*m/)&.to_s || ""
         reset_sequence = style_sequence.empty? ? "" : "\e[0m"
 
         # Split into multiple lines while preserving styles
-        cell_content = cell.render.split("\n")
+        cell_content = rendered.split("\n")
 
         # Add style to each line
         cell_content.map! { |line|
@@ -241,8 +245,8 @@ module RubyRich
   
       # Normalize row height
       max_height = row_lines.map(&:size).max
-      row_lines.each do |lines|
-        width = column_widths[row_lines.index(lines)]
+      row_lines.each_with_index do |lines, index|
+        width = column_widths[index]
         style_sequence = lines.first.match(/\e\[[0-9;]*m/)&.to_s || ""
         reset_sequence = style_sequence.empty? ? "" : "\e[0m"
         lines.fill(style_sequence + " " * width + reset_sequence, lines.size...max_height)
@@ -253,6 +257,10 @@ module RubyRich
         row_lines.map { |lines| lines[line_index] }.join(" | ").prepend("| ").concat(" |")
       end
     end
+
+    def render_cell(cell)
+      cell.respond_to?(:render) ? cell.render : cell.to_s
+    end
   
     def align_cell(content, width)
       style_sequences = content.scan(/\e\[[0-9;]*m/)
@@ -280,4 +288,4 @@ module RubyRich
       end
     end
   end  
-end 
+end 

data/lib/ruby_rich/transcript.rb

@@ -160,11 +160,12 @@ module RubyRich
     class Store
       include Enumerable
 
-      attr_reader :entries
+      attr_reader :entries, :version
 
       def initialize
         @entries = []
         @sequence = 0
+        @version = 0
         @mutex = Mutex.new
       end
 
@@ -183,6 +184,7 @@ module RubyRich
             name: name
           )
           @entries << entry
+          touch
           entry
         end
       end
@@ -201,6 +203,7 @@ module RubyRich
           return false unless index
 
           @entries.delete_at(index)
+          touch
           true
         end
       end
@@ -241,10 +244,15 @@ module RubyRich
           return false unless entry
 
           yield entry
+          touch
           true
         end
       end
 
+      def touch
+        @version += 1
+      end
+
       def normalize_type(type)
         normalized = type.to_sym
         normalized = :tool if normalized == :tool_call
@@ -278,6 +286,10 @@ module RubyRich
       @store.entries
     end
 
+    def version
+      @store.version
+    end
+
     def focus
       @focused = true
       self

data/lib/ruby_rich/version.rb

@@ -1,3 +1,3 @@
 module RubyRich
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/ruby_rich/viewport.rb

@@ -21,6 +21,8 @@ module RubyRich
       @selection_end = nil
       @selected_text = ""
       @focused = true
+      @rendered_lines_cache_key = nil
+      @rendered_lines_cache = nil
     end
 
     def focus
@@ -36,6 +38,7 @@ module RubyRich
     def content=(new_content)
       was_at_bottom = at_bottom?
       @content = new_content
+      invalidate_rendered_lines
       scroll_to_bottom if @auto_scroll && was_at_bottom
       clamp_scroll
     end
@@ -140,7 +143,24 @@ module RubyRich
     private
 
     def rendered_lines
-      @rendered_lines = normalize_lines(@content)
+      key = rendered_lines_cache_key(@content)
+      return @rendered_lines_cache if @rendered_lines_cache_key == key && @rendered_lines_cache
+
+      @rendered_lines_cache_key = key
+      @rendered_lines_cache = normalize_lines(@content)
+    end
+
+    def invalidate_rendered_lines
+      @rendered_lines_cache_key = nil
+      @rendered_lines_cache = nil
+    end
+
+    def rendered_lines_cache_key(value)
+      [
+        value.object_id,
+        content_width,
+        value.respond_to?(:version) ? value.version : nil
+      ]
     end
 
     def keyboard_event?(event_data)
@@ -162,12 +182,58 @@ module RubyRich
 
       case rendered
       when String
-        rendered.split("\n")
+        rendered.split("\n").flat_map { |line| wrap_display_line(line, content_width) }
       when Array
-        rendered
+        rendered.flat_map { |line| wrap_display_line(line.to_s, content_width) }
       else
-        rendered.to_s.split("\n")
+        rendered.to_s.split("\n").flat_map { |line| wrap_display_line(line, content_width) }
+      end
+    end
+
+    def wrap_display_line(line, target_width)
+      return [""] if line.empty?
+      return [line] if display_width(line) <= target_width
+
+      lines = []
+      current = +""
+      width = 0
+      in_escape = false
+      escape = +""
+      active_sgr = +""
+
+      line.each_char do |char|
+        if in_escape
+          escape << char
+          if char == "m"
+            current << escape
+            active_sgr = escape == AnsiCode.reset ? +"" : escape.dup
+            escape = +""
+            in_escape = false
+          end
+          next
+        elsif char.ord == 27
+          escape << char
+          in_escape = true
+          next
+        end
+
+        char_width = Unicode::DisplayWidth.of(char)
+        if width.positive? && width + char_width > target_width
+          lines << close_wrapped_line(current, active_sgr)
+          current = active_sgr.dup
+          width = 0
+        end
+
+        current << char
+        width += char_width
       end
+
+      lines << current unless current.empty?
+      lines.empty? ? [""] : lines
+    end
+
+    def close_wrapped_line(line, active_sgr)
+      active_sgr.empty? || line.end_with?(AnsiCode.reset) ? line : "#{line}#{AnsiCode.reset}"
     end
 
     def page_size

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rich
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - zhuang biaowei