natty-ui 0.28.0 → 0.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db28cf57db8670d12ed258d70765447c08bd51462acc7907ea9072b64117f965
-  data.tar.gz: 36e9c43bf76fcb1e68b450a1289bcffa8b4cfb33fa2d575ed9b1b92dc6ecce69
+  metadata.gz: 3573e7d7a6d163f278494a095198e3fd913ff6710c4984ff12279f80893c1b54
+  data.tar.gz: 9d424a564160fa470b71d857b31fa725320b21047abd8423e613335b0e0449c6
 SHA512:
-  metadata.gz: e19e8e97300a844d294f61e9d4e6c43f5db5fe5a7122ff7c07c7bdd460e229ffffb0b6c943fe1e9f015bf91008824312746290098e10c7851ece75b7bfcb21bf
-  data.tar.gz: c6caff65104a42913c3f38ad53b0d628b11aff7517f6450d562c7f41e3b99234caaa48d8e266dd7abb6ca3a83546cd27a019612d0ee6f9e40e249717d26ecfd1
+  metadata.gz: f2b6c3c4bc0c8636bbed5dcfcfb5cc9f77487ef84be7650abba172b707cf2e9eb9c59b9a4f0ba3c2209ce4902c704f8920cbd99d63d7da3cd347dbf466afe689
+  data.tar.gz: 2c514b126360dd2c2b6173e9944db8e3cc1bd5a5505d5176ebaa382cf9a810dccc59137c55d1b18d7f1229ac8cbcee5fa9553ad5763ecea30fa84cabc0430387

data/README.md

