Solved issue: initial layout selection not applied

eea · Oct 12, 2020 · add0c02 · add0c02
1 parent 9f633d6
commit add0c02
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/ColumnsBlock/ColumnsBlockEdit.jsx b/src/ColumnsBlock/ColumnsBlockEdit.jsx
@@ -139,12 +139,11 @@ class ColumnsBlockEdit extends React.Component {
     const cols = this.props.data.data?.blocks_layout?.items || [];
     const prevCols = prevProps.data.data?.blocks_layout?.items || [];
 
-    console.log('val', this.props.data.gridCols);
-    if (
-      cols.length !==
-      prevCols.length /* ||
-      this.props.data.gridCols?.length === 0 */
-    ) {
+    const colNumChanged = cols.length !== prevCols.length;
+    const notInitialLayoutSelection = prevCols.length !== 0;
+    const shouldUpdateLayout = colNumChanged && notInitialLayoutSelection;
+
+    if (shouldUpdateLayout) {
       const available_variants = variants.filter(
         ({ defaultData }) => defaultData?.gridCols?.length === cols.length,
       );