@atlaskit/editor-plugin-block-controls 8.0.7 → 8.0.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/editor-plugin-block-controls
 
+## 8.0.8
+
+### Patch Changes
+
+- [`eb7609ee331ab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eb7609ee331ab) -
+  [ux] EDITOR-4264 Fix preserved selection mapping
+- Updated dependencies
+
 ## 8.0.7
 
 ### Patch Changes

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _styles = require("@atlaskit/editor-common/styles");
 var _selection = require("../utils/selection");
@@ -59,11 +58,10 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
           var meta = (0, _utils.getSelectionPreservationMeta)(tr);
           var newState = _objectSpread({}, pluginState);
           if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-            newState.preservedSelection = (0, _selection.mapPreservedSelection)(tr.selection, tr);
+            newState.preservedSelection = (0, _selection.createPreservedSelection)(tr.doc.resolve(tr.selection.from), tr.doc.resolve(tr.selection.to));
           } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
             newState.preservedSelection = undefined;
-          }
-          if (newState.preservedSelection && tr.docChanged) {
+          } else if (newState.preservedSelection && tr.docChanged) {
             newState.preservedSelection = (0, _selection.mapPreservedSelection)(newState.preservedSelection, tr);
           }
           if (!(0, _utils.compareSelections)(newState.preservedSelection, pluginState.preservedSelection)) {
@@ -97,14 +95,15 @@ var createSelectionPreservationPlugin = exports.createSelectionPreservationPlugi
         if (selectionUnchanged || selectionInvalid) {
           return null;
         }
-        try {
-          return newState.tr.setSelection(preservedSel);
-        } catch (error) {
-          (0, _monitoring.logException)(error, {
-            location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+        var newSelection = (0, _selection.createPreservedSelection)(newState.doc.resolve(preservedSel.from), newState.doc.resolve(preservedSel.to));
+
+        // If selection becomes invalid, stop preserving
+        if (!newSelection) {
+          return (0, _editorCommands.stopPreservingSelection)({
+            tr: newState.tr
           });
         }
-        return null;
+        return newState.tr.setSelection(newSelection);
       },
       view: function view() {
         return {

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 = void 0;
+exports.setCursorPositionAtMovedNode = exports.selectNode = exports.rootTaskListDepth = exports.rootListDepth = exports.newGetSelection = exports.isNodeWithCodeBlock = exports.isHandleCorrelatedToSelection = exports.getSelection = exports.getInlineNodePos = 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");
@@ -81,7 +81,16 @@ var oldGetSelection = function oldGetSelection(tr, start) {
     return new _state.TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
   }
 };
-var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
+
+/**
+ * Gets the appropriate selection for the node at the given start position.
+ *
+ * @param doc The ProseMirror document.
+ * @param selectionEmpty Indicates if the current selection is empty.
+ * @param start The start position of the node.
+ * @returns The appropriate selection for the node.
+ */
+var newGetSelection = exports.newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
   var node = doc.nodeAt(start);
   var isNodeSelection = node && _state.NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;

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

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapPreservedSelection = exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = exports.expandSelectionHeadToNodeAtPos = exports.alignAnchorHeadInDirectionOfPos = void 0;
+exports.mapPreservedSelection = exports.getSelectedSlicePosition = exports.getMultiSelectionIfPosInside = exports.expandSelectionHeadToNodeAtPos = exports.createPreservedSelection = exports.alignAnchorHeadInDirectionOfPos = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-tables/utils");
 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();
@@ -91,38 +93,51 @@ var mapPreservedSelection = exports.mapPreservedSelection = function mapPreserve
   var _ref = (0, _main.getBlockControlsMeta)(tr) || {},
     preservedSelectionMapping = _ref.preservedSelectionMapping;
   var mapping = preservedSelectionMapping || 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 && !wasSelectionEmpty) {
-      // If selection has become empty i.e. content has been deleted, stop preserving
-      return undefined;
-    }
-    // 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));
+  var from = mapping.map(selection.from);
+  var to = mapping.map(selection.to);
+  var isSelectionEmpty = from === to;
+  var wasSelectionEmpty = selection.from === selection.to;
+  if (isSelectionEmpty && !wasSelectionEmpty) {
+    // If selection has become empty i.e. content has been deleted, stop preserving
+    return undefined;
+  }
+  return createPreservedSelection(tr.doc.resolve(from), tr.doc.resolve(to));
+};
 
-    // If after expanding the selection it is still empty, return a single cursor selection at 'from'
-    var nodeAfter = expanded.$from.nodeAfter;
-    var nodeBefore = expanded.$to.nodeBefore;
-    var expandedSelectionEmpty = nodeAfter === nodeBefore && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0;
-    if (isSelectionEmpty && expandedSelectionEmpty) {
-      return _state.TextSelection.create(tr.doc, from);
-    }
-    var $from = expanded.$from,
-      $to = expanded.$to;
+/**
+ * Creates a preserved selection which is expanded to block boundaries.
+ *
+ * Will return the correct type of selection based on the nodes contained within the
+ * expanded selection range.
+ *
+ * If the selection becomes empty or invalid, it returns undefined.
+ *
+ * @param $from The resolved position of the start of the selection
+ * @param $to The resolved position of the end of the selection
+ * @returns A Selection or undefined if selection is invalid
+ */
+var createPreservedSelection = exports.createPreservedSelection = function createPreservedSelection($from, $to) {
+  var _doc$nodeAt;
+  var doc = $from.doc;
+
+  // expand the selection range to block boundaries, so selection always includes whole nodes
+  var expanded = (0, _selection.expandToBlockRange)($from, $to);
+
+  // stop preserving if selection becomes invalid
+  if (expanded.$from.pos < 0 || expanded.$to.pos > doc.content.size || expanded.$from.pos >= expanded.$to.pos) {
+    return undefined;
+  }
 
-    // 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);
+  // If multiple blocks selected, create TextSelection from start of first node to end of last node
+  if (expanded.range && (0, _selection.isMultiBlockRange)(expanded.range)) {
+    return new _state.TextSelection(expanded.$from, expanded.$to);
   }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch (_unused) {
+  var nodeType = (_doc$nodeAt = doc.nodeAt(expanded.$from.pos)) === null || _doc$nodeAt === void 0 || (_doc$nodeAt = _doc$nodeAt.type) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.name;
+  if (!nodeType) {
     return undefined;
   }
+  if (nodeType === 'table') {
+    return (0, _utils.getTableSelectionClosesToPos)($from);
+  }
+  return (0, _getSelection.newGetSelection)(doc, false, expanded.$from.pos) || undefined;
 };

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

@@ -1,7 +1,6 @@
-import { logException } from '@atlaskit/editor-common/monitoring';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { mapPreservedSelection } from '../utils/selection';
+import { createPreservedSelection, mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, isPreservedSelectionChanged, isSelectionWithinCodeBlock, syncDOMSelection } from './utils';
@@ -51,11 +50,10 @@ export const createSelectionPreservationPlugin = api => () => {
           ...pluginState
         };
         if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-          newState.preservedSelection = mapPreservedSelection(tr.selection, tr);
+          newState.preservedSelection = createPreservedSelection(tr.doc.resolve(tr.selection.from), tr.doc.resolve(tr.selection.to));
         } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
           newState.preservedSelection = undefined;
-        }
-        if (newState.preservedSelection && tr.docChanged) {
+        } else if (newState.preservedSelection && tr.docChanged) {
           newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
         }
         if (!compareSelections(newState.preservedSelection, pluginState.preservedSelection)) {
@@ -89,14 +87,15 @@ export const createSelectionPreservationPlugin = api => () => {
       if (selectionUnchanged || selectionInvalid) {
         return null;
       }
-      try {
-        return newState.tr.setSelection(preservedSel);
-      } catch (error) {
-        logException(error, {
-          location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+      const newSelection = createPreservedSelection(newState.doc.resolve(preservedSel.from), newState.doc.resolve(preservedSel.to));
+
+      // If selection becomes invalid, stop preserving
+      if (!newSelection) {
+        return stopPreservingSelection({
+          tr: newState.tr
         });
       }
-      return null;
+      return newState.tr.setSelection(newSelection);
     },
     view() {
       return {

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

@@ -76,7 +76,16 @@ const oldGetSelection = (tr, start) => {
     return new TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
   }
 };
-const newGetSelection = (doc, selectionEmpty, start) => {
+
+/**
+ * Gets the appropriate selection for the node at the given start position.
+ *
+ * @param doc The ProseMirror document.
+ * @param selectionEmpty Indicates if the current selection is empty.
+ * @param start The start position of the node.
+ * @returns The appropriate selection for the node.
+ */
+export const newGetSelection = (doc, selectionEmpty, start) => {
   const node = doc.nodeAt(start);
   const isNodeSelection = node && NodeSelection.isSelectable(node);
   const nodeSize = node ? node.nodeSize : 1;

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

@@ -1,6 +1,8 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
 import { getBlockControlsMeta, key } from '../main';
+import { newGetSelection } 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();
@@ -87,40 +89,53 @@ export const mapPreservedSelection = (selection, tr) => {
     preservedSelectionMapping
   } = getBlockControlsMeta(tr) || {};
   const mapping = preservedSelectionMapping || 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 && !wasSelectionEmpty) {
-      // If selection has become empty i.e. content has been deleted, stop preserving
-      return undefined;
-    }
-    // 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));
+  const from = mapping.map(selection.from);
+  const to = mapping.map(selection.to);
+  const isSelectionEmpty = from === to;
+  const wasSelectionEmpty = selection.from === selection.to;
+  if (isSelectionEmpty && !wasSelectionEmpty) {
+    // If selection has become empty i.e. content has been deleted, stop preserving
+    return undefined;
+  }
+  return createPreservedSelection(tr.doc.resolve(from), tr.doc.resolve(to));
+};
+
+/**
+ * Creates a preserved selection which is expanded to block boundaries.
+ *
+ * Will return the correct type of selection based on the nodes contained within the
+ * expanded selection range.
+ *
+ * If the selection becomes empty or invalid, it returns undefined.
+ *
+ * @param $from The resolved position of the start of the selection
+ * @param $to The resolved position of the end of the selection
+ * @returns A Selection or undefined if selection is invalid
+ */
+export const createPreservedSelection = ($from, $to) => {
+  var _doc$nodeAt, _doc$nodeAt$type;
+  const {
+    doc
+  } = $from;
 
-    // If after expanding the selection it is still empty, return a single cursor selection at 'from'
-    const nodeAfter = expanded.$from.nodeAfter;
-    const nodeBefore = expanded.$to.nodeBefore;
-    const expandedSelectionEmpty = nodeAfter === nodeBefore && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0;
-    if (isSelectionEmpty && expandedSelectionEmpty) {
-      return TextSelection.create(tr.doc, from);
-    }
-    const {
-      $from,
-      $to
-    } = expanded;
+  // expand the selection range to block boundaries, so selection always includes whole nodes
+  const expanded = expandToBlockRange($from, $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);
+  // stop preserving if selection becomes invalid
+  if (expanded.$from.pos < 0 || expanded.$to.pos > doc.content.size || expanded.$from.pos >= expanded.$to.pos) {
+    return undefined;
   }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch {
+
+  // If multiple blocks selected, create TextSelection from start of first node to end of last node
+  if (expanded.range && isMultiBlockRange(expanded.range)) {
+    return new TextSelection(expanded.$from, expanded.$to);
+  }
+  const nodeType = (_doc$nodeAt = doc.nodeAt(expanded.$from.pos)) === null || _doc$nodeAt === void 0 ? void 0 : (_doc$nodeAt$type = _doc$nodeAt.type) === null || _doc$nodeAt$type === void 0 ? void 0 : _doc$nodeAt$type.name;
+  if (!nodeType) {
     return undefined;
   }
+  if (nodeType === 'table') {
+    return getTableSelectionClosesToPos($from);
+  }
+  return newGetSelection(doc, false, expanded.$from.pos) || undefined;
 };

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

@@ -1,10 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _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 { DRAG_HANDLE_SELECTOR } from '@atlaskit/editor-common/styles';
-import { mapPreservedSelection } from '../utils/selection';
+import { createPreservedSelection, mapPreservedSelection } from '../utils/selection';
 import { stopPreservingSelection } from './editor-commands';
 import { selectionPreservationPluginKey } from './plugin-key';
 import { compareSelections, getSelectionPreservationMeta, hasUserSelectionChange, isPreservedSelectionChanged, isSelectionWithinCodeBlock, syncDOMSelection } from './utils';
@@ -53,11 +52,10 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
           var meta = getSelectionPreservationMeta(tr);
           var newState = _objectSpread({}, pluginState);
           if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'startPreserving') {
-            newState.preservedSelection = mapPreservedSelection(tr.selection, tr);
+            newState.preservedSelection = createPreservedSelection(tr.doc.resolve(tr.selection.from), tr.doc.resolve(tr.selection.to));
           } else if ((meta === null || meta === void 0 ? void 0 : meta.type) === 'stopPreserving') {
             newState.preservedSelection = undefined;
-          }
-          if (newState.preservedSelection && tr.docChanged) {
+          } else if (newState.preservedSelection && tr.docChanged) {
             newState.preservedSelection = mapPreservedSelection(newState.preservedSelection, tr);
           }
           if (!compareSelections(newState.preservedSelection, pluginState.preservedSelection)) {
@@ -91,14 +89,15 @@ export var createSelectionPreservationPlugin = function createSelectionPreservat
         if (selectionUnchanged || selectionInvalid) {
           return null;
         }
-        try {
-          return newState.tr.setSelection(preservedSel);
-        } catch (error) {
-          logException(error, {
-            location: 'editor-plugin-block-controls/SelectionPreservationPlugin'
+        var newSelection = createPreservedSelection(newState.doc.resolve(preservedSel.from), newState.doc.resolve(preservedSel.to));
+
+        // If selection becomes invalid, stop preserving
+        if (!newSelection) {
+          return stopPreservingSelection({
+            tr: newState.tr
           });
         }
-        return null;
+        return newState.tr.setSelection(newSelection);
       },
       view: function view() {
         return {

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

@@ -75,7 +75,16 @@ var oldGetSelection = function oldGetSelection(tr, start) {
     return new TextSelection(tr.doc.resolve(inlineNodePos), tr.doc.resolve(inlineNodeEndPos));
   }
 };
-var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
+
+/**
+ * Gets the appropriate selection for the node at the given start position.
+ *
+ * @param doc The ProseMirror document.
+ * @param selectionEmpty Indicates if the current selection is empty.
+ * @param start The start position of the node.
+ * @returns The appropriate selection for the node.
+ */
+export var newGetSelection = function newGetSelection(doc, selectionEmpty, start) {
   var node = doc.nodeAt(start);
   var isNodeSelection = node && NodeSelection.isSelectable(node);
   var nodeSize = node ? node.nodeSize : 1;

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

@@ -1,6 +1,8 @@
-import { expandToBlockRange } from '@atlaskit/editor-common/selection';
+import { expandToBlockRange, isMultiBlockRange } from '@atlaskit/editor-common/selection';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { getTableSelectionClosesToPos } from '@atlaskit/editor-tables/utils';
 import { getBlockControlsMeta, key } from '../main';
+import { newGetSelection } 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();
@@ -85,38 +87,51 @@ export var mapPreservedSelection = function mapPreservedSelection(selection, tr)
   var _ref = getBlockControlsMeta(tr) || {},
     preservedSelectionMapping = _ref.preservedSelectionMapping;
   var mapping = preservedSelectionMapping || 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 && !wasSelectionEmpty) {
-      // If selection has become empty i.e. content has been deleted, stop preserving
-      return undefined;
-    }
-    // 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));
+  var from = mapping.map(selection.from);
+  var to = mapping.map(selection.to);
+  var isSelectionEmpty = from === to;
+  var wasSelectionEmpty = selection.from === selection.to;
+  if (isSelectionEmpty && !wasSelectionEmpty) {
+    // If selection has become empty i.e. content has been deleted, stop preserving
+    return undefined;
+  }
+  return createPreservedSelection(tr.doc.resolve(from), tr.doc.resolve(to));
+};
 
-    // If after expanding the selection it is still empty, return a single cursor selection at 'from'
-    var nodeAfter = expanded.$from.nodeAfter;
-    var nodeBefore = expanded.$to.nodeBefore;
-    var expandedSelectionEmpty = nodeAfter === nodeBefore && (nodeAfter === null || nodeAfter === void 0 ? void 0 : nodeAfter.content.size) === 0;
-    if (isSelectionEmpty && expandedSelectionEmpty) {
-      return TextSelection.create(tr.doc, from);
-    }
-    var $from = expanded.$from,
-      $to = expanded.$to;
+/**
+ * Creates a preserved selection which is expanded to block boundaries.
+ *
+ * Will return the correct type of selection based on the nodes contained within the
+ * expanded selection range.
+ *
+ * If the selection becomes empty or invalid, it returns undefined.
+ *
+ * @param $from The resolved position of the start of the selection
+ * @param $to The resolved position of the end of the selection
+ * @returns A Selection or undefined if selection is invalid
+ */
+export var createPreservedSelection = function createPreservedSelection($from, $to) {
+  var _doc$nodeAt;
+  var doc = $from.doc;
+
+  // expand the selection range to block boundaries, so selection always includes whole nodes
+  var expanded = expandToBlockRange($from, $to);
+
+  // stop preserving if selection becomes invalid
+  if (expanded.$from.pos < 0 || expanded.$to.pos > doc.content.size || expanded.$from.pos >= expanded.$to.pos) {
+    return undefined;
+  }
 
-    // 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);
+  // If multiple blocks selected, create TextSelection from start of first node to end of last node
+  if (expanded.range && isMultiBlockRange(expanded.range)) {
+    return new TextSelection(expanded.$from, expanded.$to);
   }
-  try {
-    return selection.map(tr.doc, mapping);
-  } catch (_unused) {
+  var nodeType = (_doc$nodeAt = doc.nodeAt(expanded.$from.pos)) === null || _doc$nodeAt === void 0 || (_doc$nodeAt = _doc$nodeAt.type) === null || _doc$nodeAt === void 0 ? void 0 : _doc$nodeAt.name;
+  if (!nodeType) {
     return undefined;
   }
+  if (nodeType === 'table') {
+    return getTableSelectionClosesToPos($from);
+  }
+  return newGetSelection(doc, false, expanded.$from.pos) || undefined;
 };

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

@@ -7,6 +7,15 @@ export declare const getInlineNodePos: (doc: PMNode, start: number, nodeSize: nu
     inlineNodePos: number;
 };
 export declare const isNodeWithCodeBlock: (tr: Transaction, start: number, nodeSize: number) => boolean;
+/**
+ * Gets the appropriate selection for the node at the given start position.
+ *
+ * @param doc The ProseMirror document.
+ * @param selectionEmpty Indicates if the current selection is empty.
+ * @param start The start position of the node.
+ * @returns The appropriate selection for the node.
+ */
+export declare const newGetSelection: (doc: PMNode, selectionEmpty: boolean, start: number) => false | NodeSelection | TextSelection;
 export declare const getSelection: (tr: Transaction, start: number, api?: ExtractInjectionAPI<BlockControlsPlugin>) => false | NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string, api?: ExtractInjectionAPI<BlockControlsPlugin>) => Transaction;
 export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number, api?: ExtractInjectionAPI<BlockControlsPlugin>) => Transaction;

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

@@ -1,5 +1,6 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type ReadonlyTransaction, type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection, 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;
@@ -38,3 +39,16 @@ export declare const alignAnchorHeadInDirectionOfPos: (selection: Selection, pos
  * @returns The mapped selection or undefined if mapping is not possible
  */
 export declare const mapPreservedSelection: (selection: Selection, tr: ReadonlyTransaction | Transaction) => Selection | undefined;
+/**
+ * Creates a preserved selection which is expanded to block boundaries.
+ *
+ * Will return the correct type of selection based on the nodes contained within the
+ * expanded selection range.
+ *
+ * If the selection becomes empty or invalid, it returns undefined.
+ *
+ * @param $from The resolved position of the start of the selection
+ * @param $to The resolved position of the end of the selection
+ * @returns A Selection or undefined if selection is invalid
+ */
+export declare const createPreservedSelection: ($from: ResolvedPos, $to: ResolvedPos) => NodeSelection | TextSelection | import("@atlaskit/editor-tables").CellSelection | undefined;

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

@@ -7,6 +7,15 @@ export declare const getInlineNodePos: (doc: PMNode, start: number, nodeSize: nu
     inlineNodePos: number;
 };
 export declare const isNodeWithCodeBlock: (tr: Transaction, start: number, nodeSize: number) => boolean;
+/**
+ * Gets the appropriate selection for the node at the given start position.
+ *
+ * @param doc The ProseMirror document.
+ * @param selectionEmpty Indicates if the current selection is empty.
+ * @param start The start position of the node.
+ * @returns The appropriate selection for the node.
+ */
+export declare const newGetSelection: (doc: PMNode, selectionEmpty: boolean, start: number) => false | NodeSelection | TextSelection;
 export declare const getSelection: (tr: Transaction, start: number, api?: ExtractInjectionAPI<BlockControlsPlugin>) => false | NodeSelection | TextSelection;
 export declare const selectNode: (tr: Transaction, start: number, nodeType: string, api?: ExtractInjectionAPI<BlockControlsPlugin>) => Transaction;
 export declare const setCursorPositionAtMovedNode: (tr: Transaction, start: number, api?: ExtractInjectionAPI<BlockControlsPlugin>) => Transaction;

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

@@ -1,5 +1,6 @@
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import { type ReadonlyTransaction, type Selection, type Transaction } from '@atlaskit/editor-prosemirror/state';
+import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
+import { NodeSelection, TextSelection, 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;
@@ -38,3 +39,16 @@ export declare const alignAnchorHeadInDirectionOfPos: (selection: Selection, pos
  * @returns The mapped selection or undefined if mapping is not possible
  */
 export declare const mapPreservedSelection: (selection: Selection, tr: ReadonlyTransaction | Transaction) => Selection | undefined;
+/**
+ * Creates a preserved selection which is expanded to block boundaries.
+ *
+ * Will return the correct type of selection based on the nodes contained within the
+ * expanded selection range.
+ *
+ * If the selection becomes empty or invalid, it returns undefined.
+ *
+ * @param $from The resolved position of the start of the selection
+ * @param $to The resolved position of the end of the selection
+ * @returns A Selection or undefined if selection is invalid
+ */
+export declare const createPreservedSelection: ($from: ResolvedPos, $to: ResolvedPos) => NodeSelection | TextSelection | import("@atlaskit/editor-tables").CellSelection | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-controls",
-	"version": "8.0.7",
+	"version": "8.0.8",
 	"description": "Block controls plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
 		"@atlaskit/primitives": "^17.0.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.13.0",
+		"@atlaskit/tmp-editor-statsig": "^16.14.0",
 		"@atlaskit/tokens": "^9.1.0",
 		"@atlaskit/tooltip": "^20.13.0",
 		"@babel/runtime": "^7.0.0",