@atlaskit/editor-plugin-layout 2.5.0 → 2.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-layout
 
+## 2.5.1
+
+### Patch Changes
+
+- [#142936](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/142936)
+  [`9d1e16eaadf95`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9d1e16eaadf95) -
+  ED-26662: Delete layout column can create a single column layout
+- Updated dependencies
+
 ## 2.5.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/main.js

@@ -80,7 +80,7 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
 // see packages/editor/editor-plugin-layout-tests/src/__tests__/unit/delete.ts
 var handleDeleteLayoutColumn = function handleDeleteLayoutColumn(state, dispatch) {
   var sel = state.selection;
-  if (sel instanceof _state.NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && (0, _experiments.editorExperiment)('advanced_layouts', true)) {
+  if (sel instanceof _state.NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && (0, _experiments.editorExperiment)('advanced_layouts', true) && !(0, _experiments.editorExperiment)('single_column_layouts', true)) {
     var _sel$$from$parent$las, _sel$$from$parent$fir;
     var tr = state.tr;
     var layoutContentFragment = sel.$from.parentOffset === 0 ? _model.Fragment.from((_sel$$from$parent$las = sel.$from.parent.lastChild) === null || _sel$$from$parent$las === void 0 ? void 0 : _sel$$from$parent$las.content) : _model.Fragment.from((_sel$$from$parent$fir = sel.$from.parent.firstChild) === null || _sel$$from$parent$fir === void 0 ? void 0 : _sel$$from$parent$fir.content);
@@ -172,12 +172,10 @@ var _default = exports.default = function _default(options) {
       if ((0, _experiments.editorExperiment)('advanced_layouts', true) && changes.length === 1) {
         var _change$slice$content, _change$slice$content2;
         var change = changes[0];
-        // when need to update a layoutColumn with width 100
-        // meaning a single column layout has been create,
-        // We replace the layout with its content
-        // This is to prevent a single column layout from being created
-        // when a user deletes a layoutColumn
-        if (change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === _consts.EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
+        // When editorExperiment('single_column_layouts', true) is on
+        // delete can create a single column layout
+        // otherwise we replace the single column layout with its content
+        if (!(0, _experiments.editorExperiment)('single_column_layouts', true) && change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === _consts.EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
           var tr = newState.tr;
           var content = change.slice.content.firstChild.content;
           tr.replaceWith(change.from - 1, change.to, content);

package/dist/es2019/pm-plugins/main.js

@@ -75,7 +75,7 @@ const getInitialPluginState = (options, state) => {
 // see packages/editor/editor-plugin-layout-tests/src/__tests__/unit/delete.ts
 const handleDeleteLayoutColumn = (state, dispatch) => {
   const sel = state.selection;
-  if (sel instanceof NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && editorExperiment('advanced_layouts', true)) {
+  if (sel instanceof NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && editorExperiment('advanced_layouts', true) && !editorExperiment('single_column_layouts', true)) {
     var _sel$$from$parent$las, _sel$$from$parent$fir;
     const tr = state.tr;
     const layoutContentFragment = sel.$from.parentOffset === 0 ? Fragment.from((_sel$$from$parent$las = sel.$from.parent.lastChild) === null || _sel$$from$parent$las === void 0 ? void 0 : _sel$$from$parent$las.content) : Fragment.from((_sel$$from$parent$fir = sel.$from.parent.firstChild) === null || _sel$$from$parent$fir === void 0 ? void 0 : _sel$$from$parent$fir.content);
@@ -162,12 +162,10 @@ export default (options => new SafePlugin({
     if (editorExperiment('advanced_layouts', true) && changes.length === 1) {
       var _change$slice$content, _change$slice$content2;
       const change = changes[0];
-      // when need to update a layoutColumn with width 100
-      // meaning a single column layout has been create,
-      // We replace the layout with its content
-      // This is to prevent a single column layout from being created
-      // when a user deletes a layoutColumn
-      if (change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
+      // When editorExperiment('single_column_layouts', true) is on
+      // delete can create a single column layout
+      // otherwise we replace the single column layout with its content
+      if (!editorExperiment('single_column_layouts', true) && change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
         const tr = newState.tr;
         const {
           content

package/dist/esm/pm-plugins/main.js

@@ -73,7 +73,7 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
 // see packages/editor/editor-plugin-layout-tests/src/__tests__/unit/delete.ts
 var handleDeleteLayoutColumn = function handleDeleteLayoutColumn(state, dispatch) {
   var sel = state.selection;
-  if (sel instanceof NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && editorExperiment('advanced_layouts', true)) {
+  if (sel instanceof NodeSelection && sel.node.type.name === 'layoutColumn' && sel.$from.parent.type.name === 'layoutSection' && sel.$from.parent.childCount === 2 && dispatch && editorExperiment('advanced_layouts', true) && !editorExperiment('single_column_layouts', true)) {
     var _sel$$from$parent$las, _sel$$from$parent$fir;
     var tr = state.tr;
     var layoutContentFragment = sel.$from.parentOffset === 0 ? Fragment.from((_sel$$from$parent$las = sel.$from.parent.lastChild) === null || _sel$$from$parent$las === void 0 ? void 0 : _sel$$from$parent$las.content) : Fragment.from((_sel$$from$parent$fir = sel.$from.parent.firstChild) === null || _sel$$from$parent$fir === void 0 ? void 0 : _sel$$from$parent$fir.content);
@@ -165,12 +165,10 @@ export default (function (options) {
       if (editorExperiment('advanced_layouts', true) && changes.length === 1) {
         var _change$slice$content, _change$slice$content2;
         var change = changes[0];
-        // when need to update a layoutColumn with width 100
-        // meaning a single column layout has been create,
-        // We replace the layout with its content
-        // This is to prevent a single column layout from being created
-        // when a user deletes a layoutColumn
-        if (change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
+        // When editorExperiment('single_column_layouts', true) is on
+        // delete can create a single column layout
+        // otherwise we replace the single column layout with its content
+        if (!editorExperiment('single_column_layouts', true) && change.slice.content.childCount === 1 && ((_change$slice$content = change.slice.content.firstChild) === null || _change$slice$content === void 0 ? void 0 : _change$slice$content.type.name) === 'layoutColumn' && ((_change$slice$content2 = change.slice.content.firstChild) === null || _change$slice$content2 === void 0 ? void 0 : _change$slice$content2.attrs.width) === EVEN_DISTRIBUTED_COL_WIDTHS[1]) {
           var tr = newState.tr;
           var content = change.slice.content.firstChild.content;
           tr.replaceWith(change.from - 1, change.to, content);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "2.5.0",
+	"version": "2.5.1",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^103.7.0",
+		"@atlaskit/editor-common": "^103.12.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -45,8 +45,8 @@
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.8.0",
-		"@atlaskit/tokens": "^4.7.0",
+		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tokens": "^4.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},