Make Line::fromSpans() variadic (php-tui#197)

* Make `Line::fromSpans()` variadic * Update CHANGELOG.md
GreenCape · Nov 29, 2023 · 0270d07 · 0270d07
1 parent e5dd9de
commit 0270d07
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ Improvements:
 
 - Improve the gauge label style when filled #195 @KennedyTedesco
 
+Refactoring:
+
+- Make `Line::fromSpans()` variadic #197 @KennedyTedesco
+
 ## 0.1.0
 
 Features:

diff --git a/example/demo/src/App.php b/example/demo/src/App.php
@@ -38,7 +38,6 @@
 use PhpTui\Tui\Model\Layout\Constraint;
 use PhpTui\Tui\Model\Style;
 use PhpTui\Tui\Model\Text\Line;
-use PhpTui\Tui\Model\Text\Span;
 use PhpTui\Tui\Model\Text\Title;
 use PhpTui\Tui\Model\Widget;
 use PhpTui\Tui\Model\Widget\Borders;
@@ -241,9 +240,7 @@ private function header(): Widget
                     TabsWidget::fromTitles(
                         Line::parse('<fg=red>[q]</>uit'),
                         ...array_reduce(ActivePage::cases(), function (array $lines, ActivePage $page) {
-                            $lines[] = Line::fromSpans([
-                                Span::fromString(sprintf('%s', $page->navItem()->label)),
-                            ]);
+                            $lines[] = Line::fromString(sprintf('%s', $page->navItem()->label));
 
                             return $lines;
                         }, []),

diff --git a/example/demo/src/Page/ItemListPage.php b/example/demo/src/Page/ItemListPage.php
@@ -61,7 +61,7 @@ public function build(): Widget
                 ListWidget::default()
                     ->state($this->state)
                     ->items(...array_map(function (array $event) {
-                        return ListItem::new(Text::fromLine(Line::fromSpans([
+                        return ListItem::new(Text::fromLine(Line::fromSpans(
                             Span::fromString($event[1])->fg(match ($event[1]) {
                                 'INFO' => AnsiColor::Green,
                                 'WARNING' => AnsiColor::Yellow,
@@ -70,7 +70,7 @@ public function build(): Widget
                             }),
                             Span::fromString(' '),
                             Span::fromString($event[0]),
-                        ])));
+                        )));
                     }, array_merge(self::EVENTS, self::EVENTS)))
             )
         ;

diff --git a/src/Extension/Core/Widget/ParagraphWidget.php b/src/Extension/Core/Widget/ParagraphWidget.php
@@ -71,6 +71,6 @@ public static function fromLines(Line ...$lines): self
 
     public static function fromSpans(Span ...$spans): self
     {
-        return self::fromText(Text::fromLine(Line::fromSpans($spans)));
+        return self::fromText(Text::fromLine(Line::fromSpans(...$spans)));
     }
 }
diff --git a/src/Model/Text/Line.php b/src/Model/Text/Line.php
@@ -47,10 +47,7 @@ public function width(): int
         );
     }
 
-    /**
-     * @param Span[] $spans
-     */
-    public static function fromSpans(array $spans): self
+    public static function fromSpans(Span ...$spans): self
     {
         return new self($spans);
     }
@@ -65,7 +62,7 @@ public static function fromString(string $string): self
     public static function parse(string $string): self
     {
         return self::fromSpans(
-            SpanParser::new()->parse($string)
+            ...SpanParser::new()->parse($string)
         );
     }