@@ -3,7 +3,7 @@
 This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely, natty user interface you like to have for your command line applications. It contains elegant, simple and beautiful tools that enhance your command line interfaces functionally and aesthetically.
 
 - Gem: [rubygems.org](https://rubygems.org/gems/natty-ui)
-- Source: [github.com](https://github.com/mblumtritt/natty-ui)
+- Source: [codeberg.org](https://codeberg.org/mblumtritt/natty-ui)
 - Help: [rubydoc.info](https://rubydoc.info/gems/natty-ui/NattyUI)
 
 ## Features
@@ -33,13 +33,13 @@ This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely, nat
 
 You can execute all examples by
 
-```sh
+```shell
 ruby ./examples/examples.rb
 ```
 
 or see the non-ANSI version
 
-```sh
+```shell
 NO_COLOR=1 ruby ./examples/examples.rb
 ```
 

data/examples/examples.rb

@@ -16,11 +16,10 @@ EXAMPLES = {
   'vbars' => 'Print Vertical Bars',
   'hbars' => 'Print Horizontal Bars',
   'sections' => 'Sections',
-  'tasks' => 'Tasks'
+  'tasks' => 'Tasks',
+  'options' => 'Options and Selections'
 }.freeze
 
-DEFAULT_MODE = NattyUI.input_mode == :default
-
 ui.space
 
 while true
@@ -34,12 +33,12 @@ while true
       ui.div('[faint](Abort with [\\ESC])', padding: [1, 0, 1])
     end
 
-  ui.space unless DEFAULT_MODE
+  ui.space unless Terminal.ansi?
   break unless selected
 
   ui.temporary do
     load("#{__dir__}/#{selected}.rb")
-    if DEFAULT_MODE
+    if Terminal.ansi?
       ui.await { ui.puts '[faint][\\Press ENTER to continue...]' }
     else
       ui.space

data/examples/options.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative '../lib/natty-ui'
+
+ui.message '[b]​ᓚᕠᗢ NattyUI[/b] [i green]Options and Selections[/]' do
+  ui.space
+  ui.puts <<~INFO, eol: false
+    [i]Options[/i] and [i]selections[/i] allow the user to select from several
+    options interactively.
+    If ANSI is available the user can use [b][Up][/b] and [b][Down][/b] keys to
+    navigate, switch the state of selected item with [b][Space][/b] and complete
+    the selection with [b][Enter][/b].
+  INFO
+
+  ui.space
+  options =
+    ui.select %w[Kitty iTerm2 Ghostty Tabby Rio] do
+      ui.puts '[i]Which terminal applications did you already tested?[/i]'
+    end
+  case options.size
+  when 0
+    ui.puts 'You selected nothing – test more in future!'
+  when 1
+    ui.puts "#{options.first} is indeed a nice terminal."
+  else
+    ui.puts "#{options.join(', ')} are worth to test!"
+  end
+end

data/lib/natty-ui/attributes.rb

@@ -29,7 +29,6 @@ module NattyUI
       def _init = nil
       def _assign(_opt) = self
       def _store(opt) = opt
-
       def as_uint(value) = [0, value.to_i].max
       def as_nint(value) = ([0, value.to_i].max if value)
 
@@ -555,9 +554,7 @@ module NattyUI
 
   module TextWithAttributes
     include WithAttributes
-
     attr_reader :text
-
     def empty? = @text.empty?
     alias _to_s to_s
     private :_to_s

data/lib/natty-ui/choice.rb

@@ -7,24 +7,31 @@ module NattyUI
     def select
       yield(self) if block_given?
       pin_line = NattyUI.lines_written
-      draw(current = @ret.index(@selected) || 0)
+      draw
+      last = @current
       while (event = Terminal.read_key_event)
         case event.name
         when 'Esc', 'Ctrl+c'
           break nil if @abortable
-        when 'Enter', ' '
-          break @ret[current]
+        when 'Enter', 'Space'
+          break @ret[@current]
         when 'Home'
-          current = 0
+          @current = 0
         when 'End'
-          current = @texts.size - 1
-        when 'Up', 'Back', 'Shift+Tab', 'i'
-          current = @texts.size - 1 if (current -= 1) < 0
-        when 'Down', 'Tab', 'k'
-          current = 0 if (current += 1) == @texts.size
+          @current = @texts.size - 1
+        when 'Up', 'Back', 'Shift+Tab', 'i', 'w'
+          @current = @texts.size - 1 if (@current -= 1) < 0
+        when 'Down', 'Tab', 'k', 's'
+          @current = 0 if (@current += 1) == @texts.size
+        else
+          next unless event.simple?
+          c = event.key.ord
+          @current = (c - 48).clamp(0, @texts.size - 1) if c.between?(48, 57)
         end
+        next if last == @current
         pin_line = NattyUI.back_to_line(pin_line, erase: false)
-        draw(current)
+        draw
+        last = @current
       end
     ensure
       NattyUI.back_to_line(@start_line)
@@ -38,17 +45,17 @@ module NattyUI
       @texts = args + kwargs.values
       @ret = Array.new(args.size, &:itself) + kwargs.keys
       @abortable = abortable
-      @selected = selected
+      @current = @ret.index(selected) || 0
       theme = Theme.current
       @mark = [theme.mark(:choice), theme.choice_style]
       @mark_current = [theme.mark(:current_choice), theme.choice_current_style]
     end
 
-    def draw(current)
+    def draw
       @texts.each_with_index do |str, idx|
-        mark, decor = idx == current ? @mark_current : @mark
+        mark, style = idx == @current ? @mark_current : @mark
         @parent.puts(
-          "#{decor}#{str}",
+          "#{style}#{str}",
           first_line_prefix: mark,
           first_line_prefix_width: mark.width
         )

data/lib/natty-ui/dumb_choice.rb

@@ -11,7 +11,8 @@ module NattyUI
         return if @abortable && %w[Esc Ctrl+c].include?(event.name)
         next unless event.simple?
         code = event.raw.upcase
-        if @ret.size <= 9 && ('1'..'9').include?(code)
+        if @ret.size <= 9
+          next unless ('1'..'9').include?(code)
           code = @ret[code.ord - 49] and break code
         elsif ('A'..'Z').include?(code)
           code = @ret[code.ord - 65] and break code

data/lib/natty-ui/dumb_options.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require_relative 'element'
+
+module NattyUI
+  class DumbOptions < Element
+    def select
+      yield(self) if block_given?
+      draw
+      while (event = Terminal.read_key_event)
+        return if @abortable && %w[Esc Ctrl+c].include?(event.name)
+        return @opts.transform_values(&:last) if event.name == 'Enter'
+        next unless event.simple?
+        code = event.raw.upcase
+        if @opts.size <= 9
+          next unless ('1'..'9').include?(code)
+          offset = 49
+        elsif ('A'..'Z').include?(code)
+          offset = 65
+        else
+          next
+        end
+        key = @opts.keys[code.ord - offset] or next
+        @opts[key][-1] = !@opts[key][-1]
+        @parent.space
+        draw
+      end
+    ensure
+      @parent.space
+    end
+
+    private
+
+    def initialize(parent, opts, abortable, selected)
+      super(parent)
+      @opts =
+        opts.to_h do |k, v|
+          v.is_a?(Enumerable) ? [k, [v[0], !!v[-1]]] : [k, [k, !!v]]
+        end
+      @abortable = abortable
+      @current = @opts.key?(selected) ? selected : @opts.first.first
+      theme = Theme.current
+      @marks = {
+        true => theme.mark(:checkmark),
+        false => theme.mark(:choice)
+      }.compare_by_identity
+    end
+
+    def draw
+      glyph = @opts.size <= 9 ? 1 : 'A'
+      @opts.each_pair do |_, (str, selected)|
+        mark = @marks[selected]
+        @parent.puts(
+          str,
+          first_line_prefix: "[\\#{glyph}] #{mark}",
+          first_line_prefix_width: mark.width + 2
+        )
+        glyph = glyph.succ
+      end
+    end
+  end
+  private_constant :DumbOptions
+end

data/lib/natty-ui/element.rb

@@ -32,12 +32,12 @@ module NattyUI
       self
     end
 
-    alias _to_s to_s
-    private :_to_s
-
     # @!visibility private
     alias to_s inspect
 
+    alias _to_s to_s
+    private :_to_s
+
     private
 
     def initialize(parent)
@@ -48,7 +48,6 @@ module NattyUI
 
   module WithStatus
     attr_reader :status
-
     def active? = @status.nil?
     def closed? = !active?
     def ok? = @state == :ok

data/lib/natty-ui/features.rb

@@ -37,44 +37,67 @@ module NattyUI
     # @return [Features]
     #   itself
     def puts(*text, **options)
-      bbcode = true if (bbcode = options[:bbcode]).nil?
-      max_width = options[:max_width] || Terminal.columns
-      max_width = Terminal.columns + max_width if max_width < 0
-
-      prefix_width =
-        if (prefix = options[:prefix])
-          prefix = Ansi.bbcode(prefix) if bbcode
-          options[:prefix_width] || Text.width(prefix, bbcode: false)
-        else
-          0
-        end
+      if (ansi = Terminal.ansi?)
+        @__eol ||= "\e[m\n"
+      else
+        @__eol ||= "\n"
+      end
 
-      if (first_line = options[:first_line_prefix])
-        first_line = Ansi.bbcode(first_line) if bbcode
-        first_line_width =
-          options[:first_line_prefix_width] ||
-            Text.width(first_line, bbcode: false)
+      if options.empty?
+        bbcode = true
+        max_width = Terminal.columns
+      else
+        bbcode = true if (bbcode = options[:bbcode]).nil?
+        ignore_newline = options[:eol] == false || options[:ignore_newline]
+
+        if (max_width = options[:max_width]).nil?
+          return self if (max_width = Terminal.columns).zero?
+        elsif max_width < 1
+          if max_width > 0
+            max_width *= Terminal.columns
+          elsif max_width < 0
+            max_width += Terminal.columns
+          else
+            return self
+          end
+        end
 
-        if prefix_width < first_line_width
-          prefix_next = "#{prefix}#{' ' * (first_line_width - prefix_width)}"
-          prefix = first_line
-          prefix_width = first_line_width
-        else
-          prefix_next = prefix
-          prefix =
-            if first_line_width < prefix_width
-              first_line + (' ' * (prefix_width - first_line_width))
-            else
-              first_line
-            end
+        prefix_width =
+          if (prefix = options[:prefix])
+            prefix = Ansi.bbcode(prefix) if bbcode
+            options[:prefix_width] || Text.width(prefix, bbcode: false)
+          else
+            0
+          end
+
+        if (first_line = options[:first_line_prefix])
+          first_line = Ansi.bbcode(first_line) if bbcode
+          first_line_width =
+            options[:first_line_prefix_width] ||
+              Text.width(first_line, bbcode: false)
+
+          if prefix_width < first_line_width
+            prefix_next = "#{prefix}#{' ' * (first_line_width - prefix_width)}"
+            prefix = first_line
+            prefix_width = first_line_width
+          else
+            prefix_next = prefix
+            prefix =
+              if first_line_width < prefix_width
+                first_line + (' ' * (prefix_width - first_line_width))
+              else
+                first_line
+              end
+          end
         end
-      end
 
-      max_width -= prefix_width
+        max_width -= prefix_width
 
-      if (suffix = options[:suffix])
-        suffix = Ansi.bbcode(suffix) if bbcode
-        max_width -= options[:suffix_width] || Text.width(suffix, bbcode: false)
+        if (suffix = options[:suffix])
+          suffix = Ansi.bbcode(suffix) if bbcode
+          max_width -=
+            options[:suffix_width] || Text.width(suffix, bbcode: false)
+        end
       end
 
       return self if max_width <= 0
@@ -84,13 +107,13 @@ module NattyUI
           *text,
           limit: max_width,
           bbcode: bbcode,
-          ansi: Terminal.ansi?,
-          ignore_newline: options[:eol] == false || options[:ignore_newline]
+          ansi: ansi,
+          ignore_newline: ignore_newline
         )
 
       if (align = options[:align]).nil?
         lines.each do |line|
-          Terminal.print(prefix, line, suffix, EOL__, bbcode: false)
+          Terminal.print(prefix, line, suffix, @__eol, bbcode: false)
           @lines_written += 1
           prefix, prefix_next = prefix_next, nil if prefix_next
         end
@@ -110,7 +133,7 @@ module NattyUI
             ' ' * (max_width - width),
             line,
             suffix,
-            EOL__,
+            @__eol,
             bbcode: false
           )
           @lines_written += 1
@@ -125,7 +148,7 @@ module NattyUI
             line,
             ' ' * (space - lw),
             suffix,
-            EOL__,
+            @__eol,
             bbcode: false
           )
           @lines_written += 1
@@ -138,7 +161,7 @@ module NattyUI
             line,
             ' ' * (max_width - width),
             suffix,
-            EOL__,
+            @__eol,
             bbcode: false
           )
           @lines_written += 1
