Refreshable navigation

packages/panels/docs/06-navigation.md

@@ -246,7 +246,7 @@ To register new navigation items, you can use the [configuration](configuration)
 ```php
 use Filament\Navigation\NavigationItem;
 use Filament\Pages\Dashboard;
-use Filament\Panel;
+use Filament\Panel;use function Filament\Support\original_request;
 
 public function panel(Panel $panel): Panel
 {
@@ -261,7 +261,7 @@ public function panel(Panel $panel): Panel
             NavigationItem::make('dashboard')
                 ->label(fn (): string => __('filament-panels::pages/dashboard.title'))
                 ->url(fn (): string => Dashboard::getUrl())
-                ->isActiveWhen(fn () => request()->routeIs('filament.admin.pages.dashboard')),
+                ->isActiveWhen(fn () => original_request()->routeIs('filament.admin.pages.dashboard')),
             // ...
         ]);
 }
@@ -328,7 +328,7 @@ use App\Filament\Resources\UserResource;
 use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationItem;
 use Filament\Pages\Dashboard;
-use Filament\Panel;
+use Filament\Panel;use function Filament\Support\original_request;
 
 public function panel(Panel $panel): Panel
 {
@@ -338,7 +338,7 @@ public function panel(Panel $panel): Panel
             return $builder->items([
                 NavigationItem::make('Dashboard')
                     ->icon('heroicon-o-home')
-                    ->isActiveWhen(fn (): bool => request()->routeIs('filament.admin.pages.dashboard'))
+                    ->isActiveWhen(fn (): bool => original_request()->routeIs('filament.admin.pages.dashboard'))
                     ->url(fn (): string => Dashboard::getUrl()),
                 ...UserResource::getNavigationItems(),
                 ...Settings::getNavigationItems(),

packages/panels/resources/views/components/layout/index.blade.php

@@ -36,7 +36,7 @@ class="fi-layout flex min-h-screen w-full flex-row-reverse overflow-x-clip"
             @if (filament()->hasTopbar())
                 {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::TOPBAR_BEFORE, scopes: $livewire->getRenderHookScopes()) }}
 
-                <x-filament-panels::topbar :navigation="$navigation" />
+                @livewire(\Filament\Livewire\Topbar::class)
 
                 {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::TOPBAR_AFTER, scopes: $livewire->getRenderHookScopes()) }}
             @endif
@@ -90,10 +90,7 @@ class="fi-layout flex min-h-screen w-full flex-row-reverse overflow-x-clip"
                 class="fi-sidebar-close-overlay fixed inset-0 z-30 bg-gray-950/50 transition duration-500 dark:bg-gray-950/75 lg:hidden"
             ></div>
 
-            <x-filament-panels::sidebar
-                :navigation="$navigation"
-                class="fi-main-sidebar"
-            />
+            @livewire(\Filament\Livewire\Sidebar::class)
 
             <script>
                 document.addEventListener('DOMContentLoaded', () => {

packages/panels/resources/views/livewire/sidebar.blade.php

@@ -0,0 +1,4 @@
+<x-filament-panels::sidebar
+    :navigation="filament()->getNavigation()"
+    class="fi-main-sidebar"
+/>

packages/panels/resources/views/livewire/topbar.blade.php

@@ -0,0 +1,3 @@
+<x-filament-panels::topbar
+    :navigation="filament()->getNavigation()"
+/>

packages/panels/src/Livewire/Sidebar.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Filament\Livewire;
+
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\On;
+use Livewire\Component;
+use Livewire\Livewire;
+use Livewire\Mechanisms\PersistentMiddleware\PersistentMiddleware;
+
+class Sidebar extends Component
+{
+    #[On('refresh-sidebar')]
+    public function refresh(): void {}
+
+    public function render(): View
+    {
+        return view('filament-panels::livewire.sidebar');
+    }
+}

packages/panels/src/Livewire/Topbar.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Filament\Livewire;
+
+use Illuminate\Contracts\View\View;
+use Livewire\Attributes\On;
+use Livewire\Component;
+use Livewire\Livewire;
+use Livewire\Mechanisms\PersistentMiddleware\PersistentMiddleware;
+
+class Topbar extends Component
+{
+    #[On('refresh-topbar')]
+    public function refresh(): void {}
+
+    public function render(): View
+    {
+        return view('filament-panels::livewire.topbar');
+    }
+}

packages/panels/src/Pages/Page.php

@@ -12,6 +12,7 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Route;
+use function Filament\Support\original_request;
 
 abstract class Page extends BasePage
 {
@@ -104,7 +105,7 @@ public static function getNavigationItems(): array
                 ->parentItem(static::getNavigationParentItem())
                 ->icon(static::getNavigationIcon())
                 ->activeIcon(static::getActiveNavigationIcon())
-                ->isActiveWhen(fn (): bool => request()->routeIs(static::getNavigationItemActiveRoutePattern()))
+                ->isActiveWhen(fn (): bool => original_request()->routeIs(static::getNavigationItemActiveRoutePattern()))
                 ->sort(static::getNavigationSort())
                 ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
                 ->badgeTooltip(static::getNavigationBadgeTooltip())

packages/panels/src/Panel/Concerns/HasComponents.php

@@ -7,6 +7,8 @@
 use Filament\Livewire\DatabaseNotifications;
 use Filament\Livewire\GlobalSearch;
 use Filament\Livewire\Notifications;
+use Filament\Livewire\Sidebar;
+use Filament\Livewire\Topbar;
 use Filament\Pages\Auth\EditProfile;
 use Filament\Pages\Page;
 use Filament\Resources\Pages\Page as ResourcePage;
@@ -486,6 +488,8 @@ protected function registerLivewireComponents(): void
             $this->queueLivewireComponentForRegistration(EditProfile::class);
             $this->queueLivewireComponentForRegistration(GlobalSearch::class);
             $this->queueLivewireComponentForRegistration(Notifications::class);
+            $this->queueLivewireComponentForRegistration(Sidebar::class);
+            $this->queueLivewireComponentForRegistration(Topbar::class);
 
             if ($this->hasEmailVerification() && is_subclass_of($emailVerificationRouteAction = $this->getEmailVerificationPromptRouteAction(), Component::class)) {
                 $this->queueLivewireComponentForRegistration($emailVerificationRouteAction);

packages/panels/src/Resources/Pages/Page.php

@@ -13,6 +13,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Route as RouteFacade;
+use function Filament\Support\original_request;
 
 abstract class Page extends BasePage
 {
@@ -59,7 +60,7 @@ public static function getNavigationItems(array $urlParameters = []): array
                 ->parentItem(static::getNavigationParentItem())
                 ->icon(static::getNavigationIcon())
                 ->activeIcon(static::getActiveNavigationIcon())
-                ->isActiveWhen(fn (): bool => request()->routeIs(static::getRouteName()))
+                ->isActiveWhen(fn (): bool => original_request()->routeIs(static::getRouteName()))
                 ->sort(static::getNavigationSort())
                 ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
                 ->url(static::getNavigationUrl($urlParameters)),

packages/panels/src/Resources/Resource/Concerns/HasNavigation.php

@@ -8,6 +8,7 @@
 use Filament\Pages\Enums\SubNavigationPosition;
 use Filament\Resources\Pages\Page;
 use Illuminate\Contracts\Support\Htmlable;
+use function Filament\Support\original_request;
 
 trait HasNavigation
 {
@@ -66,7 +67,7 @@ public static function getNavigationItems(): array
                 ->parentItem(static::getNavigationParentItem())
                 ->icon(static::getNavigationIcon())
                 ->activeIcon(static::getActiveNavigationIcon())
-                ->isActiveWhen(fn () => request()->routeIs(static::getRouteBaseName() . '.*'))
+                ->isActiveWhen(fn () => original_request()->routeIs(static::getRouteBaseName() . '.*'))
                 ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
                 ->badgeTooltip(static::getNavigationBadgeTooltip())
                 ->sort(static::getNavigationSort())

packages/support/src/SupportServiceProvider.php

@@ -25,7 +25,9 @@
 use Illuminate\Support\Str;
 use Illuminate\Support\Stringable;
 use Laravel\Octane\Events\RequestReceived;
+use Livewire\Livewire;
 use Livewire\Mechanisms\DataStore;
+use Livewire\Mechanisms\PersistentMiddleware\PersistentMiddleware;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
@@ -92,6 +94,21 @@ class_exists(RequestReceived::class) && Event::listen(RequestReceived::class, fn
             ),
         );
 
+        $this->app->scoped(
+            'originalRequest',
+            function () {
+                if (! Livewire::isLivewireRequest()) {
+                    return request();
+                }
+
+                $persistentMiddleware = app(PersistentMiddleware::class);
+                $request = invade($persistentMiddleware)->makeFakeRequest();
+                invade($persistentMiddleware)->getRouteFromRequest($request);
+
+                return $request;
+            },
+        );
+
         $this->app->bind(DataStore::class, DataStoreOverride::class);
     }
 

packages/support/src/helpers.php

@@ -7,6 +7,7 @@
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Database\Connection;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Http\Request;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Number;
 use Illuminate\Support\Str;
@@ -219,3 +220,10 @@ function generate_search_term_expression(string $search, ?bool $isSearchForcedCa
         return Str::lower($search);
     }
 }
+
+if (! function_exists('Filament\Support\original_request')) {
+    function original_request(): Request
+    {
+        return app('originalRequest');
+    }
+}