Take advantage of span-tree(Str:D) affordance

Author: japhb

lib/Terminal/Widgets/Input/Button.rakumod

@@ -25,10 +25,9 @@ class Terminal::Widgets::Input::Button
 
         my $has-border = self.layout.computed.has-border;
         my @string     = $locale.flat-string-spans($label // '');
-
-        my @spans = $has-border ?? @string !!
-                    $has-Uni1   ?? (string-span('⌈'), |@string, string-span('⌋')) !!
-                                   (string-span('['), |@string, string-span(']'));
+        my @spans      = $has-border ??        @string       !!
+                         $has-Uni1   ?? ('⌈', |@string, '⌋') !!
+                                        ('[', |@string, ']');
         span-tree(|@spans);
     }
 

lib/Terminal/Widgets/Input/Checkbox.rakumod

@@ -22,8 +22,7 @@ class Terminal::Widgets::Input::Checkbox
             Uni1  => «   ☐    ☒  »,
             Uni7  => «   🞏    🞕  »;
 
-        # XXXX: Hoist string-span up into constant?
-        $caps.best-symbol-choice(%boxes).map({ string-span($_) })
+        $caps.best-symbol-choice(%boxes)
     }
 
     #| Content (text inside framing)

lib/Terminal/Widgets/Input/RadioButton.rakumod

@@ -22,8 +22,7 @@ class Terminal::Widgets::Input::RadioButton
             Uni1  => «   ○    ⊙  »,
             Uni7  => «   🞅    🞊  »;
 
-        # XXXX: Hoist string-span up into constant?
-        $caps.best-symbol-choice(%buttons).map({ string-span($_) })
+        $caps.best-symbol-choice(%buttons)
     }
 
     #| Content (text inside framing)

lib/Terminal/Widgets/Input/ToggleButton.rakumod

@@ -26,10 +26,9 @@ class Terminal::Widgets::Input::ToggleButton
 
         my $has-border = self.layout.computed.has-border;
         my @string     = $locale.flat-string-spans($label // '');
-
-        my @spans = $has-border ?? @string !!
-                    $has-Uni1   ?? (string-span('⌈'), |@string, string-span('⌋')) !!
-                                   (string-span('['), |@string, string-span(']'));
+        my @spans      = $has-border ??        @string       !!
+                         $has-Uni1   ?? ('⌈', |@string, '⌋') !!
+                                        ('[', |@string, ']');
 
         $.state ?? span-tree(color => 'white on_blue', |@spans)
                 !! span-tree(|@spans)

lib/Terminal/Widgets/Viewer/Log.rakumod

@@ -63,11 +63,13 @@ class Terminal::Widgets::Viewer::Log
         constant TC = Terminal::Widgets::TextContent;
 
         my $as-tree = do given $entry.content {
-            when Str            { TC::span-tree(string-span($_)) }
             when SS::Span       { SS::span-tree('', [$_]) }
-            when TC::StringSpan { TC::span-tree($_) }
             when SS::SpanTree   { $_ }
+
+            when Str            { TC::span-tree($_) }
+            when TC::StringSpan { TC::span-tree($_) }
             when TC::SpanTree   { $_ }
+
             default { die "Unrecognized LogEntry.content type {.^name.raku}" }
         };