@atlaskit/editor-plugin-block-controls 7.11.2 → 7.11.4

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 7.11.4
+
+### Patch Changes
+
+- [`26f8da78a699c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/26f8da78a699c) -
+  EDITOR-3756 Fix initial collapse of preserved selection
+- Updated dependencies
+
+## 7.11.3
+
+### Patch Changes
+
+- [`59c74907ab1c6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/59c74907ab1c6) -
+  [ux] EDITOR-3727 fix selection preservation on empty lines
+- [`7e5df3d5beaf3`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7e5df3d5beaf3) -
+  Add new flattenListStep and unwrapListStep and use for list -> paragraph step. Also moved
+  expandToBlockRange util function to editor-common to re-use
+- [`e3779b75fdeca`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e3779b75fdeca) -
+  EDITOR-1643 Promote syncBlock and bodiedSyncBlock to full schema
+- Updated dependencies
+
 ## 7.11.2
 
 ### Patch Changes

package/dist/cjs/pm-plugins/selection-preservation/pm-plugin.js

@@ -8,10 +8,7 @@ exports.createSelectionPreservationPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _state = require("@atlaskit/editor-prosemirror/state");
-var _transform = require("@atlaskit/editor-prosemirror/transform");
-var _main = require("../main");
-var _getSelection = require("../utils/getSelection");
+var _selection = require("../utils/selection");
 var _editorCommands = require("./editor-commands");
 var _pluginKey = require("./plugin-key");
 var _utils = require("./utils");
@@ -63,7 +60,7 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
+          newState.preservedSelection = (0, _selection.mapPreservedSelection)(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -81,10 +78,9 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         });
       }
       var currSel = newState.selection;
-      var wasEmptySelection = savedSel.from === savedSel.to;
       var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -97,35 +93,4 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
       return null;
     }
   });
