fix(field): Fix potential exception when editor palette is empty (Fixes

#43) (#44) enhance(plugin): Move `palette()` to a trait to allow usage outside of the plugin
Log1x · Nov 4, 2022 · 30af4f6 · 30af4f6
1 parent 59f3798
commit 30af4f6
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 42 deletions.
diff --git a/plugin.php b/plugin.php
@@ -4,7 +4,7 @@
  * Plugin Name: Advanced Custom Fields: Editor Palette Field
  * Plugin URI:  https://github.com/log1x/acf-editor-palette
  * Description: A Gutenberg-like editor palette color picker field for Advanced Custom Fields.
- * Version:     1.1.3
+ * Version:     1.1.4
  * Author:      Brandon Nifong
  * Author URI:  https://github.com/log1x
  */

diff --git a/src/Concerns/Palette.php b/src/Concerns/Palette.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Log1x\AcfEditorPalette\Concerns;
+
+trait Palette
+{
+    /**
+     * Retrieve the editor color palette.
+     *
+     * @param  string $color
+     * @return string[]
+     */
+    public function palette($color = null)
+    {
+        $colors = [];
+        $themeJson = [];
+
+        $palette = (array) current(
+            get_theme_support('editor-color-palette') ?? []
+        );
+
+        if (function_exists('wp_get_global_settings')) {
+            $themeJson = wp_get_global_settings(['color', 'palette', 'theme']);
+        }
+
+        if (! isset($themeJson['border'])) {
+            $palette = array_merge($palette, $themeJson);
+        }
+
+        if (empty($palette)) {
+            return $color ?: $colors;
+        }
+
+        foreach ($palette as $value) {
+            $colors = array_merge($colors, [
+                $value['slug'] => array_merge($value, [
+                    'text' => sprintf('has-text-color has-%s-color', $value['slug']),
+                    'background' => sprintf('has-background has-%s-background-color', $value['slug']),
+                ])
+            ]);
+        }
+
+        return ! empty($color) ? (
+            $colors[$color] ?? null
+        ) : $colors;
+    }
+}
diff --git a/src/Field.php b/src/Field.php
@@ -5,6 +5,7 @@
 class Field extends \acf_field
 {
     use Concerns\Asset;
+    use Concerns\Palette;
 
     /**
      * The default field values.
@@ -34,47 +35,6 @@ public function __construct(callable $plugin)
         parent::__construct();
     }
 
-    /**
-     * Retrieve the editor color palette.
-     *
-     * @param  string $color
-     * @return string[]
-     */
-    protected function palette($color = null)
-    {
-        $colors = [];
-        $themeJson = [];
-
-        $palette = (array) current(
-            get_theme_support('editor-color-palette')
-        );
-
-        if (function_exists('wp_get_global_settings')) {
-            $themeJson = wp_get_global_settings(['color', 'palette', 'theme']);
-        }
-
-        if (! isset($themeJson['border'])) {
-            $palette = array_merge($palette, $themeJson);
-        }
-
-        if (empty($palette)) {
-            return $color ?: $colors;
-        }
-
-        foreach ($palette as $value) {
-            $colors = array_merge($colors, [
-                $value['slug'] => array_merge($value, [
-                    'text' => sprintf('has-text-color has-%s-color', $value['slug']),
-                    'background' => sprintf('has-background has-%s-background-color', $value['slug']),
-                ])
-            ]);
-        }
-
-        return ! empty($color) ? (
-            $colors[$color] ?? null
-        ) : $colors;
-    }
-
     /**
      * The rendered field type.
      *