diff --git a/packages/admin/resources/views/components/dropdown/index.blade.php b/packages/admin/resources/views/components/dropdown/index.blade.php new file mode 100644 index 0000000000..f15143360a --- /dev/null +++ b/packages/admin/resources/views/components/dropdown/index.blade.php @@ -0,0 +1,10 @@ +@captureSlots([ + 'trigger', +]) + + + {{ $slot }} + diff --git a/packages/admin/resources/views/components/layouts/app/topbar/user-menu.blade.php b/packages/admin/resources/views/components/layouts/app/topbar/user-menu.blade.php index 7dbf666c77..ef38ff2e55 100644 --- a/packages/admin/resources/views/components/layouts/app/topbar/user-menu.blade.php +++ b/packages/admin/resources/views/components/layouts/app/topbar/user-menu.blade.php @@ -2,123 +2,104 @@ $user = \Filament\Facades\Filament::auth()->user(); @endphp -
class(['relative']) }} -> - - - -
+ @php + $items = \Filament\Facades\Filament::getUserMenuItems(); + $accountItem = $items['account'] ?? null; + $logoutItem = $items['logout'] ?? null; + @endphp + + + {{ $accountItem?->getLabel() ?? \Filament\Facades\Filament::getUserName($user) }} + + +
+ @if (config('filament.dark_mode')) + + {{ __('filament::layout.buttons.light_mode.label') }} + + + + {{ __('filament::layout.buttons.dark_mode.label') }} + + @endif +
+ + @foreach ($items as $key => $item) + @if ($key !== 'account' && $key !== 'logout') + + {{ $item->getLabel() }} + + @endif + @endforeach + + + {{ $logoutItem?->getLabel() ?? __('filament::layout.buttons.logout.label') }} + + + diff --git a/packages/forms/resources/views/components/builder.blade.php b/packages/forms/resources/views/components/builder.blade.php index 984b47492f..47d332a44b 100644 --- a/packages/forms/resources/views/components/builder.blade.php +++ b/packages/forms/resources/views/components/builder.blade.php @@ -187,13 +187,13 @@ class="space-y-12" x-transition class="absolute inset-x-0 bottom-0 z-10 flex items-center justify-center h-12 -mb-12" > -
- + + + + -
+ @endif diff --git a/packages/forms/resources/views/components/builder/block-picker.blade.php b/packages/forms/resources/views/components/builder/block-picker.blade.php index 75ff5c095d..961b15edf5 100644 --- a/packages/forms/resources/views/components/builder/block-picker.blade.php +++ b/packages/forms/resources/views/components/builder/block-picker.blade.php @@ -4,26 +4,13 @@ 'statePath', ]) -
class([ - 'absolute hidden z-20 w-52 filament-forms-builder-component-block-picker', - ]) }} -> - +
class(['filament-forms-builder-component-block-picker']) }}> + @foreach ($blocks as $block) + + {{ $block->getLabel() }} + + @endforeach
diff --git a/packages/forms/resources/views/components/dropdown/index.blade.php b/packages/forms/resources/views/components/dropdown/index.blade.php new file mode 100644 index 0000000000..afa391ef44 --- /dev/null +++ b/packages/forms/resources/views/components/dropdown/index.blade.php @@ -0,0 +1,10 @@ +@captureSlots([ + 'trigger', +]) + + + {{ $slot }} + diff --git a/packages/support/resources/views/components/actions/group.blade.php b/packages/support/resources/views/components/actions/group.blade.php index 701f30a096..9631e704e0 100644 --- a/packages/support/resources/views/components/actions/group.blade.php +++ b/packages/support/resources/views/components/actions/group.blade.php @@ -7,39 +7,26 @@ 'tooltip' => null, ]) -
class(['relative']) }}> - - - {{ $label }} - - + + + + + {{ $label }} + + + - -
+ @foreach ($actions as $action) + @if (! $action->isHidden()) + {{ $action }} + @endif + @endforeach + diff --git a/packages/support/resources/views/components/dropdown/index.blade.php b/packages/support/resources/views/components/dropdown/index.blade.php new file mode 100644 index 0000000000..9cebd76436 --- /dev/null +++ b/packages/support/resources/views/components/dropdown/index.blade.php @@ -0,0 +1,46 @@ +@props([ + 'darkMode' => false, + 'placement' => 'bottom-end', + 'teleport' => false, + 'trigger' => null, + 'width' => 'sm', +]) + +
class('filament-dropdown') }} +> +
+ {{ $trigger }} +
+ +
$darkMode, + match ($width) { + 'xs' => 'max-w-xs', + 'md' => 'max-w-md', + 'lg' => 'max-w-lg', + 'xl' => 'max-w-xl', + '2xl' => 'max-w-2xl', + '3xl' => 'max-w-3xl', + '4xl' => 'max-w-4xl', + '5xl' => 'max-w-5xl', + '6xl' => 'max-w-6xl', + '7xl' => 'max-w-7xl', + default => 'max-w-sm', + }, + ]) + > + {{ $slot }} +
+
diff --git a/packages/support/resources/views/components/dropdown/item.blade.php b/packages/support/resources/views/components/dropdown/item.blade.php index 51cb2ba319..0e056ca053 100644 --- a/packages/support/resources/views/components/dropdown/item.blade.php +++ b/packages/support/resources/views/components/dropdown/item.blade.php @@ -41,7 +41,7 @@ ]); @endphp -
  • only(['class']) }}> +
    only(['class']) }}> @if ($tag === 'button')
  • +
    diff --git a/packages/tables/resources/views/components/bulk-actions/index.blade.php b/packages/tables/resources/views/components/bulk-actions/index.blade.php index f671e8c696..1c4ff2eac3 100644 --- a/packages/tables/resources/views/components/bulk-actions/index.blade.php +++ b/packages/tables/resources/views/components/bulk-actions/index.blade.php @@ -2,31 +2,12 @@ 'actions', ]) -
    class(['relative filament-tables-bulk-actions']) }} -> - +class(['filament-tables-bulk-actions']) }}> + + + - -
    + @foreach ($actions as $action) + {{ $action }} + @endforeach + diff --git a/packages/tables/resources/views/components/bulk-actions/trigger.blade.php b/packages/tables/resources/views/components/bulk-actions/trigger.blade.php index 61e26580a1..b53c55447e 100644 --- a/packages/tables/resources/views/components/bulk-actions/trigger.blade.php +++ b/packages/tables/resources/views/components/bulk-actions/trigger.blade.php @@ -1,6 +1,5 @@ class(['filament-tables-bulk-actions-trigger']) }} /> diff --git a/packages/tables/resources/views/components/dropdown/index.blade.php b/packages/tables/resources/views/components/dropdown/index.blade.php new file mode 100644 index 0000000000..bb608dd75d --- /dev/null +++ b/packages/tables/resources/views/components/dropdown/index.blade.php @@ -0,0 +1,10 @@ +@captureSlots([ + 'trigger', +]) + + + {{ $slot }} + diff --git a/packages/tables/resources/views/components/filters/popover.blade.php b/packages/tables/resources/views/components/filters/popover.blade.php index 2522ba7d34..71ad3e55a2 100644 --- a/packages/tables/resources/views/components/filters/popover.blade.php +++ b/packages/tables/resources/views/components/filters/popover.blade.php @@ -3,54 +3,24 @@ 'width' => 'sm', ]) -
    class(['relative inline-block filament-tables-filters']) }} -> - +class(['filament-tables-filters']) }}> + + + -
    + diff --git a/packages/tables/resources/views/components/filters/trigger.blade.php b/packages/tables/resources/views/components/filters/trigger.blade.php index c10dc23fe7..a40d8b6547 100644 --- a/packages/tables/resources/views/components/filters/trigger.blade.php +++ b/packages/tables/resources/views/components/filters/trigger.blade.php @@ -1,6 +1,5 @@ class(['filament-tables-filters-trigger']) }} /> diff --git a/packages/tables/resources/views/components/toggleable/index.blade.php b/packages/tables/resources/views/components/toggleable/index.blade.php index 52771f0ba4..6aec91e521 100644 --- a/packages/tables/resources/views/components/toggleable/index.blade.php +++ b/packages/tables/resources/views/components/toggleable/index.blade.php @@ -3,46 +3,16 @@ 'width' => 'sm', ]) -
    class(['relative inline-block filament-tables-column-toggling']) }} -> - +class(['filament-tables-column-toggling']) }}> + + + -
    + diff --git a/packages/tables/resources/views/components/toggleable/trigger.blade.php b/packages/tables/resources/views/components/toggleable/trigger.blade.php index 638b4a52a4..0e76914b8b 100644 --- a/packages/tables/resources/views/components/toggleable/trigger.blade.php +++ b/packages/tables/resources/views/components/toggleable/trigger.blade.php @@ -1,6 +1,5 @@ class(['filament-tables-column-toggling-trigger']) }} />