@atlaskit/editor-plugin-layout 2.3.0 → 2.3.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-layout
 
+## 2.3.2
+
+### Patch Changes
+
+- [#128309](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/128309)
+  [`5668591816f6a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5668591816f6a) -
+  Clean up platform_editor_advanced_layouts_dnd_remove_layout
+- Updated dependencies
+
+## 2.3.1
+
+### Patch Changes
+
+- [#128179](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/128179)
+  [`1ce5182d1a35f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1ce5182d1a35f) -
+  Clean up feature flag platform_editor_advanced_layouts_post_fix_patch_3
+- Updated dependencies
+
 ## 2.3.0
 
 ### Minor Changes

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

@@ -14,7 +14,6 @@ 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 _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _consts = require("./consts");
 var _pluginKey = require("./plugin-key");
@@ -346,21 +345,15 @@ var setPresetLayout = exports.setPresetLayout = function setPresetLayout(editorA
       var _ref = _pluginKey.pluginKey.getState(state),
         pos = _ref.pos,
         selectedLayout = _ref.selectedLayout;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_3')) {
-        if (pos === null) {
-          return false;
-        }
-      } else if (selectedLayout === layout || pos === null) {
+      if (pos === null) {
         return false;
       }
       var node = state.doc.nodeAt(pos);
       if (!node) {
         return false;
       }
-      if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_post_fix_patch_3')) {
-        if (selectedLayout === layout && node.childCount > 1) {
-          return false;
-        }
+      if (selectedLayout === layout && node.childCount > 1) {
+        return false;
       }
       var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
@@ -392,15 +385,11 @@ function layoutNeedChanges(node) {
 var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
   var layoutColumnCount = layoutNode.childCount;
   if (layoutColumnCount <= 1) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      return 'single';
-    }
-
-    // This prevents the creation of a single column layout
-    // once we support single column layout, we can return 'single'
-    return 'two_equal';
+    return 'single';
   }
   switch (layoutColumnCount) {
+    case 1:
+      return 'single';
     case 2:
       return 'two_equal';
     case 3:

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

@@ -14,7 +14,6 @@ var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("./actions");
 var _consts = require("./consts");
@@ -81,24 +80,19 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
 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 ((0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      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);
-      var parent = (0, _utils2.findParentNodeClosestToPos)(sel.$from, function (node) {
-        return node.type.name === 'layoutSection';
-      });
-      if (parent) {
-        var layoutSectionPos = tr.mapping.map(parent.pos);
-        var layoutSectionNodeSize = parent.node.nodeSize;
-        dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
-        return true;
-      }
-      return false;
-    } else {
-      dispatch(state.tr.deleteRange(sel.from + 1, sel.from + sel.node.content.size));
+    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);
+    var parent = (0, _utils2.findParentNodeClosestToPos)(sel.$from, function (node) {
+      return node.type.name === 'layoutSection';
+    });
+    if (parent) {
+      var layoutSectionPos = tr.mapping.map(parent.pos);
+      var layoutSectionNodeSize = parent.node.nodeSize;
+      dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
+      return true;
     }
-    return true;
+    return false;
   }
   return false;
 };
@@ -169,7 +163,7 @@ var _default = exports.default = function _default(options) {
           changes.push(change);
         }
       });
