Merge branch '4.x' into 5.x

danharrin · danharrin · commit 1a3e97ff5fd8 · 2026-04-03T16:11:05.000+01:00
diff --git a/docs/12-components/03-avatar.md b/docs/12-components/03-avatar.md
@@ -52,3 +52,4 @@ You can also pass your own custom size classes into the `size` attribute:
     alt="Dan Harrin"
     size="w-12 h-12"
 />
+```
diff --git a/packages/forms/resources/lang/en/components.php b/packages/forms/resources/lang/en/components.php
@@ -548,6 +548,35 @@
 
                         'color' => [
                             'label' => 'Color',
+
+                            'options' => [
+                                'slate' => 'Slate',
+                                'gray' => 'Gray',
+                                'zinc' => 'Zinc',
+                                'neutral' => 'Neutral',
+                                'stone' => 'Stone',
+                                'mauve' => 'Mauve',
+                                'olive' => 'Olive',
+                                'mist' => 'Mist',
+                                'taupe' => 'Taupe',
+                                'red' => 'Red',
+                                'orange' => 'Orange',
+                                'amber' => 'Amber',
+                                'yellow' => 'Yellow',
+                                'lime' => 'Lime',
+                                'green' => 'Green',
+                                'emerald' => 'Emerald',
+                                'teal' => 'Teal',
+                                'cyan' => 'Cyan',
+                                'sky' => 'Sky',
+                                'blue' => 'Blue',
+                                'indigo' => 'Indigo',
+                                'violet' => 'Violet',
+                                'purple' => 'Purple',
+                                'fuchsia' => 'Fuchsia',
+                                'pink' => 'Pink',
+                                'rose' => 'Rose',
+                            ],
                         ],
 
                         'custom_color' => [
diff --git a/packages/forms/resources/lang/fr/components.php b/packages/forms/resources/lang/fr/components.php
@@ -548,6 +548,35 @@
 
                         'color' => [
                             'label' => 'Couleur',
+
+                            'options' => [
+                                'slate' => 'Ardoise',
+                                'gray' => 'Gris',
+                                'zinc' => 'Zinc',
+                                'neutral' => 'Neutre',
+                                'stone' => 'Pierre',
+                                'mauve' => 'Mauve',
+                                'olive' => 'Olive',
+                                'mist' => 'Brume',
+                                'taupe' => 'Taupe',
+                                'red' => 'Rouge',
+                                'orange' => 'Orange',
+                                'amber' => 'Ambre',
+                                'yellow' => 'Jaune',
+                                'lime' => 'Citron vert',
+                                'green' => 'Vert',
+                                'emerald' => 'Émeraude',
+                                'teal' => 'Sarcelle',
+                                'cyan' => 'Cyan',
+                                'sky' => 'Ciel',
+                                'blue' => 'Bleu',
+                                'indigo' => 'Indigo',
+                                'violet' => 'Violet',
+                                'purple' => 'Pourpre',
+                                'fuchsia' => 'Fuchsia',
+                                'pink' => 'Rose',
+                                'rose' => 'Rosé',
+                            ],
                         ],
 
                         'custom_color' => [
diff --git a/packages/forms/src/Components/RichEditor/TextColor.php b/packages/forms/src/Components/RichEditor/TextColor.php
@@ -48,9 +48,17 @@ public function getDarkColor(): ?string
      */
     public static function getDefaults(): array
     {
+        $translations = __('filament-forms::components.rich_editor.actions.text_color.modal.form.color.options');
+
         return Arr::mapWithKeys(
             Color::all(),
-            fn (array $color, string $name): array => [$name => TextColor::make(Str::ucwords($name), $color['600'], $color['400'] ?? null)],
+            static fn (array $color, string $name): array => [$name => TextColor::make(
+                is_array($translations) && array_key_exists($name, $translations)
+                    ? $translations[$name]
+                    : Str::ucwords($name),
+                $color['600'],
+                $color['400'] ?? null,
+            )],
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,17 @@ public function getDarkColor(): ?string`
`48`	`48`	`*/`
`49`	`49`	`public static function getDefaults(): array`
`50`	`50`	`{`
	`51`	`+ $translations = __('filament-forms::components.rich_editor.actions.text_color.modal.form.color.options');`
	`52`	`+`
`51`	`53`	`return Arr::mapWithKeys(`
`52`	`54`	`Color::all(),`
`53`		`- fn (array $color, string $name): array => [$name => TextColor::make(Str::ucwords($name), $color['600'], $color['400'] ?? null)],`
	`55`	`+ static fn (array $color, string $name): array => [$name => TextColor::make(`
	`56`	`+ is_array($translations) && array_key_exists($name, $translations)`
	`57`	`+ ? $translations[$name]`
	`58`	`+ : Str::ucwords($name),`
	`59`	`+ $color['600'],`
	`60`	`+ $color['400'] ?? null,`
	`61`	`+ )],`
`54`	`62`	`);`
`55`	`63`	`}`
`56`	`64`	`}`