@atlaskit/editor-core 187.7.2 → 187.8.3

package/dist/cjs/plugins/text-formatting/commands/clear-formatting.js

@@ -7,7 +7,7 @@ exports.FORMATTING_NODE_TYPES = exports.FORMATTING_MARK_TYPES = void 0;
 exports.clearFormatting = clearFormatting;
 exports.clearFormattingWithAnalytics = clearFormattingWithAnalytics;
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
-var _prosemirrorTransform = require("prosemirror-transform");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _cellSelection2 = require("../utils/cell-selection");
 var FORMATTING_NODE_TYPES = ['heading', 'codeBlock', 'blockquote'];
@@ -39,7 +39,7 @@ function clearNodeFormattingOnSelection(state, tr, formattedNodeType, nodeName,
         var toPos = tr.doc.resolve(pos + node.nodeSize - 1);
         var nodeRange = fromPos.blockRange(toPos);
         if (nodeRange) {
-          var targetLiftDepth = (0, _prosemirrorTransform.liftTarget)(nodeRange);
+          var targetLiftDepth = (0, _transform.liftTarget)(nodeRange);
           if (targetLiftDepth || targetLiftDepth === 0) {
             formattingCleared.push(nodeName);
             tr.lift(nodeRange, targetLiftDepth);

package/dist/cjs/plugins/text-formatting/commands/text-formatting.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toggleUnderlineWithAnalytics = exports.toggleUnderline = exports.toggleSuperscriptWithAnalytics = exports.toggleSuperscript = exports.toggleSubscriptWithAnalytics = exports.toggleSubscript = exports.toggleStrongWithAnalytics = exports.toggleStrong = exports.toggleStrikeWithAnalytics = exports.toggleStrike = exports.toggleEmWithAnalytics = exports.toggleEm = exports.toggleCodeWithAnalytics = exports.toggleCode = exports.moveRight = exports.moveLeft = exports.createInlineCodeFromTextInputWithAnalytics = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _commands = require("../../../utils/commands");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("../utils");
@@ -68,7 +68,7 @@ var moveLeft = function moveLeft() {
 
       // at the right edge: remove code mark and move the cursor to the left
       if (!insideCode && atRightEdge) {
-        var tr = state.tr.setSelection(_prosemirrorState.Selection.near(state.doc.resolve($cursor.pos - 1)));
+        var tr = state.tr.setSelection(_state.Selection.near(state.doc.resolve($cursor.pos - 1)));
         if (dispatch) {
           dispatch(tr.removeStoredMark(code));
         }
@@ -85,7 +85,7 @@ var moveLeft = function moveLeft() {
 
       // at the left edge: add code mark and move the cursor to the left
       if (insideCode && atLeftEdge) {
-        var _tr = state.tr.setSelection(_prosemirrorState.Selection.near(state.doc.resolve($cursor.pos - 1)));
+        var _tr = state.tr.setSelection(_state.Selection.near(state.doc.resolve($cursor.pos - 1)));
         if (dispatch) {
           dispatch(_tr.addStoredMark(code.create()));
         }

package/dist/cjs/plugins/text-formatting/pm-plugins/clear-formatting-keymap.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _clearFormatting = require("../commands/clear-formatting");
@@ -15,7 +15,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function keymapPlugin(editorAnalyticsAPI) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.clearFormatting.common, (0, _clearFormatting.clearFormattingWithAnalytics)(_analytics.INPUT_METHOD.SHORTCUT, editorAnalyticsAPI), list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }
 var _default = keymapPlugin;
 exports.default = _default;

package/dist/cjs/plugins/text-formatting/pm-plugins/clear-formatting.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.pluginKey = exports.plugin = void 0;
 var safePlugin = _interopRequireWildcard(require("@atlaskit/editor-common/safe-plugin"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-var pluginKey = new _prosemirrorState.PluginKey('clearFormattingPlugin');
+var pluginKey = new _state.PluginKey('clearFormattingPlugin');
 exports.pluginKey = pluginKey;
 var plugin = function plugin(dispatch) {
   return new safePlugin.SafePlugin({

package/dist/cjs/plugins/text-formatting/pm-plugins/cursor.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 _default = new _safePlugin.SafePlugin({
   props: {
     handleClick: function handleClick(view, clickPos, event) {
@@ -39,7 +39,7 @@ var _default = new _safePlugin.SafePlugin({
         var nodeNextToClick = $click.nodeBefore && code.isInSet($click.nodeBefore.marks) ? $click.nodeAfter : $click.nodeBefore;
 
         // Need to set the selection here to allow clicking between [code('text'),{<>},emoji()]
-        var tr = view.state.tr.setSelection(_prosemirrorState.TextSelection.near($click));
+        var tr = view.state.tr.setSelection(_state.TextSelection.near($click));
         if (clickWasInsideNodeDOM) {
           tr.setStoredMarks([code.create()]);
         } else {

package/dist/cjs/plugins/text-formatting/pm-plugins/keymap.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = keymapPlugin;
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var commands = _interopRequireWildcard(require("../commands/text-formatting"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -48,5 +48,5 @@ function keymapPlugin(schema, editorAnalyticsAPI) {
       inputMethod: _analytics.INPUT_METHOD.SHORTCUT
     }), list);
   }
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

package/dist/cjs/plugins/text-formatting/pm-plugins/main.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "pluginKey", {
     return _pluginKey.pluginKey;
   }
 });
-var _prosemirrorCommands = require("prosemirror-commands");
+var _commands = require("@atlaskit/editor-prosemirror/commands");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var keymaps = _interopRequireWildcard(require("@atlaskit/editor-common/keymaps"));
 var _utils = require("@atlaskit/editor-common/utils");
@@ -33,19 +33,19 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
   var state = {};
   if (code) {
     state.codeActive = (0, _utils2.anyMarkActive)(editorState, code.create());
-    state.codeDisabled = !(0, _prosemirrorCommands.toggleMark)(code)(editorState);
+    state.codeDisabled = !(0, _commands.toggleMark)(code)(editorState);
   }
   if (em) {
     state.emActive = (0, _utils2.anyMarkActive)(editorState, em);
-    state.emDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(em)(editorState);
+    state.emDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(em)(editorState);
   }
   if (strike) {
     state.strikeActive = (0, _utils2.anyMarkActive)(editorState, strike);
-    state.strikeDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(strike)(editorState);
+    state.strikeDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strike)(editorState);
   }
   if (strong) {
     state.strongActive = (0, _utils2.anyMarkActive)(editorState, strong);
-    state.strongDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(strong)(editorState);
+    state.strongDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(strong)(editorState);
   }
   if (subsup) {
     var subMark = subsup.create({
@@ -55,17 +55,17 @@ var getTextFormattingState = function getTextFormattingState(editorState, editor
       type: 'sup'
     });
     state.subscriptActive = (0, _utils2.anyMarkActive)(editorState, subMark);
-    state.subscriptDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(subsup, {
+    state.subscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
       type: 'sub'
     })(editorState);
     state.superscriptActive = (0, _utils2.anyMarkActive)(editorState, supMark);
-    state.superscriptDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(subsup, {
+    state.superscriptDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(subsup, {
       type: 'sup'
     })(editorState);
   }
   if (underline) {
     state.underlineActive = (0, _utils2.anyMarkActive)(editorState, underline);
-    state.underlineDisabled = state.codeActive ? true : !(0, _prosemirrorCommands.toggleMark)(underline)(editorState);
+    state.underlineDisabled = state.codeActive ? true : !(0, _commands.toggleMark)(underline)(editorState);
   }
   return state;
 };

package/dist/cjs/plugins/text-formatting/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('textFormatting');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('textFormatting');
 exports.pluginKey = pluginKey;

package/dist/cjs/plugins/text-formatting/pm-plugins/smart-input-rule.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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _prosemirrorState = require("prosemirror-state");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
@@ -33,7 +33,7 @@ function replaceTextUsingCaptureGroup(text) {
     // But, this is JS #trustnoone
     Math.max(startPos, 0), end);
     tr.replaceWith(safePos, end, state.schema.text(replacement, $to.marks()));
-    tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(tr.selection.to)));
+    tr.setSelection(_state2.Selection.near(tr.doc.resolve(tr.selection.to)));
     return tr;
   };
 }

package/dist/cjs/plugins/toolbar-lists-indentation/index.js

@@ -12,9 +12,11 @@ var _types = require("../../ui/Toolbar/types");
 var _main = require("../list/pm-plugins/main");
 var _indentationButtons = require("./pm-plugins/indentation-buttons");
 var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref, api) {
+  var _api$dependencies$ana;
   var showIndentationButtons = _ref.showIndentationButtons,
     allowHeadingAndParagraphIndentation = _ref.allowHeadingAndParagraphIndentation;
   var featureFlags = (api === null || api === void 0 ? void 0 : api.dependencies.featureFlags.sharedState.currentState()) || {};
+  var editorAnalyticsAPI = api === null || api === void 0 ? void 0 : (_api$dependencies$ana = api.dependencies.analytics) === null || _api$dependencies$ana === void 0 ? void 0 : _api$dependencies$ana.actions;
   return {
     name: 'toolbarListsIndentation',
     pmPlugins: function pmPlugins() {
@@ -65,7 +67,8 @@ var toolbarListsIndentationPlugin = function toolbarListsIndentationPlugin(_ref,
             orderedListDisabled: listState.orderedListDisabled,
             showIndentationButtons: !!showIndentationButtons,
             indentDisabled: indentationState.indentDisabled,
-            outdentDisabled: indentationState.outdentDisabled
+            outdentDisabled: indentationState.outdentDisabled,
+            editorAnalyticsAPI: editorAnalyticsAPI
           });
         }
       });

package/dist/cjs/plugins/toolbar-lists-indentation/pm-plugins/indentation-buttons.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.createPlugin = void 0;
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _selection = require("../../list/utils/selection");
 var _helpers = require("../../tasks-and-decisions/pm-plugins/helpers");
 var _commands = require("../../indentation/commands");
-var pluginKey = new _prosemirrorState.PluginKey('indentationButtonsPlugin');
+var pluginKey = new _state.PluginKey('indentationButtonsPlugin');
 exports.pluginKey = pluginKey;
 function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndentation) {
   var state = {
@@ -50,7 +50,7 @@ function getIndentationButtonsState(editorState, allowHeadingAndParagraphIndenta
     };
   }
   var isTopLevelParagraphOrHeading = selection.$from.depth === 1;
-  var isInLayoutNode = (0, _prosemirrorUtils.hasParentNodeOfType)(editorState.schema.nodes.layoutColumn)(selection) &&
+  var isInLayoutNode = (0, _utils.hasParentNodeOfType)(editorState.schema.nodes.layoutColumn)(selection) &&
   // depth of non-nested paragraphs and headings in layouts will always be 3
   selection.$from.depth === 3;
   if (allowHeadingAndParagraphIndentation && (0, _commands.isIndentationAllowed)(editorState.schema, node) && (isTopLevelParagraphOrHeading || isInLayoutNode)) {
@@ -89,7 +89,7 @@ var createPlugin = function createPlugin(_ref) {
       apply: function apply(_tr, pluginState, _oldState, newState) {
         if (showIndentationButtons) {
           var state = getIndentationButtonsState(newState, allowHeadingAndParagraphIndentation);
-          if (!(0, _utils.shallowEqual)(pluginState, state)) {
+          if (!(0, _utils2.shallowEqual)(pluginState, state)) {
             dispatch(pluginKey, state);
             return state;
           }

package/dist/cjs/plugins/toolbar-lists-indentation/ui/index.js

@@ -24,7 +24,8 @@ function ToolbarListsIndentation(props) {
     popupsScrollableElement = props.popupsScrollableElement,
     indentDisabled = props.indentDisabled,
     outdentDisabled = props.outdentDisabled,
-    featureFlags = props.featureFlags;
+    featureFlags = props.featureFlags,
+    editorAnalyticsAPI = props.editorAnalyticsAPI;
   if (isSmall) {
     return (0, _react.jsx)(_ToolbarDropdown.ToolbarDropdown, {
       editorView: props.editorView,
@@ -40,7 +41,7 @@ function ToolbarListsIndentation(props) {
       indentDisabled: indentDisabled,
       outdentDisabled: outdentDisabled,
       disabled: disabled,
-      onItemActivated: _onItemActivated.onItemActivated,
+      onItemActivated: (0, _onItemActivated.onItemActivated)(editorAnalyticsAPI),
       featureFlags: featureFlags
     });
   }
@@ -55,7 +56,7 @@ function ToolbarListsIndentation(props) {
     indentDisabled: indentDisabled,
     outdentDisabled: outdentDisabled,
     disabled: disabled,
-    onItemActivated: _onItemActivated.onItemActivated,
+    onItemActivated: (0, _onItemActivated.onItemActivated)(editorAnalyticsAPI),
     featureFlags: featureFlags
   });
 }

package/dist/cjs/plugins/toolbar-lists-indentation/ui/onItemActivated.js

@@ -3,52 +3,55 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.onItemActivated = onItemActivated;
+exports.onItemActivated = void 0;
 var _commands = require("../../list/commands");
 var _commands2 = require("../../indentation/commands");
 var _keymaps = require("../../tasks-and-decisions/pm-plugins/keymaps");
 var _analytics = require("../../analytics");
 var _indentationButtons = require("../pm-plugins/indentation-buttons");
-function onItemActivated(_ref) {
-  var buttonName = _ref.buttonName,
-    editorView = _ref.editorView,
-    featureFlags = _ref.featureFlags;
-  switch (buttonName) {
-    case 'bullet_list':
-      (0, _commands.toggleBulletList)(editorView, _analytics.INPUT_METHOD.TOOLBAR);
-      break;
-    case 'ordered_list':
-      (0, _commands.toggleOrderedList)(editorView, _analytics.INPUT_METHOD.TOOLBAR);
-      break;
-    case 'indent':
-      {
-        var _indentationButtonsPl;
-        var node = (_indentationButtonsPl = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
-        if (node === 'paragraph_heading') {
-          (0, _commands2.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
-        }
-        if (node === 'list') {
-          (0, _commands.indentList)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
-        }
-        if (node === 'taskList') {
-          (0, _keymaps.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
-        }
+var onItemActivated = function onItemActivated(editorAnalyticsAPI) {
+  return function (_ref) {
+    var buttonName = _ref.buttonName,
+      editorView = _ref.editorView,
+      featureFlags = _ref.featureFlags;
+    switch (buttonName) {
+      case 'bullet_list':
+        (0, _commands.toggleBulletList)(editorAnalyticsAPI)(editorView, _analytics.INPUT_METHOD.TOOLBAR);
         break;
-      }
-    case 'outdent':
-      {
-        var _indentationButtonsPl2;
-        var _node = (_indentationButtonsPl2 = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
-        if (_node === 'paragraph_heading') {
-          (0, _commands2.getOutdentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
-        }
-        if (_node === 'list') {
-          (0, _commands.outdentList)(_analytics.INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
+      case 'ordered_list':
+        (0, _commands.toggleOrderedList)(editorAnalyticsAPI)(editorView, _analytics.INPUT_METHOD.TOOLBAR);
+        break;
+      case 'indent':
+        {
+          var _indentationButtonsPl;
+          var node = (_indentationButtonsPl = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl === void 0 ? void 0 : _indentationButtonsPl.node;
+          if (node === 'paragraph_heading') {
+            (0, _commands2.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          }
+          if (node === 'list') {
+            (0, _commands.indentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          }
+          if (node === 'taskList') {
+            (0, _keymaps.getIndentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          }
+          break;
         }
-        if (_node === 'taskList') {
-          (0, _keymaps.getUnindentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+      case 'outdent':
+        {
+          var _indentationButtonsPl2;
+          var _node = (_indentationButtonsPl2 = _indentationButtons.pluginKey.getState(editorView.state)) === null || _indentationButtonsPl2 === void 0 ? void 0 : _indentationButtonsPl2.node;
+          if (_node === 'paragraph_heading') {
+            (0, _commands2.getOutdentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          }
+          if (_node === 'list') {
+            (0, _commands.outdentList)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.TOOLBAR, featureFlags)(editorView.state, editorView.dispatch);
+          }
+          if (_node === 'taskList') {
+            (0, _keymaps.getUnindentCommand)(_analytics.INPUT_METHOD.TOOLBAR)(editorView.state, editorView.dispatch);
+          }
+          break;
         }
-        break;
-      }
-  }
-}
+    }
+  };
+};
+exports.onItemActivated = onItemActivated;

package/dist/cjs/plugins/type-ahead/commands/insert-type-ahead-item.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.insertTypeAheadItem = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _prosemirrorHistory = require("prosemirror-history");
-var _prosemirrorModel = require("prosemirror-model");
+var _history = require("@atlaskit/editor-prosemirror/history");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _typeAhead = require("@atlaskit/editor-common/type-ahead");
 var _insertUtils = require("../insert-utils");
@@ -22,14 +22,14 @@ var validateNode = function validateNode(_ref) {
   if (!maybeNode) {
     return null;
   }
-  if (maybeNode instanceof _prosemirrorModel.Node || maybeNode instanceof _prosemirrorModel.Fragment) {
+  if (maybeNode instanceof _model.Node || maybeNode instanceof _model.Fragment) {
     return maybeNode;
   }
   if (typeof maybeNode === 'string') {
     return schema.text(maybeNode);
   }
   try {
-    return _prosemirrorModel.Node.fromJSON(schema, maybeNode);
+    return _model.Node.fromJSON(schema, maybeNode);
   } catch (e) {
     // eslint-disable-next-line no-console
     console.error(e);
@@ -62,7 +62,7 @@ var createInsertCallback = function createInsertCallback(_ref2) {
       tr.delete(position.start, position.end);
       return tr;
     }
-    node instanceof _prosemirrorModel.Node && node.isBlock ? (0, _insertUtils.insertBlockNode)({
+    node instanceof _model.Node && node.isBlock ? (0, _insertUtils.insertBlockNode)({
       node: node,
       tr: tr,
       position: position
@@ -72,7 +72,7 @@ var createInsertCallback = function createInsertCallback(_ref2) {
       position: position,
       selectInlineNode: Boolean(opts.selectInlineNode)
     });
-    (0, _prosemirrorHistory.closeHistory)(tr);
+    (0, _history.closeHistory)(tr);
     if (wasInsertedBySpace) {
       return tr;
     }
@@ -95,7 +95,7 @@ var createDeleteRawTextCallback = function createDeleteRawTextCallback(_ref3) {
     insertItem = _ref3.insertItem;
   return function (newState) {
     var tr = newState.tr;
-    (0, _prosemirrorHistory.closeHistory)(tr);
+    (0, _history.closeHistory)(tr);
     if (!wasInsertedBySpace) {
       tr.delete(position.start, position.end);
       var config = {
@@ -167,7 +167,7 @@ var insertTypeAheadItem = function insertTypeAheadItem(view) {
       var insertCallbackProxy = new Proxy(insertCallback, proxyHandler);
       var nextTr = handler.selectItem(newEditorSate, item, insertCallbackProxy, meta);
       if (!wasInsertCallbackCalled && nextTr) {
-        (0, _prosemirrorHistory.closeHistory)(nextTr);
+        (0, _history.closeHistory)(nextTr);
 
         // In some cases we need to re-open the typeahead
         // e.g.: addign mentions from the quick insert
@@ -198,7 +198,7 @@ var insertTypeAheadItem = function insertTypeAheadItem(view) {
       })
     });
     tr.insertText(text);
-    (0, _prosemirrorHistory.closeHistory)(tr);
+    (0, _history.closeHistory)(tr);
     view.dispatch(tr);
     view.focus();
   };

package/dist/cjs/plugins/type-ahead/insert-utils.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertInlineNodeOrFragment = exports.insertBlockNode = 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 _insert = require("@atlaskit/editor-common/insert");
 function findInsertPoint(doc, pos, nodeToInsert) {
   var $pos = doc.resolve(pos);
@@ -77,14 +77,14 @@ var insertBlockNode = function insertBlockNode(_ref) {
     if (inserted) {
       return tr;
     }
-    var sliceInserted = _prosemirrorModel.Slice.maxOpen(_prosemirrorModel.Fragment.from(nodeNormalized));
+    var sliceInserted = _model.Slice.maxOpen(_model.Fragment.from(nodeNormalized));
     var _findInsertPoint = findInsertPoint(tr.doc, mappedStart, nodeNormalized),
       from = _findInsertPoint.from,
       to = _findInsertPoint.to;
     tr.replaceWith(from, to, node);
     var openPosition = Math.min(from + (node.isAtom ? node.nodeSize : sliceInserted.openStart), tr.doc.content.size);
     var FORWARD_DIRECTION = 1;
-    var nextSelection = _prosemirrorState.TextSelection.findFrom(tr.doc.resolve(openPosition), FORWARD_DIRECTION, true);
+    var nextSelection = _state.TextSelection.findFrom(tr.doc.resolve(openPosition), FORWARD_DIRECTION, true);
     if (nextSelection) {
       return tr.setSelection(nextSelection);
     }
@@ -99,11 +99,11 @@ var insertInlineNodeOrFragment = function insertInlineNodeOrFragment(_ref2) {
     selectInlineNode = _ref2.selectInlineNode;
   var start = position.start,
     end = position.end;
-  var fragment = maybeFragment instanceof _prosemirrorModel.Node ? _prosemirrorModel.Fragment.from(maybeFragment) : maybeFragment;
+  var fragment = maybeFragment instanceof _model.Node ? _model.Fragment.from(maybeFragment) : maybeFragment;
   tr.replaceWith(start, end, fragment);
   if (selectInlineNode) {
-    return tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, start));
+    return tr.setSelection(_state.NodeSelection.create(tr.doc, start));
   }
-  return tr.setSelection(_prosemirrorState.TextSelection.near(tr.doc.resolve(start + fragment.size)));
+  return tr.setSelection(_state.TextSelection.near(tr.doc.resolve(start + fragment.size)));
 };
 exports.insertInlineNodeOrFragment = insertInlineNodeOrFragment;

package/dist/cjs/plugins/type-ahead/pm-plugins/decorations.js

@@ -8,12 +8,12 @@ exports.factoryDecorations = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _uuid = _interopRequireDefault(require("uuid"));
-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 _colors = require("@atlaskit/theme/colors");
 var _w3cKeyname = require("w3c-keyname");
 var _reactIntlNext = require("react-intl-next");
-var _prosemirrorHistory = require("prosemirror-history");
+var _history = require("@atlaskit/editor-prosemirror/history");
 var _constants = require("../constants");
 var _WrapperTypeAhead = require("../ui/WrapperTypeAhead");
 var _statsModifier = require("../stats-modifier");
@@ -29,9 +29,9 @@ var factoryDecorations = function factoryDecorations(_ref) {
       inputMethod = _ref2.inputMethod,
       reopenQuery = _ref2.reopenQuery;
     var selection = tr.selection;
-    if (!(selection instanceof _prosemirrorState.TextSelection) || !selection.$cursor) {
+    if (!(selection instanceof _state.TextSelection) || !selection.$cursor) {
       return {
-        decorationSet: _prosemirrorView.DecorationSet.empty,
+        decorationSet: _view.DecorationSet.empty,
         stats: null,
         decorationElement: null
       };
@@ -41,7 +41,7 @@ var factoryDecorations = function factoryDecorations(_ref) {
     var typeaheadComponent = document.createElement('mark');
     var stats = new _statsModifier.StatsModifier();
     var shouldFocusCursorInsideQuery = true;
-    var deco = _prosemirrorView.Decoration.widget($cursor.pos, function (editorView, getDecorationPosition) {
+    var deco = _view.Decoration.widget($cursor.pos, function (editorView, getDecorationPosition) {
       var _popupMountRef$curren, _popupMountRef$curren2, _popupMountRef$curren3;
       typeaheadComponent.setAttribute('id', decorationId);
       typeaheadComponent.setAttribute('role', 'search');
@@ -64,7 +64,7 @@ var factoryDecorations = function factoryDecorations(_ref) {
         var hasReopenQuery = typeof reopenQuery === 'string' && reopenQuery.trim().length > 0;
         var currentQuery = (0, _utils.getTypeAheadQuery)(editorView.state);
         if (hasReopenQuery || (currentQuery === null || currentQuery === void 0 ? void 0 : currentQuery.length) === 0) {
-          var command = inputType === 'historyUndo' ? _prosemirrorHistory.undo : _prosemirrorHistory.redo;
+          var command = inputType === 'historyUndo' ? _history.undo : _history.redo;
           var _tr = editorView.state.tr;
           var fakeDispatch = function fakeDispatch(customTr) {
             _tr = customTr;
@@ -115,13 +115,13 @@ var factoryDecorations = function factoryDecorations(_ref) {
       ignoreSelection: false
     });
     return {
-      decorationSet: _prosemirrorView.DecorationSet.create(tr.doc, [deco]),
+      decorationSet: _view.DecorationSet.create(tr.doc, [deco]),
       decorationElement: typeaheadComponent,
       stats: stats
     };
   };
   var removeDecorations = function removeDecorations(decorationSet) {
-    if (!decorationSet || decorationSet === _prosemirrorView.DecorationSet.empty) {
+    if (!decorationSet || decorationSet === _view.DecorationSet.empty) {
       return false;
     }
     var typeAheadDecorations = decorationSet.find(undefined, undefined, function (spec) {

package/dist/cjs/plugins/type-ahead/pm-plugins/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('typeAheadPlugin');
+var _state = require("@atlaskit/editor-prosemirror/state");
+var pluginKey = new _state.PluginKey('typeAheadPlugin');
 exports.pluginKey = pluginKey;

package/dist/cjs/plugins/type-ahead/pm-plugins/main.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createPlugin = createPlugin;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorView = require("prosemirror-view");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _constants = require("../constants");
 var _actions = require("./actions");
@@ -55,7 +55,7 @@ function createPlugin(_ref) {
         return {
           typeAheadHandlers: typeAheadHandlers,
           query: '',
-          decorationSet: _prosemirrorView.DecorationSet.empty,
+          decorationSet: _view.DecorationSet.empty,
           decorationElement: null,
           items: [],
           selectedIndex: -1,

package/dist/cjs/plugins/type-ahead/pm-plugins/reducer.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createReducer = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorView = require("prosemirror-view");
+var _view = require("@atlaskit/editor-prosemirror/view");
 var _steps = require("@atlaskit/adf-schema/steps");
 var _actions = require("./actions");
 var _key = require("./key");
@@ -78,7 +78,7 @@ var createReducer = function createReducer(_ref) {
       inputMethod: null,
       query: '',
       decorationElement: null,
-      decorationSet: _prosemirrorView.DecorationSet.empty,
+      decorationSet: _view.DecorationSet.empty,
       stats: null,
       triggerHandler: undefined,
       items: []

package/dist/cjs/plugins/type-ahead/transforms/open-typeahead-at-cursor.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.openTypeAheadAtCursor = exports.openTypeAhead = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _selection = require("@atlaskit/editor-common/selection");
 var _key = require("../pm-plugins/key");
 var _actions = require("../pm-plugins/actions");
@@ -35,7 +35,7 @@ var openTypeAheadAtCursor = function openTypeAheadAtCursor(_ref) {
       query: query
     })(tr);
     var selection = tr.selection;
-    if (!(selection instanceof _prosemirrorState.TextSelection || selection instanceof _selection.GapCursorSelection)) {
+    if (!(selection instanceof _state.TextSelection || selection instanceof _selection.GapCursorSelection)) {
       return tr;
     }
     if (selection instanceof _selection.GapCursorSelection) {