@@ -148,6 +171,20 @@ module NattyUI
       self
     end
 
+    # Print given text with a decoration mark.
+    #
+    # @param text (see puts)
+    # @param mark [Symbol, #to_s]
+    #   marker type
+    #
+    # @return (see puts)
+    def mark(*text, mark: :default, **options)
+      mark = Theme.current.mark(mark)
+      options[:first_line_prefix] = mark
+      options[:first_line_prefix_width] = mark.width
+      puts(*text, **options)
+    end
+
     # Print given text as lines like {#puts}. Used in elements with temporary
     # output like {#task} the text will be kept ("pinned").
     #
@@ -169,21 +206,7 @@ module NattyUI
     #
     # @return (see puts)
     def pin(*text, mark: nil, **options)
-      options[:pin] = true
-      options[:first_line_prefix] = Theme.current.mark(mark) if mark
-      puts(*text, **options)
-    end
-
-    # Print given text with a decoration mark.
-    #
-    # @param text (see puts)
-    # @param mark [Symbol, #to_s]
-    #   marker type
-    #
-    # @return (see puts)
-    def mark(*text, mark: :default)
-      mark = Theme.current.mark(mark)
-      puts(*text, first_line_prefix: mark, first_line_prefix_width: mark.width)
+      mark(*text, mark: mark, pin: true, **options)
     end
 
     # Print given text as a quotation.
