Merge pull request #136 from craftpulse/v4-develop

4.5.3

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.5.3 - 2024-09-23
+### Fixed
+- Undefined Array Key 0 Error in Craft 5.36 Colour Swatches 5.0.2 #133
+- Error occurs when entering colors directly in the CMS field #127
+
 ## 4.5.2 - 2024-04-15
 ### Fixed
 - Fixed the bug when default color isn't the first in array #124

composer.json

@@ -2,7 +2,7 @@
     "name": "craftpulse/craft-colour-swatches",
     "description": "Let clients choose from a predefined set of colours and utilise associated colour codes and class names in your templates.",
     "type": "craft-plugin",
-    "version": "4.5.2",
+    "version": "4.5.3",
     "keywords": [
         "craft",
         "cms",

src/fields/ColourSwatches.php

@@ -192,10 +192,16 @@ public function serializeValue(mixed $value, ?ElementInterface $element = null):
         if (!$saveValue) {
 
             if (is_null($this->default)) {
-                $default = array_filter($settingsPalette, function($option) {return $option['default'] == true;});
+                $array_filter = [];
+                foreach ($settingsPalette as $key => $option) {
+                    if ($option['default']) {
+                        $array_filter[$key] = $option;
+                    }
+                }
+                $default = $array_filter;
 
                 if (!is_null($default) && count($default) > 0) {
-                    $this->default = $default[0]['label'];
+                    $this->default = array_values($default)[0]['label'];
                 }
             }
 

src/models/Settings.php

@@ -31,7 +31,7 @@ class Settings extends Model
     protected function defineRules(): array
     {
         return [
-            [['colors', 'palettes'], 'required'],
+//            [['colors', 'palettes'], 'required'],
             [['colors', 'palettes'], function ($attribute, $params) {
                 if (!is_array($this->colors)) {
                     $this->addError('colors', Craft::t('colour-swatches', 'colors is not array!'));
@@ -49,7 +49,7 @@ protected function defineRules(): array
                         }
                     }
                 }
-                
+
                 return $palettes;
             }]
         ];

src/templates/input.twig

@@ -31,7 +31,7 @@
 {#    : field.options %}#}
 
 {% if options|length == 0 %}
-    <p>{{ "The selected colour palette for this field isn\'t defined in the `colour-swatches.php` config file"|t('colour-swatches') }}</p>
+    <p>{{ "The selected colour palette for this field isn\'t defined in the `colour-swatches.php` config file or settings."|t('colour-swatches') }}</p>
 {% endif %}
 
 <div id="{{ id }}" class="color-swatches">