@atlaskit/editor-core 187.7.2 → 187.8.3

package/dist/cjs/plugins/collab-edit/utils.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.scrollToCollabCursor = exports.replaceDocument = exports.getPositionOfTelepointer = exports.getAvatarColor = exports.findPointers = exports.createTelepointers = exports.colors = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorView = require("prosemirror-view");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var themeColors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("@atlaskit/editor-common/utils");
@@ -58,7 +58,7 @@ var createTelepointers = function createTelepointers(from, to, sessionId, isSele
   var color = avatarColor.index.toString();
   if (isSelection) {
     var className = "telepointer color-".concat(color, " telepointer-selection");
-    decorations.push(_prosemirrorView.Decoration.inline(from, to, {
+    decorations.push(_view.Decoration.inline(from, to, {
       class: className,
       'data-initial': initial
     }, {
@@ -78,17 +78,17 @@ var createTelepointers = function createTelepointers(from, to, sessionId, isSele
     color: avatarColor.color.solid
   }), ";");
   cursor.setAttribute('data-initial', initial);
-  return decorations.concat(_prosemirrorView.Decoration.widget(to, spaceJoinerAfter, {
+  return decorations.concat(_view.Decoration.widget(to, spaceJoinerAfter, {
     pointer: {
       sessionId: sessionId
     },
     key: "telepointer-".concat(sessionId, "-zero")
-  })).concat(_prosemirrorView.Decoration.widget(to, cursor, {
+  })).concat(_view.Decoration.widget(to, cursor, {
     pointer: {
       sessionId: sessionId
     },
     key: "telepointer-".concat(sessionId)
-  })).concat(_prosemirrorView.Decoration.widget(to, spaceJoinerBefore, {
+  })).concat(_view.Decoration.widget(to, spaceJoinerBefore, {
     pointer: {
       sessionId: sessionId
     },
@@ -113,11 +113,11 @@ var replaceDocument = function replaceDocument(doc, state, version, options, res
       if (selection.to < tr.doc.content.size - 2) {
         var $from = tr.doc.resolve(selection.from);
         var $to = tr.doc.resolve(selection.to);
-        var newselection = new _prosemirrorState.TextSelection($from, $to);
+        var newselection = new _state.TextSelection($from, $to);
         tr.setSelection(newselection);
       }
     } else {
-      tr.setSelection(_prosemirrorState.Selection.atStart(tr.doc));
+      tr.setSelection(_state.Selection.atStart(tr.doc));
     }
     tr.setMeta('replaceDocument', true);
     if ((0, _typeof2.default)(version) !== undefined && options && options.useNativePlugin) {
@@ -141,7 +141,7 @@ var scrollToCollabCursor = function scrollToCollabCursor(editorView, participant
       actionSubject: _types.ACTION_SUBJECT.SELECTION,
       eventType: _types.EVENT_TYPE.TRACK
     };
-    tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
+    tr.setSelection(_state.Selection.near(tr.doc.resolve(selectedUser.cursorPos)));
     tr = (0, _utils2.addAnalytics)(state, tr, analyticsPayload);
     tr.scrollIntoView();
     editorView.dispatch(tr);

package/dist/cjs/plugins/copy-button/commands.js

@@ -9,7 +9,7 @@ exports.getProvideMarkVisualFeedbackForCopyButtonCommand = getProvideMarkVisualF
 exports.removeMarkVisualFeedbackForCopyButtonCommand = removeMarkVisualFeedbackForCopyButtonCommand;
 exports.resetCopiedState = void 0;
 var _pluginKey = require("./pm-plugins/plugin-key");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _clipboard = require("../../utils/clipboard");
 var _utils = require("./utils");
 var _analytics = require("../analytics");
@@ -132,7 +132,7 @@ var createToolbarCopyCommandForNode = function createToolbarCopyCommandForNode(n
           div.firstChild.setAttribute('data-pm-slice', '0 0 []');
         }
         // ED-17083 safari seems have bugs for extension copy because exntension do not have a child text(innerText) and it will not recognized as html in clipboard, this could be merge into one if this extension fixed children issue or safari fix the copy bug
-        if (_utils2.browser.safari && state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node.type === state.schema.nodes.extension) {
+        if (_utils2.browser.safari && state.selection instanceof _state.NodeSelection && state.selection.node.type === state.schema.nodes.extension) {
           (0, _clipboard.copyHTMLToClipboardPolyfill)(div);
         } else {
           (0, _clipboard.copyHTMLToClipboard)(div);

package/dist/cjs/plugins/copy-button/pm-plugins/main.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.copyButtonPlugin = copyButtonPlugin;
 exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorView = require("prosemirror-view");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _pluginKey = require("./plugin-key");
 function getMarkSelectionDecorationStartAndEnd(_ref) {
   var markType = _ref.markType,
@@ -95,7 +95,7 @@ function copyButtonPlugin() {
         //   ]);
         // }
 
-        return _prosemirrorView.DecorationSet.empty;
+        return _view.DecorationSet.empty;
       }
     }
   });

package/dist/cjs/plugins/copy-button/pm-plugins/plugin-key.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.copyButtonPluginKey = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var copyButtonPluginKey = new _prosemirrorState.PluginKey('copyButtonPlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var copyButtonPluginKey = new _state.PluginKey('copyButtonPlugin');
 exports.copyButtonPluginKey = copyButtonPluginKey;

package/dist/cjs/plugins/copy-button/utils.js

@@ -5,18 +5,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getSelectedNodeOrNodeParentByNodeType = getSelectedNodeOrNodeParentByNodeType;
 exports.toDOM = void 0;
-var _prosemirrorUtils = require("prosemirror-utils");
-var _prosemirrorModel = require("prosemirror-model");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
 function getSelectedNodeOrNodeParentByNodeType(_ref) {
   var nodeType = _ref.nodeType,
     selection = _ref.selection;
-  var node = (0, _prosemirrorUtils.findSelectedNodeOfType)(nodeType)(selection);
+  var node = (0, _utils.findSelectedNodeOfType)(nodeType)(selection);
   if (!node) {
-    node = (0, _prosemirrorUtils.findParentNodeOfType)(nodeType)(selection);
+    node = (0, _utils.findParentNodeOfType)(nodeType)(selection);
   }
   return node;
 }
 var toDOM = function toDOM(node, schema) {
-  return _prosemirrorModel.DOMSerializer.fromSchema(schema).serializeNode(node);
+  return _model.DOMSerializer.fromSchema(schema).serializeNode(node);
 };
 exports.toDOM = toDOM;

package/dist/cjs/plugins/custom-autoformat/doc.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.completeReplacements = exports.buildHandler = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _prosemirrorHistory = require("prosemirror-history");
+var _history = require("@atlaskit/editor-prosemirror/history");
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("./utils");
 var buildHandler = function buildHandler(_regex, handler) {
@@ -87,7 +87,7 @@ var completeReplacements = function completeReplacements(view, state) {
     });
 
     // and dispatch the replacement, closing history for cmd+z to allow undo separately
-    view.dispatch((0, _prosemirrorHistory.closeHistory)(tr));
+    view.dispatch((0, _history.closeHistory)(tr));
   });
 };
 exports.completeReplacements = completeReplacements;

package/dist/cjs/plugins/custom-autoformat/index.js

@@ -9,7 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _reducers = _interopRequireDefault(require("./reducers"));
 var _inputRules = require("./input-rules");
 var _doc = require("./doc");
@@ -53,7 +53,7 @@ var createPMPlugin = function createPMPlugin(_ref) {
         (0, _inputRules.triggerInputRule)(view, rules, from, to, text);
         return false;
       },
-      handleKeyDown: (0, _prosemirrorKeymap.keydownHandler)({
+      handleKeyDown: (0, _keymap.keydownHandler)({
         Enter: function Enter(_state, _dispatch, view) {
           if (view) {
             (0, _inputRules.triggerInputRule)(view, rules, view.state.selection.from, view.state.selection.to, '');

package/dist/cjs/plugins/custom-autoformat/utils.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.getPluginState = exports.autoformatAction = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var pluginKey = new _prosemirrorState.PluginKey('customAutoformatPlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('customAutoformatPlugin');
 exports.pluginKey = pluginKey;
 var getPluginState = function getPluginState(editorState) {
   return pluginKey.getState(editorState);

package/dist/cjs/plugins/date/actions.js

@@ -4,20 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setDatePickerAt = exports.openDatePicker = exports.insertDate = exports.focusDateInput = exports.deleteDate = exports.createDate = exports.closeDatePickerWithAnalytics = exports.closeDatePicker = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorModel = require("prosemirror-model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("@atlaskit/editor-common/utils");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _analytics = require("../analytics");
 var _internal = require("./utils/internal");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var createDate = function createDate(isQuickInsertAction) {
   return function (insert, state) {
     var dateNode = state.schema.nodes.date.createChecked({
       timestamp: (0, _utils.todayTimestampInUTC)()
     });
     var space = state.schema.text(' ');
-    var tr = insert(_prosemirrorModel.Fragment.from([dateNode, space]), {
+    var tr = insert(_model.Fragment.from([dateNode, space]), {
       selectInlineNode: true
     });
     var newPluginState = {
@@ -111,16 +111,16 @@ var insertDate = function insertDate(date, inputMethod, commitMethod) {
         timestamp: timestamp
       });
       var textNode = state.schema.text(' ');
-      var fragment = _prosemirrorModel.Fragment.fromArray([dateNode, textNode]);
+      var fragment = _model.Fragment.fromArray([dateNode, textNode]);
       var _state$selection = state.selection,
         from = _state$selection.from,
         to = _state$selection.to;
-      var insertable = (0, _prosemirrorUtils.canInsert)(tr.selection.$from, fragment);
+      var insertable = (0, _utils2.canInsert)(tr.selection.$from, fragment);
       if (!insertable) {
-        var parentSelection = _prosemirrorState.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
-        tr.insert(parentSelection.to, fragment).setSelection(_prosemirrorState.NodeSelection.create(tr.doc, parentSelection.to + 1));
+        var parentSelection = _state.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+        tr.insert(parentSelection.to, fragment).setSelection(_state.NodeSelection.create(tr.doc, parentSelection.to + 1));
       } else {
-        tr.replaceWith(from, to, fragment).setSelection(_prosemirrorState.NodeSelection.create(tr.doc, from));
+        tr.replaceWith(from, to, fragment).setSelection(_state.NodeSelection.create(tr.doc, from));
       }
       if (dispatch) {
         dispatch(tr.scrollIntoView().setMeta(_pluginKey.pluginKey, {
@@ -135,7 +135,7 @@ var insertDate = function insertDate(date, inputMethod, commitMethod) {
         // to be set to null by the PM plugin (onSelectionChanged), which will
         // immediately close the datepicker once a valid date is typed in.
         // Adding this check forces it to stay open until the user presses Enter.
-        tr = tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(showDatePickerAt + 2)));
+        tr = tr.setSelection(_state.Selection.near(tr.doc.resolve(showDatePickerAt + 2)));
       }
       tr = tr.setNodeMarkup(showDatePickerAt, schema.nodes.date, {
         timestamp: timestamp
@@ -143,7 +143,7 @@ var insertDate = function insertDate(date, inputMethod, commitMethod) {
         isNew: false
       }).scrollIntoView();
       if (!enterPressed) {
-        tr = tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, showDatePickerAt));
+        tr = tr.setSelection(_state.NodeSelection.create(tr.doc, showDatePickerAt));
       }
       if (dispatch) {
         dispatch(tr);
@@ -173,7 +173,7 @@ var closeDatePicker = function closeDatePicker() {
     var tr = showDatePickerAt ? state.tr.setMeta(_pluginKey.pluginKey, {
       showDatePickerAt: null,
       isNew: false
-    }).setSelection(_prosemirrorState.Selection.near(state.tr.doc.resolve(showDatePickerAt + 2))) : state.tr.setMeta(_pluginKey.pluginKey, {
+    }).setSelection(_state.Selection.near(state.tr.doc.resolve(showDatePickerAt + 2))) : state.tr.setMeta(_pluginKey.pluginKey, {
       isNew: false
     });
     dispatch(tr);
@@ -204,7 +204,7 @@ var openDatePicker = function openDatePicker() {
       if (dispatch) {
         dispatch(state.tr.setMeta(_pluginKey.pluginKey, {
           showDatePickerAt: showDatePickerAt
-        }).setSelection(_prosemirrorState.NodeSelection.create(state.doc, showDatePickerAt)));
+        }).setSelection(_state.NodeSelection.create(state.doc, showDatePickerAt)));
       }
     }
     return false;

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

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _react = _interopRequireDefault(require("react"));
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _actions = require("./actions");
@@ -51,7 +51,7 @@ function ContentComponent(_ref) {
   var showDatePickerAt = dateState.showDatePickerAt,
     isNew = dateState.isNew,
     focusDateInput = dateState.focusDateInput;
-  var element = (0, _prosemirrorUtils.findDomRefAtPos)(showDatePickerAt, domAtPos);
+  var element = (0, _utils.findDomRefAtPos)(showDatePickerAt, domAtPos);
   return /*#__PURE__*/_react.default.createElement(DatePicker, {
     mountTo: popupsMountPoint,
     boundariesElement: popupsBoundariesElement,

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
-var _prosemirrorState = require("prosemirror-state");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _actions = require("../actions");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _main = require("./main");
@@ -17,7 +17,7 @@ function keymapPlugin() {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.enter.common, function (state, dispatch) {
     var datePlugin = (0, _main.getPluginState)(state);
-    var isDateNode = state.selection instanceof _prosemirrorState.NodeSelection ? state.selection.node.type === state.schema.nodes.date : false;
+    var isDateNode = state.selection instanceof _state.NodeSelection ? state.selection.node.type === state.schema.nodes.date : false;
     if (!isDateNode) {
       return false;
     }
@@ -30,7 +30,7 @@ function keymapPlugin() {
   }, list);
   keymaps.bindKeymapWithCommand(keymaps.tab.common, function (state, dispatch) {
     var datePlugin = (0, _main.getPluginState)(state);
-    var isDateNode = state.selection instanceof _prosemirrorState.NodeSelection ? state.selection.node.type === state.schema.nodes.date : false;
+    var isDateNode = state.selection instanceof _state.NodeSelection ? state.selection.node.type === state.schema.nodes.date : false;
     if (!isDateNode) {
       return false;
     }
@@ -40,7 +40,7 @@ function keymapPlugin() {
     }
     return false;
   }, list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }
 var _default = keymapPlugin;
 exports.default = _default;

package/dist/cjs/plugins/date/pm-plugins/plugin-key.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var pluginKey = new _prosemirrorState.PluginKey('datePlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('datePlugin');
 exports.pluginKey = pluginKey;

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

@@ -8,7 +8,7 @@ exports.mapping = mapping;
 exports.onSelectionChanged = onSelectionChanged;
 exports.reducer = reducer;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function reducer(pluginState, meta) {
@@ -62,7 +62,7 @@ function onSelectionChanged(tr, pluginState) {
   return pluginState;
 }
 var isDateNodeSelection = function isDateNodeSelection(selection) {
-  if (selection instanceof _prosemirrorState.NodeSelection) {
+  if (selection instanceof _state.NodeSelection) {
     var nodeTypeName = selection.node.type.name;
     return nodeTypeName === 'date';
   }

package/dist/cjs/plugins/editor-disabled/index.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.createPlugin = createPlugin;
 exports.pluginKey = exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _pluginStateFactory = require("../../utils/plugin-state-factory");
-var pluginKey = new _prosemirrorState.PluginKey('editorDisabledPlugin');
+var pluginKey = new _state.PluginKey('editorDisabledPlugin');
 exports.pluginKey = pluginKey;
 function reducer(_pluginState, meta) {
   return meta;

package/dist/cjs/plugins/emoji/commands/insert-emoji.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertEmoji = insertEmoji;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorUtils = require("prosemirror-utils");
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _analytics = require("../../analytics");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -21,8 +21,8 @@ function insertEmoji(emojiId, inputMethod) {
       }));
       var textNode = state.schema.text(' ');
       if (dispatch) {
-        var fragment = _prosemirrorModel.Fragment.fromArray([node, textNode]);
-        var tr = (0, _prosemirrorUtils.safeInsert)(fragment)(state.tr);
+        var fragment = _model.Fragment.fromArray([node, textNode]);
+        var tr = (0, _utils.safeInsert)(fragment)(state.tr);
         if (inputMethod) {
           (0, _analytics.addAnalytics)(state, tr, {
             action: _analytics.ACTION.INSERTED,
@@ -34,7 +34,7 @@ function insertEmoji(emojiId, inputMethod) {
             eventType: _analytics.EVENT_TYPE.TRACK
           });
         }
-        dispatch(tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
+        dispatch(tr.setSelection(_state.Selection.near(tr.doc.resolve(state.selection.$from.pos + fragment.size))));
       }
       return true;
     }

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

@@ -13,9 +13,9 @@ exports.setProvider = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _emoji2 = require("@atlaskit/emoji");
 var _reactNodeView = require("@atlaskit/editor-common/react-node-view");
@@ -158,7 +158,7 @@ var emojiPlugin = function emojiPlugin(options, api) {
         text: text
       });
       var space = state.schema.text(' ');
-      var tr = insert(_prosemirrorModel.Fragment.from([emojiNode, space]));
+      var tr = insert(_model.Fragment.from([emojiNode, space]));
       api === null || api === void 0 ? void 0 : (_api$dependencies$ana7 = api.dependencies.analytics) === null || _api$dependencies$ana7 === void 0 ? void 0 : _api$dependencies$ana7.actions.attachAnalyticsEvent({
         action: _analytics.ACTION.INSERTED,
         actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
@@ -269,7 +269,7 @@ var setProvider = function setProvider(provider) {
   };
 };
 exports.setProvider = setProvider;
-var emojiPluginKey = new _prosemirrorState.PluginKey('emojiPlugin');
+var emojiPluginKey = new _state.PluginKey('emojiPlugin');
 exports.emojiPluginKey = emojiPluginKey;
 function getEmojiPluginState(state) {
   return emojiPluginKey.getState(state) || {};

package/dist/cjs/plugins/emoji/pm-plugins/ascii-input-rules.js

@@ -14,7 +14,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("../../analytics");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -219,7 +219,7 @@ var AsciiEmojiTransactionCreator = /*#__PURE__*/function () {
   }]);
   return AsciiEmojiTransactionCreator;
 }();
-var stateKey = new _prosemirrorState.PluginKey('asciiEmojiPlugin');
+var stateKey = new _state.PluginKey('asciiEmojiPlugin');
 exports.stateKey = stateKey;
 var plugins = function plugins(schema, providerFactory, featureFlags) {
   return [inputRulePlugin(schema, providerFactory, featureFlags)].filter(function (plugin) {

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

@@ -6,14 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorState = require("prosemirror-state");
+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 _utils2 = require("./utils");
 var _pluginFactory = require("./pm-plugins/plugin-factory");
 var _blockType = require("../block-type/commands/block-type");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var setExpandRef = function setExpandRef(ref) {
@@ -124,7 +124,7 @@ var insertExpand = function insertExpand(state, dispatch) {
   if (!expandNode) {
     return false;
   }
-  var tr = state.selection.empty ? (0, _prosemirrorUtils.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _blockType.createWrapSelectionTransaction)({
+  var tr = state.selection.empty ? (0, _utils3.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _blockType.createWrapSelectionTransaction)({
     state: state,
     type: expandNode.type
   });
@@ -169,7 +169,7 @@ var setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
       if (!editorView.hasFocus()) {
         editorView.focus();
       }
-      var sel = _prosemirrorState.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
+      var sel = _state.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
       if (sel && dispatch) {
         dispatch(editorView.state.tr.setSelection(sel));
       }

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

@@ -11,10 +11,10 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _ExpandIconButton = require("../ui/ExpandIconButton");
 var _w3cKeyname = require("w3c-keyname");
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("../../../utils");
 var _commands = require("../commands");
@@ -215,7 +215,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
       if (_this.isCollapsed() && resolvedPos.nodeAfter && ['expand', 'nestedExpand'].indexOf(resolvedPos.nodeAfter.type.name) > -1) {
         return _this.setRightGapCursor(event);
       }
-      var sel = _prosemirrorState.Selection.findFrom(resolvedPos, 1, true);
+      var sel = _state.Selection.findFrom(resolvedPos, 1, true);
       if (sel) {
         // If the input has focus, ProseMirror doesn't
         // Give PM focus back before changing our selection
@@ -285,7 +285,7 @@ var ExpandNodeView = /*#__PURE__*/function () {
           state = _this$view8.state,
           dispatch = _this$view8.dispatch;
         _this.view.focus();
-        (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.End, _prosemirrorState.NodeSelection.create(state.doc, pos))(state, dispatch);
+        (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.End, _state.NodeSelection.create(state.doc, pos))(state, dispatch);
       }
     });
     (0, _defineProperty2.default)(this, "handleArrowLeftFromTitle", function (event) {
@@ -311,12 +311,12 @@ var ExpandNodeView = /*#__PURE__*/function () {
         if ((0, _pluginFactory.getPluginState)(state).selectionRelativeToNode === undefined) {
           (0, _commands2.setSelectionRelativeToNode)(undefined, new _gapCursorSelection.GapCursorSelection(state.doc.resolve(pos), _gapCursorSelection.Side.LEFT))(state, dispatch);
         } else {
-          (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.Start, _prosemirrorState.NodeSelection.create(state.doc, pos))(state, dispatch);
+          (0, _commands2.setSelectionRelativeToNode)(_types.RelativeSelectionPos.Start, _state.NodeSelection.create(state.doc, pos))(state, dispatch);
         }
       }
     });
     this.intl = getIntl();
-    var _DOMSerializer$render = _prosemirrorModel.DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
+    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, toDOM(node, this.intl)),
       dom = _DOMSerializer$render.dom,
       contentDOM = _DOMSerializer$render.contentDOM;
     this.getPos = getPos;

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

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.expandKeymap = expandKeymap;
-var _prosemirrorKeymap = require("prosemirror-keymap");
-var _prosemirrorState = require("prosemirror-state");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var keymaps = _interopRequireWildcard(require("../../../keymaps"));
 var _gapCursorSelection = require("../../selection/gap-cursor-selection");
 var _utils = require("../utils");
@@ -22,7 +22,7 @@ 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';
 };
 var isExpandSelected = function isExpandSelected(selection) {
-  return selection instanceof _prosemirrorState.NodeSelection && isExpandNode(selection.node);
+  return selection instanceof _state.NodeSelection && isExpandNode(selection.node);
 };
 function expandKeymap() {
   var list = {};
@@ -51,7 +51,7 @@ function expandKeymap() {
     return false;
   }, list);
   keymaps.bindKeymapWithCommand(keymaps.tab.common, function (state, dispatch, editorView) {
-    if (state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node.type === state.schema.nodes.expand && editorView && editorView.dom instanceof HTMLElement) {
+    if (state.selection instanceof _state.NodeSelection && state.selection.node.type === state.schema.nodes.expand && editorView && editorView.dom instanceof HTMLElement) {
       var from = state.selection.from;
       var expand = editorView.nodeDOM(from);
       if (!expand || !(expand instanceof HTMLElement)) {
@@ -61,7 +61,7 @@ function expandKeymap() {
       if (iconContainer && iconContainer.focus) {
         var tr = state.tr;
         var pos = state.selection.from;
-        tr.setSelection(new _prosemirrorState.TextSelection(tr.doc.resolve(pos)));
+        tr.setSelection(new _state.TextSelection(tr.doc.resolve(pos)));
         if (dispatch) {
           dispatch(tr);
         }
@@ -99,7 +99,7 @@ function expandKeymap() {
       if (expand && expand.start === prevCursorPos) {
         return (0, _commands.focusTitle)(expand.start)(state, dispatch, editorView);
       }
-      var sel = _prosemirrorState.Selection.findFrom(state.doc.resolve(prevCursorPos), -1);
+      var sel = _state.Selection.findFrom(state.doc.resolve(prevCursorPos), -1);
       var expandBefore = (0, _utils.findExpand)(state, sel);
       if (sel && expandBefore) {
         // moving cursor from outside of an expand to the title when it is collapsed
@@ -152,7 +152,7 @@ function expandKeymap() {
     var expandNode = (0, _utils.findExpand)(state);
     if (!expandNode) {
       // @see ED-7977
-      var sel = _prosemirrorState.Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
+      var sel = _state.Selection.findFrom(state.doc.resolve(Math.max(selection.$from.pos - 1, 0)), -1);
       var expandBefore = (0, _utils.findExpand)(state, sel);
       if (expandBefore && (expandBefore.node.type === expand || expandBefore.node.type === nestedExpand) && !expandBefore.node.attrs.__expanded) {
         return (0, _commands.focusTitle)(expandBefore.start)(state, dispatch, editorView);
@@ -165,11 +165,11 @@ function expandKeymap() {
     if (parentNode && !isExpandNode(parentNode)) {
       return false;
     }
-    var textSel = _prosemirrorState.Selection.findFrom(state.doc.resolve(expandNode.pos), 1, true);
+    var textSel = _state.Selection.findFrom(state.doc.resolve(expandNode.pos), 1, true);
     if (textSel && selection.$from.pos === textSel.$from.pos && (0, _utils2.isEmptyNode)(state.schema)(expandNode.node) && dispatch) {
       return (0, _commands.deleteExpand)()(state, dispatch);
     }
     return false;
   }, list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }