@atlaskit/editor-core 187.8.0 → 187.8.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 187.8.3
+
+### Patch Changes
+
+- [`4e6f1bf8511`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e6f1bf8511) - [ED-19233] Import prosemirror libraries from internal facade package
+- Updated dependencies
+
 ## 187.8.0
 
 ### Minor Changes

package/dist/cjs/actions/index.js

@@ -10,14 +10,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 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 _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _utils = require("@atlaskit/editor-common/utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _eventDispatcher = require("../event-dispatcher");
 var _nativeCollabProviderPlugin = require("../plugins/collab-edit/native-collab-provider-plugin");
-var _utils2 = require("../plugins/extension/utils");
-var _utils3 = require("../utils");
+var _utils3 = require("../plugins/extension/utils");
+var _utils4 = require("../utils");
 var _action = require("../utils/action");
 var _deprecationWarnings = _interopRequireDefault(require("../utils/deprecation-warnings"));
 var _document = require("../utils/document");
@@ -30,7 +30,7 @@ var EditorActions = /*#__PURE__*/function () {
     (0, _defineProperty2.default)(this, "dispatchAnalyticsEvent", function (payload) {
       if (_this.eventDispatcher) {
         var dispatch = (0, _eventDispatcher.createDispatch)(_this.eventDispatcher);
-        dispatch(_utils.analyticsEventKey, {
+        dispatch(_utils2.analyticsEventKey, {
           payload: payload
         });
       }
@@ -187,7 +187,7 @@ var EditorActions = /*#__PURE__*/function () {
       }
       var editorView = this.editorView;
       var state = editorView.state;
-      var tr = editorView.state.tr.setSelection(_prosemirrorState.TextSelection.create(state.doc, 0, state.doc.nodeSize - 2)).deleteSelection();
+      var tr = editorView.state.tr.setSelection(_state.TextSelection.create(state.doc, 0, state.doc.nodeSize - 2)).deleteSelection();
       editorView.dispatch(tr);
       return true;
     }
@@ -237,14 +237,14 @@ var EditorActions = /*#__PURE__*/function () {
               return (0, _action.getEditorValueWithMedia)(editorView);
             case 5:
               doc = _context3.sent;
-              json = (0, _utils3.toJSON)(doc);
+              json = (0, _utils4.toJSON)(doc);
               if (this.contentEncode) {
                 _context3.next = 9;
                 break;
               }
               return _context3.abrupt("return", json);
             case 9:
-              nodeSanitized = _prosemirrorModel.Node.fromJSON(this.editorView.state.schema, json);
+              nodeSanitized = _model.Node.fromJSON(this.editorView.state.schema, json);
               return _context3.abrupt("return", this.contentEncode(nodeSanitized));
             case 11:
             case "end":
@@ -263,7 +263,7 @@ var EditorActions = /*#__PURE__*/function () {
       var _this$editorView;
       if ((_this$editorView = this.editorView) !== null && _this$editorView !== void 0 && _this$editorView.state) {
         var _findNodePosWithLocal, _this$editorView2;
-        return (_findNodePosWithLocal = (0, _utils2.findNodePosWithLocalId)((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
+        return (_findNodePosWithLocal = (0, _utils3.findNodePosWithLocalId)((_this$editorView2 = this.editorView) === null || _this$editorView2 === void 0 ? void 0 : _this$editorView2.state, id)) === null || _findNodePosWithLocal === void 0 ? void 0 : _findNodePosWithLocal.node;
       }
     }
   }, {
@@ -288,10 +288,10 @@ var EditorActions = /*#__PURE__*/function () {
       if ((_this$editorView5 = this.editorView) !== null && _this$editorView5 !== void 0 && (_this$editorView5$sta = _this$editorView5.state) !== null && _this$editorView5$sta !== void 0 && _this$editorView5$sta.selection) {
         var _findParentNode;
         var selection = this.editorView.state.selection;
-        if (selection instanceof _prosemirrorState.NodeSelection) {
+        if (selection instanceof _state.NodeSelection) {
           return selection.node;
         }
-        return (_findParentNode = (0, _prosemirrorUtils.findParentNode)(function (node) {
+        return (_findParentNode = (0, _utils.findParentNode)(function (node) {
           return Boolean(node.type.spec.selectable);
         })(selection)) === null || _findParentNode === void 0 ? void 0 : _findParentNode.node;
       }
@@ -304,7 +304,7 @@ var EditorActions = /*#__PURE__*/function () {
       if (!this.editorView) {
         return true;
       }
-      return (0, _utils.isEmptyDocument)(this.editorView.state.doc);
+      return (0, _utils2.isEmptyDocument)(this.editorView.state.doc);
     }
   }, {
     key: "replaceDocument",
@@ -342,13 +342,13 @@ var EditorActions = /*#__PURE__*/function () {
         return true;
       }
       var schema = state.schema;
-      var content = Array.isArray(rawValue) ? (0, _document.processRawFragmentValue)(schema, rawValue) : (0, _utils.processRawValue)(schema, rawValue);
+      var content = Array.isArray(rawValue) ? (0, _document.processRawFragmentValue)(schema, rawValue) : (0, _utils2.processRawValue)(schema, rawValue);
       if (!content) {
         return false;
       }
 
       // try to find a place in the document where to insert a node if its not allowed at the cursor position by schema
-      this.editorView.dispatch((0, _prosemirrorUtils.safeInsert)(content, undefined, tryToReplace)(state.tr).scrollIntoView());
+      this.editorView.dispatch((0, _utils.safeInsert)(content, undefined, tryToReplace)(state.tr).scrollIntoView());
       return true;
     }
   }, {

package/dist/cjs/commands/index.js

@@ -14,8 +14,8 @@ exports.insertNewLineWithAnalytics = void 0;
 exports.preventDefault = preventDefault;
 exports.toggleBlockMark = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _analytics = require("../plugins/analytics");
 var _utils = require("../utils");
@@ -33,14 +33,14 @@ function insertNewLine() {
     var hardBreak = state.schema.nodes.hardBreak;
     if (hardBreak) {
       var hardBreakNode = hardBreak.createChecked();
-      if (parent && parent.type.validContent(_prosemirrorModel.Fragment.from(hardBreakNode))) {
+      if (parent && parent.type.validContent(_model.Fragment.from(hardBreakNode))) {
         if (dispatch) {
           dispatch(state.tr.replaceSelectionWith(hardBreakNode, false));
         }
         return true;
       }
     }
-    if (state.selection instanceof _prosemirrorState.TextSelection) {
+    if (state.selection instanceof _state.TextSelection) {
       if (dispatch) {
         dispatch(state.tr.insertText('\n'));
       }
@@ -78,7 +78,7 @@ function canCreateParagraphNear(state) {
   var $from = state.selection.$from;
   var node = $from.node($from.depth);
   var insideCodeBlock = !!node && node.type === state.schema.nodes.codeBlock;
-  var isNodeSelection = state.selection instanceof _prosemirrorState.NodeSelection;
+  var isNodeSelection = state.selection instanceof _state.NodeSelection;
   return $from.depth > 1 || isNodeSelection || insideCodeBlock;
 }
 function createParagraphNear() {
@@ -89,7 +89,7 @@ function createParagraphNear() {
       return false;
     }
     var insertPos;
-    if (state.selection instanceof _prosemirrorState.TextSelection) {
+    if (state.selection instanceof _state.TextSelection) {
       if (topLevelNodeIsEmptyTextBlock(state)) {
         return false;
       }
@@ -98,7 +98,7 @@ function createParagraphNear() {
       insertPos = getInsertPosFromNonTextBlock(state, append);
     }
     var tr = state.tr.insert(insertPos, paragraph.createAndFill());
-    tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, insertPos + 1));
+    tr.setSelection(_state.TextSelection.create(tr.doc, insertPos + 1));
     if (dispatch) {
       dispatch(tr);
     }
@@ -121,7 +121,7 @@ function getInsertPosFromNonTextBlock(state, append) {
   var _state$selection2 = state.selection,
     $from = _state$selection2.$from,
     $to = _state$selection2.$to;
-  var nodeAtSelection = state.selection instanceof _prosemirrorState.NodeSelection && state.doc.nodeAt(state.selection.$anchor.pos);
+  var nodeAtSelection = state.selection instanceof _state.NodeSelection && state.doc.nodeAt(state.selection.$anchor.pos);
   var isMediaSelection = nodeAtSelection && nodeAtSelection.type.name === 'mediaGroup';
   var pos;
   if (!append) {
@@ -147,7 +147,7 @@ function addParagraphAtEnd(tr) {
       tr.insert(doc.content.size, paragraph.createAndFill());
     }
   }
-  tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, tr.doc.content.size - 1));
+  tr.setSelection(_state.TextSelection.create(tr.doc, tr.doc.content.size - 1));
   tr.scrollIntoView();
 }
 function createParagraphAtEnd() {
@@ -243,7 +243,7 @@ exports.toggleBlockMark = toggleBlockMark;
 var clearEditorContent = function clearEditorContent(state, dispatch) {
   var tr = state.tr;
   tr.replace(0, state.doc.nodeSize - 2);
-  tr.setSelection(_prosemirrorState.Selection.atStart(tr.doc));
+  tr.setSelection(_state.Selection.atStart(tr.doc));
   if (dispatch) {
     dispatch(tr);
     return true;

package/dist/cjs/create-editor/ReactEditorViewInternal.js

@@ -15,8 +15,8 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorView = require("prosemirror-view");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _messages = require("./messages");
 var _utils = require("@atlaskit/editor-common/utils");
 var _ufo = require("@atlaskit/editor-common/ufo");
@@ -76,7 +76,7 @@ function handleEditorFocus(view) {
       view.focus();
       return;
     }
-    var selection = _prosemirrorState.TextSelection.create(view.state.doc, anchor, head);
+    var selection = _state2.TextSelection.create(view.state.doc, anchor, head);
     var tr = view.state.tr.setSelection(selection);
     view.dispatch(tr);
     view.focus();
@@ -218,11 +218,11 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
       }
       var selection;
       if (doc) {
-        selection = options.selectionAtStart ? _prosemirrorState.Selection.atStart(doc) : _prosemirrorState.Selection.atEnd(doc);
+        selection = options.selectionAtStart ? _state2.Selection.atStart(doc) : _state2.Selection.atEnd(doc);
       }
       // Workaround for ED-3507: When media node is the last element, scrollIntoView throws an error
-      var patchedSelection = selection ? _prosemirrorState.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
-      return _prosemirrorState.EditorState.create({
+      var patchedSelection = selection ? _state2.Selection.findFrom(selection.$head, -1, true) || undefined : undefined;
+      return _state2.EditorState.create({
         schema: schema,
         plugins: plugins,
         doc: doc,
@@ -433,7 +433,7 @@ var ReactEditorView = /*#__PURE__*/function (_React$Component) {
 
       // Creates the editor-view from this.editorState. If an editor has been mounted
       // previously, this will contain the previous state of the editor.
-      _this.view = new _prosemirrorView.EditorView({
+      _this.view = new _view.EditorView({
         mount: node
       }, _this.getDirectEditorProps());
       _this.pluginInjectionAPI.onEditorViewUpdated({

package/dist/cjs/create-editor/create-schema.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createSchema = createSchema;
 var _sortByOrder = require("./sort-by-order");
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _createEditor = require("./create-editor");
 function createSchema(editorConfig) {
@@ -17,7 +17,7 @@ function createSchema(editorConfig) {
     acc[node.name] = node.node;
     return acc;
   }, {}), marks);
-  return new _prosemirrorModel.Schema({
+  return new _model.Schema({
     nodes: nodes,
     marks: marks
   });

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

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _keymaps = require("../../../keymaps");
 var _commands = require("../commands");
 function keymapPlugin() {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.alignLeft.common, (0, _commands.changeAlignment)('start'), list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

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

@@ -9,7 +9,7 @@ exports.createPlugin = createPlugin;
 exports.pluginKey = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _commands = require("../commands");
 var _utils = require("../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; }
@@ -20,7 +20,7 @@ function createInitialPluginState(editorState, pluginConfig) {
     isEnabled: true
   };
 }
-var pluginKey = new _prosemirrorState.PluginKey('alignmentPlugin');
+var pluginKey = new _state.PluginKey('alignmentPlugin');
 exports.pluginKey = pluginKey;
 function createPlugin(dispatch, pluginConfig) {
   return new _safePlugin.SafePlugin({

package/dist/cjs/plugins/alignment/utils/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getActiveAlignment = void 0;
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var getActiveAlignment = function getActiveAlignment(state) {
   if (state.selection instanceof _cellSelection.CellSelection) {
@@ -19,7 +19,7 @@ var getActiveAlignment = function getActiveAlignment(state) {
       return mark === marks[0];
     }) ? marks[0] : 'start';
   }
-  var node = (0, _prosemirrorUtils.findParentNodeOfType)([state.schema.nodes.paragraph, state.schema.nodes.heading])(state.selection);
+  var node = (0, _utils.findParentNodeOfType)([state.schema.nodes.paragraph, state.schema.nodes.heading])(state.selection);
   var getMark = node && node.node.marks.filter(function (mark) {
     return mark.type === state.schema.marks.alignment;
   })[0];

package/dist/cjs/plugins/analytics/plugin-key.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.analyticsPluginKey = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 /**
  * @private
  * @deprecated
  * Do not use the analytics plugin key directly.
  * This will be deprecated soon.
  */
-var analyticsPluginKey = new _prosemirrorState.PluginKey('deprecatedAnalyticsPlugin');
+var analyticsPluginKey = new _state.PluginKey('deprecatedAnalyticsPlugin');
 exports.analyticsPluginKey = analyticsPluginKey;

package/dist/cjs/plugins/annotation/commands/transform.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("../../analytics/utils");
@@ -24,7 +24,7 @@ var addAnnotationMark = function addAnnotationMark(id) {
     // Apply the mark only to text node in the range.
     var tr = (0, _commands.applyMarkOnRange)(from, to, false, annotationMark, transaction);
     // set selection back to the end of annotation once annotation mark is applied
-    tr.setSelection(_prosemirrorState.TextSelection.create(tr.doc, head));
+    tr.setSelection(_state.TextSelection.create(tr.doc, head));
     return tr;
   };
 };

package/dist/cjs/plugins/annotation/pm-plugins/inline-comment.js

@@ -10,7 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _inlineCommentEvents = require("./../../analytics/types/inline-comment-events");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorView = require("prosemirror-view");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _nodeviews = require("../nodeviews");
 var _commands = require("../commands");
@@ -200,7 +200,7 @@ var inlineCommentPlugin = function inlineCommentPlugin(options) {
           annotations = _ref5.annotations,
           selectedAnnotations = _ref5.selectedAnnotations,
           isVisible = _ref5.isVisible;
-        var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _prosemirrorView.DecorationSet.empty;
+        var decorations = draftDecorationSet !== null && draftDecorationSet !== void 0 ? draftDecorationSet : _view.DecorationSet.empty;
         var focusDecorations = [];
         state.doc.descendants(function (node, pos) {
           node.marks.filter(function (mark) {
@@ -211,7 +211,7 @@ var inlineCommentPlugin = function inlineCommentPlugin(options) {
             }));
             var isUnresolved = !!annotations && annotations[mark.attrs.id] === false;
             if (isVisible) {
-              focusDecorations.push(_prosemirrorView.Decoration.inline(pos, pos + node.nodeSize, {
+              focusDecorations.push(_view.Decoration.inline(pos, pos + node.nodeSize, {
                 class: "".concat((0, _nodeviews.getAnnotationViewClassname)(isUnresolved, isSelected), " ").concat(isUnresolved),
                 nodeName: 'span'
               }));

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

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _keymaps = require("../../../keymaps");
 var _commands = require("../commands");
 var _analytics = require("../../analytics");
 function keymapPlugin() {
   var list = {};
   (0, _keymaps.bindKeymapWithCommand)(_keymaps.addInlineComment.common, (0, _commands.setInlineCommentDraftState)(true, _analytics.INPUT_METHOD.SHORTCUT), list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

package/dist/cjs/plugins/annotation/pm-plugins/reducer.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _types = require("./types");
-var _prosemirrorView = require("prosemirror-view");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _utils = require("../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; }
@@ -56,7 +56,7 @@ exports.default = _default;
 function getNewDraftState(pluginState, drafting, editorState) {
   var draftDecorationSet = pluginState.draftDecorationSet;
   if (!draftDecorationSet || !drafting) {
-    draftDecorationSet = _prosemirrorView.DecorationSet.empty;
+    draftDecorationSet = _view.DecorationSet.empty;
   }
   var newState = _objectSpread(_objectSpread({}, pluginState), {}, {
     draftDecorationSet: draftDecorationSet

package/dist/cjs/plugins/annotation/ui/InlineCommentView.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.InlineCommentView = InlineCommentView;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _AnnotationViewWrapper = require("./AnnotationViewWrapper");
 var _types = require("../types");
-var _utils = require("../utils");
+var _utils2 = require("../utils");
 var _commands = require("../commands");
 var _analytics = require("../../analytics");
 var _types2 = require("../../analytics/types");
@@ -41,16 +41,16 @@ function InlineCommentView(_ref) {
     dispatch = editorView.dispatch;
   var CreateComponent = inlineCommentProvider.createComponent,
     ViewComponent = inlineCommentProvider.viewComponent;
-  var inlineCommentState = (0, _utils.getPluginState)(state);
+  var inlineCommentState = (0, _utils2.getPluginState)(state);
   var _ref2 = inlineCommentState || {},
     bookmark = _ref2.bookmark,
     selectedAnnotations = _ref2.selectedAnnotations,
     annotations = _ref2.annotations;
-  var selection = (0, _utils.getSelectionPositions)(state, inlineCommentState);
+  var selection = (0, _utils2.getSelectionPositions)(state, inlineCommentState);
   var position = findPosForDOM(selection);
   var dom;
   try {
-    dom = (0, _prosemirrorUtils.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
+    dom = (0, _utils.findDomRefAtPos)(position, editorView.domAtPos.bind(editorView));
   } catch (error) {
     // eslint-disable-next-line no-console
     console.warn(error);
@@ -131,7 +131,7 @@ function InlineCommentView(_ref) {
   return /*#__PURE__*/_react.default.createElement(_AnnotationViewWrapper.AnnotationViewWrapper, {
     "data-editor-popup": "true",
     "data-testid": _types.AnnotationTestIds.floatingComponent,
-    key: (0, _utils.getAnnotationViewKey)(activeAnnotations),
+    key: (0, _utils2.getAnnotationViewKey)(activeAnnotations),
     onViewed: onAnnotationViewed
   }, /*#__PURE__*/_react.default.createElement(ViewComponent, {
     annotations: activeAnnotations,

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

@@ -14,8 +14,8 @@ exports.hasInvalidWhitespaceNode = hasInvalidWhitespaceNode;
 exports.isSelectionValid = exports.inlineCommentPluginKey = void 0;
 exports.stripNonExistingAnnotations = stripNonExistingAnnotations;
 exports.surroundingMarks = void 0;
-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 _styles = require("@atlaskit/editor-common/styles");
 var _utils = require("@atlaskit/editor-common/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
@@ -116,7 +116,7 @@ var validateAnnotationMark = function validateAnnotationMark(annotationMark) {
  * (when creating new comment)
  */
 var addDraftDecoration = function addDraftDecoration(start, end) {
-  return _prosemirrorView.Decoration.inline(start, end, {
+  return _view.Decoration.inline(start, end, {
     class: "".concat(_styles.AnnotationSharedClassNames.draft)
   });
 };
@@ -176,7 +176,7 @@ function getSelectionPositions(editorState, inlineCommentState) {
   }
   return editorState.selection;
 }
-var inlineCommentPluginKey = new _prosemirrorState.PluginKey('inlineCommentPluginKey');
+var inlineCommentPluginKey = new _state.PluginKey('inlineCommentPluginKey');
 exports.inlineCommentPluginKey = inlineCommentPluginKey;
 var getPluginState = function getPluginState(state) {
   return inlineCommentPluginKey.getState(state);
@@ -224,7 +224,7 @@ var isSelectionValid = function isSelectionValid(state) {
   var selection = state.selection;
   var _ref3 = getPluginState(state) || {},
     disallowOnWhitespace = _ref3.disallowOnWhitespace;
-  if (selection.empty || !(selection instanceof _prosemirrorState.TextSelection || selection instanceof _prosemirrorState.AllSelection)) {
+  if (selection.empty || !(selection instanceof _state.TextSelection || selection instanceof _state.AllSelection)) {
     return _types.AnnotationSelectionType.INVALID;
   }
   var containsInvalidNodes = hasInvalidNodes(state);

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isChromeWithSelectionBug = exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorCommands = require("prosemirror-commands");
-var _prosemirrorHistory = require("prosemirror-history");
+var _commands = require("@atlaskit/editor-prosemirror/commands");
+var _history = require("@atlaskit/editor-prosemirror/history");
 var _utils = require("@atlaskit/editor-common/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
 var _filterSteps = _interopRequireDefault(require("./pm-plugins/filter-steps"));
@@ -74,14 +74,14 @@ var basePlugin = function basePlugin(options, api) {
       }, {
         name: 'history',
         plugin: function plugin() {
-          return (0, _prosemirrorHistory.history)();
+          return (0, _history.history)();
         }
       },
       // should be last :(
       {
         name: 'codeBlockIndent',
         plugin: function plugin() {
-          return (0, _keymap.keymap)(_objectSpread(_objectSpread({}, _prosemirrorCommands.baseKeymap), {}, {
+          return (0, _keymap.keymap)(_objectSpread(_objectSpread({}, _commands.baseKeymap), {}, {
             'Mod-[': function Mod() {
               return true;
             },

package/dist/cjs/plugins/base/pm-plugins/better-type-history.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pluginKey = exports.default = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorHistory = require("prosemirror-history");
-var _prosemirrorTransform = require("prosemirror-transform");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _history = require("@atlaskit/editor-prosemirror/history");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _step = require("../../../utils/step");
 var getEnterKeyboardActionStep = function getEnterKeyboardActionStep(trs) {
   var firstTr = trs.length === 1 && trs[0];
-  if (!firstTr || !firstTr.docChanged || !firstTr.isGeneric || !(firstTr.selection instanceof _prosemirrorState.TextSelection)) {
+  if (!firstTr || !firstTr.docChanged || !firstTr.isGeneric || !(firstTr.selection instanceof _state.TextSelection)) {
     return null;
   }
   var selection = firstTr.selection,
     steps = firstTr.steps;
   var replaceSteps = steps.filter(function (step) {
-    return step instanceof _prosemirrorTransform.ReplaceStep || step instanceof _prosemirrorTransform.ReplaceAroundStep;
+    return step instanceof _transform.ReplaceStep || step instanceof _transform.ReplaceAroundStep;
   });
   if (!selection.$cursor || replaceSteps.length !== 1) {
     return null;
@@ -35,10 +35,10 @@ var isSliceSplittingBlockNode = function isSliceSplittingBlockNode(slice) {
   return firstNode && secondNode && firstNode.type === secondNode.type;
 };
 var isSliceAddingNewlineChar = function isSliceAddingNewlineChar(slice, schema) {
-  var newLine = _prosemirrorModel.Fragment.from(schema.text('\n'));
+  var newLine = _model.Fragment.from(schema.text('\n'));
   return slice.content.eq(newLine);
 };
-var pluginKey = new _prosemirrorState.PluginKey('betterTypeHistoryPlugin');
+var pluginKey = new _state.PluginKey('betterTypeHistoryPlugin');
 exports.pluginKey = pluginKey;
 var _default = function _default() {
   return new _safePlugin.SafePlugin({
@@ -48,7 +48,7 @@ var _default = function _default() {
         return tran.getMeta(pluginKey);
       });
       if (hasHandlePasteMeta) {
-        return (0, _prosemirrorHistory.closeHistory)(newState.tr);
+        return (0, _history.closeHistory)(newState.tr);
       }
       var enterStep = getEnterKeyboardActionStep(transactions);
       if (!enterStep) {
@@ -57,7 +57,7 @@ var _default = function _default() {
       var slice = (0, _step.extractSliceFromStep)(enterStep);
       var schema = newState.schema;
       if (slice && (isSliceSplittingBlockNode(slice) || isSliceAddingNewlineChar(slice, schema))) {
-        return (0, _prosemirrorHistory.closeHistory)(newState.tr);
+        return (0, _history.closeHistory)(newState.tr);
       }
     }
   });

package/dist/cjs/plugins/base/pm-plugins/composition.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isComposing = 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 _utils = require("@atlaskit/editor-common/utils");
-var compositionPluginKey = new _prosemirrorState.PluginKey('compositionPlugin');
+var compositionPluginKey = new _state.PluginKey('compositionPlugin');
 var isComposing = function isComposing(state) {
   var _compositionPluginKey;
   return !!((_compositionPluginKey = compositionPluginKey.getState(state)) !== null && _compositionPluginKey !== void 0 && _compositionPluginKey.isComposing);

package/dist/cjs/plugins/base/pm-plugins/context-identifier.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.stateKey = exports.getContextIdentifier = exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-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; }
-var stateKey = new _prosemirrorState.PluginKey('contextIdentiferPlugin');
+var stateKey = new _state.PluginKey('contextIdentiferPlugin');
 exports.stateKey = stateKey;
 var getContextIdentifier = function getContextIdentifier(state) {
   if (state) {

package/dist/cjs/plugins/base/pm-plugins/disable-spell-checking.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 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 _utils = require("@atlaskit/editor-common/utils");
 function getCurrentBrowserAndVersion() {
   switch (true) {
@@ -34,7 +34,7 @@ function getCurrentBrowserAndVersion() {
 }
 var _default = function _default(featureFlags) {
   return new _safePlugin.SafePlugin({
-    key: new _prosemirrorState.PluginKey('disableSpellchecking'),
+    key: new _state.PluginKey('disableSpellchecking'),
     props: {
       attributes: function attributes(editorState) {
         if (!featureFlags) {