@atlaskit/editor-plugin-layout 11.0.0 → 11.0.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-plugin-layout
 
+## 11.0.1
+
+### Patch Changes
+
+- [`8bf2ab100a93d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8bf2ab100a93d) -
+  Add col to layout keywords
+- [`91c01182107f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/91c01182107f2) -
+  Preserve layout column selection after menu actions and delay editor-ai-dev Bitbucket credential
+  checks until after CLI command validation.
+- Updated dependencies
+
 ## 11.0.0
 
 ### Patch Changes

package/dist/cjs/layoutPlugin.js

@@ -57,7 +57,7 @@ var selectIntoLayoutSection = exports.selectIntoLayoutSection = function selectI
   return tr;
 };
 var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
-  var _api$analytics, _api$analytics5;
+  var _api$analytics, _api$analytics4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -161,7 +161,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             id: 'onecolumnlayout',
             title: formatMessage(_messages.layoutMessages.singleColumnAdvancedLayout),
             description: formatMessage(_messages.toolbarInsertBlockMessages.singleColumnsDescriptionAdvancedLayout),
-            keywords: ['layout', 'column', 'section', 'single column'],
+            keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'single column'] : ['layout', 'column', 'section', 'single column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconOneColumnLayout, null);
@@ -191,7 +191,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
                 description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
                   numberOfColumns: descriptionColumnCount
                 }),
-                keywords: ['layout', 'column', 'section', keyword],
+                keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', keyword] : ['layout', 'column', 'section', keyword],
                 priority: 1100,
                 icon: Icon,
                 action: function action(insert, state) {
@@ -250,7 +250,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'two'
             }),
-            keywords: ['layout', 'column', 'section', 'two column'],
+            keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'two column'] : ['layout', 'column', 'section', 'two column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconTwoColumnLayout, null);
@@ -271,7 +271,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'three'
             }),
-            keywords: ['layout', 'column', 'section', 'three column'],
+            keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'three column'] : ['layout', 'column', 'section', 'three column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconThreeColumnLayout, null);
@@ -292,7 +292,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'four'
             }),
-            keywords: ['layout', 'column', 'section', 'four column'],
+            keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'four column'] : ['layout', 'column', 'section', 'four column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFourColumnLayout, null);
@@ -313,7 +313,7 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(_messages.toolbarInsertBlockMessages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'five'
             }),
-            keywords: ['layout', 'column', 'section', 'five column'],
+            keywords: (0, _expValEquals.expValEquals)('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'five column'] : ['layout', 'column', 'section', 'five column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/_react.default.createElement(_quickInsert.IconFiveColumnLayout, null);
@@ -377,18 +377,18 @@ var layoutPlugin = exports.layoutPlugin = function layoutPlugin(_ref) {
       return _pluginKey.pluginKey.getState(editorState);
     },
     commands: {
-      deleteLayoutColumn: function deleteLayoutColumn(props) {
-        var _api$analytics4;
-        return (0, _actions.deleteLayoutColumn)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(props);
+      deleteLayoutColumn: (0, _actions.deleteLayoutColumn)(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api),
+      distributeLayoutColumns: function distributeLayoutColumns(options) {
+        var _api$analytics5;
+        return (0, _actions.distributeLayoutColumns)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, api)(options);
       },
-      distributeLayoutColumns: (0, _actions.distributeLayoutColumns)(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions),
       insertLayoutColumn: function insertLayoutColumn(side) {
         var _api$analytics6;
-        return (0, _actions.insertLayoutColumn)(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+        return (0, _actions.insertLayoutColumn)(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, api);
       },
       setLayoutColumnValign: function setLayoutColumnValign(valign) {
         var _api$analytics7;
-        return (0, _actions.setLayoutColumnValign)(valign, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions);
+        return (0, _actions.setLayoutColumnValign)(valign, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions, api);
       },
       toggleLayoutColumnMenu: _actions.toggleLayoutColumnMenu
     }

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fixColumnStructure = exports.fixColumnSizes = exports.distributeLayoutColumns = exports.deleteLayoutColumn = exports.deleteActiveLayoutNode = exports.createMultiColumnLayoutSection = exports.createDefaultLayoutSection = exports.TWO_COL_LAYOUTS = exports.THREE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = void 0;
+exports.fixColumnStructure = exports.fixColumnSizes = exports.distributeLayoutColumns = exports.deleteLayoutColumn = exports.deleteActiveLayoutNode = exports.createMultiColumnLayoutSection = exports.createDefaultLayoutSection = exports.TWO_COL_LAYOUTS = exports.THREE_COL_LAYOUTS = exports.ONE_COL_LAYOUTS = exports.LAYOUT_COLUMN_INSERT_META = void 0;
 exports.forceSectionToPresetLayout = forceSectionToPresetLayout;
 exports.getEffectiveMaxLayoutColumns = getEffectiveMaxLayoutColumns;
 exports.toggleLayoutColumnMenu = exports.setPresetLayout = exports.setLayoutColumnValign = exports.insertLayoutColumnsWithAnalytics = exports.insertLayoutColumns = exports.insertLayoutColumn = exports.getSelectedLayout = exports.getPresetLayout = void 0;
@@ -14,6 +14,7 @@ var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
@@ -552,6 +553,27 @@ var formatLayoutName = function formatLayoutName(layout) {
       return _analytics.LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }
 };
+var LAYOUT_COLUMN_INSERT_META = exports.LAYOUT_COLUMN_INSERT_META = 'layoutColumnInsert';
+var mapLayoutColumnPreservedSelection = function mapLayoutColumnPreservedSelection(tr, api) {
+  var insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
+  if (insertMeta) {
+    var _api$blockControls;
+    var mapping = insertMeta.side === 'left' ? new _transform.Mapping([new _transform.StepMap([insertMeta.insertedColumnPos, 0, insertMeta.insertedColumnNodeSize])]) : new _transform.Mapping();
+    api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.mapPreservedSelection(mapping)({
+      tr: tr
+    });
+    return;
+  }
+
+  // Width and alignment updates should keep original layout column selection unchanged.
+  if (tr.getMeta('scrollIntoView') === false && tr.docChanged) {
+    var _api$blockControls2;
+    api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.mapPreservedSelection(new _transform.Mapping())({
+      tr: tr
+    });
+  }
+};
+
 /**
  * Returns the active maximum layout column count for the current advanced layouts experiment state.
  */
@@ -604,6 +626,18 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       updatedColumns.push(newColumn);
     }
     var updatedLayoutSectionNode = layoutSectionNode.copy(_model.Fragment.fromArray(updatedColumns));
