Merge pull request #122 from craftpulse/v4-develop

4.5.1

CHANGELOG.md

@@ -4,6 +4,10 @@ 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.1 - 2024-03-08
+### Fixed
+- Fixed the default fetch if the default isn't the first one in the config list
+
 ## 4.5.0 - 2024-03-02
 ### Changed
 - Changed code according to PHPStan advise (prep for Craft 5)
@@ -109,4 +113,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Updated Types
 
 ### Removed
-- Removed unused element class
+- Removed unused element class

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.0",
+    "version": "4.5.1",
     "keywords": [
         "craft",
         "cms",

src/fields/ColourSwatches.php

@@ -143,8 +143,12 @@ public function normalizeValue(mixed $value, ?ElementInterface $element = null):
             // if default is set --> return default
             $default = array_filter($this->options, function($option) {return $option['default'] == 1;});
 
-            if (is_array($default) && count($default) > 0) {
-                return new ColourSwatchesModel(Json::encode($default[0]));
+            if (!is_null($default) && count($default) > 0) {
+                try {
+                    return new ColourSwatchesModel(Json::encode(current($default)));
+                } catch(\ErrorException) {
+                    Craft::error("There's no default colour defined");
+                }
             }
 
             // if no default is set --> return null