Merge pull request #1368 from moonshine-software/remove-url

Remove url
moonshine-software · Dec 12, 2024 · 2d208d4 · 2d208d4
2 parents ca82821 + e4d596e
commit 2d208d4
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/src/UI/src/Components/Link.php b/src/UI/src/Components/Link.php
@@ -57,6 +57,13 @@ public function tooltip(?string $tooltip = null): self
         return $this;
     }
 
+    public function blank(): self
+    {
+        return $this->customAttributes([
+            'target' => '_blank',
+        ]);
+    }
+
     public function getView(): string
     {
         return 'moonshine::components.link-'

diff --git a/src/UI/src/Components/Url.php b/src/UI/src/Components/Url.php
@@ -4,7 +4,10 @@
 
 namespace MoonShine\UI\Components;
 
-/** @method static static make(string $href, string $value, ?string $icon = '', bool $withoutIcon = false, bool $blank = false) */
+/**
+ * @method static static make(string $href, string $value, ?string $icon = '', bool $withoutIcon = false, bool $blank = false)
+ * @deprecated use \MoonShine\UI\Components\Link
+ */
 final class Url extends MoonShineComponent
 {
     protected string $view = 'moonshine::components.url';

diff --git a/src/UI/src/Fields/Field.php b/src/UI/src/Fields/Field.php
@@ -14,7 +14,7 @@
 use MoonShine\Support\DTOs\AsyncCallback;
 use MoonShine\Support\Enums\HttpMethod;
 use MoonShine\UI\Components\Badge;
-use MoonShine\UI\Components\Url;
+use MoonShine\UI\Components\Link;
 use MoonShine\UI\Traits\Fields\WithBadge;
 use MoonShine\UI\Traits\Fields\WithHint;
 use MoonShine\UI\Traits\Fields\WithLink;
@@ -377,13 +377,19 @@ private function previewDecoration(Renderable|string $value): Renderable|string
         if ($this->hasLink()) {
             $href = $this->getLinkValue($value);
 
-            $value = (string) Url::make(
+            $value = (string) Link::make(
                 href: $href,
-                value: $this->getLinkName($value) ?: $value,
-                icon: $this->getLinkIcon(),
-                withoutIcon: $this->isWithoutIcon(),
-                blank: $this->isLinkBlank()
-            )->render();
+                label: $this->getLinkName($value) ?: $value,
+            )
+                ->when(
+                    ! $this->isWithoutIcon() && $this->getLinkIcon() !== null,
+                    fn (Link $ctx): Link => $ctx->icon($this->getLinkIcon())
+                )
+                ->when(
+                    $this->isLinkBlank(),
+                    fn (Link $ctx): Link => $ctx->blank()
+                )
+                ->render();
         }
 
         if ($this->isBadge()) {

diff --git a/tests/Feature/ComponentsEqualsTest.php b/tests/Feature/ComponentsEqualsTest.php
@@ -56,7 +56,6 @@
 use MoonShine\UI\Components\Tabs\Tab;
 use MoonShine\UI\Components\Thumbnails;
 use MoonShine\UI\Components\Title;
-use MoonShine\UI\Components\Url;
 use MoonShine\UI\Components\When;
 
 uses()->group('components');
@@ -525,13 +524,6 @@ function renderBlade(string $alias, array $parameters = [], array $attributes =
         );
     });
 
-    it('url', function () {
-        compare(
-            Url::make('/', 'Link', icon: 'users', blank: true)->withoutIcon(),
-            ['href' => '/', 'value' => 'Link', 'icon' => 'users', 'blank' => true, 'without-icon' => true]
-        );
-    });
-
     it('when', function () {
         compare(
             When::make(fn () => false, fn () => $this->components),

diff --git a/tests/Unit/Fields/PreviewFieldTest.php b/tests/Unit/Fields/PreviewFieldTest.php
@@ -9,7 +9,7 @@
 use MoonShine\UI\Components\Badge;
 use MoonShine\UI\Components\Boolean;
 use MoonShine\UI\Components\FormBuilder;
-use MoonShine\UI\Components\Url;
+use MoonShine\UI\Components\Link;
 use MoonShine\UI\Fields\Preview;
 
 uses()->group('fields');
@@ -107,7 +107,7 @@
 it('link value', function (): void {
     expect((string) $this->field->link('/')->preview())
         ->toBe(
-            (string) Url::make('/', $this->item->no_input)->render()
+            (string) Link::make('/', $this->item->no_input)->render()
         );
 });