BUGFIX: Correctly display string presets

The merge order overwrote the object made in the code before
Sebobo · Jun 9, 2023 · 1a96b80 · 1a96b80
1 parent 2c4a194
commit 1a96b80
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Resources/Private/Scripts/ColorPickerEditor/src/ColorPickerEditor.tsx b/Resources/Private/Scripts/ColorPickerEditor/src/ColorPickerEditor.tsx
@@ -63,8 +63,8 @@ export default function makeColorPickerEditor(defaults: ColorPickerOptions) {
 
             this.state = {
                 ...(defaults || {}),
-                presetColors,
                 ...options,
+                presetColors,
             };
         }
 

diff --git a/Resources/Public/ColorPickerEditor/Plugin.js b/Resources/Public/ColorPickerEditor/Plugin.js
diff --git a/Resources/Public/ColorPickerEditor/Plugin.js.map b/Resources/Public/ColorPickerEditor/Plugin.js.map