@@ -198,7 +221,7 @@ module NattyUI
         *text,
         prefix: quote,
         prefix_width: quote.width,
-        max_width: width < 20 ? nil : width.to_i
+        max_width: width < 20 ? nil : width.round
       )
     end
 
@@ -293,7 +316,7 @@ module NattyUI
     #
     # @return (see puts)
     def space(count = 1)
-      puts("\n" * count) if (count = count.to_i).positive?
+      (count = count.to_i).positive? ? puts("\n" * count) : self
     end
 
     # Print given items as list (like 'ls' command).
@@ -735,7 +758,8 @@ module NattyUI
       end
     end
 
-    # Request a user's chocie.
+    # Allows the user to select an option from a selection.
+    # The selected option is returned.
     #
     # @overload choice(*choices, abortable: false)
     #   @param [#to_s] choices
@@ -773,6 +797,8 @@ module NattyUI
     #     one or more alternatives to select from
     #   @param [true, false] abortable
     #     whether the user is allowed to abort with 'Esc' or 'Ctrl+c'
+    #   @param [#to_s, nil] selected
+    #     optionally pre-selected option
     #
     #   @return [Object]
     #     key for selected choice
@@ -795,6 +821,8 @@ module NattyUI
     #     one or more alternatives to select from
     #   @param [true, false] abortable
     #     whether the user is allowed to abort with 'Esc' or 'Ctrl+c'
