Merge branch '3.x' into fix/item-validation

filamentphp · Nov 28, 2024 · 4232b6f · 4232b6f
2 parents 8262cbd + c69d5af
commit 4232b6f
Show file tree

Hide file tree

Showing 13 changed files with 775 additions and 811 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/packages/actions/resources/lang/sk/import.php b/packages/actions/resources/lang/sk/import.php
@@ -19,7 +19,7 @@
                 'rules' => [
                     'duplicate_columns' => '{0} Súbor nesmie obsahovať viac ako jeden prázdny názov stĺpca.|{1,*} Súbor nesmie obsahovať duplicitné názvy stĺpcov: :columns.',
                 ],
-                
+
             ],
 
             'columns' => [

diff --git a/packages/forms/dist/index.css b/packages/forms/dist/index.css
diff --git a/packages/forms/resources/css/components/markdown-editor.css b/packages/forms/resources/css/components/markdown-editor.css
diff --git a/packages/forms/resources/views/components/rich-editor.blade.php b/packages/forms/resources/views/components/rich-editor.blade.php
diff --git a/packages/forms/resources/views/components/rich-editor/toolbar/button.blade.php b/packages/forms/resources/views/components/rich-editor/toolbar/button.blade.php
@@ -4,7 +4,7 @@
             ->merge([
                 'type' => 'button',
             ], escape: false)
-            ->class(['fi-fo-rich-editor-toolbar-btn flex h-8 min-w-[theme(spacing.8)] cursor-pointer items-center justify-center rounded-lg px-2 text-sm font-semibold text-gray-700 transition duration-75 hover:bg-gray-50 focus-visible:bg-gray-50 dark:text-gray-200 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 [&.trix-active]:bg-gray-50 [&.trix-active]:text-primary-600 dark:[&.trix-active]:bg-white/5 dark:[&.trix-active]:text-primary-400'])
+            ->class(['fi-fo-rich-editor-toolbar-btn flex h-8 min-w-[theme(spacing.8)] cursor-pointer items-center justify-center rounded-lg text-sm font-semibold text-gray-700 transition duration-75 hover:bg-gray-50 focus-visible:bg-gray-50 dark:text-gray-200 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 [&.trix-active]:bg-gray-50 [&.trix-active]:text-primary-600 dark:[&.trix-active]:bg-white/5 dark:[&.trix-active]:text-primary-400'])
     }}
 >
     {{ $slot }}

diff --git a/packages/panels/dist/theme.css b/packages/panels/dist/theme.css
diff --git a/packages/panels/src/Http/Middleware/Authenticate.php b/packages/panels/src/Http/Middleware/Authenticate.php
@@ -19,7 +19,7 @@ protected function authenticate($request, array $guards): void
         if (! $guard->check()) {
             $this->unauthenticated($request, $guards);
 
-            return;
+            return; /** @phpstan-ignore-line */
         }
 
         $this->auth->shouldUse(Filament::getAuthGuard());

diff --git a/packages/spatie-laravel-translatable-plugin/src/SpatieLaravelTranslatablePlugin.php b/packages/spatie-laravel-translatable-plugin/src/SpatieLaravelTranslatablePlugin.php
@@ -54,9 +54,11 @@ public function defaultLocales(?array $defaultLocales = null): static
         return $this;
     }
 
-    public function getLocaleLabelUsing(?Closure $callback): void
+    public function getLocaleLabelUsing(?Closure $callback): static
     {
         $this->getLocaleLabelUsing = $callback;
+
+        return $this;
     }
 
     public function getLocaleLabel(string $locale, ?string $displayLocale = null): ?string

diff --git a/packages/support/composer.json b/packages/support/composer.json
@@ -9,14 +9,14 @@
     },
     "require": {
         "php": "^8.1",
-        "blade-ui-kit/blade-heroicons": "^2.2.1",
+        "blade-ui-kit/blade-heroicons": "^2.5",
         "doctrine/dbal": "^3.2|^4.0",
         "ext-intl": "*",
         "illuminate/contracts": "^10.45|^11.0",
         "illuminate/support": "^10.45|^11.0",
         "illuminate/view": "^10.45|^11.0",
         "kirschbaum-development/eloquent-power-joins": "^3.0|^4.0",
-        "livewire/livewire": "^3.4.10",
+        "livewire/livewire": "3.5.12",
         "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
         "spatie/color": "^1.5",
         "spatie/invade": "^1.0|^2.0",

diff --git a/packages/support/resources/views/components/tabs/item.blade.php b/packages/support/resources/views/components/tabs/item.blade.php
@@ -62,7 +62,7 @@
                 'role' => 'tab',
             ])
             ->class([
-                'fi-tabs-item group flex items-center gap-x-2 rounded-lg px-3 py-2 text-sm font-medium outline-none transition duration-75',
+                'fi-tabs-item group flex items-center justify-center gap-x-2 rounded-lg px-3 py-2 text-sm font-medium outline-none transition duration-75',
                 $inactiveItemClasses => (! $hasAlpineActiveClasses) && (! $active),
                 $activeItemClasses => (! $hasAlpineActiveClasses) && $active,
             ])

diff --git a/packages/tables/resources/lang/sk/table.php b/packages/tables/resources/lang/sk/table.php
@@ -22,7 +22,7 @@
             ],
 
             'more_list_items' => 'a ďalších :count',
-            
+
         ],
 
     ],

diff --git a/packages/tables/resources/lang/uk/table.php b/packages/tables/resources/lang/uk/table.php
@@ -10,6 +10,10 @@
 
     'columns' => [
 
+        'actions' => [
+            'label' => 'Дія|Дії',
+        ],
+
         'text' => [
 
             'actions' => [
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ @@
                     'rules' => [
                         'duplicate_columns' => '{0} Súbor nesmie obsahovať viac ako jeden prázdny názov stĺpca.|{1,*} Súbor nesmie obsahovať duplicitné názvy stĺpcov: :columns.',
                     ],
                 ],
                 'columns' => [
@@ Expand Down @@