@atlaskit/editor-core 187.46.0 → 187.47.0

package/dist/cjs/plugins/selection/commands.js

@@ -3,24 +3,37 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = exports.arrowRight = exports.arrowLeft = void 0;
+exports.setSelectionRelativeToNode = exports.setSelectionInsideAtNodeEnd = exports.selectNearNode = exports.arrowRight = exports.arrowLeft = void 0;
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _gapCursorSelection = require("./gap-cursor-selection");
-var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("@atlaskit/editor-common/utils");
 var _actions = require("./actions");
 var _pluginFactory = require("./plugin-factory");
 var _utils2 = require("./utils");
 var _types = require("./types");
+var selectNearNode = function selectNearNode(selectionRelativeToNode, selection) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    tr.setMeta(_types.selectionPluginKey, {
+      type: _actions.SelectionActionTypes.SET_RELATIVE_SELECTION,
+      selectionRelativeToNode: selectionRelativeToNode
+    });
+    if (selection) {
+      return tr.setSelection(selection);
+    }
+    return tr;
+  };
+};
+exports.selectNearNode = selectNearNode;
 var setSelectionRelativeToNode = function setSelectionRelativeToNode(selectionRelativeToNode, selection) {
   return (0, _pluginFactory.createCommand)({
     type: _actions.SelectionActionTypes.SET_RELATIVE_SELECTION,
     selectionRelativeToNode: selectionRelativeToNode
   }, function (tr) {
-    if (selection) {
-      return tr.setSelection(selection);
-    }
-    return tr;
+    return selectNearNode(selectionRelativeToNode, selection)({
+      tr: tr
+    }) || tr;
   });
 };
 exports.setSelectionRelativeToNode = setSelectionRelativeToNode;
