@atlaskit/editor-core 187.8.0 → 187.8.7

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/keymaps.js

@@ -7,19 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.getUnindentCommand = exports.getIndentCommand = exports.default = void 0;
 exports.keymapPlugin = keymapPlugin;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorCommands = require("prosemirror-commands");
-var _prosemirrorKeymap = require("prosemirror-keymap");
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _commands = require("@atlaskit/editor-prosemirror/commands");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _adfSchema = require("@atlaskit/adf-schema");
-var _commands = require("../../../utils/commands");
-var _utils = require("@atlaskit/editor-common/utils");
+var _commands2 = require("../../../utils/commands");
+var _utils2 = require("@atlaskit/editor-common/utils");
 var _analytics = require("../../analytics");
-var _commands2 = require("../commands");
-var _commands3 = require("./commands");
+var _commands3 = require("../commands");
+var _commands4 = require("./commands");
 var _helpers = require("./helpers");
-var _utils2 = require("../utils");
+var _utils3 = 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; }
 var indentationAnalytics = function indentationAnalytics(curIndentLevel, direction, inputMethod) {
@@ -46,7 +46,7 @@ var actionDecisionFollowsOrNothing = function actionDecisionFollowsOrNothing($po
 };
 var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispatch) {
   // only run if selection is at end of text, and inside a task or decision item
-  if (!(0, _commands.isEmptySelectionAtEnd)(state) || !(0, _helpers.isInsideTaskOrDecisionItem)(state) || !dispatch) {
+  if (!(0, _commands2.isEmptySelectionAtEnd)(state) || !(0, _helpers.isInsideTaskOrDecisionItem)(state) || !dispatch) {
     return false;
   }
   // look for the node after this current one
@@ -63,11 +63,11 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
     bulletList = _state$schema$nodes.bulletList,
     orderedList = _state$schema$nodes.orderedList,
     listItem = _state$schema$nodes.listItem;
-  var parentList = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($next, [taskList, taskItem, decisionList, decisionItem]);
+  var parentList = (0, _utils.findParentNodeOfTypeClosestToPos)($next, [taskList, taskItem, decisionList, decisionItem]);
   if (!parentList) {
     if ($next.parent.type === paragraph) {
       // try to join paragraph and taskList when backspacing
-      return (0, _commands3.joinAtCut)($next.doc.resolve($next.pos))(state, dispatch);
+      return (0, _commands4.joinAtCut)($next.doc.resolve($next.pos))(state, dispatch);
     }
     // If the item we are joining is a list
     if ($next.parent.type === bulletList || $next.parent.type === orderedList) {
@@ -81,7 +81,7 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
         var tr = (0, _helpers.liftBlock)(state.tr, resolvedStartPos, resolvedStartPos);
 
         // If autoJoin not used, two ul/ol elements appear rather than one with multiple li elements
-        return (0, _prosemirrorCommands.autoJoin)(function (state, dispatch) {
+        return (0, _commands.autoJoin)(function (state, dispatch) {
           if (tr) {
             if (dispatch) {
               dispatch(tr);
@@ -97,13 +97,13 @@ var joinTaskDecisionFollowing = function joinTaskDecisionFollowing(state, dispat
 };
 var getUnindentCommand = function getUnindentCommand() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
-    var normalizedSelection = (0, _utils2.normalizeTaskItemsSelection)(state.selection);
+  return (0, _utils2.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
+    var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
     var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
     if (!curIndentLevel || curIndentLevel === 1) {
       return false;
     }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _prosemirrorCommands.autoJoin)(_commands3.liftSelection, ['taskList']))(state, dispatch);
+    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.OUTDENT, inputMethod))((0, _commands.autoJoin)(_commands4.liftSelection, ['taskList']))(state, dispatch);
   });
 };
 
@@ -116,7 +116,7 @@ var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
   var _state$schema$nodes2 = state.schema.nodes,
     tableCell = _state$schema$nodes2.tableCell,
     tableHeader = _state$schema$nodes2.tableHeader;
-  var cell = (0, _prosemirrorUtils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
+  var cell = (0, _utils.findParentNodeOfType)([tableCell, tableHeader])(state.selection);
   if ((curIndentLevel === 1 && curIndex === 0 || (0, _helpers.isInsideDecision)(state)) && cell) {
     return true;
   }
@@ -124,13 +124,13 @@ var shouldLetTabThroughInTable = function shouldLetTabThroughInTable(state) {
 };
 var getIndentCommand = function getIndentCommand() {
   var inputMethod = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _analytics.INPUT_METHOD.KEYBOARD;
-  return (0, _utils.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
-    var normalizedSelection = (0, _utils2.normalizeTaskItemsSelection)(state.selection);
+  return (0, _utils2.filterCommands)(_helpers.isInsideTask, function (state, dispatch) {
+    var normalizedSelection = (0, _utils3.normalizeTaskItemsSelection)(state.selection);
     var curIndentLevel = (0, _helpers.getCurrentIndentLevel)(normalizedSelection);
     if (!curIndentLevel || curIndentLevel >= 6) {
       return true;
     }
-    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _prosemirrorCommands.autoJoin)(_commands3.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
+    return (0, _analytics.withAnalytics)(indentationAnalytics(curIndentLevel, _analytics.INDENT_DIRECTION.INDENT, inputMethod))((0, _commands.autoJoin)(_commands4.wrapSelectionInTaskList, ['taskList']))(state, dispatch);
   });
 };
 exports.getIndentCommand = getIndentCommand;
@@ -165,9 +165,9 @@ var backspaceFrom = function backspaceFrom($from) {
     return false;
   };
 };
-var backspace = (0, _utils.filterCommands)(_commands.isEmptySelectionAtStart, (0, _prosemirrorCommands.autoJoin)((0, _prosemirrorCommands.chainCommands)(function (state, dispatch) {
-  return (0, _commands3.joinAtCut)(state.selection.$from)(state, dispatch);
-}, (0, _utils.filterCommands)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
+var backspace = (0, _utils2.filterCommands)(_commands2.isEmptySelectionAtStart, (0, _commands.autoJoin)((0, _commands.chainCommands)(function (state, dispatch) {
+  return (0, _commands4.joinAtCut)(state.selection.$from)(state, dispatch);
+}, (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, function (state, dispatch) {
   return backspaceFrom(state.selection.$from)(state, dispatch);
 })), ['taskList', 'decisionList']));
 var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTaskDecisionFollowing(state, dispatch) {
@@ -179,7 +179,7 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
     tr = state.tr;
 
   // only run if cursor is at the end of the node
-  if (!(0, _commands.isEmptySelectionAtEnd)(state) || !dispatch) {
+  if (!(0, _commands2.isEmptySelectionAtEnd)(state) || !dispatch) {
     return false;
   }
 
@@ -213,7 +213,7 @@ var unindentTaskOrUnwrapTaskDecisionFollowing = function unindentTaskOrUnwrapTas
   }
   return false;
 };
-var deleteForwards = (0, _prosemirrorCommands.autoJoin)((0, _prosemirrorCommands.chainCommands)((0, _commands.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
+var deleteForwards = (0, _commands.autoJoin)((0, _commands.chainCommands)((0, _commands2.deleteEmptyParagraphAndMoveBlockUp)(_helpers.isActionOrDecisionList), joinTaskDecisionFollowing, unindentTaskOrUnwrapTaskDecisionFollowing), ['taskList', 'decisionList']);
 var splitListItemWith = function splitListItemWith(tr, content, $from, setSelection) {
   var origDoc = tr.doc;
 
@@ -234,12 +234,12 @@ var splitListItemWith = function splitListItemWith(tr, content, $from, setSelect
   }
   // and delete the action at the current pos
   // we can do this because we know either first new child will be taskItem or nothing at all
-  var frag = _prosemirrorModel.Fragment.from(content);
-  tr = tr.replace(tr.mapping.map($from.start() - 2), tr.mapping.map($from.end() + 2), frag.size ? new _prosemirrorModel.Slice(frag, 0, 0) : _prosemirrorModel.Slice.empty);
+  var frag = _model.Fragment.from(content);
+  tr = tr.replace(tr.mapping.map($from.start() - 2), tr.mapping.map($from.end() + 2), frag.size ? new _model.Slice(frag, 0, 0) : _model.Slice.empty);
 
   // put cursor inside paragraph
   if (setSelection) {
-    tr = tr.setSelection(new _prosemirrorState.TextSelection(tr.doc.resolve($from.pos + 1 - (shouldSplit ? 0 : 2))));
+    tr = tr.setSelection(new _state.TextSelection(tr.doc.resolve($from.pos + 1 - (shouldSplit ? 0 : 2))));
   }
 
   // lift list up if the node after the initial one was a taskList
@@ -279,7 +279,7 @@ var splitListItem = function splitListItem(state, dispatch) {
   }
   return false;
 };
-var enter = (0, _utils.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0, _prosemirrorCommands.chainCommands)((0, _utils.filterCommands)(_helpers.isEmptyTaskDecision, (0, _prosemirrorCommands.chainCommands)(getUnindentCommand(), splitListItem)), function (state, dispatch) {
+var enter = (0, _utils2.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0, _commands.chainCommands)((0, _utils2.filterCommands)(_helpers.isEmptyTaskDecision, (0, _commands.chainCommands)(getUnindentCommand(), splitListItem)), function (state, dispatch) {
   var selection = state.selection,
     schema = state.schema;
   var taskItem = schema.nodes.taskItem;
@@ -308,7 +308,7 @@ var enter = (0, _utils.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0,
       }
     }]);
   };
-  var insertTr = (0, _commands2.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
+  var insertTr = (0, _commands3.insertTaskDecisionWithAnalytics)(state, listType, _analytics.INPUT_METHOD.KEYBOARD, addItem);
   if (insertTr && dispatch) {
     insertTr.scrollIntoView();
     dispatch(insertTr);
@@ -317,12 +317,12 @@ var enter = (0, _utils.filterCommands)(_helpers.isInsideTaskOrDecisionItem, (0,
 }));
 function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
   var indentHandlers = {
-    'Shift-Tab': (0, _utils.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+    'Shift-Tab': (0, _utils2.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
       return getUnindentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
     }),
-    Tab: (0, _utils.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
+    Tab: (0, _utils2.filterCommands)([_helpers.isInsideTaskOrDecisionItem, function (state) {
       return !shouldLetTabThroughInTable(state);
     }], function (state, dispatch) {
       return getIndentCommand(_analytics.INPUT_METHOD.KEYBOARD)(state, dispatch) || !!consumeTabs;
@@ -338,7 +338,7 @@ function keymapPlugin(schema, allowNestedTasks, consumeTabs) {
     'Ctrl-d': deleteForwards,
     Enter: enter
   }, allowNestedTasks ? indentHandlers : defaultHandlers);
-  return (0, _prosemirrorKeymap.keymap)(keymaps);
+  return (0, _keymap.keymap)(keymaps);
 }
 var _default = keymapPlugin;
 exports.default = _default;

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

@@ -8,7 +8,7 @@ exports.createPlugin = createPlugin;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 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 _adfSchema = require("@atlaskit/adf-schema");
 var _utils = require("../../../utils");
 var _utils2 = require("../../selection/utils");
@@ -53,7 +53,7 @@ function createPlugin(portalProviderAPI, eventDispatcher, providerFactory, dispa
         var state = view.state,
           dispatch = view.dispatch;
         var tr = state.tr;
-        if (state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node.type === view.state.schema.nodes.decisionItem) {
+        if (state.selection instanceof _state.NodeSelection && state.selection.node.type === view.state.schema.nodes.decisionItem) {
           state.selection.replace(tr);
           tr.insertText(text);
           if (dispatch) {

package/dist/cjs/plugins/tasks-and-decisions/pm-plugins/plugin-key.js

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

package/dist/cjs/plugins/tasks-and-decisions/utils.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformSliceToDecisionList = exports.normalizeTaskItemsSelection = void 0;
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 // If slice is decisionItem, wrap it inside a decisionList. This prevents an
 // additional newline from being pasted along with the selected decision item.
 var transformSliceToDecisionList = function transformSliceToDecisionList(slice, schema) {
   var node = slice.content.firstChild;
   if (slice.content.childCount === 1 && node && node.type.name === 'decisionItem') {
     var decisionListWrapperNode = schema.nodes.decisionList.create({}, node);
-    return new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(decisionListWrapperNode), slice.openStart, slice.openEnd);
+    return new _model.Slice(_model.Fragment.from(decisionListWrapperNode), slice.openStart, slice.openEnd);
   }
   return slice;
 };
@@ -22,12 +22,12 @@ function isTaskListNode(node) {
 }
 var resolvePositionToStartOfTaskItem = function resolvePositionToStartOfTaskItem($pos) {
   var fromRange = $pos.blockRange($pos, isTaskListNode);
-  var fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? _prosemirrorState.Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
+  var fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? _state.Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
   return fromPosition;
 };
 var resolvePositionToEndOfTaskItem = function resolvePositionToEndOfTaskItem($pos) {
   var toRange = $pos.blockRange($pos, isTaskListNode);
-  var toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? _prosemirrorState.Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
+  var toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? _state.Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
   return toPosition;
 };
 var normalizeTaskItemsSelection = function normalizeTaskItemsSelection(selection) {
@@ -36,12 +36,12 @@ var normalizeTaskItemsSelection = function normalizeTaskItemsSelection(selection
   }
   var $from = selection.$from,
     $to = selection.$to;
-  if (selection instanceof _prosemirrorState.NodeSelection) {
+  if (selection instanceof _state.NodeSelection) {
     var _head = resolvePositionToStartOfTaskItem($from);
-    return new _prosemirrorState.TextSelection(_head, _head);
+    return new _state.TextSelection(_head, _head);
   }
   var head = resolvePositionToStartOfTaskItem($from);
   var anchor = resolvePositionToEndOfTaskItem($to);
-  return new _prosemirrorState.TextSelection(anchor, head);
+  return new _state.TextSelection(anchor, head);
 };
 exports.normalizeTaskItemsSelection = normalizeTaskItemsSelection;

package/dist/cjs/plugins/text-color/commands/remove-color.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.removeColor = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
 var _main = require("../pm-plugins/main");
 var removeColor = function removeColor() {
@@ -13,7 +13,7 @@ var removeColor = function removeColor() {
       selection = state.selection;
     var textColor = schema.marks.textColor;
     var tr = state.tr;
-    if (selection instanceof _prosemirrorState.TextSelection) {
+    if (selection instanceof _state.TextSelection) {
       var from = selection.from,
         to = selection.to,
         $cursor = selection.$cursor;

package/dist/cjs/plugins/text-color/commands/toggle-color.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toggleColor = void 0;
-var _commands = require("../../../utils/commands");
+var _mark = require("@atlaskit/editor-common/mark");
 var _main = require("../pm-plugins/main");
 var _disabled = require("../utils/disabled");
 var toggleColor = function toggleColor(color) {
@@ -26,7 +26,7 @@ var toggleColor = function toggleColor(color) {
         color: color
       });
       state.tr.scrollIntoView();
-      (0, _commands.toggleMark)(textColor, {
+      (0, _mark.toggleMark)(textColor, {
         color: color
       })(state, dispatch);
     }

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

@@ -16,7 +16,7 @@ exports.pluginKey = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _textColorPalette = require("../../../ui/ColorPalette/Palettes/textColorPalette");
 var _common = require("../../../ui/ColorPalette/Palettes/common");
 var _color = require("../utils/color");
@@ -45,7 +45,7 @@ var ACTIONS = /*#__PURE__*/function (ACTIONS) {
   return ACTIONS;
 }({});
 exports.ACTIONS = ACTIONS;
-var pluginKey = new _prosemirrorState.PluginKey('textColorPlugin');
+var pluginKey = new _state.PluginKey('textColorPlugin');
 exports.pluginKey = pluginKey;
 function createPlugin(dispatch, pluginConfig) {
   return new _safePlugin.SafePlugin({

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,8 +4,8 @@ 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 _commands = require("../../../utils/commands");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _mark = require("@atlaskit/editor-common/mark");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("../utils");
 var _editorAnalytics = require("@atlaskit/editor-common/editor-analytics");
@@ -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()));
         }
@@ -109,7 +109,7 @@ var toggleEm = function toggleEm() {
   return function (state, dispatch) {
     var em = state.schema.marks.em;
     if (em) {
-      return (0, _commands.toggleMark)(em)(state, dispatch);
+      return (0, _mark.toggleMark)(em)(state, dispatch);
     }
     return false;
   };
@@ -134,7 +134,7 @@ var toggleStrike = function toggleStrike() {
   return function (state, dispatch) {
     var strike = state.schema.marks.strike;
     if (strike) {
-      return (0, _commands.toggleMark)(strike)(state, dispatch);
+      return (0, _mark.toggleMark)(strike)(state, dispatch);
     }
     return false;
   };
@@ -159,7 +159,7 @@ var toggleStrong = function toggleStrong() {
   return function (state, dispatch) {
     var strong = state.schema.marks.strong;
     if (strong) {
-      return (0, _commands.toggleMark)(strong)(state, dispatch);
+      return (0, _mark.toggleMark)(strong)(state, dispatch);
     }
     return false;
   };
@@ -184,7 +184,7 @@ var toggleUnderline = function toggleUnderline() {
   return function (state, dispatch) {
     var underline = state.schema.marks.underline;
     if (underline) {
-      return (0, _commands.toggleMark)(underline)(state, dispatch);
+      return (0, _mark.toggleMark)(underline)(state, dispatch);
     }
     return false;
   };
@@ -209,7 +209,7 @@ var toggleSuperscript = function toggleSuperscript() {
   return function (state, dispatch) {
     var subsup = state.schema.marks.subsup;
     if (subsup) {
-      return (0, _commands.toggleMark)(subsup, {
+      return (0, _mark.toggleMark)(subsup, {
         type: 'sup'
       })(state, dispatch);
     }
@@ -236,7 +236,7 @@ var toggleSubscript = function toggleSubscript() {
   return function (state, dispatch) {
     var subsup = state.schema.marks.subsup;
     if (subsup) {
-      return (0, _commands.toggleMark)(subsup, {
+      return (0, _mark.toggleMark)(subsup, {
         type: 'sub'
       })(state, dispatch);
     }
@@ -263,7 +263,7 @@ var toggleCode = function toggleCode() {
   return function (state, dispatch) {
     var code = state.schema.marks.code;
     if (code) {
-      return (0, _commands.toggleMark)(code)(state, dispatch);
+      return (0, _mark.toggleMark)(code)(state, dispatch);
     }
     return false;
   };
@@ -297,7 +297,7 @@ var createInlineCodeFromTextInput = function createInlineCodeFromTextInput(from,
         var tr = state.tr.replaceRangeWith(from - 1, to + 1, state.schema.text(text));
         if (dispatch) {
           var codeMark = state.schema.marks.code.create();
-          tr = (0, _commands.applyMarkOnRange)(tr.mapping.map(from - 1), tr.mapping.map(to + 1), false, codeMark, tr).setStoredMarks([codeMark]);
+          tr = (0, _mark.applyMarkOnRange)(tr.mapping.map(from - 1), tr.mapping.map(to + 1), false, codeMark, tr).setStoredMarks([codeMark]);
           dispatch(tr);
         }
         return true;

package/dist/cjs/plugins/text-formatting/commands/transform-to-code.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformSmartCharsMentionsAndEmojis = void 0;
-var _utils = require("../../../utils");
+var _mark = require("@atlaskit/editor-common/mark");
 var SMART_TO_ASCII = {
   '…': '...',
   '→': '->',
@@ -52,7 +52,7 @@ var transformSmartCharsMentionsAndEmojis = function transformSmartCharsMentionsA
     text = _schema$nodes2.text,
     emoji = _schema$nodes2.emoji;
   // Traverse through all the nodes within the range and replace them with their plaintext counterpart
-  var children = (0, _utils.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
+  var children = (0, _mark.filterChildrenBetween)(tr.doc, from, to, isNodeTextBlock(schema));
   children.forEach(function (_ref) {
     var node = _ref.node,
       pos = _ref.pos;

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

@@ -1,19 +1,16 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pluginKey = exports.plugin = void 0;
-var safePlugin = _interopRequireWildcard(require("@atlaskit/editor-common/safe-plugin"));
-var _prosemirrorState = require("prosemirror-state");
+var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+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({
+  return new _safePlugin.SafePlugin({
     state: {
       init: function init(_config, state) {
         return {

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/input-rule.js

@@ -19,7 +19,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _inputRules = require("../../../utils/input-rules");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _transformToCode = require("../commands/transform-to-code");
+var _mark = require("@atlaskit/editor-common/mark");
 var _ValidCombinations;
 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); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -95,7 +95,7 @@ function addMark(markType, schema, char) {
       return null;
     }
     if (markType.name === 'code') {
-      (0, _transformToCode.transformSmartCharsMentionsAndEmojis)(tr.mapping.map(start), tr.mapping.map(end), tr);
+      (0, _mark.transformSmartCharsMentionsAndEmojis)(tr.mapping.map(start), tr.mapping.map(end), tr);
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);

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");
@@ -20,7 +20,8 @@ var _utils2 = require("../utils");
 var _pluginKey = require("./plugin-key");
 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; }
-// eslint-disable-next-line no-duplicate-imports
+// TODO: Ideally this should use the custom toggleMark function from @atlaskit/editor-common so we also disable the options when selecting inline nodes but it disables the marks when the selection is empty at this point in time which is undesirable
+// import { toggleMark } from '@atlaskit/editor-common/mark';
 
 var getTextFormattingState = function getTextFormattingState(editorState, editorAnalyticsAPI) {
   var _editorState$schema$m = editorState.schema.marks,
@@ -33,19 +34,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 +56,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;
 };