+    var insertedColumnOffset = 0;
+    layoutSectionNode.forEach(function (column, _offset, index) {
+      if (index < insertIndex) {
+        insertedColumnOffset += column.nodeSize;
+      }
+    });
+    var insertedColumnPos = layoutSectionPos + 1 + insertedColumnOffset;
+    tr.setMeta(LAYOUT_COLUMN_INSERT_META, {
+      insertedColumnNodeSize: newColumn.nodeSize,
+      insertedColumnPos: insertedColumnPos,
+      side: side
+    });
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: _analytics.ACTION.INSERTED,
@@ -623,12 +657,21 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     return tr;
   };
 };
-var insertLayoutColumn = exports.insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI) {
-  return insertLayoutColumnAt(side, editorAnalyticsAPI);
-};
-var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutColumnValign(valign, editorAnalyticsAPI) {
+var insertLayoutColumn = exports.insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI, api) {
   return function (_ref5) {
     var tr = _ref5.tr;
+    var result = insertLayoutColumnAt(side, editorAnalyticsAPI)({
+      tr: tr
+    });
+    if (result) {
+      mapLayoutColumnPreservedSelection(tr, api);
+    }
+    return result;
+  };
+};
+var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutColumnValign(valign, editorAnalyticsAPI, api) {
+  return function (_ref6) {
+    var tr = _ref6.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -639,17 +682,17 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
     var startIndex = selectedLayoutColumnsResult.startIndex,
       endIndex = selectedLayoutColumnsResult.endIndex,
       selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
-    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref6) {
-      var node = _ref6.node;
+    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref7) {
+      var node = _ref7.node;
       return node.attrs.valign !== valign;
     });
     if (columnsToUpdate.length === 0) {
       return null;
     }
     var updatedColumnCount = columnsToUpdate.length;
-    columnsToUpdate.forEach(function (_ref7) {
-      var node = _ref7.node,
-        pos = _ref7.pos;
+    columnsToUpdate.forEach(function (_ref8) {
+      var node = _ref8.node,
+        pos = _ref8.pos;
       tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
         valign: valign
       }));
@@ -669,18 +712,19 @@ var setLayoutColumnValign = exports.setLayoutColumnValign = function setLayoutCo
       eventType: _analytics.EVENT_TYPE.TRACK
     })(tr);
     tr.setMeta('scrollIntoView', false);
+    mapLayoutColumnPreservedSelection(tr, api);
     return tr;
   };
 };