+    #   @param [Integer] selected
+    #     pre-selected option index
     #
     #   @yieldparam temp [Temporary]
     #     temporary displayed section (section will be erased after input)
@@ -807,17 +835,79 @@ module NattyUI
     def choice(*choices, abortable: false, selected: nil, **kwchoices, &block)
       return if choices.empty? && kwchoices.empty?
       choice =
-        case NattyUI.input_mode
-        when :default
+        if Terminal.ansi?
           Choice.new(self, choices, kwchoices, abortable, selected)
-        when :dumb
-          DumbChoice.new(self, choices, kwchoices, abortable)
         else
-          return
+          DumbChoice.new(self, choices, kwchoices, abortable)
         end
       __with(choice) { choice.select(&block) }
     end
 
+    # Allows the user to select from several options.
+    # All options are returned with their selection status.
+    #
+    # @param [{#to_s => [true,false]}] choices
+    #   Hash of options and their selection state
+    # @param [true, false] abortable
+    #   whether the user is allowed to abort with 'Esc' or 'Ctrl+c'
+    # @param [#to_s, nil] selected
+    #   optionally pre-selected key
+    #
+    # @yieldparam temp [Temporary]
+    #   temporary displayed section (section will be erased after input)
+    #
+    # @return [{#to_s => [true,false]}]
+    #   Hash of options and their selection state
+    # @return [nil]
+    #   when user aborted the selection
+    def options(abortable: false, selected: nil, **choices, &block)
+      return {} if choices.empty?
+      options =
+        if Terminal.ansi?
+          Options.new(self, choices, abortable, selected)
+        else
+          DumbOptions.new(self, choices, abortable, selected)
+        end
+      __with(options) { options.select(&block) }
+    end
+
+    # Allows the user to select from several options.
+    # The selected options are returned.
+    #
+    # @example Select a terminal
+    #   ui.select %w[Kitty iTerm2 Ghostty Tabby Rio] do
+    #    ui.puts '[i]Which terminal applications did you already tested?[/i]'
+    #   end
+    #
+    # @param [Array<#to_s>] choices
+    #   selectable options
+    # @param [true, false] abortable
+    #   whether the user is allowed to abort with 'Esc' or 'Ctrl+c'
+    # @param [Integer, :all, nil] selected
+    #   optionally pre-selected option index or `:all` to pre-select all items
+    # @yieldparam temp [Temporary]
+    #   temporary displayed section (section will be erased after input)
+    #
+    # @return [Array<#to_s>]
+    #   selected options
+    # @return [nil]
+    #   when user aborted the selection
+    def select(*choices, abortable: false, selected: nil, &block)
+      return [] if choices.empty?
+      choices = choices[0] if choices.size == 1 && choices[0].is_a?(Enumerable)
+      if selected == :all
+        sel = true
+      elsif selected
+        selected = choices[selected.to_i]
+      end
+      options(
+        abortable: abortable,
+        selected: selected,
+        **choices.to_h { [_1, sel] },
+        &block
+      ).filter_map { |key, selected| key if selected }
+    end
+
     #
     # @!endgroup
     #
