@atlaskit/editor-plugin-selection 26.0.4 → 26.0.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-selection
 
+## 26.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 26.0.4
 
 ### Patch Changes

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

@@ -5,9 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = exports.selectNearNode = exports.arrowRight = exports.arrowLeft = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _isIgnored = require("@atlaskit/editor-common/selection/is-ignored");
+var _types = require("@atlaskit/editor-common/selection/types");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _types = require("../types");
+var _types2 = require("../types");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
 var _utils2 = require("./utils");
@@ -16,7 +19,7 @@ var _utils2 = require("./utils");
 var selectNearNode = exports.selectNearNode = function selectNearNode(selectionRelativeToNode, selection) {
   return function (_ref) {
     var tr = _ref.tr;
-    tr.setMeta(_types.selectionPluginKey, {
+    tr.setMeta(_types2.selectionPluginKey, {
       type: _actions.SelectionActionTypes.SET_RELATIVE_SELECTION,
       selectionRelativeToNode: selectionRelativeToNode
     });
@@ -38,7 +41,7 @@ var setSelectionRelativeToNode = exports.setSelectionRelativeToNode = function s
 };
 var arrowRight = exports.arrowRight = function arrowRight(state, dispatch) {
   var selection = state.selection;
-  if (selection instanceof _selection.GapCursorSelection) {
+  if (selection instanceof _selection2.GapCursorSelection) {
     return arrowRightFromGapCursor(selection)(state, dispatch);
   } else if (selection instanceof _state.NodeSelection) {
     return arrowRightFromNode(selection)(state, dispatch);
@@ -49,7 +52,7 @@ var arrowRight = exports.arrowRight = function arrowRight(state, dispatch) {
 };
 var arrowLeft = exports.arrowLeft = function arrowLeft(state, dispatch) {
   var selection = state.selection;
-  if (selection instanceof _selection.GapCursorSelection) {
+  if (selection instanceof _selection2.GapCursorSelection) {
     return arrowLeftFromGapCursor(selection)(state, dispatch);
   } else if (selection instanceof _state.NodeSelection) {
     return arrowLeftFromNode(selection)(state, dispatch);
@@ -66,12 +69,12 @@ var arrowRightFromGapCursor = function arrowRightFromGapCursor(selection) {
     if (side === _selection.Side.LEFT) {
       var selectableNode = (0, _utils2.findSelectableContainerAfter)($to, state.doc);
       if (selectableNode) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     } else if (side === _selection.Side.RIGHT && (0, _utils2.isSelectionAtEndOfParentNode)($from, selection)) {
       var _selectableNode = (0, _utils2.findSelectableContainerParent)(selection);
       if (_selectableNode) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode.pos))(state, dispatch);
       }
     }
     return false;
@@ -86,16 +89,16 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(selection) {
     if (side === _selection.Side.RIGHT) {
       var selectableNode = (0, _utils2.findSelectableContainerBefore)($from, state.doc);
       if (selectableNode) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     } else if (side === _selection.Side.LEFT && (0, _utils2.isSelectionAtStartOfParentNode)($from, selection)) {
-      if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
+      if (selectionRelativeToNode === _types.RelativeSelectionPos.Before) {
         var $parent = state.doc.resolve(selection.$from.before(selection.$from.depth));
         if ($parent) {
           var _selectableNode2 = (0, _utils2.findSelectableContainerBefore)($parent, state.doc);
-          if (_selectableNode2 && (0, _selection.isIgnored)(_selectableNode2.node)) {
+          if (_selectableNode2 && (0, _isIgnored.isIgnored)(_selectableNode2.node)) {
             // selection is inside node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
-            return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode2.pos))(state, dispatch);
+            return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode2.pos))(state, dispatch);
           }
         }
         // we don't return this as we want to reset the relative pos, but not block other plugins
@@ -104,7 +107,7 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(selection) {
       } else {
         var _selectableNode3 = (0, _utils2.findSelectableContainerParent)(selection);
         if (_selectableNode3) {
-          return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode3.pos))(state, dispatch);
+          return setSelectionRelativeToNode(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode3.pos))(state, dispatch);
         }
       }
     }
@@ -119,19 +122,19 @@ var arrowRightFromNode = function arrowRightFromNode(selection) {
     var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState2.selectionRelativeToNode;
     if (node.isAtom) {
-      if ((0, _utils2.isSelectionAtEndOfParentNode)($to, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
+      if ((0, _utils2.isSelectionAtEndOfParentNode)($to, selection) && (node.isInline || (0, _isIgnored.isIgnored)(node))) {
         // selection is for inline node or atom node which is ignored by gap-cursor and that is the last child of its parent node - set text selection after it
-        return findAndSetTextSelection(_selection.RelativeSelectionPos.End, state.doc.resolve(from + 1), _types.SelectionDirection.After)(state, dispatch);
+        return findAndSetTextSelection(_types.RelativeSelectionPos.End, state.doc.resolve(from + 1), _types2.SelectionDirection.After)(state, dispatch);
       }
       return false;
-    } else if (selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
+    } else if (selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
       // selection is for container node - set selection inside it at the start
-      return setSelectionInsideAtNodeStart(_selection.RelativeSelectionPos.Inside, node, from)(state, dispatch);
-    } else if ((0, _selection.isIgnored)(node) && (!selectionRelativeToNode || selectionRelativeToNode === _selection.RelativeSelectionPos.End)) {
+      return setSelectionInsideAtNodeStart(_types.RelativeSelectionPos.Inside, node, from)(state, dispatch);
+    } else if ((0, _isIgnored.isIgnored)(node) && (!selectionRelativeToNode || selectionRelativeToNode === _types.RelativeSelectionPos.End)) {
       var selectableNode = (0, _utils2.findSelectableContainerAfter)($to, state.doc);
-      if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
+      if (selectableNode && (0, _isIgnored.isIgnored)(selectableNode.node)) {
         // selection is for node without gap cursor followed by another node without gap cursor - set node selection for next node
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     }
     return false;
@@ -146,23 +149,23 @@ var arrowLeftFromNode = function arrowLeftFromNode(selection) {
     var _getPluginState3 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState3.selectionRelativeToNode;
     if (node.isAtom) {
-      if ((0, _utils2.isSelectionAtStartOfParentNode)($from, selection) && (node.isInline || (0, _selection.isIgnored)(node))) {
+      if ((0, _utils2.isSelectionAtStartOfParentNode)($from, selection) && (node.isInline || (0, _isIgnored.isIgnored)(node))) {
         // selection is for inline node or atom node which is ignored by gap-cursor and that is the first child of its parent node - set text selection before it
-        return findAndSetTextSelection(_selection.RelativeSelectionPos.Start, state.doc.resolve(from), _types.SelectionDirection.Before)(state, dispatch);
+        return findAndSetTextSelection(_types.RelativeSelectionPos.Start, state.doc.resolve(from), _types2.SelectionDirection.Before)(state, dispatch);
       }
       return false;
-    } else if (selectionRelativeToNode === _selection.RelativeSelectionPos.End) {
+    } else if (selectionRelativeToNode === _types.RelativeSelectionPos.End) {
       // selection is for container node - set selection inside it at the end
-      return setSelectionInsideAtNodeEnd(_selection.RelativeSelectionPos.Inside, node, from, to)(state, dispatch);
-    } else if (!selectionRelativeToNode || selectionRelativeToNode === _selection.RelativeSelectionPos.Inside) {
+      return setSelectionInsideAtNodeEnd(_types.RelativeSelectionPos.Inside, node, from, to)(state, dispatch);
+    } else if (!selectionRelativeToNode || selectionRelativeToNode === _types.RelativeSelectionPos.Inside) {
       // selection is for container node - set selection inside it at the start
       // (this is a special case when the user selects by clicking node)
-      return setSelectionInsideAtNodeStart(_selection.RelativeSelectionPos.Before, node, from)(state, dispatch);
-    } else if ((0, _selection.isIgnored)(node) && selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
+      return setSelectionInsideAtNodeStart(_types.RelativeSelectionPos.Before, node, from)(state, dispatch);
+    } else if ((0, _isIgnored.isIgnored)(node) && selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
       // selection is for node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
       var selectableNode = (0, _utils2.findSelectableContainerBefore)($from, state.doc);
-      if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+      if (selectableNode && (0, _isIgnored.isIgnored)(selectableNode.node)) {
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     }
     return false;
@@ -173,7 +176,7 @@ var arrowRightFromText = function arrowRightFromText(selection) {
     if ((0, _utils2.isSelectionAtEndOfParentNode)(selection.$to, selection)) {
       var selectableNode = (0, _utils2.findSelectableContainerParent)(selection);
       if (selectableNode) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     }
     return false;
@@ -183,11 +186,11 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
   return function (state, dispatch) {
     var _getPluginState4 = (0, _pluginFactory.getPluginState)(state),
       selectionRelativeToNode = _getPluginState4.selectionRelativeToNode;
-    if (selectionRelativeToNode === _selection.RelativeSelectionPos.Before) {
+    if (selectionRelativeToNode === _types.RelativeSelectionPos.Before) {
       var selectableNode = (0, _utils2.findSelectableContainerBefore)(selection.$from, state.doc);
-      if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
+      if (selectableNode && (0, _isIgnored.isIgnored)(selectableNode.node)) {
         // selection is inside node without gap cursor preceeded by another node without gap cursor - set node selection for previous node
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
       // we don't return this as we want to reset the relative pos, but not block other plugins
       // from responding to arrow left key
@@ -195,7 +198,7 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
     } else if ((0, _utils2.isSelectionAtStartOfParentNode)(selection.$from, selection)) {
       var _selectableNode4 = (0, _utils2.findSelectableContainerParent)(selection);
       if (_selectableNode4) {
-        return setSelectionRelativeToNode(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode4.pos))(state, dispatch);
+        return setSelectionRelativeToNode(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, _selectableNode4.pos))(state, dispatch);
       }
     }
     return false;
@@ -213,20 +216,20 @@ var findAndSetTextSelection = function findAndSetTextSelection(selectionRelative
 var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selectionRelativeToNode, node, pos) {
   return function (state, dispatch) {
     if ((0, _utils.isNodeEmpty)(node)) {
-      return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(pos), _types.SelectionDirection.After)(state, dispatch);
+      return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(pos), _types2.SelectionDirection.After)(state, dispatch);
     }
     var selectableNode = (0, _utils2.findFirstChildNodeToSelect)(node);
     if (selectableNode) {
       var childNode = selectableNode.node,
         childPos = selectableNode.pos;
       var selectionPos = pos + childPos + 1;
-      if (childNode.isText || childNode.isAtom && (0, _selection.isIgnored)(childNode) || childNode.isInline) {
+      if (childNode.isText || childNode.isAtom && (0, _isIgnored.isIgnored)(childNode) || childNode.isInline) {
         //selection is for text node, inline node or atom node which is ignored by gap-cursor. set selection before it.
-        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types.SelectionDirection.Before)(state, dispatch);
+        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types2.SelectionDirection.Before)(state, dispatch);
       } else if ((0, _utils.isEmptyParagraph)(childNode)) {
-        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types.SelectionDirection.Before)(state, dispatch);
-      } else if (!(0, _selection.isIgnored)(node)) {
-        return setSelectionRelativeToNode(selectionRelativeToNode, new _selection.GapCursorSelection(state.doc.resolve(selectionPos), _selection.Side.LEFT))(state, dispatch);
+        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types2.SelectionDirection.Before)(state, dispatch);
+      } else if (!(0, _isIgnored.isIgnored)(node)) {
+        return setSelectionRelativeToNode(selectionRelativeToNode, new _selection2.GapCursorSelection(state.doc.resolve(selectionPos), _selection.Side.LEFT))(state, dispatch);
       } else if ((0, _utils2.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);
       }
@@ -237,20 +240,20 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
 var setSelectionInsideAtNodeEnd = exports.setSelectionInsideAtNodeEnd = function setSelectionInsideAtNodeEnd(selectionRelativeToNode, node, from, to) {
   return function (state, dispatch) {
     if ((0, _utils.isNodeEmpty)(node)) {
-      return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(to), _types.SelectionDirection.Before)(state, dispatch);
+      return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(to), _types2.SelectionDirection.Before)(state, dispatch);
     }
     var selectableNode = (0, _utils2.findLastChildNodeToSelect)(node);
     if (selectableNode) {
       var childNode = selectableNode.node,
         childPos = selectableNode.pos;
       var selectionPos = from + childPos + childNode.nodeSize;
-      if (childNode.isText || childNode.isAtom && (0, _selection.isIgnored)(childNode) || childNode.isInline) {
+      if (childNode.isText || childNode.isAtom && (0, _isIgnored.isIgnored)(childNode) || childNode.isInline) {
         //selection is for text node, inline node or atom node which is ignored by gap-cursor. set selection after it.
-        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types.SelectionDirection.After)(state, dispatch);
+        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types2.SelectionDirection.After)(state, dispatch);
       } else if ((0, _utils.isEmptyParagraph)(childNode)) {
-        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types.SelectionDirection.After)(state, dispatch);
-      } else if (!(0, _selection.isIgnored)(node)) {
-        return setSelectionRelativeToNode(selectionRelativeToNode, new _selection.GapCursorSelection(state.doc.resolve(selectionPos + 1), _selection.Side.RIGHT))(state, dispatch);
+        return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types2.SelectionDirection.After)(state, dispatch);
+      } else if (!(0, _isIgnored.isIgnored)(node)) {
+        return setSelectionRelativeToNode(selectionRelativeToNode, new _selection2.GapCursorSelection(state.doc.resolve(selectionPos + 1), _selection.Side.RIGHT))(state, dispatch);
       } else if ((0, _utils2.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);
       }

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

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldSkipGapCursor = exports.setSelectionTopLevelBlocks = exports.setCursorForTopLevelBlocks = exports.hasGapCursorPlugin = exports.deleteNode = exports.arrow = void 0;
 var _selection = require("@atlaskit/editor-common/selection");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
+var _isValidTargetNode = require("@atlaskit/editor-common/selection/is-valid-target-node");
 var _utils = require("@atlaskit/editor-common/utils");
-var _whitespace = require("@atlaskit/editor-common/whitespace");
+var _whitespace = require("@atlaskit/editor-common/whitespace/whitespace");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _gapCursorPluginKey = require("../gap-cursor-plugin-key");
@@ -36,8 +38,8 @@ var shouldSkipGapCursor = exports.shouldSkipGapCursor = function shouldSkipGapCu
 function shouldHandleMediaGapCursor(dir, state) {
   var _selection$$from$node;
   var selection = state.selection;
-  var upArrowFromGapCursorIntoMedia = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils.isMediaNode)(selection.$from.nodeBefore);
-  var downArrowFromGapCursorIntoMediaGroup = selection instanceof _selection.GapCursorSelection && dir === _direction.Direction.DOWN && ((_selection$$from$node = selection.$from.nodeAfter) === null || _selection$$from$node === void 0 ? void 0 : _selection$$from$node.type.name) === 'mediaGroup';
+  var upArrowFromGapCursorIntoMedia = selection instanceof _selection2.GapCursorSelection && dir === _direction.Direction.UP && selection.$from.nodeBefore && (0, _utils.isMediaNode)(selection.$from.nodeBefore);
+  var downArrowFromGapCursorIntoMediaGroup = selection instanceof _selection2.GapCursorSelection && dir === _direction.Direction.DOWN && ((_selection$$from$node = selection.$from.nodeAfter) === null || _selection$$from$node === void 0 ? void 0 : _selection$$from$node.type.name) === 'mediaGroup';
   return upArrowFromGapCursorIntoMedia || downArrowFromGapCursorIntoMediaGroup;
 }
 
@@ -53,13 +55,13 @@ function handleMediaGapCursor(dir, state) {
     if (nodeBeforePos && selection.side === 'right' && ((_tr$doc$nodeAt = tr.doc.nodeAt(nodeBeforePos)) === null || _tr$doc$nodeAt === void 0 ? void 0 : _tr$doc$nodeAt.type.name) === 'mediaSingle') {
       tr.setSelection(new _state.NodeSelection(tr.doc.resolve(nodeBeforePos))).scrollIntoView();
     } else if (nodeBeforePos || nodeBeforePos === 0) {
-      tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(nodeBeforePos), _selection.Side.LEFT)).scrollIntoView();
+      tr.setSelection(new _selection2.GapCursorSelection(tr.doc.resolve(nodeBeforePos), _selection.Side.LEFT)).scrollIntoView();
     }
   }
   if (dir === _direction.Direction.DOWN && selection.$from.nodeAfter) {
     var nodeAfterPos = selection.side === 'right' ? $pos.pos : $pos.pos + selection.$from.nodeAfter.nodeSize;
     if (nodeAfterPos) {
-      tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(nodeAfterPos), _selection.Side.LEFT)).scrollIntoView();
+      tr.setSelection(new _selection2.GapCursorSelection(tr.doc.resolve(nodeAfterPos), _selection.Side.LEFT)).scrollIntoView();
     }
   }
   return tr;
@@ -110,14 +112,14 @@ var arrow = exports.arrow = function arrow(dir, endOfTextblock) {
     }
 
     // when jumping between block nodes at the same depth, we need to reverse cursor without changing ProseMirror position
-    if (selection instanceof _selection.GapCursorSelection &&
+    if (selection instanceof _selection2.GapCursorSelection &&
     // next node allow gap cursor position
-    (0, _selection.isValidTargetNode)((0, _direction.isBackward)(dir) ? $pos.nodeBefore : $pos.nodeAfter) && (
+    (0, _isValidTargetNode.isValidTargetNode)((0, _direction.isBackward)(dir) ? $pos.nodeBefore : $pos.nodeAfter) && (
     // gap cursor changes block node
     (0, _direction.isBackward)(dir) && selection.side === _selection.Side.LEFT || (0, _direction.isForward)(dir) && selection.side === _selection.Side.RIGHT)) {
       // reverse cursor position
       if (dispatch) {
-        dispatch(tr.setSelection(new _selection.GapCursorSelection($pos, selection.side === _selection.Side.RIGHT ? _selection.Side.LEFT : _selection.Side.RIGHT)).scrollIntoView());
+        dispatch(tr.setSelection(new _selection2.GapCursorSelection($pos, selection.side === _selection.Side.RIGHT ? _selection.Side.LEFT : _selection.Side.RIGHT)).scrollIntoView());
       }
       return true;
     }
@@ -130,14 +132,14 @@ var arrow = exports.arrow = function arrow(dir, endOfTextblock) {
         return false;
       }
     }
-    var nextSelection = _selection.GapCursorSelection.findFrom($pos, (0, _direction.isBackward)(dir) ? -1 : 1, mustMove);
+    var nextSelection = _selection2.GapCursorSelection.findFrom($pos, (0, _direction.isBackward)(dir) ? -1 : 1, mustMove);
     if (!nextSelection) {
       return false;
     }
-    if (!(0, _selection.isValidTargetNode)((0, _direction.isForward)(dir) ? nextSelection.$from.nodeBefore : nextSelection.$from.nodeAfter)) {
+    if (!(0, _isValidTargetNode.isValidTargetNode)((0, _direction.isForward)(dir) ? nextSelection.$from.nodeBefore : nextSelection.$from.nodeAfter)) {
       // reverse cursor position
       if (dispatch) {
-        dispatch(tr.setSelection(new _selection.GapCursorSelection(nextSelection.$from, (0, _direction.isForward)(dir) ? _selection.Side.LEFT : _selection.Side.RIGHT)).scrollIntoView());
+        dispatch(tr.setSelection(new _selection2.GapCursorSelection(nextSelection.$from, (0, _direction.isForward)(dir) ? _selection.Side.LEFT : _selection.Side.RIGHT)).scrollIntoView());
       }
       return true;
     }
@@ -149,14 +151,14 @@ var arrow = exports.arrow = function arrow(dir, endOfTextblock) {
 };
 var deleteNode = exports.deleteNode = function deleteNode(dir) {
   return function (state, dispatch) {
-    if (state.selection instanceof _selection.GapCursorSelection) {
+    if (state.selection instanceof _selection2.GapCursorSelection) {
       var _state$selection = state.selection,
         $from = _state$selection.$from,
         $anchor = _state$selection.$anchor;
       var tr = state.tr;
       if ((0, _direction.isBackward)(dir)) {
         if (state.selection.side === 'left') {
-          tr.setSelection(new _selection.GapCursorSelection($anchor, _selection.Side.RIGHT));
+          tr.setSelection(new _selection2.GapCursorSelection($anchor, _selection.Side.RIGHT));
           if (dispatch) {
             dispatch(tr);
           }
@@ -226,13 +228,13 @@ var setSelectionTopLevelBlocks = exports.setSelectionTopLevelBlocks = function s
   if ($pos === null) {
     return;
   }
-  var isGapCursorAllowed = cursorCoords.side === _selection.Side.LEFT ? (0, _selection.isValidTargetNode)($pos.nodeAfter) : (0, _selection.isValidTargetNode)($pos.nodeBefore);
-  if (isGapCursorAllowed && _selection.GapCursorSelection.valid($pos)) {
+  var isGapCursorAllowed = cursorCoords.side === _selection.Side.LEFT ? (0, _isValidTargetNode.isValidTargetNode)($pos.nodeAfter) : (0, _isValidTargetNode.isValidTargetNode)($pos.nodeBefore);
+  if (isGapCursorAllowed && _selection2.GapCursorSelection.valid($pos)) {
     // this forces PM to re-render the decoration node if we change the side of the gap cursor, it doesn't do it by default
-    if (tr.selection instanceof _selection.GapCursorSelection) {
+    if (tr.selection instanceof _selection2.GapCursorSelection) {
       tr.setSelection(_state.Selection.near($pos));
     } else {
-      tr.setSelection(new _selection.GapCursorSelection($pos, cursorCoords.side));
+      tr.setSelection(new _selection2.GapCursorSelection($pos, cursorCoords.side));
     }
   }
   // try to set text selection if the editor isnt focused

package/dist/cjs/pm-plugins/gap-cursor/utils.js

@@ -7,9 +7,10 @@ exports.getComputedStyleForLayoutMode = void 0;
 exports.getLayoutModeFromTargetNode = getLayoutModeFromTargetNode;
 exports.getMediaNearPos = getMediaNearPos;
 exports.isTextBlockNearPos = exports.isLeftCursor = exports.isIgnoredClick = void 0;
-var _mediaSingle = require("@atlaskit/editor-common/media-single");
+var _constants = require("@atlaskit/editor-common/media-single/constants");
 var _selection = require("@atlaskit/editor-common/selection");
 var _styles = require("@atlaskit/editor-common/styles");
+var _unsupportedContent = require("@atlaskit/editor-common/styles/unsupported-content");
 var _editorExperiment = require("@atlaskit/tmp-editor-statsig/editor-experiment");
 var isLeftCursor = exports.isLeftCursor = function isLeftCursor(side) {
   return side === _selection.Side.LEFT;
@@ -95,7 +96,7 @@ var isIgnoredClick = exports.isIgnoredClick = function isIgnoredClick(elem) {
   }
 
   // check if we're clicking an image caption placeholder
-  if (elem !== null && elem !== void 0 && elem.closest("[data-id=\"".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID, "\"]"))) {
+  if (elem !== null && elem !== void 0 && elem.closest("[data-id=\"".concat(_constants.CAPTION_PLACEHOLDER_ID, "\"]"))) {
     return true;
   }
 
@@ -119,7 +120,7 @@ var isIgnoredClick = exports.isIgnoredClick = function isIgnoredClick(elem) {
 
   // Check if unsupported node selection
   // (without this, selection requires double clicking in FF due to posAtCoords differences)
-  if (elem !== null && elem !== void 0 && elem.closest(".".concat(_styles.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
+  if (elem !== null && elem !== void 0 && elem.closest(".".concat(_unsupportedContent.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
     return true;
   }
   return false;

package/dist/cjs/pm-plugins/gap-cursor-keymap.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = keymapPlugin;
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _selection = require("@atlaskit/editor-common/selection");
+var _selection = require("@atlaskit/editor-common/selection/gap-cursor/selection");
 var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _actions = require("./gap-cursor/actions");

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

@@ -6,13 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
+var _actions = require("@atlaskit/editor-common/selection/actions");
+var _selection2 = require("@atlaskit/editor-common/selection/gap-cursor/selection");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _types = require("../types");
 var _gapCursorPluginKey = require("./gap-cursor-plugin-key");
-var _actions = require("./gap-cursor/actions");
+var _actions2 = require("./gap-cursor/actions");
 var _direction = require("./gap-cursor/direction");
 var _utils2 = require("./gap-cursor/utils");
 var _placeGapCursor = require("./gap-cursor/utils/place-gap-cursor");
@@ -30,7 +32,7 @@ var plugin = new _safePlugin.SafePlugin({
       var _meta$displayGapCurso, _selectionMeta$hideCu;
       var meta = tr.getMeta(_gapCursorPluginKey.gapCursorPluginKey);
       var selectionMeta = tr.getMeta(_types.selectionPluginKey);
-      var selectionIsGapCursor = newState.selection instanceof _selection.GapCursorSelection;
+      var selectionIsGapCursor = newState.selection instanceof _selection2.GapCursorSelection;
       return {
         selectionIsGapCursor: selectionIsGapCursor,
         // only attempt to hide gap cursor if selection is gap cursor
@@ -49,7 +51,7 @@ var plugin = new _safePlugin.SafePlugin({
     if (_view.state.selection.anchor === 0 && _view.state.selection instanceof _state.NodeSelection) {
       // This is required otherwise the dispatch doesn't trigger in the correct place
       window.requestAnimationFrame(function () {
-        _view.dispatch(_view.state.tr.setSelection(new _selection.GapCursorSelection(_view.state.doc.resolve(0), _selection.Side.LEFT)));
+        _view.dispatch(_view.state.tr.setSelection(new _selection2.GapCursorSelection(_view.state.doc.resolve(0), _selection.Side.LEFT)));
       });
     }
     return {};
@@ -61,7 +63,7 @@ var plugin = new _safePlugin.SafePlugin({
       var _gapCursorPluginKey$g = _gapCursorPluginKey.gapCursorPluginKey.getState(editorState),
         displayGapCursor = _gapCursorPluginKey$g.displayGapCursor,
         hideCursor = _gapCursorPluginKey$g.hideCursor;
-      if (selection instanceof _selection.GapCursorSelection && displayGapCursor && !hideCursor) {
+      if (selection instanceof _selection2.GapCursorSelection && displayGapCursor && !hideCursor) {
         var $from = selection.$from,
           side = selection.side;
 
@@ -78,7 +80,7 @@ var plugin = new _safePlugin.SafePlugin({
         var node = isRightCursor ? $from.nodeBefore : $from.nodeAfter;
         var layoutMode = node && (0, _utils2.getLayoutModeFromTargetNode)(node);
         return _view2.DecorationSet.create(doc, [_view2.Decoration.widget(position, _placeGapCursor.toDOM, {
-          key: "".concat(_selection.JSON_ID, "-").concat(side, "-").concat(layoutMode),
+          key: "".concat(_selection2.JSON_ID, "-").concat(side, "-").concat(layoutMode),
           // position === 0: if gap cursor at start of document, render it on the left side of the selection to enable pasting (otherwise Chrome doesn't pick up the paste event)
           side: layoutMode || position === 0 ? -1 : 0
         })]);
@@ -91,8 +93,8 @@ var plugin = new _safePlugin.SafePlugin({
         // Do not show GapCursor when there is a CellSection happening
         return null;
       }
-      if ($anchor.pos === $head.pos && _selection.GapCursorSelection.valid($head)) {
-        return new _selection.GapCursorSelection($head);
+      if ($anchor.pos === $head.pos && _selection2.GapCursorSelection.valid($head)) {
+        return new _selection2.GapCursorSelection($head);
       }
       return null;
     },
@@ -120,14 +122,14 @@ var plugin = new _safePlugin.SafePlugin({
           return false;
         }
         var mediaGapCursor = !$pos.nodeBefore ? $pos.before() : $pos.after();
-        return (0, _selection.setGapCursorAtPos)(mediaGapCursor, side)(view.state, view.dispatch);
+        return (0, _actions.setGapCursorAtPos)(mediaGapCursor, side)(view.state, view.dispatch);
       }
       var docSize = view.state.doc.content.size;
       var nodeInside = posAtCoords.inside < 0 || posAtCoords.inside > docSize ? null : view.state.doc.nodeAt(posAtCoords.inside);
       if (nodeInside !== null && nodeInside !== void 0 && nodeInside.isAtom) {
         return false;
       }
-      return (0, _selection.setGapCursorAtPos)(nodePos, side)(view.state, view.dispatch);
+      return (0, _actions.setGapCursorAtPos)(nodePos, side)(view.state, view.dispatch);
     },
     handleDOMEvents: {
       /**
@@ -139,9 +141,9 @@ var plugin = new _safePlugin.SafePlugin({
       // Ignored via go/ees005
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       beforeinput: function beforeinput(view, event) {
-        if (event.inputType === 'deleteContentBackward' && view.state.selection instanceof _selection.GapCursorSelection) {
+        if (event.inputType === 'deleteContentBackward' && view.state.selection instanceof _selection2.GapCursorSelection) {
           event.preventDefault();
-          return (0, _actions.deleteNode)(_direction.Direction.BACKWARD)(view.state, view.dispatch);
+          return (0, _actions2.deleteNode)(_direction.Direction.BACKWARD)(view.state, view.dispatch);
         }
         return false;
       }

package/dist/cjs/pm-plugins/plugin-factory.js

@@ -6,19 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getPluginState = exports.createPluginState = exports.createCommand = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _utils = require("@atlaskit/editor-common/utils");
+var _pluginStateFactory = require("@atlaskit/editor-common/utils/plugin-state-factory");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _view = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _types = require("../types");
 var _reducer = require("./reducer");
-var _utils2 = require("./utils");
+var _utils = require("./utils");
 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; }
 var handleDocChanged = function handleDocChanged(tr, pluginState) {
   // in some collab edge cases mapping decorations could throw an error
   try {
-    if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils2.getDecorations)(tr).find().length === 0)) {
+    if (pluginState.decorationSet.find().length === 0 && (!tr.selectionSet || (0, _utils.getDecorations)(tr).find().length === 0)) {
       return pluginState;
     }
     var decorationSet = pluginState.decorationSet.map(tr.mapping, tr.doc);
@@ -33,14 +33,14 @@ var handleDocChanged = function handleDocChanged(tr, pluginState) {
 };
 var handleSelectionChanged = function handleSelectionChanged(tr, pluginState) {
   // Reset relative selection pos when user clicks to select a node
-  if ((tr.selection instanceof _state.NodeSelection && (0, _utils2.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
+  if ((tr.selection instanceof _state.NodeSelection && (0, _utils.isSelectableContainerNode)(tr.selection.node) || tr.selection instanceof _cellSelection.CellSelection) && !tr.getMeta(_types.selectionPluginKey)) {
     return _objectSpread(_objectSpread({}, pluginState), {}, {
       selectionRelativeToNode: undefined
     });
   }
   return pluginState;
 };
-var dest = (0, _utils.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
+var dest = (0, _pluginStateFactory.pluginFactory)(_types.selectionPluginKey, _reducer.reducer, {
   onDocChanged: handleDocChanged,
   onSelectionChanged: handleSelectionChanged
 });

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

@@ -8,12 +8,13 @@ exports.isSelectionAtStartOfParentNode = exports.isSelectionAtEndOfParentNode =
 exports.shouldRecalcDecorations = shouldRecalcDecorations;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _selection = require("@atlaskit/editor-common/selection");
+var _isIgnored = require("@atlaskit/editor-common/selection/is-ignored");
 var _utils = require("@atlaskit/editor-common/utils");
 var _nodeTypeUtils = require("@atlaskit/editor-common/utils/node-type-utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _view = require("@atlaskit/editor-prosemirror/view");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _types = require("../types");
 var _hideCursorDecoration = require("./cursor/ui/hide-cursor-decoration");
@@ -25,7 +26,7 @@ var getDecorations = exports.getDecorations = function getDecorations(tr, manual
   }
   if (selection instanceof _state.NodeSelection) {
     decorations.push(_view.Decoration.node(selection.from, selection.to, {
-      class: _editorSharedStyles.akEditorSelectedNodeClassName
+      class: _constants.akEditorSelectedNodeClassName
     }));
     return _view.DecorationSet.create(tr.doc, decorations);
   }
@@ -41,7 +42,7 @@ var getDecorations = exports.getDecorations = function getDecorations(tr, manual
         var node = _ref.node,
           pos = _ref.pos;
         return _view.Decoration.node(pos, pos + node.nodeSize, {
-          class: _editorSharedStyles.akEditorSelectedNodeClassName
+          class: _constants.akEditorSelectedNodeClassName
         });
       });
       decorations.push.apply(decorations, (0, _toConsumableArray2.default)(selectionDecorations));
@@ -154,7 +155,7 @@ var findSelectableContainerParent = exports.findSelectableContainerParent = func
   var foundNodeThatSupportsGapCursor = false;
   var selectableNode = (0, _utils2.findParentNode)(function (node) {
     var isSelectable = isSelectableContainerNode(node);
-    if (!isSelectable && !(0, _selection.isIgnored)(node)) {
+    if (!isSelectable && !(0, _isIgnored.isIgnored)(node)) {
       foundNodeThatSupportsGapCursor = true;
     }
     return isSelectable;
@@ -188,7 +189,7 @@ var findSelectableContainerBefore = exports.findSelectableContainerBefore = func
           pos: $selectionBefore.start(i) - 1
         };
       }
-      if (i > $pos.depth + 1 && !(0, _selection.isIgnored)(node)) {
+      if (i > $pos.depth + 1 && !(0, _isIgnored.isIgnored)(node)) {
         return;
       }
     }
@@ -224,7 +225,7 @@ var findSelectableContainerAfter = exports.findSelectableContainerAfter = functi
           pos: $selectionAfter.start(i) - 1
         };
       }
-      if (i > $pos.depth + 1 && !(0, _selection.isIgnored)(node)) {
+      if (i > $pos.depth + 1 && !(0, _isIgnored.isIgnored)(node)) {
         return;
       }
     }
@@ -237,7 +238,7 @@ var findSelectableContainerAfter = exports.findSelectableContainerAfter = functi
  */
 var findFirstChildNodeToSelect = exports.findFirstChildNodeToSelect = function findFirstChildNodeToSelect(parent) {
   return (0, _utils2.flatten)(parent).find(function (child) {
-    return isSelectableChildNode(child.node) || !(0, _selection.isIgnored)(child.node);
+    return isSelectableChildNode(child.node) || !(0, _isIgnored.isIgnored)(child.node);
   });
 };
 
@@ -248,7 +249,7 @@ var findFirstChildNodeToSelect = exports.findFirstChildNodeToSelect = function f
 var findLastChildNodeToSelect = exports.findLastChildNodeToSelect = function findLastChildNodeToSelect(parent) {
   var child;
   parent.descendants(function (node, pos) {
-    if (isSelectableChildNode(node) || !(0, _selection.isIgnored)(node)) {
+    if (isSelectableChildNode(node) || !(0, _isIgnored.isIgnored)(node)) {
       child = {
         node: node,
         pos: pos

package/dist/cjs/types/index.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "RelativeSelectionPos", {
   enumerable: true,
   get: function get() {
-    return _selection.RelativeSelectionPos;
+    return _types.RelativeSelectionPos;
   }
 });
 exports.selectionPluginKey = exports.SelectionDirection = void 0;
-var _selection = require("@atlaskit/editor-common/selection");
+var _types = require("@atlaskit/editor-common/selection/types");
 var _state = require("@atlaskit/editor-prosemirror/state");
 /* eslint-disable @atlaskit/editor/no-re-export */
 // Entry file in package.json

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

@@ -1,6 +1,9 @@
 /* eslint-disable import/no-extraneous-dependencies */
 
-import { isIgnored as isIgnoredByGapCursor, RelativeSelectionPos, GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+import { Side } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection/is-ignored';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 import { isEmptyParagraph, isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { SelectionDirection, selectionPluginKey } from '../types';

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

@@ -1,6 +1,8 @@
-import { atTheBeginningOfDoc, atTheEndOfDoc, GapCursorSelection, Side, isValidTargetNode } from '@atlaskit/editor-common/selection';
+import { atTheBeginningOfDoc, atTheEndOfDoc, Side } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
+import { isValidTargetNode } from '@atlaskit/editor-common/selection/is-valid-target-node';
 import { isMediaNode, isNodeBeforeMediaNode, isPositionNearTableRow } from '@atlaskit/editor-common/utils';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace/whitespace';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findPositionOfNodeBefore, removeNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { gapCursorPluginKey } from '../gap-cursor-plugin-key';

package/dist/es2019/pm-plugins/gap-cursor/utils.js

@@ -1,6 +1,7 @@
-import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single/constants';
 import { Side } from '@atlaskit/editor-common/selection';
-import { TableSharedCssClassName, UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles/unsupported-content';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 export const isLeftCursor = side => side === Side.LEFT;
 export function getMediaNearPos(doc, $pos, schema, dir = -1) {

package/dist/es2019/pm-plugins/gap-cursor-keymap.js

@@ -1,5 +1,5 @@
 import { backspace, bindKeymapWithCommand, deleteKey, insertNewLine, moveDown, moveLeft, moveRight, moveUp } from '@atlaskit/editor-common/keymaps';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { createParagraphNear } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { arrow, deleteNode } from './gap-cursor/actions';

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

@@ -1,5 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { GapCursorSelection, Side as GapCursorSide, JSON_ID, setGapCursorAtPos, Side } from '@atlaskit/editor-common/selection';
+import { Side as GapCursorSide, Side } from '@atlaskit/editor-common/selection';
+import { setGapCursorAtPos } from '@atlaskit/editor-common/selection/actions';
+import { GapCursorSelection, JSON_ID } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';

package/dist/es2019/pm-plugins/plugin-factory.js

@@ -1,4 +1,4 @@
-import { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';

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

@@ -1,10 +1,11 @@
-import { isIgnored as isIgnoredByGapCursor, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection/is-ignored';
 import { isEmptyParagraph, isListItemNode } from '@atlaskit/editor-common/utils';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AllSelection, NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeClosestToPos, flatten, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { selectionPluginKey } from '../types';
 import { createHideCursorDecoration } from './cursor/ui/hide-cursor-decoration';

package/dist/es2019/types/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 // Entry file in package.json
 
-import { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export const selectionPluginKey = new PluginKey('selection');
 export { RelativeSelectionPos };

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

@@ -1,6 +1,9 @@
 /* eslint-disable import/no-extraneous-dependencies */
 
-import { isIgnored as isIgnoredByGapCursor, RelativeSelectionPos, GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
+import { Side } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection/is-ignored';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 import { isEmptyParagraph, isNodeEmpty } from '@atlaskit/editor-common/utils';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { SelectionDirection, selectionPluginKey } from '../types';

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

@@ -1,6 +1,8 @@
-import { atTheBeginningOfDoc, atTheEndOfDoc, GapCursorSelection, Side, isValidTargetNode } from '@atlaskit/editor-common/selection';
+import { atTheBeginningOfDoc, atTheEndOfDoc, Side } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
+import { isValidTargetNode } from '@atlaskit/editor-common/selection/is-valid-target-node';
 import { isMediaNode, isNodeBeforeMediaNode, isPositionNearTableRow } from '@atlaskit/editor-common/utils';
-import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
+import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace/whitespace';
 import { NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findPositionOfNodeBefore, removeNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { gapCursorPluginKey } from '../gap-cursor-plugin-key';

package/dist/esm/pm-plugins/gap-cursor/utils.js

@@ -1,6 +1,7 @@
-import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single';
+import { CAPTION_PLACEHOLDER_ID } from '@atlaskit/editor-common/media-single/constants';
 import { Side } from '@atlaskit/editor-common/selection';
-import { TableSharedCssClassName, UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
+import { UnsupportedSharedCssClassName } from '@atlaskit/editor-common/styles/unsupported-content';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/editor-experiment';
 export var isLeftCursor = function isLeftCursor(side) {
   return side === Side.LEFT;

package/dist/esm/pm-plugins/gap-cursor-keymap.js

@@ -1,5 +1,5 @@
 import { backspace, bindKeymapWithCommand, deleteKey, insertNewLine, moveDown, moveLeft, moveRight, moveUp } from '@atlaskit/editor-common/keymaps';
-import { GapCursorSelection } from '@atlaskit/editor-common/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { createParagraphNear } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { arrow, deleteNode } from './gap-cursor/actions';

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

@@ -1,5 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { GapCursorSelection, Side as GapCursorSide, JSON_ID, setGapCursorAtPos, Side } from '@atlaskit/editor-common/selection';
+import { Side as GapCursorSide, Side } from '@atlaskit/editor-common/selection';
+import { setGapCursorAtPos } from '@atlaskit/editor-common/selection/actions';
+import { GapCursorSelection, JSON_ID } from '@atlaskit/editor-common/selection/gap-cursor/selection';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';

package/dist/esm/pm-plugins/plugin-factory.js

@@ -1,7 +1,7 @@
 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 { pluginFactory } from '@atlaskit/editor-common/utils';
+import { pluginFactory } from '@atlaskit/editor-common/utils/plugin-state-factory';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';

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

@@ -1,11 +1,12 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import { isIgnored as isIgnoredByGapCursor, isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { isSelectionAtStartOfNode } from '@atlaskit/editor-common/selection';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection/is-ignored';
 import { isEmptyParagraph, isListItemNode } from '@atlaskit/editor-common/utils';
 import { getBaseNodeTypeName } from '@atlaskit/editor-common/utils/node-type-utils';
 import { AllSelection, NodeSelection, Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeClosestToPos, flatten, hasParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
-import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
+import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles/constants';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { selectionPluginKey } from '../types';
 import { createHideCursorDecoration } from './cursor/ui/hide-cursor-decoration';

package/dist/esm/types/index.js

@@ -1,7 +1,7 @@
 /* eslint-disable @atlaskit/editor/no-re-export */
 // Entry file in package.json
 
-import { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 export var selectionPluginKey = new PluginKey('selection');
 export { RelativeSelectionPos };

package/dist/types/editor-actions/index.d.ts

@@ -1,4 +1,4 @@
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { SelectionPlugin } from '../selectionPluginType';

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

@@ -1,4 +1,4 @@
-import type { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
+import type { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 export declare enum SelectionActionTypes {

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

@@ -1,5 +1,6 @@
-import { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
-import type { Command, EditorCommandWithMetadata } from '@atlaskit/editor-common/types';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
+import type { EditorCommandWithMetadata } from '@atlaskit/editor-common/types/editor-command';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 export declare const selectNearNode: EditorCommandWithMetadata;

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

@@ -1,4 +1,4 @@
-import type { Command } from '@atlaskit/editor-common/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
 import type { ResolvedPos } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Direction } from './direction';

package/dist/types/pm-plugins/plugin-factory.d.ts

@@ -1,6 +1,6 @@
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
-import type { SelectionPluginState } from '@atlaskit/editor-common/selection';
-import type { Command } from '@atlaskit/editor-common/types';
+import type { SelectionPluginState } from '@atlaskit/editor-common/selection/types';
+import type { Command } from '@atlaskit/editor-common/types/command';
 import type { EditorState, SafeStateField, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { SelectionAction } from './actions';
 export declare const createCommand: <A = SelectionAction>(action: A | ((state: Readonly<EditorState>) => false | A), transform?: (tr: Transaction, state: EditorState) => Transaction) => Command;

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

@@ -1,3 +1,3 @@
-import type { SelectionPluginState } from '@atlaskit/editor-common/selection';
+import type { SelectionPluginState } from '@atlaskit/editor-common/selection/types';
 import type { SelectionAction } from './actions';
 export declare function reducer(pluginState: SelectionPluginState, action: SelectionAction): SelectionPluginState;

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

@@ -1,8 +1,8 @@
-import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics/types/dispatch-analytics-event';
 import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type { SelectionPluginState } from '@atlaskit/editor-common/selection';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { SelectionPluginState } from '@atlaskit/editor-common/selection/types';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types/next-editor-plugin';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { SelectionPlugin } from '../selectionPluginType';
 import type { SelectionPluginOptions } from '../types';

package/dist/types/selectionPluginType.d.ts

@@ -1,6 +1,7 @@
-import type { SelectionSharedState } from '@atlaskit/editor-common/selection';
-import type { EditorCommand, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
-import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
+import type { SelectionSharedState } from '@atlaskit/editor-common/selection/types';
+import type { EditorCommand } from '@atlaskit/editor-common/types/editor-command';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types/next-editor-plugin';
+import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction/interaction-plugin-type';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorSelectionAPI, SelectionPluginOptions } from './types';
 export type SelectionPlugin = NextEditorPlugin<'selection', {

package/dist/types/types/index.d.ts

@@ -1,6 +1,6 @@
-import { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
+import { RelativeSelectionPos } from '@atlaskit/editor-common/selection/types';
 export type { SelectionPluginState } from '@atlaskit/editor-common/selection';
-import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types';
+import type { LongPressSelectionPluginOptions } from '@atlaskit/editor-common/types/selection';
 import type { JSONNode } from '@atlaskit/editor-json-transformer/types';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import type { EditorState, Selection, Transaction } from '@atlaskit/editor-prosemirror/state';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection",
-	"version": "26.0.4",
+	"version": "26.0.5",
 	"description": "Selection plugin for @atlaskit/editor-core",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -24,7 +24,7 @@
 		"@atlaskit/editor-prosemirror": "^9.0.0",
 		"@atlaskit/editor-shared-styles": "^4.4.0",
 		"@atlaskit/editor-tables": "^3.2.0",
-		"@atlaskit/tmp-editor-statsig": "^231.0.0",
+		"@atlaskit/tmp-editor-statsig": "^232.0.0",
 		"@atlaskit/tokens": "^20.4.0",
 		"@babel/runtime": "^7.0.0"
 	},