@atlaskit/editor-core 187.46.1 → 187.47.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-core
 
+## 187.47.0
+
+### Minor Changes
+
+- [`8cb8dafa05a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8cb8dafa05a) - [ED-19774] Removing ../selection imports where possible. selectionPlugin imports still exist until we have an extracted package for selection.
+
+### Patch Changes
+
+- [`6a4f206b435`](https://bitbucket.org/atlassian/atlassian-frontend/commits/6a4f206b435) - [ux] MEX-2598 Bug fix: Fixed the bug that caused certain nodes from disappearing when it was located beneath a media group node that got switched to a media inline node. This bug fix ensures that switching from media group to media inline should not affect the surrounding nodes.
+- Updated dependencies
+
 ## 187.46.1
 
 ### Patch Changes

package/dist/cjs/index.js

@@ -98,13 +98,13 @@ Object.defineProperty(exports, "EventDispatcher", {
 Object.defineProperty(exports, "GapCursorSelection", {
   enumerable: true,
   get: function get() {
-    return _gapCursorSelection.GapCursorSelection;
+    return _selection.GapCursorSelection;
   }
 });
 Object.defineProperty(exports, "GapCursorSide", {
   enumerable: true,
   get: function get() {
-    return _gapCursorSelection.Side;
+    return _selection.Side;
   }
 });
 Object.defineProperty(exports, "INPUT_METHOD", {
@@ -469,7 +469,7 @@ var _utils2 = require("@atlaskit/editor-common/utils");
 var _createEditor = require("./create-editor");
 var _actions3 = _interopRequireDefault(require("./actions"));
 var _portalProvider = require("@atlaskit/editor-common/portal-provider");
-var _gapCursorSelection = require("./plugins/selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _mobileSelection = require("./plugins/mobile-selection");
 var _commands6 = require("./plugins/expand/commands");
 var _WithPluginState = _interopRequireDefault(require("./ui/WithPluginState"));

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

@@ -9,7 +9,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
-var _selection = require("../../selection/gap-cursor/selection");
+var _selection = require("@atlaskit/editor-common/selection");
 function captionKeymap() {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveDown.common, createNewParagraphBelowCaption, list);

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

@@ -10,11 +10,11 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _codeBlock = require("../nodeviews/code-block");
-var _utils2 = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var _pluginKey = require("../plugin-key");
 var _actions = require("./actions");
 var _actions2 = require("../actions");
-var _utils3 = require("../utils");
+var _utils2 = require("../utils");
 var _classNames = require("../ui/class-names");
 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; }
@@ -36,10 +36,10 @@ var createPlugin = function createPlugin(_ref) {
       var eventText = keyEvent.data;
       if (_utils.browser.ios && event.composed &&
       // insertParagraph will be the input type when the enter key is pressed.
-      eventInputType === 'insertParagraph' && (0, _utils3.findCodeBlock)(view.state, view.state.selection)) {
+      eventInputType === 'insertParagraph' && (0, _utils2.findCodeBlock)(view.state, view.state.selection)) {
         event.preventDefault();
         return true;
-      } else if (_utils.browser.android && event.composed && eventInputType === 'insertCompositionText' && eventText[(eventText === null || eventText === void 0 ? void 0 : eventText.length) - 1] === '\n' && (0, _utils3.findCodeBlock)(view.state, view.state.selection)) {
+      } else if (_utils.browser.android && event.composed && eventInputType === 'insertCompositionText' && eventText[(eventText === null || eventText === void 0 ? void 0 : eventText.length) - 1] === '\n' && (0, _utils2.findCodeBlock)(view.state, view.state.selection)) {
         var resultingText = event.target.outerText + '\n';
         if (resultingText.endsWith(eventText)) {
           // End of paragraph
@@ -68,7 +68,7 @@ var createPlugin = function createPlugin(_ref) {
   return new _safePlugin.SafePlugin({
     state: {
       init: function init(_, state) {
-        var node = (0, _utils3.findCodeBlock)(state, state.selection);
+        var node = (0, _utils2.findCodeBlock)(state, state.selection);
         return {
           pos: node ? node.pos : null,
           contentCopied: false,
@@ -78,7 +78,7 @@ var createPlugin = function createPlugin(_ref) {
       },
       apply: function apply(tr, pluginState, _oldState, newState) {
         if (tr.docChanged || tr.selectionSet) {
-          var node = (0, _utils3.findCodeBlock)(newState, tr.selection);
+          var node = (0, _utils2.findCodeBlock)(newState, tr.selection);
           var newPluginState = _objectSpread(_objectSpread({}, pluginState), {}, {
             pos: node ? node.pos : null,
             isNodeSelected: tr.selection instanceof _state.NodeSelection
@@ -103,7 +103,7 @@ var createPlugin = function createPlugin(_ref) {
       nodeViews: {
         codeBlock: _codeBlock.codeBlockNodeView
       },
-      handleClickOn: (0, _utils2.createSelectionClickHandler)(['codeBlock'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['codeBlock'], function (target) {
         return !!(target.closest(".".concat(_classNames.codeBlockClassNames.gutter)) || target.classList.contains(_classNames.codeBlockClassNames.content));
       }, {
         useLongPressSelection: useLongPressSelection

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

@@ -9,7 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _analytics = require("../analytics");
-var _gapCursorSelection = require("../selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils2 = require("./utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _utils3 = require("@atlaskit/editor-common/utils");
@@ -85,7 +85,7 @@ var toggleExpandExpanded = function toggleExpandExpanded(pos, nodeType) {
       // Move to a right gap cursor, if the toolbar is interacted (or an API),
       // it will insert below rather than inside (which will be invisible).
       if (isExpandedNext === false && (0, _utils2.findExpand)(state)) {
-        tr.setSelection(new _gapCursorSelection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _gapCursorSelection.Side.RIGHT));
+        tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
       }
 
       // log when people open/close expands

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

@@ -24,6 +24,8 @@ var _commands = require("./commands");
 var _messages = require("../insert-block/ui/ToolbarInsertBlock/messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
+// TO-DO: replace with editor-plugin-selection
+
 var expandPlugin = function expandPlugin(_ref) {
   var _api$featureFlags;
   var _ref$config = _ref.config,
@@ -47,11 +49,13 @@ var expandPlugin = function expandPlugin(_ref) {
         plugin: function plugin(_ref2) {
           var dispatch = _ref2.dispatch,
             getIntl = _ref2.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags);
+          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags, api);
         }
       }, {
         name: 'expandKeymap',
-        plugin: _keymap.expandKeymap
+        plugin: function plugin() {
+          return (0, _keymap.expandKeymap)(api);
+        }
       }];
     },
     pluginsOptions: {

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

@@ -19,11 +19,8 @@ var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("../../../utils");
 var _commands = require("../commands");
 var _classNames = require("../ui/class-names");
-var _gapCursorSelection = require("../../../plugins/selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _dom = require("../../../utils/dom");
-var _types = require("../../selection/types");
-var _commands2 = require("../../selection/commands");
-var _pluginFactory = require("../../selection/plugin-factory");
 function buildExpandClassName(type, expanded) {
   return "".concat(_classNames.expandClassNames.prefix, " ").concat(_classNames.expandClassNames.type(type), " ").concat(expanded ? _classNames.expandClassNames.expanded : '');
 }
@@ -61,7 +58,7 @@ var toDOM = function toDOM(node, intl) {
   }, 0]];
 };
 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;
     (0, _classCallCheck2.default)(this, ExpandNodeView);
     (0, _defineProperty2.default)(this, "allowInteractiveExpand", true);
@@ -71,7 +68,10 @@ var ExpandNodeView = /*#__PURE__*/function () {
         var _this$view = _this.view,
           state = _this$view.state,
           dispatch = _this$view.dispatch;
-        (0, _commands2.setSelectionRelativeToNode)(_types.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(_selection.RelativeSelectionPos.Start));
+        }
         var pos = _this.getPos();
         if (typeof pos === 'number') {
           (0, _commands.setSelectionInsideExpand)(pos)(state, dispatch, _this.view);
@@ -244,7 +244,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
           dispatch = _this$view6.dispatch;
         event.preventDefault();
         _this.view.focus();
-        dispatch(state.tr.setSelection(new _gapCursorSelection.GapCursorSelection(state.doc.resolve(_this.node.nodeSize + pos), _gapCursorSelection.Side.RIGHT)));
+        dispatch(state.tr.setSelection(new _selection.GapCursorSelection(state.doc.resolve(_this.node.nodeSize + pos), _selection.Side.RIGHT)));
       }
     });
     (0, _defineProperty2.default)(this, "setLeftGapCursor", function (event) {
@@ -264,11 +264,11 @@ var ExpandNodeView = /*#__PURE__*/function () {
           state = _this$view7.state,
           dispatch = _this$view7.dispatch;
         _this.view.focus();
-        dispatch(state.tr.setSelection(new _gapCursorSelection.GapCursorSelection(state.doc.resolve(pos), _gapCursorSelection.Side.LEFT)));
+        dispatch(state.tr.setSelection(new _selection.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)));
       }
     });
     (0, _defineProperty2.default)(this, "handleArrowRightFromTitle", function (event) {
-      if (!_this.input) {
+      if (!_this.input || !_this.selectNearNode) {
         return;
       }
       var pos = _this.getPos();
@@ -280,16 +280,15 @@ 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();
-        (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.End, _state.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(_selection.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, pos)));
       }
     });
     (0, _defineProperty2.default)(this, "handleArrowLeftFromTitle", function (event) {
-      if (!_this.input) {
+      if (!_this.input || !_this.selectNearNode) {
         return;
       }
       var pos = _this.getPos();
@@ -300,21 +299,23 @@ 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 ((0, _pluginFactory.getPluginState)(state).selectionRelativeToNode === undefined) {
-          (0, _commands2.setSelectionRelativeToNode)(undefined, new _gapCursorSelection.GapCursorSelection(state.doc.resolve(pos), _gapCursorSelection.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 _selection.GapCursorSelection(state.doc.resolve(pos), _selection.Side.LEFT)));
         } else {
-          (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.Start, _state.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(_selection.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, pos)));
         }
       }
     });
+    this.selectNearNode = selectNearNode;
     this.intl = getIntl();
     var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
       dom = _DOMSerializer$render.dom,
@@ -326,6 +327,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
     this.contentDOM = contentDOM;
     this.isMobile = isMobile;
     this.featureFlags = featureFlags;
+    this.api = api;
     this.icon = this.dom.querySelector(".".concat(_classNames.expandClassNames.icon));
     this.input = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleInput));
     this.titleContainer = this.dom.querySelector(".".concat(_classNames.expandClassNames.titleContainer));
@@ -449,8 +451,9 @@ exports.ExpandNodeView = ExpandNodeView;
 function _default(_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/cjs/plugins/expand/pm-plugins/keymap.js

@@ -7,13 +7,11 @@ exports.expandKeymap = expandKeymap;
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _gapCursorSelection = require("../../selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _utils = require("../utils");
 var _utils2 = require("../../../utils");
 var _classNames = require("../ui/class-names");
 var _commands = require("../commands");
-var _pluginFactory = require("../../selection/plugin-factory");
-var _types = require("../../selection/types");
 var _utils3 = require("@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';
@@ -21,16 +19,16 @@ var isExpandNode = function isExpandNode(node) {
 var isExpandSelected = function isExpandSelected(selection) {
   return selection instanceof _state.NodeSelection && isExpandNode(selection.node);
 };
-function expandKeymap() {
+function expandKeymap(api) {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.moveRight.common, function (state, dispatch, editorView) {
     if (!editorView) {
       return false;
     }
     var selection = state.selection;
-    var _getSelectionPluginSt = (0, _pluginFactory.getPluginState)(state),
-      selectionRelativeToNode = _getSelectionPluginSt.selectionRelativeToNode;
-    if (isExpandSelected(selection) && selectionRelativeToNode === _types.RelativeSelectionPos.Start) {
+    var selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
+    var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
+    if (isExpandSelected(selection) && selectionRelativeToNode === _selection.RelativeSelectionPos.Start) {
       return (0, _commands.focusTitle)(selection.from + 1)(state, dispatch, editorView);
     }
     return false;
@@ -40,9 +38,9 @@ function expandKeymap() {
       return false;
     }
     var selection = state.selection;
-    var _getSelectionPluginSt2 = (0, _pluginFactory.getPluginState)(state),
-      selectionRelativeToNode = _getSelectionPluginSt2.selectionRelativeToNode;
-    if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === _types.RelativeSelectionPos.End)) {
+    var selectionSharedState = (api === null || api === void 0 ? void 0 : api.selection.sharedState.currentState()) || {};
+    var selectionRelativeToNode = selectionSharedState.selectionRelativeToNode;
+    if (isExpandSelected(selection) && (selectionRelativeToNode === undefined || selectionRelativeToNode === _selection.RelativeSelectionPos.End)) {
       return (0, _commands.focusTitle)(selection.from + 1)(state, dispatch, editorView);
     }
     return false;
@@ -76,7 +74,7 @@ function expandKeymap() {
     var selection = state.selection,
       schema = state.schema;
     var nodeBefore = selection.$from.nodeBefore;
-    if (selection instanceof _gapCursorSelection.GapCursorSelection && selection.side === _gapCursorSelection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && !nodeBefore.attrs.__expanded) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.RIGHT && nodeBefore && (nodeBefore.type === schema.nodes.expand || nodeBefore.type === schema.nodes.nestedExpand) && !nodeBefore.attrs.__expanded) {
       var _$from = selection.$from;
       return (0, _commands.focusTitle)(Math.max(_$from.pos - 1, 0))(state, dispatch, editorView);
     }
@@ -121,7 +119,7 @@ function expandKeymap() {
       nestedExpand = _state$schema$nodes.nestedExpand;
     var selection = state.selection;
     var nodeAfter = selection.$from.nodeAfter;
-    if (selection instanceof _gapCursorSelection.GapCursorSelection && selection.side === _gapCursorSelection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && !nodeAfter.attrs.__expanded) {
+    if (selection instanceof _selection.GapCursorSelection && selection.side === _selection.Side.LEFT && nodeAfter && (nodeAfter.type === expand || nodeAfter.type === nestedExpand) && !nodeAfter.attrs.__expanded) {
       var $from = selection.$from;
       return (0, _commands.focusTitle)($from.pos + 1)(state, dispatch, editorView);
     }

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

@@ -8,10 +8,10 @@ exports.containsClass = containsClass;
 exports.createPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _utils2 = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var _nodeviews = _interopRequireDefault(require("../nodeviews"));
 var _commands = require("../commands");
-var _utils3 = require("../utils");
+var _utils2 = require("../utils");
 var _classNames = require("../ui/class-names");
 var _pluginFactory = require("./plugin-factory");
 function containsClass(element, className) {
@@ -22,6 +22,7 @@ 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 = (0, _pluginFactory.createPluginState)(dispatch, {});
   var isMobile = appearance === 'mobile';
   return new _safePlugin.SafePlugin({
@@ -32,12 +33,14 @@ var createPlugin = function createPlugin(dispatch, getIntl) {
         expand: (0, _nodeviews.default)({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          api: api
         }),
         nestedExpand: (0, _nodeviews.default)({
           getIntl: getIntl,
           isMobile: isMobile,
-          featureFlags: featureFlags
+          featureFlags: featureFlags,
+          api: api
         })
       },
       handleKeyDown: function handleKeyDown(_view, event) {
@@ -49,7 +52,7 @@ var createPlugin = function createPlugin(dispatch, getIntl) {
       handleScrollToSelection: function handleScrollToSelection() {
         return containsClass(document.activeElement, _classNames.expandClassNames.titleInput);
       },
-      handleClickOn: (0, _utils2.createSelectionClickHandler)(['expand', 'nestedExpand'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['expand', 'nestedExpand'], function (target) {
         return target.classList.contains(_classNames.expandClassNames.prefix);
       }, {
         useLongPressSelection: useLongPressSelection
@@ -68,7 +71,7 @@ var createPlugin = function createPlugin(dispatch, getIntl) {
         update: function update(view) {
           var state = view.state,
             dispatch = view.dispatch;
-          var node = (0, _utils3.findExpand)(state);
+          var node = (0, _utils2.findExpand)(state);
           if (node) {
             var expandRef = (0, _utils.findDomRefAtPos)(node.pos, domAtPos);
             if ((0, _pluginFactory.getPluginState)(state).expandRef !== expandRef) {

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

@@ -31,13 +31,12 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _selection = require("@atlaskit/editor-common/selection");
-var _utils2 = require("../../selection/utils");
 var _extension = _interopRequireDefault(require("../nodeviews/extension"));
 var _commands = require("../commands");
-var _utils3 = require("../utils");
+var _utils2 = require("../utils");
 var _pluginFactory = require("../plugin-factory");
 var _pluginKey = require("../plugin-key");
-var _utils4 = require("./utils");
+var _utils3 = require("./utils");
 var shouldShowEditButton = function shouldShowEditButton(extensionHandler, extensionProvider) {
   var usesLegacyMacroBrowser = !extensionHandler && !extensionProvider || typeof extensionHandler === 'function';
   var usesModernUpdateMethod = (0, _typeof2.default)(extensionHandler) === 'object' && typeof extensionHandler.update === 'function';
@@ -63,7 +62,7 @@ var getUpdateExtensionPromise = /*#__PURE__*/function () {
             break;
           }
           _context.next = 7;
-          return (0, _utils4.updateEditButton)(view, extensionProvider);
+          return (0, _utils3.updateEditButton)(view, extensionProvider);
         case 7:
           updateMethod = _context.sent;
           if (!updateMethod) {
@@ -103,7 +102,7 @@ var createExtensionProviderHandler = function createExtensionProviderHandler(vie
               extensionProvider: extensionProvider
             })(view.state, view.dispatch);
             _context2.next = 8;
-            return (0, _utils4.updateEditButton)(view, extensionProvider);
+            return (0, _utils3.updateEditButton)(view, extensionProvider);
           case 8:
             _context2.next = 13;
             break;
@@ -180,7 +179,7 @@ var handleUpdate = function handleUpdate(_ref4) {
     showEditButton = _getPluginState.showEditButton;
 
   // This fetches the selected extension node, either by keyboard selection or click for all types of extensions
-  var selectedExtension = (0, _utils3.getSelectedExtension)(state, true);
+  var selectedExtension = (0, _utils2.getSelectedExtension)(state, true);
   if (!selectedExtension) {
     if (showContextPanel) {
       (0, _commands.clearEditingContext)(applyChange)(state, dispatch);
@@ -188,11 +187,11 @@ var handleUpdate = function handleUpdate(_ref4) {
     return;
   }
   var node = selectedExtension.node;
-  var newElement = (0, _utils3.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
+  var newElement = (0, _utils2.getSelectedDomElement)(state.schema, domAtPos, selectedExtension);
 
   // In some cases, showEditButton can be stale and the edit button doesn't show - @see ED-15285
   // To be safe, we update the showEditButton state here
-  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !(0, _utils3.getSelectedExtension)(prevState, true);
+  var shouldUpdateEditButton = !showEditButton && extensionProvider && element === newElement && !(0, _utils2.getSelectedExtension)(prevState, true);
   var isNewNodeSelected = node.attrs.localId ? localId !== node.attrs.localId :
   // This is the current assumption and it's wrong but we are keeping it
   // as fallback in case we need to turn off `allowLocalIdGeneration`
@@ -316,7 +315,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, extensionHan
         // WARNING: referentiality-plugin also creates these nodeviews
         inlineExtension: (0, _extension.default)(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi)
       },
-      handleClickOn: (0, _utils2.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['extension', 'bodiedExtension'], function (target) {
         return !target.closest('.extension-content');
       }, {
         useLongPressSelection: useLongPressSelection

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

@@ -12,7 +12,7 @@ var _view = require("@atlaskit/editor-prosemirror/view");
 var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
-var _utils3 = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var _actions = require("../actions");
 var _pluginKey = require("./plugin-key");
 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; }
@@ -98,7 +98,7 @@ var _default = function _default(options) {
       handleKeyDown: (0, _keymap.keydownHandler)({
         Tab: (0, _utils2.filterCommand)(isWholeSelectionInsideLayoutColumn, moveCursorToNextColumn)
       }),
-      handleClickOn: (0, _utils3.createSelectionClickHandler)(['layoutColumn'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['layoutColumn'], function (target) {
         return target.hasAttribute('data-layout-section') || target.hasAttribute('data-layout-column');
       }, {
         useLongPressSelection: options.useLongPressSelection || false,

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

@@ -80,7 +80,7 @@ var changeMediaCardToInline = function changeMediaCardToInline(editorAnalyticsAP
     var node = paragraph.createChecked({}, content);
     var nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
     var tr = (0, _utils2.removeMediaGroupNode)(state);
-    tr = (0, _utils.safeInsert)(node, nodePos, true)(tr);
+    tr = (0, _utils.safeInsert)(node, nodePos, false)(tr);
     if (dispatch) {
       editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 ? void 0 : editorAnalyticsAPI.attachAnalyticsEvent({
         action: _analytics2.ACTION.CHANGED_TYPE,

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

@@ -8,7 +8,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _panel = require("@atlaskit/editor-common/panel");
 var _panel2 = require("../nodeviews/panel");
 var _types = require("../types");
-var _utils = require("../../selection/utils");
+var _selection = require("@atlaskit/editor-common/selection");
 var createPlugin = function createPlugin(dispatch, providerFactory, pluginOptions) {
   var _pluginOptions$useLon = pluginOptions.useLongPressSelection,
     useLongPressSelection = _pluginOptions$useLon === void 0 ? false : _pluginOptions$useLon;
@@ -18,7 +18,7 @@ var createPlugin = function createPlugin(dispatch, providerFactory, pluginOption
       nodeViews: {
         panel: (0, _panel2.getPanelNodeView)(pluginOptions, providerFactory)
       },
-      handleClickOn: (0, _utils.createSelectionClickHandler)(['panel'], function (target) {
+      handleClickOn: (0, _selection.createSelectionClickHandler)(['panel'], function (target) {
         return !!target.closest(".".concat(_panel.PanelSharedCssClassName.prefix));
       }, {
         useLongPressSelection: useLongPressSelection

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

@@ -34,7 +34,7 @@ var _utils2 = require("@atlaskit/editor-tables/utils");
 var _utils3 = require("../../utils");
 var _slice = require("../../utils/slice");
 var _analytics = require("../analytics");
-var _gapCursorSelection = require("../selection/gap-cursor-selection");
+var _selection = require("@atlaskit/editor-common/selection");
 var _macro = require("../macro");
 var _mediaSingle = require("../media/utils/media-single");
 var _util = require("./util");
@@ -579,7 +579,7 @@ function handleMediaSingle(inputMethod, editorAnalyticsAPI) {
           var tr = state.tr.replaceSelection(slice);
           var nextPos = tr.doc.resolve(tr.mapping.map(state.selection.$from.pos));
           if (dispatch) {
-            dispatch(tr.setSelection(new _gapCursorSelection.GapCursorSelection(nextPos, _gapCursorSelection.Side.RIGHT)));
+            dispatch(tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT)));
           }
           return true;
         }
@@ -852,7 +852,7 @@ function handleRichText(slice, queueCardsFromChangedTr) {
       var shouldUpdateCursorPosAfterPaste = ['panel', 'nestedExpand', 'decisionList'].includes(((_slice$content$lastCh = slice.content.lastChild) === null || _slice$content$lastCh === void 0 ? void 0 : (_slice$content$lastCh2 = _slice$content$lastCh.type) === null || _slice$content$lastCh2 === void 0 ? void 0 : _slice$content$lastCh2.name) || '');
       if ((0, _utils3.insideTableCell)(state) && shouldUpdateCursorPosAfterPaste) {
         var nextPos = tr.doc.resolve(tr.mapping.map(selection.$from.pos));
-        tr.setSelection(new _gapCursorSelection.GapCursorSelection(nextPos, _gapCursorSelection.Side.RIGHT));
+        tr.setSelection(new _selection.GapCursorSelection(nextPos, _selection.Side.RIGHT));
       }
     } else {
       // need to scan the slice if there's a block node or list items inside it