@@ -870,18 +960,17 @@ module NattyUI
         end
       end
     end
-
-    EOL__ = Terminal.ansi? ? "\e[m\n" : "\n"
-    private_constant :EOL__
   end
 
   dir = __dir__
   autoload :Choice, "#{dir}/choice.rb"
   autoload :DumbChoice, "#{dir}/dumb_choice.rb"
+  autoload :DumbOptions, "#{dir}/dumb_options.rb"
   autoload :CompactLSRenderer, "#{dir}/ls_renderer.rb"
   autoload :Framed, "#{dir}/framed.rb"
   autoload :HBarsRenderer, "#{dir}/hbars_renderer.rb"
   autoload :LSRenderer, "#{dir}/ls_renderer.rb"
+  autoload :Options, "#{dir}/options.rb"
   autoload :Progress, "#{dir}/progress.rb"
   autoload :DumbProgress, "#{dir}/progress.rb"
   autoload :Section, "#{dir}/section.rb"
@@ -895,10 +984,12 @@ module NattyUI
   private_constant(
     :Choice,
     :DumbChoice,
+    :DumbOptions,
     :CompactLSRenderer,
     :Framed,
     :HBarsRenderer,
     :LSRenderer,
+    :Options,
     :Progress,
     :DumbProgress,
     :Utils,

data/lib/natty-ui/ls_renderer.rb

@@ -47,7 +47,6 @@ module NattyUI
 
       class Item
         attr_reader :width
-
         def to_s(in_width) = "#{@str}#{' ' * (in_width - @width)}"
 
         def initialize(str)

data/lib/natty-ui/options.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require_relative 'element'
+
+module NattyUI
+  class Options < Element
+    def select
+      yield(self) if block_given?
+      pin_line = NattyUI.lines_written
+      draw
+      last = @current
+      while (event = Terminal.read_key_event)
+        case event.name
+        when 'Esc', 'Ctrl+c'
+          return if @abortable
+        when 'Enter'
+          return @opts.transform_values(&:last)
+        when 'Space'
+          (last = @opts[@current])[-1] = !last[-1]
+        when 'a'
+          @opts.transform_values { _1[-1] = true }
+          last = nil
+        when 'n'
+          @opts.transform_values { _1[-1] = false }
+          last = nil
+        when 'Home'
+          @current = @opts.first.first
+        when 'End'
+          @current = @opts.keys.last
+        when 'Up', 'Back', 'Shift+Tab', 'i'
+          keys = @opts.keys
+          @current = keys[keys.index(@current) - 1]
+        when 'Down', 'Tab', 'k'
+          keys = @opts.keys
+          @current = keys[keys.index(@current) + 1] || keys[0]
+        end
+        next if last == @current
+        pin_line = NattyUI.back_to_line(pin_line, erase: false)
+        draw
+        last = @current
+      end
+    ensure
+      NattyUI.back_to_line(@start_line)
+    end
+
+    private
+
+    def initialize(parent, opts, abortable, selected)
+      super(parent)
+      @opts =
+        opts.to_h do |k, v|
+          v.is_a?(Enumerable) ? [k, [v[0], !!v[-1]]] : [k, [k, !!v]]
+        end
+      @abortable = abortable
+      @current = @opts.key?(selected) ? selected : @opts.first.first
+      @start_line = NattyUI.lines_written
+      theme = Theme.current
+      @style = {
+        false => theme.choice_style,
+        true => theme.choice_current_style
+      }.compare_by_identity
+    end
+
+    def draw
+      states = NattyUI::Theme.current.option_states
+      @opts.each_pair do |key, (str, selected)|
+        mark = states.dig(current = key == @current, selected)
+        @parent.puts(
+          "#{@style[current]}#{str}",
+          first_line_prefix: mark,
+          first_line_prefix_width: mark.width
+        )
+      end
+    end
+  end
+  private_constant :Options
+end

data/lib/natty-ui/task.rb

@@ -11,7 +11,7 @@ module NattyUI
     private
 
     def _done(text)
-      NattyUI.back_to_line(@start_line, erase: :all)
+      NattyUI.back_to_line(@start_line)
       @start_line = nil
       cm = Theme.current.mark(:checkmark)
       @parent.puts(

data/lib/natty-ui/temporary.rb

@@ -8,11 +8,10 @@ module NattyUI
   #
   class Temporary < Element
     # @!visibility private
-    def puts(*objects, **options)
+    def puts(*objects, **opts)
       return self if @state
-      if options.delete(:pin)
-        @pins ||= []
-        @pins << [objects, options.except(:prefix_width, :suffix_width)]
+      if opts.delete(:pin)
+        (@pins ||= []) << [objects, opts.except(:prefix_width, :suffix_width)]
       end
       super
     end
@@ -20,8 +19,8 @@ module NattyUI
     # @!visibility private
     def done
       return self if @state
-      NattyUI.back_to_line(@start_line, erase: :all) if @start_line
-      @pins&.each { |objects, options| puts(*objects, **options) }
+      NattyUI.back_to_line(@start_line) if @start_line
+      @pins&.each { |objects, opts| puts(*objects, **opts) }
       @state = :ok
       self
     end

data/lib/natty-ui/theme.rb

@@ -55,7 +55,7 @@ module NattyUI
             failed: '[bright_red]𝑭[/fg]',
             current: '[bright_green]➔[/fg]',
             choice: '[bright_white]◦[/fg]',
-            current_choice: '[bright_green]◉[/fg]'
+            current_choice: '[bright_green]➔[/fg]'
           )
           theme.define_section(
             default: :bright_blue,
@@ -166,11 +166,13 @@ module NattyUI
     end
 
     class Compiled
-      attr_reader :task_style, :choice_current_style, :choice_style
+      attr_reader :task_style,
+                  :choice_current_style,
+                  :choice_style,
+                  :option_states
 
       def defined_marks = @mark.keys.sort!
       def defined_borders = @border.keys.sort!
-
       def heading(index) = @heading[index.to_i.clamp(1, 6) - 1]
 
       def mark(value)
@@ -208,12 +210,25 @@ module NattyUI
             SectionBorder.create(border(theme.section_border)),
             theme.section_styles.dup.compare_by_identity
           )
+        @option_states = create_option_states
       end
 
       private
 
       def as_style(value) = (Ansi[*value].freeze if value)
 
+      def create_option_states
+        # [current?][selected?]
+        c = @mark[:current_choice]
+        n = @mark[:none]
+        sel = @mark[:checkmark]
+        uns = @mark[:choice]
+        {
+          false => { false => n + uns, true => n + sel }.compare_by_identity,
+          true => { false => c + uns, true => c + sel }.compare_by_identity
+        }.compare_by_identity.freeze
+      end
+
       def create_sections(template, styles)
         Hash
           .new do |h, kind|
@@ -224,7 +239,9 @@ module NattyUI
 
       def create_mark(mark)
         return {} if mark.empty?
-        with_default(mark.to_h { |n, e| [n.to_sym, Str.new("#{e} ")] })
+        mark = mark.to_h { |n, e| [n.to_sym, Str.new("#{e} ")] }
+        mark[:none] ||= Str.new('  ', 2)
+        with_default(mark)
       end
 
       def create_border(border)
@@ -294,6 +311,7 @@ module NattyUI
 
       private_constant :SectionBorder
     end
+    # private_constant :Compiled
 
     private
 

data/lib/natty-ui/utils.rb

@@ -3,7 +3,6 @@
 module NattyUI
   module Utils
     class << self
-      # @!visibility private
       def style(value)
         value =
           case value
@@ -22,27 +21,22 @@ module NattyUI
         value.keep_if { Ansi.valid?(_1) }.empty? ? nil : value
       end
 
-      # @!visibility private
       def align(value)
         POS_ALI.include?(value) ? value : :left
       end
 
-      # @!visibility private
       def position(value)
         value if POS_ALI.include?(value)
       end
 
-      # @!visibility private
       def vertical(value)
         VERT.include?(value) ? value : :top
       end
 
-      # @!visibility private
       def split_table_attr(values)
         [values.slice(*TAB_ATTR), values.except(*TAB_ATTR)]
       end
 
-      # @!visibility private
       def padding(*value)
         value = value.flatten.take(4).map! { [0, _1.to_i].max }
         case value.size
@@ -60,7 +54,6 @@ module NattyUI
       end
       alias margin padding
 
-      # @!visibility private
       def as_size(range, value)
         return range.begin if value == :min
         return range.end if value.nil? || value.is_a?(Symbol)

data/lib/natty-ui/version.rb

@@ -2,5 +2,5 @@
 
 module NattyUI
   # The version number of the gem.
-  VERSION = '0.28.0'
+  VERSION = '0.30.0'
 end

data/lib/natty-ui.rb

@@ -36,10 +36,8 @@ module NattyUI
     #   when terminal inoput is not supported
     def input_mode
       case Terminal.input_mode
-      when :csi_u
+      when :csi_u, :legacy
         :default
-      when :legacy
-        Terminal.ansi? ? :default : :dumb
       when :dumb
         :dumb
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: natty-ui
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.30.0
 platform: ruby
 authors:
 - Mike Blumtritt
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: 0.13.0
 description: |
   This is the beautiful, nice, nifty, fancy, neat, pretty, cool, rich, lovely,
   natty user interface tool you like to have for your command line applications.
@@ -50,6 +50,7 @@ files:
 - examples/key-codes.rb
 - examples/ls.rb
 - examples/named-colors.rb
+- examples/options.rb
 - examples/sections.rb
 - examples/tables.rb
 - examples/tasks.rb
@@ -58,11 +59,13 @@ files:
 - lib/natty-ui/attributes.rb
 - lib/natty-ui/choice.rb
 - lib/natty-ui/dumb_choice.rb
+- lib/natty-ui/dumb_options.rb
 - lib/natty-ui/element.rb
 - lib/natty-ui/features.rb
 - lib/natty-ui/framed.rb
 - lib/natty-ui/hbars_renderer.rb
 - lib/natty-ui/ls_renderer.rb
+- lib/natty-ui/options.rb
 - lib/natty-ui/progress.rb
 - lib/natty-ui/section.rb
 - lib/natty-ui/table.rb
@@ -75,15 +78,15 @@ files:
 - lib/natty-ui/version.rb
 - lib/natty-ui/width_finder.rb
 - lib/natty_ui.rb
-homepage: https://github.com/mblumtritt/natty-ui
+homepage: https://codeberg.org/mblumtritt/natty-ui
 licenses:
 - BSD-3-Clause
 metadata:
+  source_code_uri: https://codeberg.org/mblumtritt/natty-ui
+  bug_tracker_uri: https://codeberg.org/mblumtritt/natty-ui/issues
+  documentation_uri: https://rubydoc.info/gems/natty-ui
   rubygems_mfa_required: 'true'
   yard.run: yard
-  source_code_uri: https://github.com/mblumtritt/natty-ui
-  bug_tracker_uri: https://github.com/mblumtritt/natty-ui/issues
-  documentation_uri: https://rubydoc.info/gems/natty-ui/NattyUI
 rdoc_options: []
 require_paths:
 - lib