Move various Input/ files to TextContent

* Labeled can now safely make the label TextContent:D
* SimpleClickable's decendents handle full TextContent in labels
* SimpleClickable itself passes full TextContent to its descendents,
  but still smashes to plain-text before writing to the grid

Author: japhb

lib/Terminal/Widgets/Input/Button.rakumod

@@ -3,6 +3,7 @@
 use Terminal::Capabilities;
 constant Uni1 = Terminal::Capabilities::SymbolSet::Uni1;
 
+use Terminal::Widgets::TextContent;
 use Terminal::Widgets::Input::SimpleClickable;
 
 
@@ -17,13 +18,18 @@ class Terminal::Widgets::Input::Button
 
     #| Content (text inside framing)
     method content-text($label) {
+        my $terminal   = self.terminal;
+        my $symbol-set = $terminal.caps.symbol-set;
+        my $has-Uni1   = $symbol-set >= Uni1;
+        my $locale     = $terminal.locale;
+
         my $has-border = self.layout.computed.has-border;
-        my $symbol-set = self.terminal.caps.symbol-set;
-        my $string     = $label // '';
+        my @string     = $locale.flat-string-spans($label // '');
 
-        $has-border         ??       $string       !!
-        $symbol-set >= Uni1 ?? '⌈' ~ $string ~ '⌋' !!
-                               '[' ~ $string ~ ']'
+        my @spans = $has-border ?? @string !!
+                    $has-Uni1   ?? (string-span('⌈'), |@string, string-span('⌋')) !!
+                                   (string-span('['), |@string, string-span(']'));
+        span-tree(|@spans);
     }
 
     #| Process a click event

lib/Terminal/Widgets/Input/Checkbox.rakumod

@@ -1,5 +1,6 @@
 # ABSTRACT: A single checkbox, optionally labeled
 
+use Terminal::Widgets::TextContent;
 use Terminal::Widgets::Input::Boolean;
 
 
@@ -21,11 +22,14 @@ class Terminal::Widgets::Input::Checkbox
             Uni1  => «   ☐    ☒  »,
             Uni7  => «   🞏    🞕  »;
 
-        $caps.best-symbol-choice(%boxes)
+        # XXXX: Hoist string-span up into constant?
+        $caps.best-symbol-choice(%boxes).map({ string-span($_) })
     }
 
     #| Content (text inside framing)
     method content-text($label) {
-        self.checkboxes()[+$.state] ~ (' ' ~ $label if $label)
+        my @label-spans = $.terminal.locale.flat-string-spans($label // '');
+        my $box-span    = self.checkboxes()[+$.state];
+        span-tree($box-span, |(pad-span(1), |@label-spans if $label))
     }
 }

lib/Terminal/Widgets/Input/Labeled.rakumod

@@ -1,8 +1,9 @@
 # ABSTRACT: Role for inputs that have a label 'attached' to them, such as radio buttons
 
+use Terminal::Widgets::TextContent;
+
 role Terminal::Widgets::Input::Labeled {
-    # XXXX: Need a 'defined textual content' type constraint
-    has $.label = '';
+    has TextContent:D $.label = '';
 
     method set-label($!label) { self.full-refresh }
 }

lib/Terminal/Widgets/Input/RadioButton.rakumod

@@ -1,5 +1,6 @@
 # ABSTRACT: A single radio button, optionally labeled
 
+use Terminal::Widgets::TextContent;
 use Terminal::Widgets::Input::Boolean;
 
 
@@ -21,11 +22,14 @@ class Terminal::Widgets::Input::RadioButton
             Uni1  => «   ○    ⊙  »,
             Uni7  => «   🞅    🞊  »;
 
-        $caps.best-symbol-choice(%buttons)
+        # XXXX: Hoist string-span up into constant?
+        $caps.best-symbol-choice(%buttons).map({ string-span($_) })
     }
 
     #| Content (text inside framing)
     method content-text($label) {
-        self.buttons()[+$.state] ~ (' ' ~ $label if $label)
+        my @label-spans = $.terminal.locale.flat-string-spans($label // '');
+        my $button-span = self.buttons()[+$.state];
+        span-tree($button-span, |(pad-span(1), |@label-spans if $label))
     }
 }

lib/Terminal/Widgets/Input/SimpleClickable.rakumod

@@ -27,9 +27,9 @@ does Terminal::Widgets::Input::Labeled {
         my $y      = $layout.top-correction;
 
         # XXXX: Temporary hack
-        my $label  = $.terminal.locale.plain-text($.label);
+        my $text   = $.terminal.locale.plain-text(self.content-text($.label));
 
-        $.grid.set-span($x, $y, self.content-text($label), self.current-color);
+        $.grid.set-span($x, $y, $text, self.current-color);
     }
 
     #| Handle minimal keyboard events

lib/Terminal/Widgets/Input/ToggleButton.rakumod

@@ -3,7 +3,7 @@
 use Terminal::Capabilities;
 constant Uni1 = Terminal::Capabilities::SymbolSet::Uni1;
 
-use Terminal::Widgets::SpanStyle;
+use Terminal::Widgets::TextContent;
 use Terminal::Widgets::Input::Boolean;
 
 
@@ -15,21 +15,23 @@ class Terminal::Widgets::Input::ToggleButton
         my $bw         = %style<border-width>;
         my $has-border = $bw ~~ Positional ?? $bw.grep(?*) !! ?$bw;
         $locale.width($label) + 2 * !$has-border
-        + 2 # XXXX: Waiting on upgrade to content model
     }
 
     #| Content (text inside framing)
     method content-text($label) {
+        my $terminal   = self.terminal;
+        my $symbol-set = $terminal.caps.symbol-set;
+        my $has-Uni1   = $symbol-set >= Uni1;
+        my $locale     = $terminal.locale;
+
         my $has-border = self.layout.computed.has-border;
-        my $symbol-set = self.terminal.caps.symbol-set;
-        my $string     = $label // '';
+        my @string     = $locale.flat-string-spans($label // '');
 
-        my $text = $has-border         ??       $string       !!
-                   $symbol-set >= Uni1 ?? '⌈' ~ $string ~ '⌋' !!
-                                          '[' ~ $string ~ ']';
+        my @spans = $has-border ?? @string !!
+                    $has-Uni1   ?? (string-span('⌈'), |@string, string-span('⌋')) !!
+                                   (string-span('['), |@string, string-span(']'));
 
-        # XXXX: Waiting on upgrade to content model
-        # $.state ?? span('white on_blue', $text) !! $text
-        $.state ?? '>' ~ $text ~ '<' !! $text
+        $.state ?? span-tree(color => 'white on_blue', |@spans)
+                !! span-tree(|@spans)
     }
 }