fixed update control array data in Constructor (can't clear)

nk-crew · Apr 18, 2020 · 2ab1db6 · 2ab1db6
1 parent c8cb79e
commit 2ab1db6
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/assets/admin/constructor/store/block-data/reducer.jsx b/src/assets/admin/constructor/store/block-data/reducer.jsx
@@ -58,17 +58,20 @@ function reducer( state = { data: false }, action ) {
             state.data.controls &&
             state.data.controls[ action.id ]
         ) {
+            // We can't just use merge() here, as it will merge inner arrays
+            // but we always need to override it.
             return {
                 ...state,
-                data: merge(
-                    {},
-                    state.data,
-                    {
-                        controls: {
-                            [ action.id ]: action.data,
+                data: {
+                    ...( state.data || {} ),
+                    controls: {
+                        ...( state.data.controls || {} ),
+                        [ action.id ]: {
+                            ...( state.data.controls[ action.id ] || {} ),
+                            ...action.data,
                         },
-                    }
-                ),
+                    },
+                },
             };
         }