mirror of
https://github.com/filamentphp/filament.git
synced 2026-09-24 15:42:09 +08:00
Merge branch '3.x' into 4.x
This commit is contained in:
Dan Harrin
Generated
+3
-3
@@ -1525,9 +1525,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/rollup": {
|
||||
"version": "3.29.4",
|
||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
|
||||
"integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
|
||||
"version": "3.29.5",
|
||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
|
||||
"integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
|
||||
"bin": {
|
||||
"rollup": "dist/bin/rollup"
|
||||
},
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"autoprefixer": "^10.4.7",
|
||||
"laravel-vite-plugin": "^0.7.2",
|
||||
"postcss": "^8.4.14",
|
||||
"postcss-nesting": "^12.0.1",
|
||||
"postcss-nesting": "^13.0.0",
|
||||
"tailwindcss": "^3.4.0",
|
||||
"vite": "^4.5.5"
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ Normally, Filament v3 recommends that users style their plugins with a custom fi
|
||||
"cssnano": "^6.0.1",
|
||||
"postcss": "^8.4.27",
|
||||
"postcss-cli": "^10.1.0",
|
||||
"postcss-nesting": "^12.0.0"
|
||||
"postcss-nesting": "^13.0.0"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Generated
+1213
-241
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -53,10 +53,10 @@
|
||||
"mime": "^4.0.4",
|
||||
"npm-run-all": "^4.1.5",
|
||||
"postcss": "^8.4.4",
|
||||
"postcss-nesting": "^12.0.1",
|
||||
"postcss-nesting": "^13.0.0",
|
||||
"prettier": "^3.1.1",
|
||||
"prettier-plugin-blade": "v2.0.0",
|
||||
"prettier-plugin-tailwindcss": "^0.5.10",
|
||||
"prettier-plugin-tailwindcss": "^0.6.8",
|
||||
"pusher-js": "^7.4.0",
|
||||
"sortablejs": "^1.15.0",
|
||||
"tailwindcss": "^3.4.0",
|
||||
|
||||
@@ -4,7 +4,7 @@ return [
|
||||
|
||||
'single' => [
|
||||
|
||||
'label' => 'Vista',
|
||||
'label' => 'Ver',
|
||||
|
||||
'modal' => [
|
||||
|
||||
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+1
-1
@@ -13,7 +13,7 @@ cropperjs/dist/cropper.min.css:
|
||||
|
||||
filepond/dist/filepond.min.css:
|
||||
(*!
|
||||
* FilePond 4.31.3
|
||||
* FilePond 4.31.4
|
||||
* Licensed under MIT, https://opensource.org/licenses/MIT/
|
||||
* Please visit https://pqina.nl/filepond/ for details.
|
||||
*)
|
||||
|
||||
@@ -33,3 +33,26 @@ ColorPicker::make('rgb_color')
|
||||
ColorPicker::make('rgba_color')
|
||||
->rgba()
|
||||
```
|
||||
|
||||
## Color picker validation
|
||||
|
||||
You may use Laravel's validation rules to validate the values of the color picker:
|
||||
|
||||
```php
|
||||
use Filament\Forms\Components\ColorPicker;
|
||||
|
||||
ColorPicker::make('hex_color')
|
||||
->regex('/^#([a-f0-9]{6}|[a-f0-9]{3})\b$/')
|
||||
|
||||
ColorPicker::make('hsl_color')
|
||||
->hsl()
|
||||
->regex('/^hsl\(\s*(\d+)\s*,\s*(\d*(?:\.\d+)?%)\s*,\s*(\d*(?:\.\d+)?%)\)$/')
|
||||
|
||||
ColorPicker::make('rgb_color')
|
||||
->rgb()
|
||||
->regex('/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/')
|
||||
|
||||
ColorPicker::make('rgba_color')
|
||||
->rgba()
|
||||
->regex('/^rgba\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3}),\s*(\d*(?:\.\d+)?)\)$/')
|
||||
```
|
||||
|
||||
@@ -247,7 +247,7 @@ export default function fileUploadFormComponent({
|
||||
.map((file) =>
|
||||
file.source instanceof File
|
||||
? file.serverId
|
||||
: this.uploadedFileIndex[file.source] ?? null,
|
||||
: (this.uploadedFileIndex[file.source] ?? null),
|
||||
) // file.serverId is null for a file that is not yet uploaded
|
||||
.filter((fileKey) => fileKey)
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
'cursor-pointer' => $itemIsCopyable,
|
||||
])
|
||||
@style([
|
||||
"background-color: {$state}" => $state,
|
||||
'background-color: ' . e($state) => $state,
|
||||
])
|
||||
></div>
|
||||
@endforeach
|
||||
|
||||
@@ -31,11 +31,11 @@ If your desired customization can't be achieved using the CSS classes above, you
|
||||
use Filament\Notifications\Notification;
|
||||
|
||||
Notification::configureUsing(function (Notification $notification): void {
|
||||
$notification->view('filament-notifications.notification');
|
||||
$notification->view('filament.notifications.notification');
|
||||
});
|
||||
```
|
||||
|
||||
Next, create the view, in this example `resources/views/notifications/notification.blade.php`. The view should use the package's base notification component for the notification functionality and pass the available `$notification` variable through the `notification` attribute. This is the bare minimum required to create your own notification view:
|
||||
Next, create the view, in this example `resources/views/filament/notifications/notification.blade.php`. The view should use the package's base notification component for the notification functionality and pass the available `$notification` variable through the `notification` attribute. This is the bare minimum required to create your own notification view:
|
||||
|
||||
```blade
|
||||
<x-filament-notifications::notification :notification="$notification">
|
||||
|
||||
@@ -138,7 +138,7 @@ class InstallCommand extends Command
|
||||
'@tailwindcss/typography' => '^0.5.4',
|
||||
'autoprefixer' => '^10.4.7',
|
||||
'postcss' => '^8.4.14',
|
||||
'postcss-nesting' => '^12.0.1',
|
||||
'postcss-nesting' => '^13.0.0',
|
||||
'tailwindcss' => '^3.1',
|
||||
...Arr::except($packages, [
|
||||
'axios',
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
'cursor-pointer' => $itemIsCopyable,
|
||||
])
|
||||
@style([
|
||||
"background-color: {$state}" => $state,
|
||||
'background-color: ' . e($state) => $state,
|
||||
])
|
||||
></div>
|
||||
@endforeach
|
||||
|
||||
@@ -216,7 +216,7 @@ class SelectFilter extends BaseFilter
|
||||
}
|
||||
|
||||
/**
|
||||
* @param bool | array<string> | Closure $condition
|
||||
* @param bool | array<string> | Closure $condition
|
||||
*/
|
||||
public function searchable(bool | array | Closure $condition = true): static
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user