diff --git a/packages/support/src/helpers.php b/packages/support/src/helpers.php index 854aef8fd0..1c61bedd47 100644 --- a/packages/support/src/helpers.php +++ b/packages/support/src/helpers.php @@ -119,12 +119,10 @@ 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"'; + } elseif (FilamentView::hasSpaMode() && str($url)->startsWith(request()->root())) { + $html .= ' wire:navigate'; } return new HtmlString($html); 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))