-var distributeLayoutColumns = exports.distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI) {
+var distributeLayoutColumns = exports.distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI, api) {
   return function () {
-    var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      _ref8$inputMethod = _ref8.inputMethod,
-      inputMethod = _ref8$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod,
-      _ref8$target = _ref8.target,
-      target = _ref8$target === void 0 ? 'selectedColumns' : _ref8$target;
-    return function (_ref9) {
-      var tr = _ref9.tr;
+    var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref9$inputMethod = _ref9.inputMethod,
+      inputMethod = _ref9$inputMethod === void 0 ? _analytics.INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref9$inputMethod,
+      _ref9$target = _ref9.target,
+      target = _ref9$target === void 0 ? 'selectedColumns' : _ref9$target;
+    return function (_ref0) {
+      var tr = _ref0.tr;
       if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
         return null;
       }
@@ -695,8 +739,8 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
       var existingWidths = (0, _utils.mapChildren)(layoutSectionNode, function (column) {
         return column.attrs.width;
       });
-      var selectedWidths = selectedLayoutColumns.map(function (_ref0) {
-        var node = _ref0.node;
+      var selectedWidths = selectedLayoutColumns.map(function (_ref1) {
+        var node = _ref1.node;
         return node.attrs.width;
       });
       var distribution = (0, _layoutColumnDistribution.calculateDistribution)(selectedWidths);
@@ -728,9 +772,9 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
       });
 
       // Apply widths via setNodeMarkup per selected column — keeps nodes in place (preserves identity, marks, decorations)
-      selectedLayoutColumns.forEach(function (_ref1, i) {
-        var node = _ref1.node,
-          pos = _ref1.pos;
+      selectedLayoutColumns.forEach(function (_ref10, i) {
+        var node = _ref10.node,
+          pos = _ref10.pos;
         var colIdx = startIndex + i;
         tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
           width: newWidths[colIdx]
@@ -750,15 +794,16 @@ var distributeLayoutColumns = exports.distributeLayoutColumns = function distrib
         eventType: _analytics.EVENT_TYPE.TRACK
       })(tr);
       tr.setMeta('scrollIntoView', false);
+      mapLayoutColumnPreservedSelection(tr, api);
       return tr;
     };
   };
 };
-var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref10) {
-  var anchorPos = _ref10.anchorPos,
-    isOpen = _ref10.isOpen;
-  return function (_ref11) {
-    var tr = _ref11.tr;
+var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref11) {
+  var anchorPos = _ref11.anchorPos,
+    isOpen = _ref11.isOpen;
+  return function (_ref12) {
+    var tr = _ref12.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       anchorPos: anchorPos,
       isOpen: isOpen
@@ -767,9 +812,10 @@ var toggleLayoutColumnMenu = exports.toggleLayoutColumnMenu = function toggleLay
     return tr;
   };
 };
-var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref12) {
-    var tr = _ref12.tr;
+var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI, api) {
+  return function (_ref13) {
+    var _api$blockControls4;
+    var tr = _ref13.tr;
     if (!(0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -800,9 +846,13 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
 
     // If all columns are selected, remove the entire layoutSection
     if (selectedLayoutColumns.length === layoutSectionNode.childCount) {
+      var _api$blockControls3;
       tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
       emitDeleteColumnAnalytics(0);
       tr.setMeta('scrollIntoView', false);
+      api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.stopPreservingSelection()({
+        tr: tr
+      });
       return tr;
     }
 
@@ -830,6 +880,9 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
     emitDeleteColumnAnalytics(redistributed.length);
     tr.setMeta('scrollIntoView', false);
+    api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.stopPreservingSelection()({
+      tr: tr
+    });
     return tr;
   };
 };

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

@@ -202,6 +202,12 @@ var _default = exports.default = function _default(options) {
         if ((0, _experiments.editorExperiment)('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
           return;
         }
+
+        // Layout column insert actions already recalculate column widths and need their own
+        // selection mapping; avoid a follow-up normalisation transaction that can remap it.
+        if (prevTr.getMeta(_actions.LAYOUT_COLUMN_INSERT_META)) {
+          return;
+        }
         var change = (0, _actions.fixColumnSizes)(prevTr, newState);
         if (change) {
           changes.push(change);

package/dist/es2019/layoutPlugin.js

@@ -52,7 +52,7 @@ export const layoutPlugin = ({
   config: options = {},
   api
 }) => {
-  var _api$analytics, _api$analytics5;
+  var _api$analytics, _api$analytics4;
   const allowAdvancedSingleColumnLayout = editorExperiment('advanced_layouts', true) && editorExperiment('single_column_layouts', true, {
     exposure: true
   });
@@ -153,7 +153,7 @@ export const layoutPlugin = ({
             id: 'onecolumnlayout',
             title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
             description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
-            keywords: ['layout', 'column', 'section', 'single column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'single column'] : ['layout', 'column', 'section', 'single column'],
             priority: 1100,
             icon: () => /*#__PURE__*/React.createElement(IconOneColumnLayout, null),
             action(insert, state) {
@@ -181,7 +181,7 @@ export const layoutPlugin = ({
               description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
                 numberOfColumns: descriptionColumnCount
               }),
-              keywords: ['layout', 'column', 'section', keyword],
+              keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', keyword] : ['layout', 'column', 'section', keyword],
               priority: 1100,
               icon: Icon,
               action(insert, state) {
@@ -231,7 +231,7 @@ export const layoutPlugin = ({
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'two'
             }),
-            keywords: ['layout', 'column', 'section', 'two column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'two column'] : ['layout', 'column', 'section', 'two column'],
             priority: 1100,
             icon: () => /*#__PURE__*/React.createElement(IconTwoColumnLayout, null),
             action(insert, state) {
@@ -250,7 +250,7 @@ export const layoutPlugin = ({
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'three'
             }),
-            keywords: ['layout', 'column', 'section', 'three column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'three column'] : ['layout', 'column', 'section', 'three column'],
             priority: 1100,
             icon: () => /*#__PURE__*/React.createElement(IconThreeColumnLayout, null),
             action(insert, state) {
@@ -269,7 +269,7 @@ export const layoutPlugin = ({
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'four'
             }),
-            keywords: ['layout', 'column', 'section', 'four column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'four column'] : ['layout', 'column', 'section', 'four column'],
             priority: 1100,
             icon: () => /*#__PURE__*/React.createElement(IconFourColumnLayout, null),
             action(insert, state) {
@@ -288,7 +288,7 @@ export const layoutPlugin = ({
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'five'
             }),
-            keywords: ['layout', 'column', 'section', 'five column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'five column'] : ['layout', 'column', 'section', 'five column'],
             priority: 1100,
             icon: () => /*#__PURE__*/React.createElement(IconFiveColumnLayout, null),
             action(insert, state) {
@@ -349,18 +349,18 @@ export const layoutPlugin = ({
       return pluginKey.getState(editorState);
     },
     commands: {
-      deleteLayoutColumn: props => {
-        var _api$analytics4;
-        return deleteLayoutColumn(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(props);
+      deleteLayoutColumn: deleteLayoutColumn(api === null || api === void 0 ? void 0 : (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api),
+      distributeLayoutColumns: options => {
+        var _api$analytics5;
+        return distributeLayoutColumns(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, api)(options);
       },
-      distributeLayoutColumns: distributeLayoutColumns(api === null || api === void 0 ? void 0 : (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions),
       insertLayoutColumn: side => {
         var _api$analytics6;
-        return insertLayoutColumn(side, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+        return insertLayoutColumn(side, api === null || api === void 0 ? void 0 : (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, api);
       },
       setLayoutColumnValign: valign => {
         var _api$analytics7;
-        return setLayoutColumnValign(valign, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions);
+        return setLayoutColumnValign(valign, api === null || api === void 0 ? void 0 : (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions, api);
       },
       toggleLayoutColumnMenu
     }

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

@@ -3,6 +3,7 @@ import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { flatmap, getStepRange, isEmptyDocument, mapChildren } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
@@ -528,6 +529,27 @@ const formatLayoutName = layout => {
       return LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }
 };
+export const LAYOUT_COLUMN_INSERT_META = 'layoutColumnInsert';
+const mapLayoutColumnPreservedSelection = (tr, api) => {
+  const insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
+  if (insertMeta) {
+    var _api$blockControls;
+    const mapping = insertMeta.side === 'left' ? new Mapping([new StepMap([insertMeta.insertedColumnPos, 0, insertMeta.insertedColumnNodeSize])]) : new Mapping();
+    api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.commands.mapPreservedSelection(mapping)({
+      tr
+    });
+    return;
+  }
+
+  // Width and alignment updates should keep original layout column selection unchanged.
+  if (tr.getMeta('scrollIntoView') === false && tr.docChanged) {
+    var _api$blockControls2;
+    api === null || api === void 0 ? void 0 : (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 ? void 0 : _api$blockControls2.commands.mapPreservedSelection(new Mapping())({
+      tr
+    });
+  }
+};
+
 /**
  * Returns the active maximum layout column count for the current advanced layouts experiment state.
  */
@@ -582,6 +604,18 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
     updatedColumns.push(newColumn);
   }
   const updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(updatedColumns));
+  let insertedColumnOffset = 0;
+  layoutSectionNode.forEach((column, _offset, index) => {
+    if (index < insertIndex) {
+      insertedColumnOffset += column.nodeSize;
+    }
+  });
+  const insertedColumnPos = layoutSectionPos + 1 + insertedColumnOffset;
+  tr.setMeta(LAYOUT_COLUMN_INSERT_META, {
+    insertedColumnNodeSize: newColumn.nodeSize,
+    insertedColumnPos,
+    side
+  });
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
@@ -600,8 +634,18 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI) => ({
   tr.setMeta('scrollIntoView', false);
   return tr;
 };
-export const insertLayoutColumn = (side, editorAnalyticsAPI) => insertLayoutColumnAt(side, editorAnalyticsAPI);
-export const setLayoutColumnValign = (valign, editorAnalyticsAPI) => ({
+export const insertLayoutColumn = (side, editorAnalyticsAPI, api) => ({
+  tr
+}) => {
+  const result = insertLayoutColumnAt(side, editorAnalyticsAPI)({
+    tr
+  });
+  if (result) {
+    mapLayoutColumnPreservedSelection(tr, api);
+  }
+  return result;
+};
+export const setLayoutColumnValign = (valign, editorAnalyticsAPI, api) => ({
   tr
 }) => {
   if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
@@ -647,9 +691,10 @@ export const setLayoutColumnValign = (valign, editorAnalyticsAPI) => ({
     eventType: EVENT_TYPE.TRACK
   })(tr);
   tr.setMeta('scrollIntoView', false);
+  mapLayoutColumnPreservedSelection(tr, api);
   return tr;
 };
-export const distributeLayoutColumns = editorAnalyticsAPI => ({
+export const distributeLayoutColumns = (editorAnalyticsAPI, api) => ({
   inputMethod = INPUT_METHOD.LAYOUT_COLUMN_MENU,
   target = 'selectedColumns'
 } = {}) => ({
@@ -727,6 +772,7 @@ export const distributeLayoutColumns = editorAnalyticsAPI => ({
     eventType: EVENT_TYPE.TRACK
   })(tr);
   tr.setMeta('scrollIntoView', false);
+  mapLayoutColumnPreservedSelection(tr, api);
   return tr;
 };
 export const toggleLayoutColumnMenu = ({
@@ -742,9 +788,10 @@ export const toggleLayoutColumnMenu = ({
   tr.setMeta('scrollIntoView', false);
   return tr;
 };
-export const deleteLayoutColumn = editorAnalyticsAPI => ({
+export const deleteLayoutColumn = (editorAnalyticsAPI, api) => ({
   tr
 }) => {
+  var _api$blockControls4;
   if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
     return null;
   }
@@ -777,9 +824,13 @@ export const deleteLayoutColumn = editorAnalyticsAPI => ({
 
   // If all columns are selected, remove the entire layoutSection
   if (selectedLayoutColumns.length === layoutSectionNode.childCount) {
+    var _api$blockControls3;
     tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
     emitDeleteColumnAnalytics(0);
     tr.setMeta('scrollIntoView', false);
+    api === null || api === void 0 ? void 0 : (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 ? void 0 : _api$blockControls3.commands.stopPreservingSelection()({
+      tr
+    });
     return tr;
   }
 
@@ -801,5 +852,8 @@ export const deleteLayoutColumn = editorAnalyticsAPI => ({
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
   emitDeleteColumnAnalytics(redistributed.length);
   tr.setMeta('scrollIntoView', false);
+  api === null || api === void 0 ? void 0 : (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 ? void 0 : _api$blockControls4.commands.stopPreservingSelection()({
+    tr
+  });
   return tr;
 };

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

@@ -7,7 +7,7 @@ import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosem
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions';
+import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
@@ -193,6 +193,12 @@ export default (options => {
         if (editorExperiment('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
           return;
         }
+
+        // Layout column insert actions already recalculate column widths and need their own
+        // selection mapping; avoid a follow-up normalisation transaction that can remap it.
+        if (prevTr.getMeta(LAYOUT_COLUMN_INSERT_META)) {
+          return;
+        }
         const change = fixColumnSizes(prevTr, newState);
         if (change) {
           changes.push(change);

package/dist/esm/layoutPlugin.js

@@ -11,7 +11,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn as _deleteLayoutColumn, distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import { createDefaultLayoutSection, createMultiColumnLayoutSection, deleteLayoutColumn, distributeLayoutColumns as _distributeLayoutColumns, insertLayoutColumn as _insertLayoutColumn, insertLayoutColumnsWithAnalytics, setLayoutColumnValign as _setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
 import { default as createLayoutPlugin } from './pm-plugins/main';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { default as createLayoutResizingPlugin } from './pm-plugins/resizing';
@@ -50,7 +50,7 @@ export var selectIntoLayoutSection = function selectIntoLayoutSection(tr) {
   return tr;
 };
 export var layoutPlugin = function layoutPlugin(_ref) {
-  var _api$analytics, _api$analytics5;
+  var _api$analytics, _api$analytics4;
   var _ref$config = _ref.config,
     options = _ref$config === void 0 ? {} : _ref$config,
     api = _ref.api;
@@ -154,7 +154,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
             id: 'onecolumnlayout',
             title: formatMessage(layoutMessages.singleColumnAdvancedLayout),
             description: formatMessage(messages.singleColumnsDescriptionAdvancedLayout),
-            keywords: ['layout', 'column', 'section', 'single column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'single column'] : ['layout', 'column', 'section', 'single column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconOneColumnLayout, null);
@@ -184,7 +184,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
                 description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
                   numberOfColumns: descriptionColumnCount
                 }),
-                keywords: ['layout', 'column', 'section', keyword],
+                keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', keyword] : ['layout', 'column', 'section', keyword],
                 priority: 1100,
                 icon: Icon,
                 action: function action(insert, state) {
@@ -243,7 +243,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'two'
             }),
-            keywords: ['layout', 'column', 'section', 'two column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'two column'] : ['layout', 'column', 'section', 'two column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconTwoColumnLayout, null);
@@ -264,7 +264,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'three'
             }),
-            keywords: ['layout', 'column', 'section', 'three column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'three column'] : ['layout', 'column', 'section', 'three column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconThreeColumnLayout, null);
@@ -285,7 +285,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'four'
             }),
-            keywords: ['layout', 'column', 'section', 'four column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'four column'] : ['layout', 'column', 'section', 'four column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconFourColumnLayout, null);
@@ -306,7 +306,7 @@ export var layoutPlugin = function layoutPlugin(_ref) {
             description: formatMessage(messages.columnsDescriptionAdvancedLayout, {
               numberOfColumns: 'five'
             }),
-            keywords: ['layout', 'column', 'section', 'five column'],
+            keywords: expValEquals('platform_editor_layout_keywords', 'isEnabled', true) ? ['layout', 'column', 'section', 'col', 'five column'] : ['layout', 'column', 'section', 'five column'],
             priority: 1100,
             icon: function icon() {
               return /*#__PURE__*/React.createElement(IconFiveColumnLayout, null);
@@ -370,18 +370,18 @@ export var layoutPlugin = function layoutPlugin(_ref) {
       return pluginKey.getState(editorState);
     },
     commands: {
-      deleteLayoutColumn: function deleteLayoutColumn(props) {
-        var _api$analytics4;
-        return _deleteLayoutColumn(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions)(props);
+      deleteLayoutColumn: deleteLayoutColumn(api === null || api === void 0 || (_api$analytics4 = api.analytics) === null || _api$analytics4 === void 0 ? void 0 : _api$analytics4.actions, api),
+      distributeLayoutColumns: function distributeLayoutColumns(options) {
+        var _api$analytics5;
+        return _distributeLayoutColumns(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions, api)(options);
       },
-      distributeLayoutColumns: distributeLayoutColumns(api === null || api === void 0 || (_api$analytics5 = api.analytics) === null || _api$analytics5 === void 0 ? void 0 : _api$analytics5.actions),
       insertLayoutColumn: function insertLayoutColumn(side) {
         var _api$analytics6;
-        return _insertLayoutColumn(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions);
+        return _insertLayoutColumn(side, api === null || api === void 0 || (_api$analytics6 = api.analytics) === null || _api$analytics6 === void 0 ? void 0 : _api$analytics6.actions, api);
       },
       setLayoutColumnValign: function setLayoutColumnValign(valign) {
         var _api$analytics7;
-        return _setLayoutColumnValign(valign, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions);
+        return _setLayoutColumnValign(valign, api === null || api === void 0 || (_api$analytics7 = api.analytics) === null || _api$analytics7 === void 0 ? void 0 : _api$analytics7.actions, api);
       },
       toggleLayoutColumnMenu: toggleLayoutColumnMenu
     }

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

@@ -6,6 +6,7 @@ import { withAnalytics } from '@atlaskit/editor-common/editor-analytics';
 import { flatmap, getStepRange, isEmptyDocument, mapChildren } from '@atlaskit/editor-common/utils';
 import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
@@ -542,6 +543,27 @@ var formatLayoutName = function formatLayoutName(layout) {
       return LAYOUT_TYPE.THREE_WITH_SIDEBARS;
   }
 };
+export var LAYOUT_COLUMN_INSERT_META = 'layoutColumnInsert';
+var mapLayoutColumnPreservedSelection = function mapLayoutColumnPreservedSelection(tr, api) {
+  var insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
+  if (insertMeta) {
+    var _api$blockControls;
+    var mapping = insertMeta.side === 'left' ? new Mapping([new StepMap([insertMeta.insertedColumnPos, 0, insertMeta.insertedColumnNodeSize])]) : new Mapping();
+    api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 || _api$blockControls.commands.mapPreservedSelection(mapping)({
+      tr: tr
+    });
+    return;
+  }
+
+  // Width and alignment updates should keep original layout column selection unchanged.
+  if (tr.getMeta('scrollIntoView') === false && tr.docChanged) {
+    var _api$blockControls2;
+    api === null || api === void 0 || (_api$blockControls2 = api.blockControls) === null || _api$blockControls2 === void 0 || _api$blockControls2.commands.mapPreservedSelection(new Mapping())({
+      tr: tr
+    });
+  }
+};
+
 /**
  * Returns the active maximum layout column count for the current advanced layouts experiment state.
  */
@@ -594,6 +616,18 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       updatedColumns.push(newColumn);
     }
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(updatedColumns));
+    var insertedColumnOffset = 0;
+    layoutSectionNode.forEach(function (column, _offset, index) {
+      if (index < insertIndex) {
+        insertedColumnOffset += column.nodeSize;
+      }
+    });
+    var insertedColumnPos = layoutSectionPos + 1 + insertedColumnOffset;
+    tr.setMeta(LAYOUT_COLUMN_INSERT_META, {
+      insertedColumnNodeSize: newColumn.nodeSize,
+      insertedColumnPos: insertedColumnPos,
+      side: side
+    });
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.INSERTED,
@@ -613,12 +647,21 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
     return tr;
   };
 };
-export var insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI) {
-  return insertLayoutColumnAt(side, editorAnalyticsAPI);
-};
-export var setLayoutColumnValign = function setLayoutColumnValign(valign, editorAnalyticsAPI) {
+export var insertLayoutColumn = function insertLayoutColumn(side, editorAnalyticsAPI, api) {
   return function (_ref5) {
     var tr = _ref5.tr;
+    var result = insertLayoutColumnAt(side, editorAnalyticsAPI)({
+      tr: tr
+    });
+    if (result) {
+      mapLayoutColumnPreservedSelection(tr, api);
+    }
+    return result;
+  };
+};
+export var setLayoutColumnValign = function setLayoutColumnValign(valign, editorAnalyticsAPI, api) {
+  return function (_ref6) {
+    var tr = _ref6.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -629,17 +672,17 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
     var startIndex = selectedLayoutColumnsResult.startIndex,
       endIndex = selectedLayoutColumnsResult.endIndex,
       selectedLayoutColumns = selectedLayoutColumnsResult.selectedLayoutColumns;
-    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref6) {
-      var node = _ref6.node;
+    var columnsToUpdate = selectedLayoutColumns.filter(function (_ref7) {
+      var node = _ref7.node;
       return node.attrs.valign !== valign;
     });
     if (columnsToUpdate.length === 0) {
       return null;
     }
     var updatedColumnCount = columnsToUpdate.length;
-    columnsToUpdate.forEach(function (_ref7) {
-      var node = _ref7.node,
-        pos = _ref7.pos;
+    columnsToUpdate.forEach(function (_ref8) {
+      var node = _ref8.node,
+        pos = _ref8.pos;
       tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
         valign: valign
       }));
@@ -659,18 +702,19 @@ export var setLayoutColumnValign = function setLayoutColumnValign(valign, editor
       eventType: EVENT_TYPE.TRACK
     })(tr);
     tr.setMeta('scrollIntoView', false);
+    mapLayoutColumnPreservedSelection(tr, api);
     return tr;
   };
 };
-export var distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI) {
+export var distributeLayoutColumns = function distributeLayoutColumns(editorAnalyticsAPI, api) {
   return function () {
-    var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-      _ref8$inputMethod = _ref8.inputMethod,
-      inputMethod = _ref8$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref8$inputMethod,
-      _ref8$target = _ref8.target,
-      target = _ref8$target === void 0 ? 'selectedColumns' : _ref8$target;
-    return function (_ref9) {
-      var tr = _ref9.tr;
+    var _ref9 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      _ref9$inputMethod = _ref9.inputMethod,
+      inputMethod = _ref9$inputMethod === void 0 ? INPUT_METHOD.LAYOUT_COLUMN_MENU : _ref9$inputMethod,
+      _ref9$target = _ref9.target,
+      target = _ref9$target === void 0 ? 'selectedColumns' : _ref9$target;
+    return function (_ref0) {
+      var tr = _ref0.tr;
       if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
         return null;
       }
@@ -685,8 +729,8 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
       var existingWidths = mapChildren(layoutSectionNode, function (column) {
         return column.attrs.width;
       });
-      var selectedWidths = selectedLayoutColumns.map(function (_ref0) {
-        var node = _ref0.node;
+      var selectedWidths = selectedLayoutColumns.map(function (_ref1) {
+        var node = _ref1.node;
         return node.attrs.width;
       });
       var distribution = calculateDistribution(selectedWidths);
@@ -718,9 +762,9 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
       });
 
       // Apply widths via setNodeMarkup per selected column — keeps nodes in place (preserves identity, marks, decorations)
-      selectedLayoutColumns.forEach(function (_ref1, i) {
-        var node = _ref1.node,
-          pos = _ref1.pos;
+      selectedLayoutColumns.forEach(function (_ref10, i) {
+        var node = _ref10.node,
+          pos = _ref10.pos;
         var colIdx = startIndex + i;
         tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
           width: newWidths[colIdx]
@@ -740,15 +784,16 @@ export var distributeLayoutColumns = function distributeLayoutColumns(editorAnal
         eventType: EVENT_TYPE.TRACK
       })(tr);
       tr.setMeta('scrollIntoView', false);
+      mapLayoutColumnPreservedSelection(tr, api);
       return tr;
     };
   };
 };
-export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref10) {
-  var anchorPos = _ref10.anchorPos,
-    isOpen = _ref10.isOpen;
-  return function (_ref11) {
-    var tr = _ref11.tr;
+export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref11) {
+  var anchorPos = _ref11.anchorPos,
+    isOpen = _ref11.isOpen;
+  return function (_ref12) {
+    var tr = _ref12.tr;
     tr.setMeta('toggleLayoutColumnMenu', {
       anchorPos: anchorPos,
       isOpen: isOpen
@@ -757,9 +802,10 @@ export var toggleLayoutColumnMenu = function toggleLayoutColumnMenu(_ref10) {
     return tr;
   };
 };
-export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI) {
-  return function (_ref12) {
-    var tr = _ref12.tr;
+export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI, api) {
+  return function (_ref13) {
+    var _api$blockControls4;
+    var tr = _ref13.tr;
     if (!expValEqualsNoExposure('platform_editor_layout_column_menu', 'isEnabled', true)) {
       return null;
     }
@@ -790,9 +836,13 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
 
     // If all columns are selected, remove the entire layoutSection
     if (selectedLayoutColumns.length === layoutSectionNode.childCount) {
+      var _api$blockControls3;
       tr.delete(layoutSectionPos, layoutSectionPos + layoutSectionNode.nodeSize);
       emitDeleteColumnAnalytics(0);
       tr.setMeta('scrollIntoView', false);
+      api === null || api === void 0 || (_api$blockControls3 = api.blockControls) === null || _api$blockControls3 === void 0 || _api$blockControls3.commands.stopPreservingSelection()({
+        tr: tr
+      });
       return tr;
     }
 
@@ -820,6 +870,9 @@ export var deleteLayoutColumn = function deleteLayoutColumn(editorAnalyticsAPI)
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
     emitDeleteColumnAnalytics(redistributed.length);
     tr.setMeta('scrollIntoView', false);
+    api === null || api === void 0 || (_api$blockControls4 = api.blockControls) === null || _api$blockControls4 === void 0 || _api$blockControls4.commands.stopPreservingSelection()({
+      tr: tr
+    });
     return tr;
   };
 };

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

@@ -11,7 +11,7 @@ import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosem
 import { findParentNodeClosestToPos, findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from './actions';
+import { fixColumnSizes, fixColumnStructure, getSelectedLayout, LAYOUT_COLUMN_INSERT_META } from './actions';
 import { getColumnDividerDecorations } from './column-resize-divider';
 import { EVEN_DISTRIBUTED_COL_WIDTHS } from './consts';
 import { pluginKey } from './plugin-key';
@@ -195,6 +195,12 @@ export default (function (options) {
         if (editorExperiment('platform_editor_layout_column_resize_handle', true) && prevTr.getMeta('layoutColumnResize')) {
           return;
         }
+
+        // Layout column insert actions already recalculate column widths and need their own
+        // selection mapping; avoid a follow-up normalisation transaction that can remap it.
+        if (prevTr.getMeta(LAYOUT_COLUMN_INSERT_META)) {
+          return;
+        }
         var change = fixColumnSizes(prevTr, newState);
         if (change) {
           changes.push(change);

package/dist/types/layoutPluginType.d.ts

@@ -1,5 +1,7 @@
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Valign } from '@atlaskit/adf-schema/layout-column';
+import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -10,7 +12,7 @@ import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
-import type { deleteLayoutColumn, distributeLayoutColumns, InsertLayoutColumnSide, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import type { DistributeLayoutColumnsOptions, InsertLayoutColumnsInputMethod, InsertLayoutColumnSide } from './pm-plugins/actions';
 import type { LayoutState } from './pm-plugins/types';
 import type { LayoutPluginOptions } from './types';
 export type LayoutPluginDependencies = [
@@ -21,6 +23,7 @@ export type LayoutPluginDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<GuidelinePlugin>,
     OptionalPlugin<InteractionPlugin>,
+    OptionalPlugin<BlockControlsPlugin>,
     OptionalPlugin<BlockMenuPlugin>,
     OptionalPlugin<ToolbarPlugin>,
     OptionalPlugin<UiControlRegistryPlugin>,
@@ -28,14 +31,17 @@ export type LayoutPluginDependencies = [
 ];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     actions: {
-        insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
+        insertLayoutColumns: (inputMethod: InsertLayoutColumnsInputMethod) => Command;
     };
     commands: {
-        deleteLayoutColumn: ReturnType<typeof deleteLayoutColumn>;
-        distributeLayoutColumns: ReturnType<typeof distributeLayoutColumns>;
+        deleteLayoutColumn: EditorCommand;
+        distributeLayoutColumns: (options?: DistributeLayoutColumnsOptions) => EditorCommand;
         insertLayoutColumn: (side: InsertLayoutColumnSide) => EditorCommand;
-        setLayoutColumnValign: (valign: Parameters<typeof setLayoutColumnValign>[0]) => EditorCommand;
-        toggleLayoutColumnMenu: typeof toggleLayoutColumnMenu;
+        setLayoutColumnValign: (valign: Valign) => EditorCommand;
+        toggleLayoutColumnMenu: (options: {
+            anchorPos?: number;
+            isOpen?: boolean;
+        }) => EditorCommand;
     };
     dependencies: LayoutPluginDependencies;
     pluginConfiguration: LayoutPluginOptions | undefined;

package/dist/types/pm-plugins/actions.d.ts

@@ -1,9 +1,10 @@
 import type { Valign } from '@atlaskit/adf-schema/layout-column';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, ExtractInjectionAPI, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { LayoutPlugin } from '../layoutPluginType';
 import type { Change, PresetLayout } from '../types';
 export declare const ONE_COL_LAYOUTS: PresetLayout[];
 export declare const TWO_COL_LAYOUTS: PresetLayout[];
@@ -17,7 +18,7 @@ export declare const getSelectedLayout: (maybeLayoutSection: Node | undefined, c
 export declare const createMultiColumnLayoutSection: (state: EditorState, numberOfColumns?: number) => Node;
 export declare const createDefaultLayoutSection: (state: EditorState) => Node;
 export declare const insertLayoutColumns: Command;
-type InsertLayoutColumnsInputMethod = TOOLBAR_MENU_TYPE | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.ELEMENT_BROWSER;
+export type InsertLayoutColumnsInputMethod = TOOLBAR_MENU_TYPE | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.ELEMENT_BROWSER;
 export declare const insertLayoutColumnsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertLayoutColumnsInputMethod) => Command;
 /**
  * Forces a layout section node to match the given preset layout by adjusting
@@ -29,20 +30,27 @@ export declare const fixColumnSizes: (changedTr: Transaction, state: EditorState
 export declare const fixColumnStructure: (state: EditorState) => Transaction | undefined;
 export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD.FLOATING_TB) => Command;
 export type InsertLayoutColumnSide = 'left' | 'right';
+export declare const LAYOUT_COLUMN_INSERT_META = "layoutColumnInsert";
+export type LayoutColumnInsertMeta = {
+    insertedColumnNodeSize: number;
+    insertedColumnPos: number;
+    side: InsertLayoutColumnSide;
+};
+type LayoutPluginAPI = ExtractInjectionAPI<LayoutPlugin> | undefined;
 /**
  * Returns the active maximum layout column count for the current advanced layouts experiment state.
  */
 export declare function getEffectiveMaxLayoutColumns(): number;
-export declare const insertLayoutColumn: (side: InsertLayoutColumnSide, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
-export declare const setLayoutColumnValign: (valign: Valign, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
-type DistributeLayoutColumnsOptions = {
+export declare const insertLayoutColumn: (side: InsertLayoutColumnSide, editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
+export declare const setLayoutColumnValign: (valign: Valign, editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
+export type DistributeLayoutColumnsOptions = {
     inputMethod?: INPUT_METHOD.LAYOUT_COLUMN_MENU | INPUT_METHOD.FLOATING_TB;
     target?: 'selectedColumns' | 'allColumns';
 };
-export declare const distributeLayoutColumns: (editorAnalyticsAPI?: EditorAnalyticsAPI) => ({ inputMethod, target, }?: DistributeLayoutColumnsOptions) => EditorCommand;
+export declare const distributeLayoutColumns: (editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => ({ inputMethod, target, }?: DistributeLayoutColumnsOptions) => EditorCommand;
 export declare const toggleLayoutColumnMenu: ({ anchorPos, isOpen }: {
     anchorPos?: number;
     isOpen?: boolean;
 }) => EditorCommand;
-export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
+export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
 export {};

package/dist/types-ts4.5/layoutPluginType.d.ts

@@ -1,5 +1,7 @@
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
+import type { Valign } from '@atlaskit/adf-schema/layout-column';
+import type { Command, EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BlockControlsPlugin } from '@atlaskit/editor-plugin-block-controls';
 import type { BlockMenuPlugin } from '@atlaskit/editor-plugin-block-menu';
 import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
@@ -10,7 +12,7 @@ import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { UiControlRegistryPlugin } from '@atlaskit/editor-plugin-ui-control-registry';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
-import type { deleteLayoutColumn, distributeLayoutColumns, InsertLayoutColumnSide, insertLayoutColumnsWithAnalytics, setLayoutColumnValign, toggleLayoutColumnMenu } from './pm-plugins/actions';
+import type { DistributeLayoutColumnsOptions, InsertLayoutColumnsInputMethod, InsertLayoutColumnSide } from './pm-plugins/actions';
 import type { LayoutState } from './pm-plugins/types';
 import type { LayoutPluginOptions } from './types';
 export type LayoutPluginDependencies = [
@@ -21,6 +23,7 @@ export type LayoutPluginDependencies = [
     OptionalPlugin<EditorDisabledPlugin>,
     OptionalPlugin<GuidelinePlugin>,
     OptionalPlugin<InteractionPlugin>,
+    OptionalPlugin<BlockControlsPlugin>,
     OptionalPlugin<BlockMenuPlugin>,
     OptionalPlugin<ToolbarPlugin>,
     OptionalPlugin<UiControlRegistryPlugin>,
@@ -28,14 +31,17 @@ export type LayoutPluginDependencies = [
 ];
 export type LayoutPlugin = NextEditorPlugin<'layout', {
     actions: {
-        insertLayoutColumns: ReturnType<typeof insertLayoutColumnsWithAnalytics>;
+        insertLayoutColumns: (inputMethod: InsertLayoutColumnsInputMethod) => Command;
     };
     commands: {
-        deleteLayoutColumn: ReturnType<typeof deleteLayoutColumn>;
-        distributeLayoutColumns: ReturnType<typeof distributeLayoutColumns>;
+        deleteLayoutColumn: EditorCommand;
+        distributeLayoutColumns: (options?: DistributeLayoutColumnsOptions) => EditorCommand;
         insertLayoutColumn: (side: InsertLayoutColumnSide) => EditorCommand;
-        setLayoutColumnValign: (valign: Parameters<typeof setLayoutColumnValign>[0]) => EditorCommand;
-        toggleLayoutColumnMenu: typeof toggleLayoutColumnMenu;
+        setLayoutColumnValign: (valign: Valign) => EditorCommand;
+        toggleLayoutColumnMenu: (options: {
+            anchorPos?: number;
+            isOpen?: boolean;
+        }) => EditorCommand;
     };
     dependencies: LayoutPluginDependencies;
     pluginConfiguration: LayoutPluginOptions | undefined;

package/dist/types-ts4.5/pm-plugins/actions.d.ts

@@ -1,9 +1,10 @@
 import type { Valign } from '@atlaskit/adf-schema/layout-column';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import type { Command, EditorCommand, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
+import type { Command, EditorCommand, ExtractInjectionAPI, TOOLBAR_MENU_TYPE } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { LayoutPlugin } from '../layoutPluginType';
 import type { Change, PresetLayout } from '../types';
 export declare const ONE_COL_LAYOUTS: PresetLayout[];
 export declare const TWO_COL_LAYOUTS: PresetLayout[];
@@ -17,7 +18,7 @@ export declare const getSelectedLayout: (maybeLayoutSection: Node | undefined, c
 export declare const createMultiColumnLayoutSection: (state: EditorState, numberOfColumns?: number) => Node;
 export declare const createDefaultLayoutSection: (state: EditorState) => Node;
 export declare const insertLayoutColumns: Command;
-type InsertLayoutColumnsInputMethod = TOOLBAR_MENU_TYPE | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.ELEMENT_BROWSER;
+export type InsertLayoutColumnsInputMethod = TOOLBAR_MENU_TYPE | INPUT_METHOD.QUICK_INSERT | INPUT_METHOD.ELEMENT_BROWSER;
 export declare const insertLayoutColumnsWithAnalytics: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => (inputMethod: InsertLayoutColumnsInputMethod) => Command;
 /**
  * Forces a layout section node to match the given preset layout by adjusting
@@ -29,20 +30,27 @@ export declare const fixColumnSizes: (changedTr: Transaction, state: EditorState
 export declare const fixColumnStructure: (state: EditorState) => Transaction | undefined;
 export declare const deleteActiveLayoutNode: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined, inputMethod?: INPUT_METHOD.FLOATING_TB) => Command;
 export type InsertLayoutColumnSide = 'left' | 'right';
+export declare const LAYOUT_COLUMN_INSERT_META = "layoutColumnInsert";
+export type LayoutColumnInsertMeta = {
+    insertedColumnNodeSize: number;
+    insertedColumnPos: number;
+    side: InsertLayoutColumnSide;
+};
+type LayoutPluginAPI = ExtractInjectionAPI<LayoutPlugin> | undefined;
 /**
  * Returns the active maximum layout column count for the current advanced layouts experiment state.
  */
 export declare function getEffectiveMaxLayoutColumns(): number;
-export declare const insertLayoutColumn: (side: InsertLayoutColumnSide, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
-export declare const setLayoutColumnValign: (valign: Valign, editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
-type DistributeLayoutColumnsOptions = {
+export declare const insertLayoutColumn: (side: InsertLayoutColumnSide, editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
+export declare const setLayoutColumnValign: (valign: Valign, editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
+export type DistributeLayoutColumnsOptions = {
     inputMethod?: INPUT_METHOD.LAYOUT_COLUMN_MENU | INPUT_METHOD.FLOATING_TB;
     target?: 'selectedColumns' | 'allColumns';
 };
-export declare const distributeLayoutColumns: (editorAnalyticsAPI?: EditorAnalyticsAPI) => ({ inputMethod, target, }?: DistributeLayoutColumnsOptions) => EditorCommand;
+export declare const distributeLayoutColumns: (editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => ({ inputMethod, target, }?: DistributeLayoutColumnsOptions) => EditorCommand;
 export declare const toggleLayoutColumnMenu: ({ anchorPos, isOpen }: {
     anchorPos?: number;
     isOpen?: boolean;
 }) => EditorCommand;
-export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI) => EditorCommand;
+export declare const deleteLayoutColumn: (editorAnalyticsAPI?: EditorAnalyticsAPI, api?: LayoutPluginAPI) => EditorCommand;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "11.0.0",
+	"version": "11.0.1",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,9 +29,10 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.15.0",
+		"@atlaskit/adf-schema": "^52.16.0",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/editor-plugin-analytics": "^11.0.0",
+		"@atlaskit/editor-plugin-block-controls": "^12.0.0",
 		"@atlaskit/editor-plugin-block-menu": "^10.0.0",
 		"@atlaskit/editor-plugin-decorations": "^11.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^11.0.0",
@@ -46,10 +47,10 @@
 		"@atlaskit/editor-shared-styles": "^3.11.0",
 		"@atlaskit/editor-toolbar": "^1.9.0",
 		"@atlaskit/editor-ui-control-model": "^1.2.0",
-		"@atlaskit/icon": "^35.3.0",
-		"@atlaskit/icon-lab": "^6.12.0",
+		"@atlaskit/icon": "^35.4.0",
+		"@atlaskit/icon-lab": "^6.13.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^88.0.0",
+		"@atlaskit/tmp-editor-statsig": "^88.3.0",
 		"@atlaskit/tokens": "^13.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",