@atlaskit/editor-plugin-layout 13.2.3 → 13.3.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-layout
 
+## 13.3.0
+
+### Minor Changes
+
+- [`5b844f57bfad8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5b844f57bfad8) -
+  [ED-7731] Preserve the editor selection when inserting, deleting, or resizing layout columns with
+  the cursor inside a column, instead of moving it out of the layout. Gated behind
+  platform_editor_layout_column_menu_kill_switch_1.
+
+## 13.2.4
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.2.3
 
 ### Patch Changes

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

@@ -566,6 +566,38 @@ var getPreviousLayoutColumnValign = function getPreviousLayoutColumnValign(selec
 var hasLayoutColumnContent = function hasLayoutColumnContent(node) {
   return !(0, _utils.isEmptyDocument)(node);
 };
+
+/**
+ * Remaps a selection through a position mapping, preserving its type. Used after replacing a
+ * layout section's contents so the selection stays in its column instead of being mapped out
+ * of the layout. Returns `undefined` if no valid selection can be derived (NodeSelection
+ * whose node is no longer selectable falls back to a nearby caret).
+ */
+var remapSelectionThroughMapping = function remapSelectionThroughMapping(selection, mapping, doc) {
+  var docSize = doc.content.size;
+  var clamp = function clamp(pos) {
+    return Math.min(Math.max(pos, 0), docSize);
+  };
+  if (selection instanceof _state.NodeSelection) {
+    var _TextSelection$findFr;
+    var mappedPos = clamp(mapping.map(selection.from));
+    var nodeAtPos = doc.nodeAt(mappedPos);
+    if (nodeAtPos && _state.NodeSelection.isSelectable(nodeAtPos)) {
+      return _state.NodeSelection.create(doc, mappedPos);
+    }
+    return (_TextSelection$findFr = _state.TextSelection.findFrom(doc.resolve(mappedPos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof _state.TextSelection) {
+    var mappedFrom = clamp(mapping.map(selection.from));
+    var mappedTo = clamp(mapping.map(selection.to));
+    try {
+      return _state.TextSelection.create(doc, mappedFrom, mappedTo);
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
+};
 var mapLayoutColumnPreservedSelection = function mapLayoutColumnPreservedSelection(tr, api) {
   var insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
   if (insertMeta) {
@@ -651,7 +683,22 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       insertedColumnPos: insertedColumnPos,
       side: side
     });
+
+    // Capture the selection before the section content is replaced (the replace below maps
+    // it out of the layout by default). The menu path restores its own preserved selection
+    // afterwards, so this restoration only matters for the cursor-in-column case.
+    var originalSelection = tr.selection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
+
+    // Inserting left shifts positions at/after the new column right by its size; inserting
+    // right leaves them unchanged. Remap the original selection through that mapping.
+    if (!(0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1')) {
+      var insertMapping = side === 'left' ? new _transform.Mapping([new _transform.StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new _transform.Mapping();
+      var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+      if (restoredSelection) {
+        tr.setSelection(restoredSelection);
+      }
+    }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: _analytics.ACTION.INSERTED,
       actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -927,7 +974,35 @@ var deleteLayoutColumn = exports.deleteLayoutColumn = function deleteLayoutColum
       return (0, _layoutColumnDistribution.redistributeAfterDeletion)(widths, selectedIndex, _consts.MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(_model.Fragment.fromArray(remainingColumns));
+
+    // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
+    // column NodeSelection whose post-delete landing is owned by the block-controls
+    // preserved-selection plugin, so we only restore the caret for the former.
+    var hadTextSelection = tr.selection instanceof _state.TextSelection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
+
+    // Land the caret in a remaining column — the one now occupying the deleted slot, or the
+    // last column when the deleted slot no longer exists. Otherwise the replace above maps
+    // the caret out of the layout to the following paragraph.
+    var remainingColumnCount = remainingColumns.length;
+    if (hadTextSelection && !(0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1') && remainingColumnCount > 0) {
+      var targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);
+      var updatedSectionNode = tr.doc.nodeAt(layoutSectionPos);
+      if (updatedSectionNode) {
+        var columnOffset = 1;
+        for (var columnIndex = 0; columnIndex < targetColumnIndex; columnIndex++) {
+          columnOffset += updatedSectionNode.child(columnIndex).nodeSize;
+        }
+        // +1 to land inside the column's first child rather than on the column boundary.
+        var caretPos = layoutSectionPos + columnOffset + 1;
+        if (caretPos >= 0 && caretPos <= tr.doc.content.size) {
+          var caretSelection = _state.TextSelection.findFrom(tr.doc.resolve(caretPos), 1, true);
+          if (caretSelection) {
+            tr.setSelection(caretSelection);
+          }
+        }
+      }
+    }
     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()({

package/dist/cjs/pm-plugins/column-resize-divider.js

@@ -9,11 +9,41 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _bindEventListener = require("bind-event-listener");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _consts = require("./consts");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/**
+ * Re-creates a selection at the same positions against the resized document. A resize only
+ * changes width attrs (not node count, order, or size), so the original positions are still
+ * valid. Returns `undefined` if no valid selection can be made.
+ */
+var remapResizeSelection = function remapResizeSelection(selection, doc) {
+  var docSize = doc.content.size;
+  var clamp = function clamp(pos) {
+    return Math.min(Math.max(pos, 0), docSize);
+  };
+  if (selection instanceof _state.NodeSelection) {
+    var _TextSelection$findFr;
+    var pos = clamp(selection.from);
+    var nodeAtPos = doc.nodeAt(pos);
+    if (nodeAtPos && _state.NodeSelection.isSelectable(nodeAtPos)) {
+      return _state.NodeSelection.create(doc, pos);
+    }
+    return (_TextSelection$findFr = _state.TextSelection.findFrom(doc.resolve(pos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof _state.TextSelection) {
+    try {
+      return _state.TextSelection.create(doc, clamp(selection.from), clamp(selection.to));
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
+};
+
 // Class names for the column resize divider widget — must stay in sync with layout.ts in editor-core
 var layoutColumnDividerClassName = 'layout-column-divider';
 var layoutColumnDividerRailClassName = 'layout-column-divider-rail';
@@ -50,9 +80,20 @@ var dispatchColumnWidths = function dispatchColumnWidths(view, sectionPos, leftC
       newColumns.push(child);
     }
   });
+
+  // Capture the selection before the replace below, which otherwise maps the caret out of
+  // the layout to the following paragraph. Restored at the same positions afterwards.
+  var shouldPreserveSelection = !(0, _platformFeatureFlags.fg)('platform_editor_layout_column_menu_kill_switch_1');
+  var selectionBeforeResize = shouldPreserveSelection ? state.selection : null;
   tr.replaceWith(sectionPos + 1, sectionPos + sectionNode.nodeSize - 1, _model.Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);
+  if (selectionBeforeResize) {
+    var restoredSelection = remapResizeSelection(selectionBeforeResize, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
+    }
+  }
   if ((0, _platformFeatureFlags.fg)('platform_editor_layout_resize_analytics')) {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: _analytics.ACTION.DRAGGED,

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

@@ -539,6 +539,36 @@ const getPreviousLayoutColumnValign = selectedLayoutColumns => {
   return hasMixedValign ? 'mixed' : firstValign !== null && firstValign !== void 0 ? firstValign : DEFAULT_LAYOUT_COLUMN_VALIGN;
 };
 const hasLayoutColumnContent = node => !isEmptyDocument(node);
+
+/**
+ * Remaps a selection through a position mapping, preserving its type. Used after replacing a
+ * layout section's contents so the selection stays in its column instead of being mapped out
+ * of the layout. Returns `undefined` if no valid selection can be derived (NodeSelection
+ * whose node is no longer selectable falls back to a nearby caret).
+ */
+const remapSelectionThroughMapping = (selection, mapping, doc) => {
+  const docSize = doc.content.size;
+  const clamp = pos => Math.min(Math.max(pos, 0), docSize);
+  if (selection instanceof NodeSelection) {
+    var _TextSelection$findFr;
+    const mappedPos = clamp(mapping.map(selection.from));
+    const nodeAtPos = doc.nodeAt(mappedPos);
+    if (nodeAtPos && NodeSelection.isSelectable(nodeAtPos)) {
+      return NodeSelection.create(doc, mappedPos);
+    }
+    return (_TextSelection$findFr = TextSelection.findFrom(doc.resolve(mappedPos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof TextSelection) {
+    const mappedFrom = clamp(mapping.map(selection.from));
+    const mappedTo = clamp(mapping.map(selection.to));
+    try {
+      return TextSelection.create(doc, mappedFrom, mappedTo);
+    } catch {
+      return undefined;
+    }
+  }
+  return undefined;
+};
 const mapLayoutColumnPreservedSelection = (tr, api) => {
   const insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
   if (insertMeta) {
@@ -625,7 +655,22 @@ const insertLayoutColumnAt = (side, editorAnalyticsAPI, inputMethod = INPUT_METH
     insertedColumnPos,
     side
   });
+
+  // Capture the selection before the section content is replaced (the replace below maps
+  // it out of the layout by default). The menu path restores its own preserved selection
+  // afterwards, so this restoration only matters for the cursor-in-column case.
+  const originalSelection = tr.selection;
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
+
+  // Inserting left shifts positions at/after the new column right by its size; inserting
+  // right leaves them unchanged. Remap the original selection through that mapping.
+  if (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
+    const insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
+    const restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
+    }
+  }
   editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
     action: ACTION.INSERTED,
     actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -888,7 +933,35 @@ export const deleteLayoutColumn = ({
   // as each redistribution step shrinks the widths array.
   .reverse().reduce((widths, selectedIndex) => redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT), existingWidths);
   const updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
+
+  // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
+  // column NodeSelection whose post-delete landing is owned by the block-controls
+  // preserved-selection plugin, so we only restore the caret for the former.
+  const hadTextSelection = tr.selection instanceof TextSelection;
   tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
+
+  // Land the caret in a remaining column — the one now occupying the deleted slot, or the
+  // last column when the deleted slot no longer exists. Otherwise the replace above maps
+  // the caret out of the layout to the following paragraph.
+  const remainingColumnCount = remainingColumns.length;
+  if (hadTextSelection && !fg('platform_editor_layout_column_menu_kill_switch_1') && remainingColumnCount > 0) {
+    const targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);
+    const updatedSectionNode = tr.doc.nodeAt(layoutSectionPos);
+    if (updatedSectionNode) {
+      let columnOffset = 1;
+      for (let columnIndex = 0; columnIndex < targetColumnIndex; columnIndex++) {
+        columnOffset += updatedSectionNode.child(columnIndex).nodeSize;
+      }
+      // +1 to land inside the column's first child rather than on the column boundary.
+      const caretPos = layoutSectionPos + columnOffset + 1;
+      if (caretPos >= 0 && caretPos <= tr.doc.content.size) {
+        const caretSelection = TextSelection.findFrom(tr.doc.resolve(caretPos), 1, true);
+        if (caretSelection) {
+          tr.setSelection(caretSelection);
+        }
+      }
+    }
+  }
   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()({

package/dist/es2019/pm-plugins/column-resize-divider.js

@@ -1,10 +1,38 @@
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 
+/**
+ * Re-creates a selection at the same positions against the resized document. A resize only
+ * changes width attrs (not node count, order, or size), so the original positions are still
+ * valid. Returns `undefined` if no valid selection can be made.
+ */
+const remapResizeSelection = (selection, doc) => {
+  const docSize = doc.content.size;
+  const clamp = pos => Math.min(Math.max(pos, 0), docSize);
+  if (selection instanceof NodeSelection) {
+    var _TextSelection$findFr;
+    const pos = clamp(selection.from);
+    const nodeAtPos = doc.nodeAt(pos);
+    if (nodeAtPos && NodeSelection.isSelectable(nodeAtPos)) {
+      return NodeSelection.create(doc, pos);
+    }
+    return (_TextSelection$findFr = TextSelection.findFrom(doc.resolve(pos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof TextSelection) {
+    try {
+      return TextSelection.create(doc, clamp(selection.from), clamp(selection.to));
+    } catch {
+      return undefined;
+    }
+  }
+  return undefined;
+};
+
 // Class names for the column resize divider widget — must stay in sync with layout.ts in editor-core
 const layoutColumnDividerClassName = 'layout-column-divider';
 const layoutColumnDividerRailClassName = 'layout-column-divider-rail';
@@ -46,9 +74,20 @@ const dispatchColumnWidths = (view, sectionPos, leftColIndex, leftWidth, rightWi
       newColumns.push(child);
     }
   });
+
+  // Capture the selection before the replace below, which otherwise maps the caret out of
+  // the layout to the following paragraph. Restored at the same positions afterwards.
+  const shouldPreserveSelection = !fg('platform_editor_layout_column_menu_kill_switch_1');
+  const selectionBeforeResize = shouldPreserveSelection ? state.selection : null;
   tr.replaceWith(sectionPos + 1, sectionPos + sectionNode.nodeSize - 1, Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);
+  if (selectionBeforeResize) {
+    const restoredSelection = remapResizeSelection(selectionBeforeResize, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
+    }
+  }
   if (fg('platform_editor_layout_resize_analytics')) {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.DRAGGED,

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

@@ -556,6 +556,38 @@ var getPreviousLayoutColumnValign = function getPreviousLayoutColumnValign(selec
 var hasLayoutColumnContent = function hasLayoutColumnContent(node) {
   return !isEmptyDocument(node);
 };
+
+/**
+ * Remaps a selection through a position mapping, preserving its type. Used after replacing a
+ * layout section's contents so the selection stays in its column instead of being mapped out
+ * of the layout. Returns `undefined` if no valid selection can be derived (NodeSelection
+ * whose node is no longer selectable falls back to a nearby caret).
+ */
+var remapSelectionThroughMapping = function remapSelectionThroughMapping(selection, mapping, doc) {
+  var docSize = doc.content.size;
+  var clamp = function clamp(pos) {
+    return Math.min(Math.max(pos, 0), docSize);
+  };
+  if (selection instanceof NodeSelection) {
+    var _TextSelection$findFr;
+    var mappedPos = clamp(mapping.map(selection.from));
+    var nodeAtPos = doc.nodeAt(mappedPos);
+    if (nodeAtPos && NodeSelection.isSelectable(nodeAtPos)) {
+      return NodeSelection.create(doc, mappedPos);
+    }
+    return (_TextSelection$findFr = TextSelection.findFrom(doc.resolve(mappedPos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof TextSelection) {
+    var mappedFrom = clamp(mapping.map(selection.from));
+    var mappedTo = clamp(mapping.map(selection.to));
+    try {
+      return TextSelection.create(doc, mappedFrom, mappedTo);
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
+};
 var mapLayoutColumnPreservedSelection = function mapLayoutColumnPreservedSelection(tr, api) {
   var insertMeta = tr.getMeta(LAYOUT_COLUMN_INSERT_META);
   if (insertMeta) {
@@ -641,7 +673,22 @@ var insertLayoutColumnAt = function insertLayoutColumnAt(side, editorAnalyticsAP
       insertedColumnPos: insertedColumnPos,
       side: side
     });
+
+    // Capture the selection before the section content is replaced (the replace below maps
+    // it out of the layout by default). The menu path restores its own preserved selection
+    // afterwards, so this restoration only matters for the cursor-in-column case.
+    var originalSelection = tr.selection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributedWidths));
+
+    // Inserting left shifts positions at/after the new column right by its size; inserting
+    // right leaves them unchanged. Remap the original selection through that mapping.
+    if (!fg('platform_editor_layout_column_menu_kill_switch_1')) {
+      var insertMapping = side === 'left' ? new Mapping([new StepMap([insertedColumnPos, 0, newColumn.nodeSize])]) : new Mapping();
+      var restoredSelection = remapSelectionThroughMapping(originalSelection, insertMapping, tr.doc);
+      if (restoredSelection) {
+        tr.setSelection(restoredSelection);
+      }
+    }
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.INSERTED,
       actionSubject: ACTION_SUBJECT.DOCUMENT,
@@ -917,7 +964,35 @@ export var deleteLayoutColumn = function deleteLayoutColumn() {
       return redistributeAfterDeletion(widths, selectedIndex, MIN_LAYOUT_COLUMN_WIDTH_PERCENT);
     }, existingWidths);
     var updatedLayoutSectionNode = layoutSectionNode.copy(Fragment.fromArray(remainingColumns));
+
+    // The cursor-in-column (keyboard) path has a plain text selection; the menu path has a
+    // column NodeSelection whose post-delete landing is owned by the block-controls
+    // preserved-selection plugin, so we only restore the caret for the former.
+    var hadTextSelection = tr.selection instanceof TextSelection;
     tr.replaceWith(layoutSectionPos + 1, layoutSectionPos + layoutSectionNode.nodeSize - 1, columnWidth(updatedLayoutSectionNode, tr.doc.type.schema, redistributed));
+
+    // Land the caret in a remaining column — the one now occupying the deleted slot, or the
+    // last column when the deleted slot no longer exists. Otherwise the replace above maps
+    // the caret out of the layout to the following paragraph.
+    var remainingColumnCount = remainingColumns.length;
+    if (hadTextSelection && !fg('platform_editor_layout_column_menu_kill_switch_1') && remainingColumnCount > 0) {
+      var targetColumnIndex = Math.min(startIndex, remainingColumnCount - 1);
+      var updatedSectionNode = tr.doc.nodeAt(layoutSectionPos);
+      if (updatedSectionNode) {
+        var columnOffset = 1;
+        for (var columnIndex = 0; columnIndex < targetColumnIndex; columnIndex++) {
+          columnOffset += updatedSectionNode.child(columnIndex).nodeSize;
+        }
+        // +1 to land inside the column's first child rather than on the column boundary.
+        var caretPos = layoutSectionPos + columnOffset + 1;
+        if (caretPos >= 0 && caretPos <= tr.doc.content.size) {
+          var caretSelection = TextSelection.findFrom(tr.doc.resolve(caretPos), 1, true);
+          if (caretSelection) {
+            tr.setSelection(caretSelection);
+          }
+        }
+      }
+    }
     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()({

package/dist/esm/pm-plugins/column-resize-divider.js

@@ -4,10 +4,40 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { bind } from 'bind-event-listener';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { Decoration } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { MIN_LAYOUT_COLUMN_WIDTH_PERCENT } from './consts';
 
+/**
+ * Re-creates a selection at the same positions against the resized document. A resize only
+ * changes width attrs (not node count, order, or size), so the original positions are still
+ * valid. Returns `undefined` if no valid selection can be made.
+ */
+var remapResizeSelection = function remapResizeSelection(selection, doc) {
+  var docSize = doc.content.size;
+  var clamp = function clamp(pos) {
+    return Math.min(Math.max(pos, 0), docSize);
+  };
+  if (selection instanceof NodeSelection) {
+    var _TextSelection$findFr;
+    var pos = clamp(selection.from);
+    var nodeAtPos = doc.nodeAt(pos);
+    if (nodeAtPos && NodeSelection.isSelectable(nodeAtPos)) {
+      return NodeSelection.create(doc, pos);
+    }
+    return (_TextSelection$findFr = TextSelection.findFrom(doc.resolve(pos), 1, true)) !== null && _TextSelection$findFr !== void 0 ? _TextSelection$findFr : undefined;
+  }
+  if (selection instanceof TextSelection) {
+    try {
+      return TextSelection.create(doc, clamp(selection.from), clamp(selection.to));
+    } catch (_unused) {
+      return undefined;
+    }
+  }
+  return undefined;
+};
+
 // Class names for the column resize divider widget — must stay in sync with layout.ts in editor-core
 var layoutColumnDividerClassName = 'layout-column-divider';
 var layoutColumnDividerRailClassName = 'layout-column-divider-rail';
@@ -44,9 +74,20 @@ var dispatchColumnWidths = function dispatchColumnWidths(view, sectionPos, leftC
       newColumns.push(child);
     }
   });
+
+  // Capture the selection before the replace below, which otherwise maps the caret out of
+  // the layout to the following paragraph. Restored at the same positions afterwards.
+  var shouldPreserveSelection = !fg('platform_editor_layout_column_menu_kill_switch_1');
+  var selectionBeforeResize = shouldPreserveSelection ? state.selection : null;
   tr.replaceWith(sectionPos + 1, sectionPos + sectionNode.nodeSize - 1, Fragment.from(newColumns));
   tr.setMeta('layoutColumnResize', true);
   tr.setMeta('scrollIntoView', false);
+  if (selectionBeforeResize) {
+    var restoredSelection = remapResizeSelection(selectionBeforeResize, tr.doc);
+    if (restoredSelection) {
+      tr.setSelection(restoredSelection);
+    }
+  }
   if (fg('platform_editor_layout_resize_analytics')) {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.DRAGGED,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-layout",
-	"version": "13.2.3",
+	"version": "13.3.0",
 	"description": "Layout plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,19 +37,19 @@
 		"@atlaskit/editor-plugin-width": "^13.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-shared-styles": "^4.0.0",
-		"@atlaskit/editor-toolbar": "^2.0.0",
-		"@atlaskit/editor-ui-control-model": "^2.0.0",
-		"@atlaskit/icon": "^36.0.0",
-		"@atlaskit/icon-lab": "^7.1.0",
+		"@atlaskit/editor-toolbar": "^2.1.0",
+		"@atlaskit/editor-ui-control-model": "^2.1.0",
+		"@atlaskit/icon": "^36.1.0",
+		"@atlaskit/icon-lab": "^7.2.0",
 		"@atlaskit/platform-feature-flags": "^2.0.0",
-		"@atlaskit/tmp-editor-statsig": "^113.0.0",
-		"@atlaskit/tokens": "^15.0.0",
+		"@atlaskit/tmp-editor-statsig": "^114.0.0",
+		"@atlaskit/tokens": "^15.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"bind-event-listener": "^3.0.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.13.0",
+		"@atlaskit/editor-common": "^116.15.0",
 		"react": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},