-      if ((0, _experiments.editorExperiment)('advanced_layouts', true) && changes.length === 1 && (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_dnd_remove_layout')) {
+      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

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

@@ -4,7 +4,6 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
@@ -323,21 +322,15 @@ export const setPresetLayout = editorAnalyticsAPI => layout => (state, dispatch)
     pos,
     selectedLayout
   } = pluginKey.getState(state);
-  if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
-    if (pos === null) {
-      return false;
-    }
-  } else if (selectedLayout === layout || pos === null) {
+  if (pos === null) {
     return false;
   }
   const node = state.doc.nodeAt(pos);
   if (!node) {
     return false;
   }
-  if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
-    if (selectedLayout === layout && node.childCount > 1) {
-      return false;
-    }
+  if (selectedLayout === layout && node.childCount > 1) {
+    return false;
   }
   const tr = forceSectionToPresetLayout(state, node, pos, layout);
   if (tr) {
@@ -367,15 +360,11 @@ function layoutNeedChanges(node) {
 const getDefaultPresetLayout = layoutNode => {
   const layoutColumnCount = layoutNode.childCount;
   if (layoutColumnCount <= 1) {
-    if (fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      return 'single';
-    }
-
-    // This prevents the creation of a single column layout
-    // once we support single column layout, we can return 'single'
-    return 'two_equal';
+    return 'single';
   }
   switch (layoutColumnCount) {
+    case 1:
+      return 'single';
     case 2:
       return 'two_equal';
     case 3:

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

@@ -6,7 +6,6 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
@@ -76,24 +75,19 @@ const getInitialPluginState = (options, state) => {
 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 (fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      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);
-      const parent = findParentNodeClosestToPos(sel.$from, node => {
-        return node.type.name === 'layoutSection';
-      });
-      if (parent) {
-        const layoutSectionPos = tr.mapping.map(parent.pos);
-        const layoutSectionNodeSize = parent.node.nodeSize;
-        dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
-        return true;
-      }
-      return false;
-    } else {
-      dispatch(state.tr.deleteRange(sel.from + 1, sel.from + sel.node.content.size));
+    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);
+    const parent = findParentNodeClosestToPos(sel.$from, node => {
+      return node.type.name === 'layoutSection';
+    });
+    if (parent) {
+      const layoutSectionPos = tr.mapping.map(parent.pos);
+      const layoutSectionNodeSize = parent.node.nodeSize;
+      dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
+      return true;
     }
-    return true;
+    return false;
   }
   return false;
 };
@@ -158,7 +152,7 @@ export default (options => new SafePlugin({
         changes.push(change);
       }
     });
-    if (editorExperiment('advanced_layouts', true) && changes.length === 1 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
+    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

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

@@ -7,7 +7,6 @@ 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 { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
@@ -337,21 +336,15 @@ export var setPresetLayout = function setPresetLayout(editorAnalyticsAPI) {
       var _ref = pluginKey.getState(state),
         pos = _ref.pos,
         selectedLayout = _ref.selectedLayout;
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
-        if (pos === null) {
-          return false;
-        }
-      } else if (selectedLayout === layout || pos === null) {
+      if (pos === null) {
         return false;
       }
       var node = state.doc.nodeAt(pos);
       if (!node) {
         return false;
       }
-      if (fg('platform_editor_advanced_layouts_post_fix_patch_3')) {
-        if (selectedLayout === layout && node.childCount > 1) {
-          return false;
-        }
+      if (selectedLayout === layout && node.childCount > 1) {
+        return false;
       }
       var tr = forceSectionToPresetLayout(state, node, pos, layout);
       if (tr) {
@@ -383,15 +376,11 @@ function layoutNeedChanges(node) {
 var getDefaultPresetLayout = function getDefaultPresetLayout(layoutNode) {
   var layoutColumnCount = layoutNode.childCount;
   if (layoutColumnCount <= 1) {
-    if (fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      return 'single';
-    }
-
-    // This prevents the creation of a single column layout
-    // once we support single column layout, we can return 'single'
-    return 'two_equal';
+    return 'single';
   }
   switch (layoutColumnCount) {
+    case 1:
+      return 'single';
     case 2:
       return 'two_equal';
     case 3:

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

@@ -9,7 +9,6 @@ import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
@@ -74,24 +73,19 @@ var getInitialPluginState = function getInitialPluginState(options, state) {
 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 (fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
-      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);
-      var parent = findParentNodeClosestToPos(sel.$from, function (node) {
-        return node.type.name === 'layoutSection';
-      });
-      if (parent) {
-        var layoutSectionPos = tr.mapping.map(parent.pos);
-        var layoutSectionNodeSize = parent.node.nodeSize;
-        dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
-        return true;
-      }
-      return false;
-    } else {
-      dispatch(state.tr.deleteRange(sel.from + 1, sel.from + sel.node.content.size));
+    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);
+    var parent = findParentNodeClosestToPos(sel.$from, function (node) {
+      return node.type.name === 'layoutSection';
+    });
+    if (parent) {
+      var layoutSectionPos = tr.mapping.map(parent.pos);
+      var layoutSectionNodeSize = parent.node.nodeSize;
+      dispatch(state.tr.replaceWith(layoutSectionPos, layoutSectionPos + layoutSectionNodeSize, layoutContentFragment));
+      return true;
     }
-    return true;
+    return false;
   }
   return false;
 };
@@ -162,7 +156,7 @@ export default (function (options) {
           changes.push(change);
         }
       });
-      if (editorExperiment('advanced_layouts', true) && changes.length === 1 && fg('platform_editor_advanced_layouts_dnd_remove_layout')) {
+      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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "2.3.0",
+	"version": "2.3.2",
 	"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": "^102.11.0",
+		"@atlaskit/editor-common": "^102.13.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/icon": "^25.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^4.1.0",
+		"@atlaskit/tmp-editor-statsig": "^4.4.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -99,12 +99,6 @@
 	"platform-feature-flags": {
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
-		},
-		"platform_editor_advanced_layouts_post_fix_patch_3": {
-			"type": "boolean"
-		},
-		"platform_editor_advanced_layouts_dnd_remove_layout": {
-			"type": "boolean"
 		}
 	}
 }