@atlaskit/editor-core 187.46.0 → 187.47.0

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

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
 import { getPanelNodeView } from '../nodeviews/panel';
 import { pluginKey } from '../types';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 export const createPlugin = (dispatch, providerFactory, pluginOptions) => {
   const {
     useLongPressSelection = false

package/dist/es2019/plugins/paste/handlers.js

@@ -7,7 +7,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
-import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { runMacroAutoConvert } from '../macro';
 import { insertMediaAsMediaSingle } from '../media/utils/media-single';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';

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

@@ -1,19 +1,30 @@
 import { NodeSelection, TextSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { GapCursorSelection, Side } from './gap-cursor-selection';
-import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isNodeEmpty, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { SelectionActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { isSelectableContainerNode, isSelectionAtEndOfParentNode, findSelectableContainerParent, isSelectionAtStartOfParentNode, findSelectableContainerBefore, findSelectableContainerAfter, findFirstChildNodeToSelect, findLastChildNodeToSelect } from './utils';
-import { RelativeSelectionPos, SelectionDirection } from './types';
-export const setSelectionRelativeToNode = (selectionRelativeToNode, selection) => createCommand({
-  type: SelectionActionTypes.SET_RELATIVE_SELECTION,
-  selectionRelativeToNode
-}, tr => {
+import { RelativeSelectionPos, SelectionDirection, selectionPluginKey } from './types';
+export const selectNearNode = (selectionRelativeToNode, selection) => ({
+  tr
+}) => {
+  tr.setMeta(selectionPluginKey, {
+    type: SelectionActionTypes.SET_RELATIVE_SELECTION,
+    selectionRelativeToNode
+  });
   if (selection) {
     return tr.setSelection(selection);
   }
   return tr;
+};
+export const setSelectionRelativeToNode = (selectionRelativeToNode, selection) => createCommand({
+  type: SelectionActionTypes.SET_RELATIVE_SELECTION,
+  selectionRelativeToNode
+}, tr => {
+  return selectNearNode(selectionRelativeToNode, selection)({
+    tr
+  }) || tr;
 });
 export const arrowRight = (state, dispatch) => {
   const {

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

@@ -1,5 +1,5 @@
 import { getLayoutModeFromTargetNode, isLeftCursor, getComputedStyleForLayoutMode } from '../utils';
-import { Side } from '../selection';
+import { Side } from '@atlaskit/editor-common/selection';
 
 /**
  * We have a couple of nodes that require us to compute style

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

@@ -1,8 +1,10 @@
 import { createPlugin } from './pm-plugins/selection-main';
+import { selectionPluginKey } from './types';
 import selectionKeymapPlugin from './pm-plugins/keymap';
 import gapCursorPlugin from './pm-plugins/gap-cursor-main';
 import { gapCursorPluginKey } from './pm-plugins/gap-cursor-plugin-key';
 import gapCursorKeymapPlugin from './pm-plugins/gap-cursor-keymap';
+import { selectNearNode } from './commands';
 const displayGapCursor = toggle => ({
   tr
 }) => {
@@ -15,7 +17,17 @@ export const selectionPlugin = ({
 }) => ({
   name: 'selection',
   commands: {
-    displayGapCursor
+    displayGapCursor,
+    selectNearNode
+  },
+  getSharedState(editorState) {
+    if (!editorState) {
+      return undefined;
+    }
+    const pluginState = selectionPluginKey.getState(editorState);
+    return {
+      selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+    };
   },
   pmPlugins() {
     return [{

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

@@ -2,28 +2,9 @@ import { NodeSelection, TextSelection, Selection, AllSelection } from '@atlaskit
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { flatten, findParentNode } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
-import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, selectNode } from '@atlaskit/editor-common/selection';
+import { isSelectionAtStartOfNode, isSelectionAtEndOfNode, getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler, isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isEmptyParagraph } from '@atlaskit/editor-common/utils';
-import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
 import { selectionPluginKey } from './types';
-export 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) {
-        const target = event.target;
-        if (isValidTarget(target)) {
-          const selectionPos = options.getNodeSelectionPos ? options.getNodeSelectionPos(view.state, nodePos) : nodePos;
-          selectNode(selectionPos)(view.state, view.dispatch);
-          return true;
-        }
-      }
-    }
-    return false;
-  };
-}
 export const getDecorations = tr => {
   if (tr.selection instanceof NodeSelection) {
     return DecorationSet.create(tr.doc, [Decoration.node(tr.selection.from, tr.selection.to, {
@@ -249,4 +230,4 @@ export const findLastChildNodeToSelect = parent => {
 };
 export const isSelectionAtStartOfParentNode = ($pos, selection) => isSelectionAtStartOfNode($pos, findSelectableContainerParent(selection));
 export const isSelectionAtEndOfParentNode = ($pos, selection) => isSelectionAtEndOfNode($pos, findSelectableContainerParent(selection));
-export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload };
+export { getNodeSelectionAnalyticsPayload, getAllSelectionAnalyticsPayload, getRangeSelectionAnalyticsPayload, getCellSelectionAnalyticsPayload, createSelectionClickHandler };

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

@@ -4,7 +4,7 @@ import { findParentNodeOfType, hasParentNodeOfType, replaceParentNodeOfType, saf
 import { liftTarget } from '@atlaskit/editor-prosemirror/transform';
 import { uuid } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, addAnalytics, EVENT_TYPE, INPUT_METHOD, USER_CONTEXT } from '../analytics';
-import { GapCursorSelection } from '../selection/gap-cursor-selection';
+import { GapCursorSelection } from '@atlaskit/editor-common/selection';
 import { stateKey as taskDecisionStateKey } from './pm-plugins/plugin-key';
 import { autoJoinTr } from '@atlaskit/editor-common/utils';
 const getContextData = (contextProvider = {}) => {

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

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { uuid } from '@atlaskit/adf-schema';
 import { nodesBetweenChanged, SetAttrsStep } from '../../../utils';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 import { decisionItemNodeView } from '../nodeviews/decisionItem';
 import { taskItemNodeViewFactory } from '../nodeviews/taskItem';
 import { stateKey } from './plugin-key';

package/dist/es2019/test-utils.js

@@ -79,7 +79,7 @@ export const createPMSchemaAndPlugins = (inputPreset = new EditorPresetBuilder()
   };
 };
 export { EventDispatcher } from './event-dispatcher';
-export { GapCursorSelection, Side as GapCursorSide } from './plugins/selection/gap-cursor/selection';
+export { GapCursorSelection, Side as GapCursorSide } from '@atlaskit/editor-common/selection';
 export function setTextSelection(view, anchor, head) {
   const {
     state

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "187.46.0";
+export const version = "187.47.0";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/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/esm/plugins/base/pm-plugins/frozen-editor.js

@@ -6,7 +6,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';
@@ -31,7 +30,6 @@ var dispatchLongTaskEvent = function dispatchLongTaskEvent(dispatchAnalyticsEven
       freezeTime: time,
       nodeSize: state.doc.nodeSize
     }, nodesCount), {}, {
-      participants: getParticipantsCount(view.state),
       interactionType: interactionType,
       severity: severity
     }),
@@ -78,7 +76,6 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
           time: 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
         }),
@@ -105,7 +102,6 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
         }, 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
@@ -181,7 +177,6 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
             experienceStore === null || experienceStore === void 0 ? void 0 : experienceStore.success(EditorExperience.typing, _objectSpread(_objectSpread({
               nodeSize: state.doc.nodeSize
             }, nodesCount), {}, {
-              participants: getParticipantsCount(state),
               objectId: (_getContextIdentifier4 = getContextIdentifier(state)) === null || _getContextIdentifier4 === void 0 ? void 0 : _getContextIdentifier4.objectId,
               time: time,
               severity: shouldTrackSeverity ? severity : undefined
@@ -200,7 +195,6 @@ export default (function (dispatchAnalyticsEvent, inputTracking, browserFreezeTr
                 time: 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/esm/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() {
   var list = {};
   bindKeymapWithCommand(moveDown.common, createNewParagraphBelowCaption, list);

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

@@ -5,7 +5,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/esm/plugins/expand/commands.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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/esm/plugins/expand/index.js

@@ -9,6 +9,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
+
 var expandPlugin = function expandPlugin(_ref) {
   var _api$featureFlags;
   var _ref$config = _ref.config,
@@ -32,11 +34,13 @@ var expandPlugin = function expandPlugin(_ref) {
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch,
             getIntl = _ref2.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: function plugin() {
+          return expandKeymap(api);
+        }
       }];
     },
     pluginsOptions: {

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

@@ -11,11 +11,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 "".concat(expandClassNames.prefix, " ").concat(expandClassNames.type(type), " ").concat(expanded ? expandClassNames.expanded : '');
 }
@@ -53,7 +50,7 @@ var toDOM = function toDOM(node, intl) {
   }, 0]];
 };
 export var ExpandNodeView = /*#__PURE__*/function () {
-  function ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags) {
+  function ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, selectNearNode, api) {
     var _this = this;
     _classCallCheck(this, ExpandNodeView);
     _defineProperty(this, "allowInteractiveExpand", true);
@@ -63,7 +60,10 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         var _this$view = _this.view,
           state = _this$view.state,
           dispatch = _this$view.dispatch;
-        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));
+        }
         var pos = _this.getPos();
         if (typeof pos === 'number') {
           setSelectionInsideExpand(pos)(state, dispatch, _this.view);
@@ -260,7 +260,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "handleArrowRightFromTitle", function (event) {
-      if (!_this.input) {
+      if (!_this.input || !_this.selectNearNode) {
         return;
       }
       var pos = _this.getPos();
@@ -272,16 +272,15 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input4.selectionStart,
         selectionEnd = _this$input4.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === value.length) {
+        var _this$api2;
         event.preventDefault();
-        var _this$view8 = _this.view,
-          state = _this$view8.state,
-          dispatch = _this$view8.dispatch;
+        var state = _this.view.state;
         _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", function (event) {
-      if (!_this.input) {
+      if (!_this.input || !_this.selectNearNode) {
         return;
       }
       var pos = _this.getPos();
@@ -292,21 +291,23 @@ export var ExpandNodeView = /*#__PURE__*/function () {
         selectionStart = _this$input5.selectionStart,
         selectionEnd = _this$input5.selectionEnd;
       if (selectionStart === selectionEnd && selectionStart === 0) {
+        var _this$api3;
         event.preventDefault();
-        var _this$view9 = _this.view,
-          state = _this$view9.state,
-          dispatch = _this$view9.dispatch;
+        var state = _this.view.state;
         _this.view.focus();
-
+        var 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();
     var _DOMSerializer$render = DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
       dom = _DOMSerializer$render.dom,
@@ -318,6 +319,7 @@ export var ExpandNodeView = /*#__PURE__*/function () {
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
     this.featureFlags = featureFlags;
+    this.api = api;
     this.icon = this.dom.querySelector(".".concat(expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(expandClassNames.titleInput));
     this.titleContainer = this.dom.querySelector(".".concat(expandClassNames.titleContainer));
@@ -440,8 +442,9 @@ export var ExpandNodeView = /*#__PURE__*/function () {
 export default function (_ref2) {
   var getIntl = _ref2.getIntl,
     isMobile = _ref2.isMobile,
-    featureFlags = _ref2.featureFlags;
+    featureFlags = _ref2.featureFlags,
+    api = _ref2.api;
   return function (node, view, getPos) {
-    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags);
+    return new ExpandNodeView(node, view, getPos, getIntl, isMobile, featureFlags, api === null || api === void 0 ? void 0 : api.selection.commands.selectNearNode, api);
   };
 }

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

@@ -1,13 +1,11 @@
 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';
 var isExpandNode = function 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';
@@ -15,15 +13,15 @@ var isExpandNode = function isExpandNode(node) {
 var isExpandSelected = function isExpandSelected(selection) {
   return selection instanceof NodeSelection && isExpandNode(selection.node);
 };
-export function expandKeymap() {
+export function expandKeymap(api) {
   var list = {};
   bindKeymapWithCommand(moveRight.common, function (state, dispatch, editorView) {
     if (!editorView) {
       return false;
     }
     var selection = state.selection;
-    var _getSelectionPluginSt = getSelectionPluginState(state),
-      selectionRelativeToNode = _getSelectionPluginSt.selectionRelativeToNode;
+    var selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
+    var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
     if (isExpandSelected(selection) && selectionRelativeToNode === RelativeSelectionPos.Start) {
       return focusTitle(selection.from + 1)(state, dispatch, editorView);
     }
@@ -34,8 +32,8 @@ export function expandKeymap() {
       return false;
     }
     var selection = state.selection;
-    var _getSelectionPluginSt2 = getSelectionPluginState(state),
-      selectionRelativeToNode = _getSelectionPluginSt2.selectionRelativeToNode;
+    var selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
+    var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
     if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === RelativeSelectionPos.End)) {
       return focusTitle(selection.from + 1)(state, dispatch, editorView);
     }

package/dist/esm/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';
@@ -14,6 +14,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
   var appearance = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'full-page';
   var useLongPressSelection = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var featureFlags = arguments.length > 4 ? arguments[4] : undefined;
+  var api = arguments.length > 5 ? arguments[5] : undefined;
   var state = createPluginState(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new SafePlugin({
@@ -24,12 +25,14 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
         expand: ExpandNodeView({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          api: api
         }),
         nestedExpand: ExpandNodeView({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          api: api
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {

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

@@ -4,8 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 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/esm/plugins/layout/pm-plugins/main.js

@@ -7,7 +7,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 var DEFAULT_LAYOUT = 'two_equal';

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

@@ -70,7 +70,7 @@ export var changeMediaCardToInline = function changeMediaCardToInline(editorAnal
     var node = paragraph.createChecked({}, content);
     var nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
     var 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,

package/dist/esm/plugins/panel/pm-plugins/main.js

@@ -2,7 +2,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PanelSharedCssClassName } from '@atlaskit/editor-common/panel';
 import { getPanelNodeView } from '../nodeviews/panel';
 import { pluginKey } from '../types';
-import { createSelectionClickHandler } from '../../selection/utils';
+import { createSelectionClickHandler } from '@atlaskit/editor-common/selection';
 export var createPlugin = function createPlugin(dispatch, providerFactory, pluginOptions) {
   var _pluginOptions$useLon = pluginOptions.useLongPressSelection,
     useLongPressSelection = _pluginOptions$useLon === void 0 ? false : _pluginOptions$useLon;

package/dist/esm/plugins/paste/handlers.js

@@ -15,7 +15,7 @@ import { replaceSelectedTable } from '@atlaskit/editor-tables/utils';
 import { compose, insideTable, isParagraph, isText, isLinkMark, insideTableCell, isInListItem } from '../../utils';
 import { mapSlice } from '../../utils/slice';
 import { INPUT_METHOD } from '../analytics';
-import { GapCursorSelection, Side } from '../selection/gap-cursor-selection';
+import { GapCursorSelection, Side } from '@atlaskit/editor-common/selection';
 import { runMacroAutoConvert } from '../macro';
 import { insertMediaAsMediaSingle } from '../media/utils/media-single';
 import { addReplaceSelectedTableAnalytics, applyTextMarksToSlice, hasOnlyNodesOfType } from './util';

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

@@ -1,20 +1,32 @@
 import { NodeSelection, TextSelection, Selection } from '@atlaskit/editor-prosemirror/state';
 import { GapCursorSelection, Side } from './gap-cursor-selection';
-import { isIgnored as isIgnoredByGapCursor } from '../selection/gap-cursor/utils/is-ignored';
+import { isIgnored as isIgnoredByGapCursor } from '@atlaskit/editor-common/selection';
 import { isNodeEmpty, isEmptyParagraph } from '@atlaskit/editor-common/utils';
 import { SelectionActionTypes } from './actions';
 import { createCommand, getPluginState } from './plugin-factory';
 import { isSelectableContainerNode, isSelectionAtEndOfParentNode, findSelectableContainerParent, isSelectionAtStartOfParentNode, findSelectableContainerBefore, findSelectableContainerAfter, findFirstChildNodeToSelect, findLastChildNodeToSelect } from './utils';
-import { RelativeSelectionPos, SelectionDirection } from './types';
+import { RelativeSelectionPos, SelectionDirection, selectionPluginKey } from './types';
+export var selectNearNode = function selectNearNode(selectionRelativeToNode, selection) {
+  return function (_ref) {
+    var tr = _ref.tr;
+    tr.setMeta(selectionPluginKey, {
+      type: SelectionActionTypes.SET_RELATIVE_SELECTION,
+      selectionRelativeToNode: selectionRelativeToNode
+    });
+    if (selection) {
+      return tr.setSelection(selection);
+    }
+    return tr;
+  };
+};
 export var setSelectionRelativeToNode = function setSelectionRelativeToNode(selectionRelativeToNode, selection) {
   return createCommand({
     type: SelectionActionTypes.SET_RELATIVE_SELECTION,
     selectionRelativeToNode: selectionRelativeToNode
   }, function (tr) {
-    if (selection) {
-      return tr.setSelection(selection);
-    }
-    return tr;
+    return selectNearNode(selectionRelativeToNode, selection)({
+      tr: tr
+    }) || tr;
   });
 };
 export var arrowRight = function arrowRight(state, dispatch) {

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

@@ -1,6 +1,6 @@
 import _toArray from "@babel/runtime/helpers/toArray";
 import { getLayoutModeFromTargetNode, isLeftCursor, getComputedStyleForLayoutMode } from '../utils';
-import { Side } from '../selection';
+import { Side } from '@atlaskit/editor-common/selection';
 
 /**
  * We have a couple of nodes that require us to compute style

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

@@ -1,8 +1,10 @@
 import { createPlugin } from './pm-plugins/selection-main';
+import { selectionPluginKey } from './types';
 import selectionKeymapPlugin from './pm-plugins/keymap';
 import gapCursorPlugin from './pm-plugins/gap-cursor-main';
 import { gapCursorPluginKey } from './pm-plugins/gap-cursor-plugin-key';
 import gapCursorKeymapPlugin from './pm-plugins/gap-cursor-keymap';
+import { selectNearNode } from './commands';
 var displayGapCursor = function displayGapCursor(toggle) {
   return function (_ref) {
     var tr = _ref.tr;
@@ -16,7 +18,17 @@ export var selectionPlugin = function selectionPlugin(_ref2) {
   return {
     name: 'selection',
     commands: {
-      displayGapCursor: displayGapCursor
+      displayGapCursor: displayGapCursor,
+      selectNearNode: selectNearNode
+    },
+    getSharedState: function getSharedState(editorState) {
+      if (!editorState) {
+        return undefined;
+      }
+      var pluginState = selectionPluginKey.getState(editorState);
+      return {
+        selectionRelativeToNode: pluginState === null || pluginState === void 0 ? void 0 : pluginState.selectionRelativeToNode
+      };
     },
     pmPlugins: function pmPlugins() {
       return [{