Cleanup

craftcms · Dec 1, 2024 · 6082369 · 6082369
1 parent 4c3a8cb
commit 6082369
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/fields/Color.php b/src/fields/Color.php
@@ -83,11 +83,11 @@ public function __construct($config = [])
     {
         // presets => palette
         if (array_key_exists('presets', $config) || array_key_exists('defaultColor', $config)) {
-            $default = ArrayHelper::remove($config, 'defaultColor');
+            $defaultColor = ArrayHelper::remove($config, 'defaultColor');
             $config['palette'] = array_map(fn(string $color) => [
                 'color' => $color,
                 'label' => null,
-                'default' => ($color === $default),
+                'default' => ($color === $defaultColor),
             ], ArrayHelper::remove($config, 'presets') ?? []);
         }
 
@@ -260,8 +260,11 @@ public function normalizeValue(mixed $value, ?ElementInterface $element): mixed
         }
 
         // If this is a new entry, look for any default options
-        if ($value === null && $this->isFresh($element) && $this->defaultColor) {
-            $value = $this->defaultColor;
+        if ($value === null && $this->isFresh($element)) {
+            $defaultColor = $this->getDefaultColor();
+            if ($defaultColor) {
+                $value = $defaultColor;
+            }
         }
 
         $value = trim($value);