-};
-var mapSelection = function mapSelection(selection, tr) {
-  var _ref = (0, _main.getBlockControlsMeta)(tr) || {},
-    nodeMoved = _ref.nodeMoved,
-    nodeMovedOffset = _ref.nodeMovedOffset;
-  var mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new _transform.Mapping([new _transform.StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
-  if (selection instanceof _state.TextSelection) {
-    var from = mapping.map(selection.from);
-    var to = mapping.map(selection.to);
-
-    // expand the text selection range to block boundaries, so as document changes occur the
-    // selection always includes whole nodes
-    var expanded = (0, _getSelection.expandToBlockRange)(tr.doc.resolve(from), tr.doc.resolve(to));
-
-    // collapse the expanded range to a valid selection range
-    var _collapseToSelectionR = (0, _getSelection.collapseToSelectionRange)(expanded.$from, expanded.$to),
-      $from = _collapseToSelectionR.$from,
-      $to = _collapseToSelectionR.$to;
-
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
-    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
-      return undefined;
-    }
-    return new _state.TextSelection($from, $to);
-  }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch (_unused) {
-    return undefined;
-  }
 };

package/dist/cjs/pm-plugins/utils/getSelection.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = exports.expandToBlockRange = exports.collapseToSelectionRange = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = exports.collapseToSelectionRange = void 0;
 var _selection2 = require("@atlaskit/editor-common/selection");
 var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _state = require("@atlaskit/editor-prosemirror/state");
@@ -222,28 +222,6 @@ var rootTaskListDepth = exports.rootTaskListDepth = function rootTaskListDepth(t
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-var expandToBlockRange = exports.expandToBlockRange = function expandToBlockRange($from, $to) {
-  var range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from: $from,
-      $to: $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -254,14 +232,14 @@ var expandToBlockRange = exports.expandToBlockRange = function expandToBlockRang
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 var collapseToSelectionRange = exports.collapseToSelectionRange = function collapseToSelectionRange($from, $to) {
-  var resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  var firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  var lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  var lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  var lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  var firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  var lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  var lastNodeStartPos = $to.pos - lastNodeSize;
+  var lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/cjs/pm-plugins/utils/selection.js

@@ -3,9 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = exports.expandSelectionHeadToNodeAtPos = exports.alignAnchorHeadInDirectionOfPos = void 0;
+exports.mapPreservedSelection = exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = exports.expandSelectionHeadToNodeAtPos = exports.alignAnchorHeadInDirectionOfPos = void 0;
+var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _main = require("../main");
+var _getSelection = require("./getSelection");
 var getMultiSelectionIfPosInside = exports.getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos, tr) {
   var _api$blockControls, _pluginState$multiSel, _tr$getMeta;
   var pluginState = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
@@ -26,7 +29,12 @@ var getMultiSelectionIfPosInside = exports.getMultiSelectionIfPosInside = functi
 };
 
 /**
+ * Given a handle position, returns the from and to positions of the selected content.
+ * If the handle position is not in a multi-selection, it returns the node's from and to positions.
  *
+ * @param handlePos The position of the handle
+ * @param tr The transaction to use for position calculations
+ * @param api The BlockControlsPlugin API for accessing shared state
  * @returns from and to positions of the selected content (after expansion)
  */
 var getSelectedSlicePosition = exports.getSelectedSlicePosition = function getSelectedSlicePosition(handlePos, tr, api) {
@@ -72,4 +80,52 @@ var expandSelectionHeadToNodeAtPos = exports.expandSelectionHeadToNodeAtPos = fu
  */
 var alignAnchorHeadInDirectionOfPos = exports.alignAnchorHeadInDirectionOfPos = function alignAnchorHeadInDirectionOfPos(selection, pos) {
   return selection instanceof _state.NodeSelection && Math.max(pos, selection.anchor) === selection.anchor ? new _state.TextSelection(selection.$head, selection.$anchor) : selection;
+};
+
+/**
+ * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
+ *
+ * @param selection The existing preserved selection to map
+ * @param tr The transaction to map through
+ * @returns The mapped selection or undefined if mapping is not possible
+ */
+var mapPreservedSelection = exports.mapPreservedSelection = function mapPreservedSelection(selection, tr) {
+  var _ref = (0, _main.getBlockControlsMeta)(tr) || {},
+    nodeMoved = _ref.nodeMoved,
+    nodeMovedOffset = _ref.nodeMovedOffset;
+  var mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new _transform.Mapping([new _transform.StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
+  if (selection instanceof _state.TextSelection) {
+    var from = mapping.map(selection.from);
+    var to = mapping.map(selection.to);
+    var isSelectionEmpty = from === to;
+    var wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new _state.TextSelection(tr.doc.resolve(from));
+    }
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    var expanded = (0, _selection.expandToBlockRange)(tr.doc.resolve(from), tr.doc.resolve(to));
+
+    // collapse the expanded range to a valid selection range
+    var _collapseToSelectionR = (0, _getSelection.collapseToSelectionRange)(expanded.$from, expanded.$to),
+      $from = _collapseToSelectionR.$from,
+      $to = _collapseToSelectionR.$to;
+
+    // stop preserving if preserved selection becomes invalid
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new _state.TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, mapping);
+  } catch (_unused) {
+    return undefined;
+  }
 };

package/dist/cjs/ui/drag-handle.js

@@ -410,13 +410,14 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
   var handleOnClickNew = (0, _react.useCallback)(function (e) {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
-      var _api$analytics, _resolvedStartPos$nod, _selectionPreservatio, _api$blockControls, _api$blockControls2;
+      var _selectionPreservatio, _api$analytics, _resolvedStartPos$nod, _api$blockControls, _api$blockControls2;
       var tr = _ref3.tr;
       var startPos = getPos();
       if (startPos === undefined) {
         return tr;
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
+      var selection = ((_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
         eventType: _analytics.EVENT_TYPE.UI,
         action: _analytics.ACTION.CLICKED,
@@ -427,7 +428,6 @@ var DragHandle = exports.DragHandle = function DragHandle(_ref2) {
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      var selection = ((_selectionPreservatio = _pluginKey.selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       var range = getExpandedSelectionRange({
         doc: tr.doc,
         selection: selection,

package/dist/es2019/pm-plugins/selection-preservation/pm-plugin.js

@@ -1,9 +1,6 @@
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
-import { getBlockControlsMeta } from '../main';
-import { collapseToSelectionRange, expandToBlockRange } from '../utils/getSelection';
+import { mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
@@ -56,7 +53,7 @@ export const createSelectionPreservationPlugin = () => {
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
+          newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -74,10 +71,9 @@ export const createSelectionPreservationPlugin = () => {
         });
       }
       const currSel = newState.selection;
-      const wasEmptySelection = savedSel.from === savedSel.to;
       const selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       const selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -90,37 +86,4 @@ export const createSelectionPreservationPlugin = () => {
       return null;
     }
   });
-};
-const mapSelection = (selection, tr) => {
-  const {
-    nodeMoved,
-    nodeMovedOffset
-  } = getBlockControlsMeta(tr) || {};
-  const mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new Mapping([new StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
-  if (selection instanceof TextSelection) {
-    const from = mapping.map(selection.from);
-    const to = mapping.map(selection.to);
-
-    // expand the text selection range to block boundaries, so as document changes occur the
-    // selection always includes whole nodes
-    const expanded = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
-
-    // collapse the expanded range to a valid selection range
-    const {
-      $from,
-      $to
-    } = collapseToSelectionRange(expanded.$from, expanded.$to);
-
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
-    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
-      return undefined;
-    }
-    return new TextSelection($from, $to);
-  }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch {
-    return undefined;
-  }
 };

package/dist/es2019/pm-plugins/utils/getSelection.js

@@ -219,28 +219,6 @@ export const rootTaskListDepth = taskListPos => {
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export const expandToBlockRange = ($from, $to) => {
-  const range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from,
-      $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -251,14 +229,14 @@ export const expandToBlockRange = ($from, $to) => {
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 export const collapseToSelectionRange = ($from, $to) => {
-  const resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  const firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  const lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  const lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  const lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  const firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  const lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  const lastNodeStartPos = $to.pos - lastNodeSize;
+  const lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/es2019/pm-plugins/utils/selection.js

@@ -1,5 +1,8 @@
-import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { key } from '../main';
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
+import { getBlockControlsMeta, key } from '../main';
+import { collapseToSelectionRange } from './getSelection';
 export const getMultiSelectionIfPosInside = (api, pos, tr) => {
   var _api$blockControls, _pluginState$multiSel, _tr$getMeta;
   const pluginState = api === null || api === void 0 ? void 0 : (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
@@ -20,7 +23,12 @@ export const getMultiSelectionIfPosInside = (api, pos, tr) => {
 };
 
 /**
+ * Given a handle position, returns the from and to positions of the selected content.
+ * If the handle position is not in a multi-selection, it returns the node's from and to positions.
  *
+ * @param handlePos The position of the handle
+ * @param tr The transaction to use for position calculations
+ * @param api The BlockControlsPlugin API for accessing shared state
  * @returns from and to positions of the selected content (after expansion)
  */
 export const getSelectedSlicePosition = (handlePos, tr, api) => {
@@ -67,4 +75,54 @@ export const expandSelectionHeadToNodeAtPos = (selection, nodePos) => {
  */
 export const alignAnchorHeadInDirectionOfPos = (selection, pos) => {
   return selection instanceof NodeSelection && Math.max(pos, selection.anchor) === selection.anchor ? new TextSelection(selection.$head, selection.$anchor) : selection;
+};
+
+/**
+ * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
+ *
+ * @param selection The existing preserved selection to map
+ * @param tr The transaction to map through
+ * @returns The mapped selection or undefined if mapping is not possible
+ */
+export const mapPreservedSelection = (selection, tr) => {
+  const {
+    nodeMoved,
+    nodeMovedOffset
+  } = getBlockControlsMeta(tr) || {};
+  const mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new Mapping([new StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
+  if (selection instanceof TextSelection) {
+    const from = mapping.map(selection.from);
+    const to = mapping.map(selection.to);
+    const isSelectionEmpty = from === to;
+    const wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new TextSelection(tr.doc.resolve(from));
+    }
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    const expanded = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
+
+    // collapse the expanded range to a valid selection range
+    const {
+      $from,
+      $to
+    } = collapseToSelectionRange(expanded.$from, expanded.$to);
+
+    // stop preserving if preserved selection becomes invalid
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, mapping);
+  } catch {
+    return undefined;
+  }
 };

package/dist/es2019/ui/drag-handle.js

@@ -389,12 +389,13 @@ export const DragHandle = ({
     api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(({
       tr
     }) => {
-      var _api$analytics, _resolvedStartPos$nod, _selectionPreservatio, _api$blockControls, _api$blockControls2;
+      var _selectionPreservatio, _api$analytics, _resolvedStartPos$nod, _api$blockControls, _api$blockControls2;
       const startPos = getPos();
       if (startPos === undefined) {
         return tr;
       }
       const resolvedStartPos = tr.doc.resolve(startPos);
+      const selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions.attachAnalyticsEvent({
         eventType: EVENT_TYPE.UI,
         action: ACTION.CLICKED,
@@ -405,7 +406,6 @@ export const DragHandle = ({
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      const selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       const range = getExpandedSelectionRange({
         doc: tr.doc,
         selection,

package/dist/esm/pm-plugins/selection-preservation/pm-plugin.js

@@ -3,10 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 import { logException } from '@atlaskit/editor-common/monitoring';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { TextSelection } from '@atlaskit/editor-prosemirror/state';
-import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
-import { getBlockControlsMeta } from '../main';
-import { collapseToSelectionRange, expandToBlockRange } from '../utils/getSelection';
+import { mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { getSelectionPreservationMeta, hasUserSelectionChange } from './utils';
@@ -57,7 +54,7 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
           newState.preservedSelection = undefined;
         }
         if (newState.preservedSelection && tr.docChanged) {
-          newState.preservedSelection = mapSelection(newState.preservedSelection, tr);
+          newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
         }
         return newState;
       }
@@ -75,10 +72,9 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         });
       }
       var currSel = newState.selection;
-      var wasEmptySelection = savedSel.from === savedSel.to;
       var selectionUnchanged = currSel.from === savedSel.from && currSel.to === savedSel.to;
       var selectionInvalid = savedSel.from < 0 || savedSel.to > newState.doc.content.size;
-      if (wasEmptySelection || selectionUnchanged || selectionInvalid) {
+      if (selectionUnchanged || selectionInvalid) {
         return null;
       }
       try {
@@ -91,35 +87,4 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
       return null;
     }
   });
-};
-var mapSelection = function mapSelection(selection, tr) {
-  var _ref = getBlockControlsMeta(tr) || {},
-    nodeMoved = _ref.nodeMoved,
-    nodeMovedOffset = _ref.nodeMovedOffset;
-  var mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new Mapping([new StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
-  if (selection instanceof TextSelection) {
-    var from = mapping.map(selection.from);
-    var to = mapping.map(selection.to);
-
-    // expand the text selection range to block boundaries, so as document changes occur the
-    // selection always includes whole nodes
-    var expanded = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
-
-    // collapse the expanded range to a valid selection range
-    var _collapseToSelectionR = collapseToSelectionRange(expanded.$from, expanded.$to),
-      $from = _collapseToSelectionR.$from,
-      $to = _collapseToSelectionR.$to;
-
-    // stop preserving if preserved selection becomes invalid or collapsed to a cursor
-    // e.g. after deleting the selection
-    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
-      return undefined;
-    }
-    return new TextSelection($from, $to);
-  }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch (_unused) {
-    return undefined;
-  }
 };

package/dist/esm/pm-plugins/utils/getSelection.js

@@ -216,28 +216,6 @@ export var rootTaskListDepth = function rootTaskListDepth(taskListPos) {
   return depth;
 };
 
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export var expandToBlockRange = function expandToBlockRange($from, $to) {
-  var range = $from.blockRange($to);
-  if (!range) {
-    return {
-      $from: $from,
-      $to: $to
-    };
-  }
-  return {
-    $from: $from.doc.resolve(range.start),
-    $to: $to.doc.resolve(range.end)
-  };
-};
-
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *
@@ -248,14 +226,14 @@ export var expandToBlockRange = function expandToBlockRange($from, $to) {
  * @returns An object containing the collapsed $from and $to resolved positions
  */
 export var collapseToSelectionRange = function collapseToSelectionRange($from, $to) {
-  var resolvedRangeEnd = $from.doc.resolve($to.pos);
-
+  var _$to$nodeBefore$nodeS, _$to$nodeBefore;
   // Get the selections that would be made for the first and last node in the range
   // We re-use the getSelection logic as it already handles various node types and edge cases
-  var firstNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, $from.pos);
-  var lastNodeSize = resolvedRangeEnd.nodeBefore ? resolvedRangeEnd.nodeBefore.nodeSize : 0;
-  var lastNodeStartPos = resolvedRangeEnd.pos - lastNodeSize;
-  var lastNodeSelection = newGetSelection($from.doc, $from.pos === $to.pos, lastNodeStartPos);
+  // always pass true for selectionEmpty to emulate a cursor selection within the node
+  var firstNodeSelection = newGetSelection($from.doc, true, $from.pos);
+  var lastNodeSize = (_$to$nodeBefore$nodeS = (_$to$nodeBefore = $to.nodeBefore) === null || _$to$nodeBefore === void 0 ? void 0 : _$to$nodeBefore.nodeSize) !== null && _$to$nodeBefore$nodeS !== void 0 ? _$to$nodeBefore$nodeS : 0;
+  var lastNodeStartPos = $to.pos - lastNodeSize;
+  var lastNodeSelection = newGetSelection($from.doc, true, lastNodeStartPos);
 
   // Return a selection spanning from the start of the first node selection to the end of the last node selection
   return {

package/dist/esm/pm-plugins/utils/selection.js

@@ -1,5 +1,8 @@
-import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
-import { key } from '../main';
+import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { Mapping, StepMap } from '@atlaskit/editor-prosemirror/transform';
+import { getBlockControlsMeta, key } from '../main';
+import { collapseToSelectionRange } from './getSelection';
 export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(api, pos, tr) {
   var _api$blockControls, _pluginState$multiSel, _tr$getMeta;
   var pluginState = api === null || api === void 0 || (_api$blockControls = api.blockControls) === null || _api$blockControls === void 0 ? void 0 : _api$blockControls.sharedState.currentState();
@@ -20,7 +23,12 @@ export var getMultiSelectionIfPosInside = function getMultiSelectionIfPosInside(
 };
 
 /**
+ * Given a handle position, returns the from and to positions of the selected content.
+ * If the handle position is not in a multi-selection, it returns the node's from and to positions.
  *
+ * @param handlePos The position of the handle
+ * @param tr The transaction to use for position calculations
+ * @param api The BlockControlsPlugin API for accessing shared state
  * @returns from and to positions of the selected content (after expansion)
  */
 export var getSelectedSlicePosition = function getSelectedSlicePosition(handlePos, tr, api) {
@@ -66,4 +74,52 @@ export var expandSelectionHeadToNodeAtPos = function expandSelectionHeadToNodeAt
  */
 export var alignAnchorHeadInDirectionOfPos = function alignAnchorHeadInDirectionOfPos(selection, pos) {
   return selection instanceof NodeSelection && Math.max(pos, selection.anchor) === selection.anchor ? new TextSelection(selection.$head, selection.$anchor) : selection;
+};
+
+/**
+ * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
+ *
+ * @param selection The existing preserved selection to map
+ * @param tr The transaction to map through
+ * @returns The mapped selection or undefined if mapping is not possible
+ */
+export var mapPreservedSelection = function mapPreservedSelection(selection, tr) {
+  var _ref = getBlockControlsMeta(tr) || {},
+    nodeMoved = _ref.nodeMoved,
+    nodeMovedOffset = _ref.nodeMovedOffset;
+  var mapping = nodeMoved && typeof nodeMovedOffset === 'number' ? new Mapping([new StepMap([0, 0, nodeMovedOffset])]) : tr.mapping;
+  if (selection instanceof TextSelection) {
+    var from = mapping.map(selection.from);
+    var to = mapping.map(selection.to);
+    var isSelectionEmpty = from === to;
+    var wasSelectionEmpty = selection.from === selection.to;
+    if (isSelectionEmpty) {
+      if (!wasSelectionEmpty) {
+        // If selection has become empty i.e. content has been deleted, stop preserving
+        return undefined;
+      }
+      // When preserving a cursor selection, just map the position without expanding
+      return new TextSelection(tr.doc.resolve(from));
+    }
+
+    // expand the text selection range to block boundaries, so as document changes occur the
+    // selection always includes whole nodes
+    var expanded = expandToBlockRange(tr.doc.resolve(from), tr.doc.resolve(to));
+
+    // collapse the expanded range to a valid selection range
+    var _collapseToSelectionR = collapseToSelectionRange(expanded.$from, expanded.$to),
+      $from = _collapseToSelectionR.$from,
+      $to = _collapseToSelectionR.$to;
+
+    // stop preserving if preserved selection becomes invalid
+    if ($from.pos < 0 || $to.pos > tr.doc.content.size || $from.pos >= $to.pos) {
+      return undefined;
+    }
+    return new TextSelection($from, $to);
+  }
+  try {
+    return selection.map(tr.doc, mapping);
+  } catch (_unused) {
+    return undefined;
+  }
 };

package/dist/esm/ui/drag-handle.js

@@ -407,13 +407,14 @@ export var DragHandle = function DragHandle(_ref2) {
   var handleOnClickNew = useCallback(function (e) {
     var _api$core;
     api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 || _api$core.actions.execute(function (_ref3) {
-      var _api$analytics, _resolvedStartPos$nod, _selectionPreservatio, _api$blockControls, _api$blockControls2;
+      var _selectionPreservatio, _api$analytics, _resolvedStartPos$nod, _api$blockControls, _api$blockControls2;
       var tr = _ref3.tr;
       var startPos = getPos();
       if (startPos === undefined) {
         return tr;
       }
       var resolvedStartPos = tr.doc.resolve(startPos);
+      var selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || _api$analytics.actions.attachAnalyticsEvent({
         eventType: EVENT_TYPE.UI,
         action: ACTION.CLICKED,
@@ -424,7 +425,6 @@ export var DragHandle = function DragHandle(_ref2) {
           nodeType: ((_resolvedStartPos$nod = resolvedStartPos.nodeAfter) === null || _resolvedStartPos$nod === void 0 ? void 0 : _resolvedStartPos$nod.type.name) || ''
         }
       })(tr);
-      var selection = ((_selectionPreservatio = selectionPreservationPluginKey.getState(view.state)) === null || _selectionPreservatio === void 0 ? void 0 : _selectionPreservatio.preservedSelection) || tr.selection;
       var range = getExpandedSelectionRange({
         doc: tr.doc,
         selection: selection,

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

@@ -2,7 +2,7 @@ import { type IntlShape } from 'react-intl-next';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveDropTargetNode, BlockControlsMeta, BlockControlsPlugin, PluginState } from '../blockControlsPluginType';
@@ -61,4 +61,4 @@ export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin
     lastDragCancelled: any;
     isSelectedViaDragHandle: any;
 }>;
-export declare const getBlockControlsMeta: (tr: ReadonlyTransaction) => BlockControlsMeta | undefined;
+export declare const getBlockControlsMeta: (tr: Transaction | ReadonlyTransaction) => BlockControlsMeta | undefined;

package/dist/types/pm-plugins/utils/getSelection.d.ts

@@ -20,18 +20,6 @@ export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: numb
 export declare const isHandleCorrelatedToSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
 export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
 export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export declare const expandToBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => {
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-};
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *

package/dist/types/pm-plugins/utils/selection.d.ts

@@ -1,12 +1,17 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type Transaction, type Selection } from '@atlaskit/editor-prosemirror/state';
+import { type ReadonlyTransaction, type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number, tr?: Transaction) => {
     anchor?: number;
     head?: number;
 };
 /**
+ * Given a handle position, returns the from and to positions of the selected content.
+ * If the handle position is not in a multi-selection, it returns the node's from and to positions.
  *
+ * @param handlePos The position of the handle
+ * @param tr The transaction to use for position calculations
+ * @param api The BlockControlsPlugin API for accessing shared state
  * @returns from and to positions of the selected content (after expansion)
  */
 export declare const getSelectedSlicePosition: (handlePos: number, tr: Transaction, api: ExtractInjectionAPI<BlockControlsPlugin>) => {
@@ -25,3 +30,11 @@ export declare const expandSelectionHeadToNodeAtPos: (selection: Selection, node
  * which may not align with the existing selection.
  */
 export declare const alignAnchorHeadInDirectionOfPos: (selection: Selection, pos: number) => Selection;
+/**
+ * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
+ *
+ * @param selection The existing preserved selection to map
+ * @param tr The transaction to map through
+ * @returns The mapped selection or undefined if mapping is not possible
+ */
+export declare const mapPreservedSelection: (selection: Selection, tr: ReadonlyTransaction | Transaction) => Selection | undefined;

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

@@ -2,7 +2,7 @@ import { type IntlShape } from 'react-intl-next';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { EditorState, ReadonlyTransaction } from '@atlaskit/editor-prosemirror/state';
+import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { ActiveDropTargetNode, BlockControlsMeta, BlockControlsPlugin, PluginState } from '../blockControlsPluginType';
@@ -61,4 +61,4 @@ export declare const createPlugin: (api: ExtractInjectionAPI<BlockControlsPlugin
     lastDragCancelled: any;
     isSelectedViaDragHandle: any;
 }>;
-export declare const getBlockControlsMeta: (tr: ReadonlyTransaction) => BlockControlsMeta | undefined;
+export declare const getBlockControlsMeta: (tr: Transaction | ReadonlyTransaction) => BlockControlsMeta | undefined;

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

@@ -20,18 +20,6 @@ export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: numb
 export declare const isHandleCorrelatedToSelection: (state: EditorState, selection: Selection, handlePos: number) => boolean;
 export declare const rootListDepth: (itemPos: ResolvedPos) => number | undefined;
 export declare const rootTaskListDepth: (taskListPos: ResolvedPos) => number | undefined;
-/**
- * This expands the given $from and $to resolved positions to the block boundaries
- * spanning all nodes in the range up to the nearest common ancestor.
- *
- * @param $from The resolved start position
- * @param $to The resolved end position
- * @returns An object containing the expanded $from and $to resolved positions
- */
-export declare const expandToBlockRange: ($from: ResolvedPos, $to: ResolvedPos) => {
-    $from: ResolvedPos;
-    $to: ResolvedPos;
-};
 /**
  * Collapses the given $from and $to resolved positions to the nearest valid selection range.
  *

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

@@ -1,12 +1,17 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type Transaction, type Selection } from '@atlaskit/editor-prosemirror/state';
+import { type ReadonlyTransaction, type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { BlockControlsPlugin } from '../../blockControlsPluginType';
 export declare const getMultiSelectionIfPosInside: (api: ExtractInjectionAPI<BlockControlsPlugin>, pos: number, tr?: Transaction) => {
     anchor?: number;
     head?: number;
 };
 /**
+ * Given a handle position, returns the from and to positions of the selected content.
+ * If the handle position is not in a multi-selection, it returns the node's from and to positions.
  *
+ * @param handlePos The position of the handle
+ * @param tr The transaction to use for position calculations
+ * @param api The BlockControlsPlugin API for accessing shared state
  * @returns from and to positions of the selected content (after expansion)
  */
 export declare const getSelectedSlicePosition: (handlePos: number, tr: Transaction, api: ExtractInjectionAPI<BlockControlsPlugin>) => {
@@ -25,3 +30,11 @@ export declare const expandSelectionHeadToNodeAtPos: (selection: Selection, node
  * which may not align with the existing selection.
  */
 export declare const alignAnchorHeadInDirectionOfPos: (selection: Selection, pos: number) => Selection;
+/**
+ * This maps a preserved selection through a transaction, expanding text selections to block boundaries.
+ *
+ * @param selection The existing preserved selection to map
+ * @param tr The transaction to map through
+ * @returns The mapped selection or undefined if mapping is not possible
+ */
+export declare const mapPreservedSelection: (selection: Selection, tr: ReadonlyTransaction | Transaction) => Selection | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "7.11.2",
+	"version": "7.11.4",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -28,7 +28,7 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.4.0",
+		"@atlaskit/adf-schema": "^51.5.1",
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/editor-plugin-accessibility-utils": "^6.0.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/editor-plugin-interaction": "^10.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^3.1.0",
 		"@atlaskit/editor-plugin-metrics": "^7.1.0",
-		"@atlaskit/editor-plugin-quick-insert": "^6.0.0",
+		"@atlaskit/editor-plugin-quick-insert": "^6.1.0",
 		"@atlaskit/editor-plugin-selection": "^6.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
 		"@atlaskit/editor-plugin-type-ahead": "^6.5.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^14.4.0",
+		"@atlaskit/tmp-editor-statsig": "^14.6.0",
 		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@babel/runtime": "^7.0.0",
@@ -66,7 +66,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.37.0",
+		"@atlaskit/editor-common": "^110.38.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"