From 99ca20fb49f3e868821d7f1b66f13e8bd052a28f Mon Sep 17 00:00:00 2001 From: Florian <88294294+fouteox@users.noreply.github.com> Date: Mon, 18 Sep 2023 09:26:07 +0200 Subject: [PATCH 1/3] Update helpers.php Fix openInNewTab where wire:navigate is true --- packages/support/src/helpers.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/support/src/helpers.php b/packages/support/src/helpers.php index 854aef8fd0..7d34838ed7 100644 --- a/packages/support/src/helpers.php +++ b/packages/support/src/helpers.php @@ -119,13 +119,12 @@ if (! function_exists('Filament\Support\generate_href_html')) { { $html = "href=\"{$url}\""; - if (FilamentView::hasSpaMode() && str($url)->startsWith(request()->root())) { - $html .= ' wire:navigate'; - } - if ($shouldOpenInNewTab) { $html .= ' target="_blank"'; } + else if (FilamentView::hasSpaMode() && str($url)->startsWith(request()->root())) { + $html .= ' wire:navigate'; + } return new HtmlString($html); } From cd7ba7bf8440c195f14f1a2c30ead07aec0a69fb Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 18 Sep 2023 08:46:09 +0100 Subject: [PATCH 2/3] Update helpers.php --- packages/support/src/helpers.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/support/src/helpers.php b/packages/support/src/helpers.php index 7d34838ed7..1c61bedd47 100644 --- a/packages/support/src/helpers.php +++ b/packages/support/src/helpers.php @@ -121,8 +121,7 @@ if (! function_exists('Filament\Support\generate_href_html')) { if ($shouldOpenInNewTab) { $html .= ' target="_blank"'; - } - else if (FilamentView::hasSpaMode() && str($url)->startsWith(request()->root())) { + } elseif (FilamentView::hasSpaMode() && str($url)->startsWith(request()->root())) { $html .= ' wire:navigate'; } From ac4505610cfbea758a3da78930eff65e9b063243 Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Mon, 18 Sep 2023 08:50:31 +0100 Subject: [PATCH 3/3] Update SpaModeTest.php --- tests/src/Support/SpaModeTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/Support/SpaModeTest.php b/tests/src/Support/SpaModeTest.php index 5c8d98c1d6..701b1deaf1 100644 --- a/tests/src/Support/SpaModeTest.php +++ b/tests/src/Support/SpaModeTest.php @@ -40,7 +40,7 @@ test('`wire:navigate` is not used in the `href` HTML if it doesn\'t match the re test('`target` HTML can be generated if the URL should open in a new tab', function () { FilamentView::spa(); expect(generate_href_html('http://localhost/page', shouldOpenInNewTab: true)) - ->toHtml()->toBe('href="http://localhost/page" wire:navigate target="_blank"'); + ->toHtml()->toBe('href="http://localhost/page" target="_blank"'); FilamentView::spa(false); expect(generate_href_html('http://localhost/page', shouldOpenInNewTab: true))