@atlaskit/editor-plugin-layout 1.12.5 → 1.12.6

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-layout
 
+## 1.12.6
+
+### Patch Changes
+
+- [#169290](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/169290)
+  [`128ec4e2667bc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/128ec4e2667bc) -
+  ED-25824 fix invalid layout after undo or other operations.
+
 ## 1.12.5
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -15,6 +15,7 @@ var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _preRelease = require("./utils/preRelease");
@@ -65,11 +66,17 @@ var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
   return [];
 };
 var isValidLayoutWidthDistributions = function isValidLayoutWidthDistributions(layoutSection) {
-  var totalWidth = (0, _utils.mapChildren)(layoutSection, function (column) {
+  var totalWidth = 0;
+  (0, _utils.mapChildren)(layoutSection, function (column) {
     return column.attrs.width;
-  }).reduce(function (total, width) {
-    return total + width;
-  }, 0);
+  }).forEach(function (width) {
+    if (typeof width === 'number' && isFinite(width) && width > 0 && width <= 100) {
+      totalWidth += width;
+    }
+
+    // not a valid width, e.g. 0, 100, undefined
+    return false;
+  });
   return Math.round(totalWidth) === 100;
 };
 
@@ -389,12 +396,30 @@ function layoutNeedChanges(node) {
   }
   return !getPresetLayout(node);
 }
+var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
+  var layoutColumnCount = layoutNode.childCount;
+  if (layoutColumnCount <= 1) {
+    return 'single';
+  }
+  switch (layoutColumnCount) {
+    case 2:
+      return 'two_equal';
+    case 3:
+      return 'three_equal';
+    case 4:
+      return 'four_equal';
+    case 5:
+      return 'five_equal';
+    default:
+      return 'five_equal';
+  }
+};
 function getLayoutChange(node, pos, schema) {
   if (node.type === schema.nodes.layoutSection) {
     if (!layoutNeedChanges(node)) {
       return;
     }
-    var presetLayout = node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
+    var presetLayout = (0, _experiments.editorExperiment)('advanced_layouts', true) ? getDefaultPresetLayout(node) : node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
     var fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
     return {
       from: pos + 1,
@@ -443,8 +468,13 @@ var fixColumnStructure = exports.fixColumnStructure = function fixColumnStructur
     selectedLayout = _ref2.selectedLayout;
   if (pos !== null && selectedLayout) {
     var node = state.doc.nodeAt(pos);
-    if (node && node.childCount !== getWidthsForPreset(selectedLayout).length) {
-      return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+    if (node) {
+      if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
+      if (!isValidLayoutWidthDistributions(node) && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
     }
   }
   return;

package/dist/es2019/actions.js

@@ -5,6 +5,7 @@ import { flatmap, getStepRange, isEmptyDocument, mapChildren } from '@atlaskit/e
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { isPreRelease2 } from './utils/preRelease';
@@ -53,9 +54,15 @@ const getWidthsForPreset = presetLayout => {
   return [];
 };
 const isValidLayoutWidthDistributions = layoutSection => {
-  const totalWidth = mapChildren(layoutSection, column => column.attrs.width).reduce((total, width) => {
-    return total + width;
-  }, 0);
+  let totalWidth = 0;
+  mapChildren(layoutSection, column => column.attrs.width).forEach(width => {
+    if (typeof width === 'number' && isFinite(width) && width > 0 && width <= 100) {
+      totalWidth += width;
+    }
+
+    // not a valid width, e.g. 0, 100, undefined
+    return false;
+  });
   return Math.round(totalWidth) === 100;
 };
 
@@ -365,12 +372,30 @@ function layoutNeedChanges(node) {
   }
   return !getPresetLayout(node);
 }
+const getDefaultPresetLayout = layoutNode => {
+  const layoutColumnCount = layoutNode.childCount;
+  if (layoutColumnCount <= 1) {
+    return 'single';
+  }
+  switch (layoutColumnCount) {
+    case 2:
+      return 'two_equal';
+    case 3:
+      return 'three_equal';
+    case 4:
+      return 'four_equal';
+    case 5:
+      return 'five_equal';
+    default:
+      return 'five_equal';
+  }
+};
 function getLayoutChange(node, pos, schema) {
   if (node.type === schema.nodes.layoutSection) {
     if (!layoutNeedChanges(node)) {
       return;
     }
-    const presetLayout = node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
+    const presetLayout = editorExperiment('advanced_layouts', true) ? getDefaultPresetLayout(node) : node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
     const fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
     return {
       from: pos + 1,
@@ -422,8 +447,13 @@ export const fixColumnStructure = state => {
   } = pluginKey.getState(state);
   if (pos !== null && selectedLayout) {
     const node = state.doc.nodeAt(pos);
-    if (node && node.childCount !== getWidthsForPreset(selectedLayout).length) {
-      return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+    if (node) {
+      if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
+      if (!isValidLayoutWidthDistributions(node) && editorExperiment('advanced_layouts', true)) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
     }
   }
   return;

package/dist/esm/actions.js

@@ -8,6 +8,7 @@ import { flatmap, getStepRange, isEmptyDocument, mapChildren } from '@atlaskit/e
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { isPreRelease2 } from './utils/preRelease';
@@ -56,11 +57,17 @@ var getWidthsForPreset = function getWidthsForPreset(presetLayout) {
   return [];
 };
 var isValidLayoutWidthDistributions = function isValidLayoutWidthDistributions(layoutSection) {
-  var totalWidth = mapChildren(layoutSection, function (column) {
+  var totalWidth = 0;
+  mapChildren(layoutSection, function (column) {
     return column.attrs.width;
-  }).reduce(function (total, width) {
-    return total + width;
-  }, 0);
+  }).forEach(function (width) {
+    if (typeof width === 'number' && isFinite(width) && width > 0 && width <= 100) {
+      totalWidth += width;
+    }
+
+    // not a valid width, e.g. 0, 100, undefined
+    return false;
+  });
   return Math.round(totalWidth) === 100;
 };
 
@@ -380,12 +387,30 @@ function layoutNeedChanges(node) {
   }
   return !getPresetLayout(node);
 }
+var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
+  var layoutColumnCount = layoutNode.childCount;
+  if (layoutColumnCount <= 1) {
+    return 'single';
+  }
+  switch (layoutColumnCount) {
+    case 2:
+      return 'two_equal';
+    case 3:
+      return 'three_equal';
+    case 4:
+      return 'four_equal';
+    case 5:
+      return 'five_equal';
+    default:
+      return 'five_equal';
+  }
+};
 function getLayoutChange(node, pos, schema) {
   if (node.type === schema.nodes.layoutSection) {
     if (!layoutNeedChanges(node)) {
       return;
     }
-    var presetLayout = node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
+    var presetLayout = editorExperiment('advanced_layouts', true) ? getDefaultPresetLayout(node) : node.childCount === 2 ? 'two_equal' : node.childCount === 3 ? 'three_equal' : 'single';
     var fixedColumns = columnWidth(node, schema, getWidthsForPreset(presetLayout));
     return {
       from: pos + 1,
@@ -434,8 +459,13 @@ export var fixColumnStructure = function fixColumnStructure(state) {
     selectedLayout = _ref2.selectedLayout;
   if (pos !== null && selectedLayout) {
     var node = state.doc.nodeAt(pos);
-    if (node && node.childCount !== getWidthsForPreset(selectedLayout).length) {
-      return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+    if (node) {
+      if (node.childCount !== getWidthsForPreset(selectedLayout).length) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
+      if (!isValidLayoutWidthDistributions(node) && editorExperiment('advanced_layouts', true)) {
+        return forceSectionToPresetLayout(state, node, pos, selectedLayout);
+      }
     }
   }
   return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "1.12.5",
+	"version": "1.12.6",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",