@@ -83,7 +96,7 @@ var arrowLeftFromGapCursor = function arrowLeftFromGapCursor(selection) {
         var $parent = state.doc.resolve(selection.$from.before(selection.$from.depth));
         if ($parent) {
           var _selectableNode2 = (0, _utils2.findSelectableContainerBefore)($parent, state.doc);
-          if (_selectableNode2 && (0, _isIgnored.isIgnored)(_selectableNode2.node)) {
+          if (_selectableNode2 && (0, _selection.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(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, _selectableNode2.pos))(state, dispatch);
           }
@@ -117,9 +130,9 @@ var arrowRightFromNode = function arrowRightFromNode(selection) {
     } else if (selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
       // selection is for container node - set selection inside it at the start
       return setSelectionInsideAtNodeStart(_types.RelativeSelectionPos.Inside, node, from)(state, dispatch);
-    } else if ((0, _isIgnored.isIgnored)(node) && (!selectionRelativeToNode || selectionRelativeToNode === _types.RelativeSelectionPos.End)) {
+    } else if ((0, _selection.isIgnored)(node) && (!selectionRelativeToNode || selectionRelativeToNode === _types.RelativeSelectionPos.End)) {
       var selectableNode = (0, _utils2.findSelectableContainerAfter)($to, state.doc);
-      if (selectableNode && (0, _isIgnored.isIgnored)(selectableNode.node)) {
+      if (selectableNode && (0, _selection.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(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
@@ -148,10 +161,10 @@ var arrowLeftFromNode = function arrowLeftFromNode(selection) {
       // 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(_types.RelativeSelectionPos.Before, node, from)(state, dispatch);
-    } else if ((0, _isIgnored.isIgnored)(node) && selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
+    } else if ((0, _selection.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, _isIgnored.isIgnored)(selectableNode.node)) {
+      if (selectableNode && (0, _selection.isIgnored)(selectableNode.node)) {
         return setSelectionRelativeToNode(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
     }
@@ -175,7 +188,7 @@ var arrowLeftFromText = function arrowLeftFromText(selection) {
       selectionRelativeToNode = _getPluginState4.selectionRelativeToNode;
     if (selectionRelativeToNode === _types.RelativeSelectionPos.Before) {
       var selectableNode = (0, _utils2.findSelectableContainerBefore)(selection.$from, state.doc);
-      if (selectableNode && (0, _isIgnored.isIgnored)(selectableNode.node)) {
+      if (selectableNode && (0, _selection.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(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, selectableNode.pos))(state, dispatch);
       }
@@ -214,7 +227,7 @@ var setSelectionInsideAtNodeStart = function setSelectionInsideAtNodeStart(selec
         return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos), _types.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, _isIgnored.isIgnored)(node)) {
+      } else if (!(0, _selection.isIgnored)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, new _gapCursorSelection.GapCursorSelection(state.doc.resolve(selectionPos), _gapCursorSelection.Side.LEFT))(state, dispatch);
       } else if ((0, _utils2.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);
@@ -237,7 +250,7 @@ var setSelectionInsideAtNodeEnd = function setSelectionInsideAtNodeEnd(selection
         return findAndSetTextSelection(selectionRelativeToNode, state.doc.resolve(selectionPos + 1), _types.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, _isIgnored.isIgnored)(node)) {
+      } else if (!(0, _selection.isIgnored)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, new _gapCursorSelection.GapCursorSelection(state.doc.resolve(selectionPos + 1), _gapCursorSelection.Side.RIGHT))(state, dispatch);
       } else if ((0, _utils2.isSelectableContainerNode)(node)) {
         return setSelectionRelativeToNode(selectionRelativeToNode, _state.NodeSelection.create(state.doc, selectionPos))(state, dispatch);

package/dist/cjs/plugins/selection/gap-cursor/utils/place-gap-cursor.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.toDOM = void 0;
 var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _utils = require("../utils");
-var _selection = require("../selection");
+var _selection = require("@atlaskit/editor-common/selection");
 /**
  * We have a couple of nodes that require us to compute style
  * on different elements, ideally all nodes should be able to

package/dist/cjs/plugins/selection/index.js

@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.selectionPlugin = exports.default = void 0;
 var _selectionMain = require("./pm-plugins/selection-main");
+var _types = require("./types");
 var _keymap = _interopRequireDefault(require("./pm-plugins/keymap"));
 var _gapCursorMain = _interopRequireDefault(require("./pm-plugins/gap-cursor-main"));
 var _gapCursorPluginKey = require("./pm-plugins/gap-cursor-plugin-key");
 var _gapCursorKeymap = _interopRequireDefault(require("./pm-plugins/gap-cursor-keymap"));
+var _commands = require("./commands");
 var displayGapCursor = function displayGapCursor(toggle) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -23,7 +25,17 @@ var selectionPlugin = function selectionPlugin(_ref2) {
   return {
     name: 'selection',
     commands: {
-      displayGapCursor: displayGapCursor
+      displayGapCursor: displayGapCursor,
+      selectNearNode: _commands.selectNearNode
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var pluginState = _types.selectionPluginKey.getState(editorState);
+      return {
+        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+      };
     },
     pmPlugins: function pmPlugins() {
       return [{

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

@@ -3,7 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createSelectionClickHandler = createSelectionClickHandler;
+Object.defineProperty(exports, "createSelectionClickHandler", {
+  enumerable: true,
+  get: function get() {
+    return _selection.createSelectionClickHandler;
+  }
+});
 exports.findSelectableContainerParent = exports.findSelectableContainerBefore = exports.findSelectableContainerAfter = exports.findLastChildNodeToSelect = exports.findFirstChildNodeToSelect = void 0;
 Object.defineProperty(exports, "getAllSelectionAnalyticsPayload", {
   enumerable: true,
@@ -39,26 +44,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _selection = require("@atlaskit/editor-common/selection");
 var _utils2 = require("@atlaskit/editor-common/utils");
-var _isIgnored = require("../selection/gap-cursor/utils/is-ignored");
 var _types = require("./types");
-function createSelectionClickHandler(nodes, isValidTarget, options) {
-  return function handleClickOn(view, pos, node, nodePos, event, direct) {
-    if (options.useLongPressSelection) {
-      return false;
-    }
-    if (direct && nodes.indexOf(node.type.name) !== -1) {
-      if (event.target) {
-        var _target = event.target;
-        if (isValidTarget(_target)) {
-          var selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
-          (0, _selection.selectNode)(selectionPos)(view.state, view.dispatch);
-          return true;
-        }
-      }
-    }
-    return false;
-  };
-}
 var getDecorations = function getDecorations(tr) {
   if (tr.selection instanceof _state.NodeSelection) {
     return _view.DecorationSet.create(tr.doc, [_view.Decoration.node(tr.selection.from, tr.selection.to, {
@@ -184,7 +170,7 @@ var findSelectableContainerParent = function findSelectableContainerParent(selec
   var foundNodeThatSupportsGapCursor = false;
   var selectableNode = (0, _utils.findParentNode)(function (node) {
     var isSelectable = isSelectableContainerNode(node);
-    if (!isSelectable && !(0, _isIgnored.isIgnored)(node)) {
+    if (!isSelectable && !(0, _selection.isIgnored)(node)) {
       foundNodeThatSupportsGapCursor = true;
     }
     return isSelectable;
@@ -219,7 +205,7 @@ var findSelectableContainerBefore = function findSelectableContainerBefore($pos,
           pos: $selectionBefore.start(i) - 1
         };
       }
-      if (i > $pos.depth + 1 && !(0, _isIgnored.isIgnored)(node)) {
+      if (i > $pos.depth + 1 && !(0, _selection.isIgnored)(node)) {
         return;
       }
     }
@@ -256,7 +242,7 @@ var findSelectableContainerAfter = function findSelectableContainerAfter($pos, d
           pos: $selectionAfter.start(i) - 1
         };
       }
-      if (i > $pos.depth + 1 && !(0, _isIgnored.isIgnored)(node)) {
+      if (i > $pos.depth + 1 && !(0, _selection.isIgnored)(node)) {
         return;
       }
     }
@@ -270,7 +256,7 @@ var findSelectableContainerAfter = function findSelectableContainerAfter($pos, d
 exports.findSelectableContainerAfter = findSelectableContainerAfter;
 var findFirstChildNodeToSelect = function findFirstChildNodeToSelect(parent) {
   return (0, _utils.flatten)(parent).find(function (child) {
-    return isSelectableChildNode(child.node) || !(0, _isIgnored.isIgnored)(child.node);
+    return isSelectableChildNode(child.node) || !(0, _selection.isIgnored)(child.node);
   });
 };
 
@@ -282,7 +268,7 @@ exports.findFirstChildNodeToSelect = findFirstChildNodeToSelect;
 var findLastChildNodeToSelect = function findLastChildNodeToSelect(parent) {
   var child;
   parent.descendants(function (node, pos) {
-    if (isSelectableChildNode(node) || !(0, _isIgnored.isIgnored)(node)) {
+    if (isSelectableChildNode(node) || !(0, _selection.isIgnored)(node)) {
       child = {
         node: node,
         pos: pos

package/dist/cjs/plugins/tasks-and-decisions/commands.js

@@ -12,7 +12,7 @@ var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("../analytics");
-var _gapCursorSelection = require("../selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _utils2 = require("@atlaskit/editor-common/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; }
@@ -212,7 +212,7 @@ var createListAtSelection = function createListAtSelection(tr, list, item, schem
   }, itemAttrs))]);
 
   // we don't take the content of a block node next to the gap cursor and always create an empty task
-  if (selection instanceof _gapCursorSelection.GapCursorSelection) {
+  if (selection instanceof _selection.GapCursorSelection) {
     return (0, _utils.safeInsert)(emptyList)(tr);
   }
 

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/main.js

@@ -11,12 +11,11 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("../../../utils");
-var _utils2 = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var _decisionItem = require("../nodeviews/decisionItem");
 var _taskItem = require("../nodeviews/taskItem");
 var _pluginKey = require("./plugin-key");
 var _helpers = require("./helpers");
-var _selection = require("@atlaskit/editor-common/selection");
 var _types = require("./types");
 var _excluded = ["localId"];
 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; }
@@ -62,7 +61,7 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         }
         return false;
       },
-      handleClickOn: (0, _utils2.createSelectionClickHandler)(['decisionItem'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['decisionItem'], function (target) {
         return target.hasAttribute('data-decision-wrapper') || target.getAttribute('aria-label') === 'Decision';
       }, {
         useLongPressSelection: useLongPressSelection

package/dist/cjs/test-utils.js

@@ -42,7 +42,7 @@ var _pluginKey = require("./plugins/analytics/plugin-key");
 var _base = require("./plugins/base");
 var _api = require("./plugins/type-ahead/api");
 var _eventDispatcher = require("./event-dispatcher");
-var _selection = require("./plugins/selection/gap-cursor/selection");
+var _selection = require("@atlaskit/editor-common/selection");
 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; }
 function getFireAnalytics(editorView) {

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "187.46.0";
+var version = "187.47.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/es2019/index.js

@@ -57,7 +57,7 @@ export { default as EditorActions } from './actions';
 // Re-export from provider factory to not cause a breaking change
 
 export { PortalProvider, PortalProviderAPI, PortalRenderer } from '@atlaskit/editor-common/portal-provider';
-export { GapCursorSelection, Side as GapCursorSide } from './plugins/selection/gap-cursor-selection';
+export { GapCursorSelection, Side as GapCursorSide } from '@atlaskit/editor-common/selection';
 export { selectionPluginKey } from './plugins/mobile-selection';
 export { insertExpand } from './plugins/expand/commands';
 export { default as WithPluginState } from './ui/WithPluginState';

package/dist/es2019/plugins/base/pm-plugins/frozen-editor.js

@@ -3,7 +3,6 @@ import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { isPerformanceObserverAvailable, isPerformanceAPIAvailable, getAnalyticsEventSeverity, countNodes } from '@atlaskit/editor-common/utils';
 import { EditorExperience, ExperienceStore } from '@atlaskit/editor-common/ufo';
 import { ACTION, ACTION_SUBJECT, BROWSER_FREEZE_INTERACTION_TYPE, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
-import { getParticipantsCount } from '../../collab-edit/get-participants-count';
 import { getContextIdentifier } from './context-identifier';
 import { setInteractionType } from '../utils/frozen-editor';
 import InputLatencyTracker from '../utils/input-latency-tracking';
@@ -30,7 +29,6 @@ const dispatchLongTaskEvent = (dispatchAnalyticsEvent, view, time, getNodeCount,
       freezeTime: time,
       nodeSize: state.doc.nodeSize,
       ...nodesCount,
-      participants: getParticipantsCount(view.state),
       interactionType,
       severity
     },
@@ -78,7 +76,6 @@ export default ((dispatchAnalyticsEvent, inputTracking, browserFreezeTracking, u
         time,
         nodeSize: state.doc.nodeSize,
         ...nodesCount,
-        participants: getParticipantsCount(state),
         objectId: (_getContextIdentifier2 = getContextIdentifier(state)) === null || _getContextIdentifier2 === void 0 ? void 0 : _getContextIdentifier2.objectId,
         severity: shouldTrackSeverity ? severity : undefined
       },
@@ -106,7 +103,6 @@ export default ((dispatchAnalyticsEvent, inputTracking, browserFreezeTracking, u
         ...nodeCount,
         nodeSize: state.doc.nodeSize,
         severity: shouldTrackSeverity ? severity : undefined,
-        participants: getParticipantsCount(state),
         objectId: (_getContextIdentifier3 = getContextIdentifier(state)) === null || _getContextIdentifier3 === void 0 ? void 0 : _getContextIdentifier3.objectId
       },
       eventType: EVENT_TYPE.OPERATIONAL
@@ -184,7 +180,6 @@ export default ((dispatchAnalyticsEvent, inputTracking, browserFreezeTracking, u
             experienceStore === null || experienceStore === void 0 ? void 0 : experienceStore.success(EditorExperience.typing, {
               nodeSize: state.doc.nodeSize,
               ...nodesCount,
-              participants: getParticipantsCount(state),
               objectId: (_getContextIdentifier4 = getContextIdentifier(state)) === null || _getContextIdentifier4 === void 0 ? void 0 : _getContextIdentifier4.objectId,
               time,
               severity: shouldTrackSeverity ? severity : undefined
@@ -205,7 +200,6 @@ export default ((dispatchAnalyticsEvent, inputTracking, browserFreezeTracking, u
                 time,
                 nodeSize: state.doc.nodeSize,
                 ...nodesCount,
-                participants: getParticipantsCount(state),
                 objectId: (_getContextIdentifier5 = getContextIdentifier(state)) === null || _getContextIdentifier5 === void 0 ? void 0 : _getContextIdentifier5.objectId
               },
               eventType: EVENT_TYPE.OPERATIONAL

package/dist/es2019/plugins/caption/pm-plugins/keymap.js

@@ -3,7 +3,7 @@ import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { bindKeymapWithCommand, moveDown, enter, moveUp, shiftTab, tab, moveLeft } from '@atlaskit/editor-common/keymaps';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { createNewParagraphBelow } from '@atlaskit/editor-common/utils';
-import { GapCursorSelection } from '../../selection/gap-cursor/selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 export function captionKeymap() {
   const list = {};
   bindKeymapWithCommand(moveDown.common, createNewParagraphBelowCaption, list);

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

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { browser } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { codeBlockNodeView } from '../nodeviews/code-block';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { pluginKey } from '../plugin-key';
 import { ACTIONS } from './actions';
 import { ignoreFollowingMutations, resetShouldIgnoreFollowingMutations } from '../actions';

package/dist/es2019/plugins/expand/commands.js

@@ -1,7 +1,7 @@
 import { Selection } from '@atlaskit/editor-prosemirror/state';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { addAnalytics, ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, INPUT_METHOD, EVENT_TYPE, PLATFORMS, MODE } from '../analytics';
-import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { findExpand } from './utils';
 import { createCommand } from './pm-plugins/plugin-factory';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';

package/dist/es2019/plugins/expand/index.js

@@ -8,6 +8,8 @@ import { getToolbarConfig } from './toolbar';
 import { createExpandNode } from './commands';
 import { messages } from '../insert-block/ui/ToolbarInsertBlock/messages';
 import { createWrapSelectionTransaction } from '@atlaskit/editor-common/utils';
+// TO-DO: replace with editor-plugin-selection
+
 const expandPlugin = ({
   config: options = {},
   api
@@ -32,11 +34,11 @@ const expandPlugin = ({
           dispatch,
           getIntl
         }) => {
-          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags);
+          return createPlugin(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags, api);
         }
       }, {
         name: 'expandKeymap',
-        plugin: expandKeymap
+        plugin: () => expandKeymap(api)
       }];
     },
     pluginsOptions: {

package/dist/es2019/plugins/expand/nodeviews/index.js

@@ -9,11 +9,8 @@ import { expandMessages } from '@atlaskit/editor-common/ui';
 import { isEmptyNode } from '../../../utils';
 import { updateExpandTitle, toggleExpandExpanded, deleteExpandAtPos, setSelectionInsideExpand } from '../commands';
 import { expandClassNames } from '../ui/class-names';
-import { GapCursorSelection, Side } from '../../../plugins/selection/gap-cursor-selection';
+import { GapCursorSelection, Side, RelativeSelectionPos } from '@atlaskit/editor-common/selection';
 import { closestElement } from '../../../utils/dom';
-import { RelativeSelectionPos } from '../../selection/types';
-import { setSelectionRelativeToNode } from '../../selection/commands';
-import { getPluginState as getSelectionPluginState } from '../../selection/plugin-factory';
 function buildExpandClassName(type, expanded) {
   return `${expandClassNames.prefix} ${expandClassNames.type(type)} ${expanded ? expandClassNames.expanded : ''}`;
 }
@@ -49,7 +46,7 @@ const toDOM = (node, intl) => ['div', {
   'class': expandClassNames.content
 }, 0]];
 export class ExpandNodeView {
-  constructor(node, view, getPos, getIntl, isMobile, featureFlags) {
+  constructor(node, view, getPos, getIntl, isMobile, featureFlags, selectNearNode, api) {
     _defineProperty(this, "allowInteractiveExpand", true);
     _defineProperty(this, "isMobile", false);
     _defineProperty(this, "focusTitle", () => {
@@ -58,7 +55,10 @@ export class ExpandNodeView {
           state,
           dispatch
         } = this.view;
-        setSelectionRelativeToNode(RelativeSelectionPos.Start)(state, dispatch);
+        if (this.selectNearNode) {
+          var _this$api;
+          (_this$api = this.api) === null || _this$api === void 0 ? void 0 : _this$api.core.actions.execute(this.selectNearNode(RelativeSelectionPos.Start));
+        }
         const pos = this.getPos();
         if (typeof pos === 'number') {
           setSelectionInsideExpand(pos)(state, dispatch, this.view);
@@ -266,7 +266,7 @@ export class ExpandNodeView {
       }
     });
     _defineProperty(this, "handleArrowRightFromTitle", event => {
-      if (!this.input) {
+      if (!this.input || !this.selectNearNode) {
         return;
       }
       const pos = this.getPos();
@@ -279,17 +279,17 @@ export class ExpandNodeView {
         selectionEnd
       } = this.input;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
+        var _this$api2;
         event.preventDefault();
         const {
-          state,
-          dispatch
+          state
         } = this.view;
         this.view.focus();
-        setSelectionRelativeToNode(RelativeSelectionPos.End, NodeSelection.create(state.doc, pos))(state, dispatch);
+        (_this$api2 = this.api) === null || _this$api2 === void 0 ? void 0 : _this$api2.core.actions.execute(this.selectNearNode(RelativeSelectionPos.End, NodeSelection.create(state.doc, pos)));
       }
     });
     _defineProperty(this, "handleArrowLeftFromTitle", event => {
-      if (!this.input) {
+      if (!this.input || !this.selectNearNode) {
         return;
       }
       const pos = this.getPos();
@@ -301,22 +301,25 @@ export class ExpandNodeView {
         selectionEnd
       } = this.input;
       if (selectionStart === selectionEnd && selectionStart === 0) {
+        var _this$api3;
         event.preventDefault();
         const {
-          state,
-          dispatch
+          state
         } = this.view;
         this.view.focus();
-
+        const selectionSharedState = ((_this$api3 = this.api) === null || _this$api3 === void 0 ? void 0 : _this$api3.selection.sharedState.currentState()) || {};
         // selectionRelativeToNode is undefined when user clicked to select node, then hit left to get focus in title
         // This is a special case where we want to bypass node selection and jump straight to gap cursor
-        if (getSelectionPluginState(state).selectionRelativeToNode === undefined) {
-          setSelectionRelativeToNode(undefined, new GapCursorSelection(state.doc.resolve(pos), Side.LEFT))(state, dispatch);
+        if ((selectionSharedState === null || selectionSharedState === void 0 ? void 0 : selectionSharedState.selectionRelativeToNode) === undefined) {
+          var _this$api4;
+          (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : _this$api4.core.actions.execute(this.selectNearNode(undefined, new GapCursorSelection(state.doc.resolve(pos), Side.LEFT)));
         } else {
-          setSelectionRelativeToNode(RelativeSelectionPos.Start, NodeSelection.create(state.doc, pos))(state, dispatch);
+          var _this$api5;
+          (_this$api5 = this.api) === null || _this$api5 === void 0 ? void 0 : _this$api5.core.actions.execute(this.selectNearNode(RelativeSelectionPos.Start, NodeSelection.create(state.doc, pos)));
         }
       }
     });
+    this.selectNearNode = selectNearNode;
     this.intl = getIntl();
     const {
       dom,
@@ -329,6 +332,7 @@ export class ExpandNodeView {
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
     this.featureFlags = featureFlags;
+    this.api = api;
     this.icon = this.dom.querySelector(`.${expandClassNames.icon}`);
     this.input = this.dom.querySelector(`.${expandClassNames.titleInput}`);
     this.titleContainer = this.dom.querySelector(`.${expandClassNames.titleContainer}`);
@@ -437,7 +441,8 @@ export class ExpandNodeView {
 export default function ({
   getIntl,
   isMobile,
-  featureFlags
+  featureFlags,
+  api
 }) {
-  return (node, view, getPos) => new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags);
+  return (node, view, getPos) => new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, api === null || api === void 0 ? void 0 : api.selection.commands.selectNearNode, api);
 }

package/dist/es2019/plugins/expand/pm-plugins/keymap.js

@@ -1,19 +1,17 @@
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { Selection, TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { bindKeymapWithCommand, moveRight, moveLeft, moveUp, moveDown, tab, backspace } from '@atlaskit/editor-common/keymaps';
-import { GapCursorSelection, Side } from '../../selection/gap-cursor-selection';
+import { GapCursorSelection, Side, RelativeSelectionPos } from '@atlaskit/editor-common/selection';
 import { findExpand } from '../utils';
 import { isEmptyNode } from '../../../utils';
 import { expandClassNames } from '../ui/class-names';
 import { deleteExpand, focusTitle } from '../commands';
-import { getPluginState as getSelectionPluginState } from '../../selection/plugin-factory';
-import { RelativeSelectionPos } from '../../selection/types';
 import { isPositionNearTableRow } from '@atlaskit/editor-common/utils';
 const isExpandNode = node => {
   return (node === null || node === void 0 ? void 0 : node.type.name) === 'expand' || (node === null || node === void 0 ? void 0 : node.type.name) === 'nestedExpand';
 };
 const isExpandSelected = selection => selection instanceof NodeSelection && isExpandNode(selection.node);
-export function expandKeymap() {
+export function expandKeymap(api) {
   const list = {};
   bindKeymapWithCommand(moveRight.common, (state, dispatch, editorView) => {
     if (!editorView) {
@@ -22,9 +20,10 @@ export function expandKeymap() {
     const {
       selection
     } = state;
+    const selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
     const {
       selectionRelativeToNode
-    } = getSelectionPluginState(state);
+    } = selectionSharedState;
     if (isExpandSelected(selection) && selectionRelativeToNode === RelativeSelectionPos.Start) {
       return focusTitle(selection.from + 1)(state, dispatch, editorView);
     }
@@ -37,9 +36,10 @@ export function expandKeymap() {
     const {
       selection
     } = state;
+    const selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
     const {
       selectionRelativeToNode
-    } = getSelectionPluginState(state);
+    } = selectionSharedState;
     if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === RelativeSelectionPos.End)) {
       return focusTitle(selection.from + 1)(state, dispatch, editorView);
     }

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

@@ -1,6 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import ExpandNodeView from '../nodeviews';
 import { setExpandRef } from '../commands';
 import { findExpand } from '../utils';
@@ -10,7 +10,7 @@ export function containsClass(element, className) {
   var _element$classList;
   return Boolean(element === null || element === void 0 ? void 0 : (_element$classList = element.classList) === null || _element$classList === void 0 ? void 0 : _element$classList.contains(className));
 }
-export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, featureFlags) => {
+export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, featureFlags, api) => {
   const state = createPluginState(dispatch, {});
   const isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -21,12 +21,14 @@ export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLon
         expand: ExpandNodeView({
           getIntl,
           isMobile,
-          featureFlags
+          featureFlags,
+          api
         }),
         nestedExpand: ExpandNodeView({
           getIntl,
           isMobile,
-          featureFlags
+          featureFlags,
+          api
         })
       },
       handleKeyDown(_view, event) {

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

@@ -1,8 +1,7 @@
 import { TextSelection, NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfTypeClosestToPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import { isSelectionAtStartOfNode, isSelectionAtEndOfNode } from '@atlaskit/editor-common/selection';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import ExtensionNodeView from '../nodeviews/extension';
 import { updateState, clearEditingContext } from '../commands';
 import { getSelectedExtension, getSelectedDomElement } from '../utils';

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

@@ -4,7 +4,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { keydownHandler } from '@atlaskit/editor-prosemirror/keymap';
 import { findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { filterCommand as filter } from '@atlaskit/editor-common/utils';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { fixColumnSizes, fixColumnStructure, getSelectedLayout } from '../actions';
 import { pluginKey } from './plugin-key';
 export const DEFAULT_LAYOUT = 'two_equal';

package/dist/es2019/plugins/media/toolbar/commands.js

@@ -67,7 +67,7 @@ export const changeMediaCardToInline = editorAnalyticsAPI => (state, dispatch) =
   const node = paragraph.createChecked({}, content);
   const nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
   let tr = removeMediaGroupNode(state);
-  tr = safeInsert(node, nodePos, true)(tr);
+  tr = safeInsert(node, nodePos, false)(tr);
   if (dispatch) {
     editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
       action: ACTION.CHANGED_TYPE,