@atlaskit/editor-core 180.1.0 → 181.0.0

package/dist/cjs/utils/index.js

@@ -11,28 +11,12 @@ Object.defineProperty(exports, "SetAttrsStep", {
   }
 });
 exports.areBlockTypesDisabled = areBlockTypesDisabled;
-exports.canJoinDown = canJoinDown;
-exports.canJoinUp = canJoinUp;
 exports.canMoveDown = canMoveDown;
 exports.canMoveUp = canMoveUp;
-Object.defineProperty(exports, "cascadeCommands", {
-  enumerable: true,
-  get: function get() {
-    return _action.cascadeCommands;
-  }
-});
 exports.checkNodeDown = checkNodeDown;
 exports.compose = compose;
-Object.defineProperty(exports, "containsClassName", {
-  enumerable: true,
-  get: function get() {
-    return _dom.containsClassName;
-  }
-});
-exports.createSliceWithContent = createSliceWithContent;
 exports.dedupe = dedupe;
 exports.filterChildrenBetween = filterChildrenBetween;
-exports.findAncestorPosition = findAncestorPosition;
 Object.defineProperty(exports, "findFarthestParentNode", {
   enumerable: true,
   get: function get() {
@@ -40,13 +24,6 @@ Object.defineProperty(exports, "findFarthestParentNode", {
   }
 });
 exports.getCursor = getCursor;
-Object.defineProperty(exports, "getEditorValueWithMedia", {
-  enumerable: true,
-  get: function get() {
-    return _action.getEditorValueWithMedia;
-  }
-});
-exports.getGroupsInRange = getGroupsInRange;
 Object.defineProperty(exports, "getNodesCount", {
   enumerable: true,
   get: function get() {
@@ -59,7 +36,6 @@ Object.defineProperty(exports, "getStepRange", {
     return _document.getStepRange;
   }
 });
-exports.hasCommonAncestor = hasCommonAncestor;
 exports.hasOpenEnd = void 0;
 Object.defineProperty(exports, "hasVisibleContent", {
   enumerable: true,
@@ -106,18 +82,6 @@ Object.defineProperty(exports, "isLinkMark", {
     return _nodes.isLinkMark;
   }
 });
-Object.defineProperty(exports, "isMarkAllowedInRange", {
-  enumerable: true,
-  get: function get() {
-    return _mark.isMarkAllowedInRange;
-  }
-});
-Object.defineProperty(exports, "isMarkExcluded", {
-  enumerable: true,
-  get: function get() {
-    return _mark.isMarkExcluded;
-  }
-});
 exports.isMarkTypeAllowedInCurrentSelection = isMarkTypeAllowedInCurrentSelection;
 Object.defineProperty(exports, "isNodeEmpty", {
   enumerable: true,
@@ -151,15 +115,6 @@ Object.defineProperty(exports, "isTextSelection", {
     return _utils.isTextSelection;
   }
 });
-Object.defineProperty(exports, "isValidPosition", {
-  enumerable: true,
-  get: function get() {
-    return _selection.isValidPosition;
-  }
-});
-exports.liftAndSelectSiblingNodes = liftAndSelectSiblingNodes;
-exports.liftSelection = liftSelection;
-exports.liftSiblingNodes = liftSiblingNodes;
 Object.defineProperty(exports, "measurements", {
   enumerable: true,
   get: function get() {
@@ -192,36 +147,12 @@ Object.defineProperty(exports, "processRawValue", {
     return _document.processRawValue;
   }
 });
-Object.defineProperty(exports, "removeBlockMarks", {
-  enumerable: true,
-  get: function get() {
-    return _mark.removeBlockMarks;
-  }
-});
 Object.defineProperty(exports, "sanitiseMarksInSelection", {
   enumerable: true,
   get: function get() {
     return _mark.sanitiseMarksInSelection;
   }
 });
-Object.defineProperty(exports, "sanitiseSelectionMarksForWrapping", {
-  enumerable: true,
-  get: function get() {
-    return _mark.sanitiseSelectionMarksForWrapping;
-  }
-});
-Object.defineProperty(exports, "setAllSelection", {
-  enumerable: true,
-  get: function get() {
-    return _selection.setAllSelection;
-  }
-});
-Object.defineProperty(exports, "setCellSelection", {
-  enumerable: true,
-  get: function get() {
-    return _selection.setCellSelection;
-  }
-});
 Object.defineProperty(exports, "setGapCursorSelection", {
   enumerable: true,
   get: function get() {
@@ -244,35 +175,21 @@ exports.shallowEqual = shallowEqual;
 exports.stringRepeat = stringRepeat;
 exports.sum = sum;
 exports.toJSON = toJSON;
-Object.defineProperty(exports, "validateNodes", {
-  enumerable: true,
-  get: function get() {
-    return _nodes.validateNodes;
-  }
-});
 exports.whichTransitionEvent = whichTransitionEvent;
-exports.wrapIn = wrapIn;
 var _prosemirrorCommands = require("prosemirror-commands");
-var _prosemirrorModel = require("prosemirror-model");
 var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorTransform = require("prosemirror-transform");
 var _editorJsonTransformer = require("@atlaskit/editor-json-transformer");
 var _cursor = require("../plugins/fake-text-cursor/cursor");
 var _prosemirrorUtils = require("prosemirror-utils");
 var _document = require("./document");
 var _position = require("./prosemirror/position");
+var _utils = require("@atlaskit/editor-common/utils");
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
-var _action = require("./action");
 var _mark = require("./mark");
 var _nodes = require("./nodes");
 var _selection = require("./selection");
-var _dom = require("./dom");
 var _measureEnum = _interopRequireDefault(require("./performance/measure-enum"));
-var _utils = require("@atlaskit/editor-common/utils");
 var _steps = require("@atlaskit/adf-schema/steps");
-function validateNode(_node) {
-  return false;
-}
 function isMarkTypeCompatibleWithMark(markType, mark) {
   return !mark.type.excludes(markType) && !markType.excludes(mark.type);
 }
@@ -280,23 +197,12 @@ function isMarkTypeAllowedInNode(markType, state) {
   return (0, _prosemirrorCommands.toggleMark)(markType)(state);
 }
 function canMoveUp(state) {
-  var selection = state.selection,
-    doc = state.doc;
-
+  var selection = state.selection;
   /**
-   * If there's a media element on the selection,
-   * add text blocks with arrow navigation.
-   * Also, the selection could be media | mediaGroup.
+   * If there's a media element on the selection it will use a gap cursor to move
    */
-  if (selection instanceof _prosemirrorState.NodeSelection) {
-    if (selection.node.type.name === 'media') {
-      /** Weird way of checking if the previous element is a paragraph */
-      var mediaAncestorNode = doc.nodeAt(selection.anchor - 3);
-      return !!(mediaAncestorNode && mediaAncestorNode.type.name === 'paragraph');
-    } else if (selection.node.type.name === 'mediaGroup') {
-      var mediaGroupAncestorNode = selection.$anchor.nodeBefore;
-      return !!(mediaGroupAncestorNode && mediaGroupAncestorNode.type.name === 'paragraph');
-    }
+  if (selection instanceof _prosemirrorState.NodeSelection && (0, _utils.isMediaNode)(selection.node)) {
+    return true;
   }
   if (selection instanceof _prosemirrorState.TextSelection) {
     if (!selection.empty) {
@@ -306,21 +212,13 @@ function canMoveUp(state) {
   return !(0, _position.atTheBeginningOfDoc)(state);
 }
 function canMoveDown(state) {
-  var selection = state.selection,
-    doc = state.doc;
+  var selection = state.selection;
 
   /**
-   * If there's a media element on the selection,
-   * add text blocks with arrow navigation.
-   * Also, the selection could be media | mediaGroup.
+   * If there's a media element on the selection it will use a gap cursor to move
    */
-  if (selection instanceof _prosemirrorState.NodeSelection) {
-    if (selection.node.type.name === 'media') {
-      var nodeAfter = doc.nodeAt(selection.$head.after());
-      return !!(nodeAfter && nodeAfter.type.name === 'paragraph');
-    } else if (selection.node.type.name === 'mediaGroup') {
-      return !(selection.$head.parentOffset === selection.$anchor.parent.content.size);
-    }
+  if (selection instanceof _prosemirrorState.NodeSelection && (0, _utils.isMediaNode)(selection.node)) {
+    return true;
   }
   if (selection instanceof _prosemirrorState.TextSelection) {
     if (!selection.empty) {
@@ -381,19 +279,6 @@ function isMarkTypeAllowedInCurrentSelection(markType, state) {
     return allowedInActiveMarks;
   });
 }
-function createSliceWithContent(content, state) {
-  return new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(state.schema.text(content)), 0, 0);
-}
-
-/**
- * Determines if content inside a selection can be joined with the next block.
- * We need this check since the built-in method for "joinDown" will join a orderedList with bulletList.
- */
-function canJoinDown(selection, doc, nodeType) {
-  return checkNodeDown(selection, doc, function (node) {
-    return node.type === nodeType;
-  });
-}
 function checkNodeDown(selection, doc, filter) {
   var ancestorDepth = findAncestorPosition(doc, selection.$to).depth;
 
@@ -405,61 +290,6 @@ function checkNodeDown(selection, doc, filter) {
   return res.nodeAfter ? filter(res.nodeAfter) : false;
 }
 
-/**
- * Determines if content inside a selection can be joined with the previous block.
- * We need this check since the built-in method for "joinUp" will join a orderedList with bulletList.
- */
-function canJoinUp(selection, doc, nodeType) {
-  var res = doc.resolve(selection.$from.before(findAncestorPosition(doc, selection.$from).depth));
-  return res.nodeBefore && res.nodeBefore.type === nodeType;
-}
-
-/**
- * Finds all "selection-groups" within a range. A selection group is based on ancestors.
- *
- * Example:
- * Given the following document and selection ({<} = start of selection and {>} = end)
- *  doc
- *    blockquote
- *      ul
- *        li
- *        li{<}
- *        li
- *     p
- *     p{>}
- *
- * The output will be two selection-groups. One within the ul and one with the two paragraphs.
- */
-function getGroupsInRange(doc, $from, $to) {
-  var isNodeValid = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : validateNode;
-  var groups = Array();
-  var commonAncestor = hasCommonAncestor(doc, $from, $to);
-  var fromAncestor = findAncestorPosition(doc, $from);
-  if (commonAncestor || fromAncestor.depth === 1 && isNodeValid($from.node(1))) {
-    groups.push({
-      $from: $from,
-      $to: $to
-    });
-  } else {
-    var current = $from;
-    while (current.pos < $to.pos) {
-      var ancestorPos = findAncestorPosition(doc, current);
-      while (ancestorPos.depth > 1) {
-        ancestorPos = findAncestorPosition(doc, ancestorPos);
-      }
-      var endPos = doc.resolve(Math.min(
-      // should not be smaller then start position in case of an empty paragraph for example.
-      Math.max(ancestorPos.start(ancestorPos.depth), ancestorPos.end(ancestorPos.depth) - 3), $to.pos));
-      groups.push({
-        $from: current,
-        $to: endPos
-      });
-      current = doc.resolve(Math.min(endPos.after(1) + 1, doc.nodeSize - 2));
-    }
-  }
-  return groups;
-}
-
 /**
  * Traverse the document until an "ancestor" is found. Any nestable block can be an ancestor.
  */
@@ -479,96 +309,6 @@ function findAncestorPosition(doc, pos) {
   }
   return newPos;
 }
-
-/**
- * Determine if two positions have a common ancestor.
- */
-function hasCommonAncestor(doc, $from, $to) {
-  var current;
-  var target;
-  if ($from.depth > $to.depth) {
-    current = findAncestorPosition(doc, $from);
-    target = findAncestorPosition(doc, $to);
-  } else {
-    current = findAncestorPosition(doc, $to);
-    target = findAncestorPosition(doc, $from);
-  }
-  while (current.depth > target.depth && current.depth > 1) {
-    current = findAncestorPosition(doc, current);
-  }
-  return current.node(current.depth) === target.node(target.depth);
-}
-
-/**
- * Takes a selection $from and $to and lift all text nodes from their parents to document-level
- */
-function liftSelection(tr, doc, $from, $to) {
-  var startPos = $from.start($from.depth);
-  var endPos = $to.end($to.depth);
-  var target = Math.max(0, findAncestorPosition(doc, $from).depth - 1);
-  tr.doc.nodesBetween(startPos, endPos, function (node, pos) {
-    if (node.isText ||
-    // Text node
-    node.isTextblock && !node.textContent // Empty paragraph
-    ) {
-      var res = tr.doc.resolve(tr.mapping.map(pos));
-      var sel = new _prosemirrorState.NodeSelection(res);
-      var range = sel.$from.blockRange(sel.$to);
-      if ((0, _prosemirrorTransform.liftTarget)(range) !== undefined) {
-        tr.lift(range, target);
-      }
-    }
-  });
-  startPos = tr.mapping.map(startPos);
-  endPos = tr.mapping.map(endPos);
-  endPos = tr.doc.resolve(endPos).end(tr.doc.resolve(endPos).depth); // We want to select the entire node
-
-  tr.setSelection(new _prosemirrorState.TextSelection(tr.doc.resolve(startPos), tr.doc.resolve(endPos)));
-  return {
-    tr: tr,
-    $from: tr.doc.resolve(startPos),
-    $to: tr.doc.resolve(endPos)
-  };
-}
-
-/**
- * Lift nodes in block to one level above.
- */
-function liftSiblingNodes(view) {
-  var tr = view.state.tr;
-  var _view$state$selection = view.state.selection,
-    $from = _view$state$selection.$from,
-    $to = _view$state$selection.$to;
-  var blockStart = tr.doc.resolve($from.start($from.depth - 1));
-  var blockEnd = tr.doc.resolve($to.end($to.depth - 1));
-  var range = blockStart.blockRange(blockEnd);
-  view.dispatch(tr.lift(range, blockStart.depth - 1));
-}
-
-/**
- * Lift sibling nodes to document-level and select them.
- */
-function liftAndSelectSiblingNodes(view) {
-  var tr = view.state.tr;
-  var _view$state$selection2 = view.state.selection,
-    $from = _view$state$selection2.$from,
-    $to = _view$state$selection2.$to;
-  var blockStart = tr.doc.resolve($from.start($from.depth - 1));
-  var blockEnd = tr.doc.resolve($to.end($to.depth - 1));
-  // TODO: [ts30] handle void and null properly
-  var range = blockStart.blockRange(blockEnd);
-  tr.setSelection(new _prosemirrorState.TextSelection(blockStart, blockEnd));
-  tr.lift(range, blockStart.depth - 1);
-  return tr;
-}
-function wrapIn(nodeType, tr, $from, $to) {
-  var range = $from.blockRange($to);
-  var wrapping = range && (0, _prosemirrorTransform.findWrapping)(range, nodeType);
-  if (wrapping) {
-    tr = tr.wrap(range, wrapping).scrollIntoView();
-  }
-  return tr;
-}
 var transformer = new _editorJsonTransformer.JSONTransformer();
 function toJSON(node) {
   return transformer.encode(node);

package/dist/cjs/utils/input-rules.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ruleWithTransform = exports.ruleWithAnalytics = exports.createWrappingTextBlockRule = exports.createWrappingJoinRule = exports.createRule = exports.createPlugin = exports.createJoinNodesRule = void 0;
+exports.ruleWithAnalytics = exports.createWrappingTextBlockRule = exports.createWrappingJoinRule = exports.createRule = exports.createPlugin = exports.createJoinNodesRule = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _prosemirrorState = require("prosemirror-state");
 var _prosemirrorTransform = require("prosemirror-transform");
@@ -32,20 +32,6 @@ var ruleWithAnalytics = function ruleWithAnalytics(getPayload) {
   };
 };
 exports.ruleWithAnalytics = ruleWithAnalytics;
-var ruleWithTransform = function ruleWithTransform(transform) {
-  return function (originalRule) {
-    var onHandlerApply = function onHandlerApply(state, tr, matchResult) {
-      transform(state, tr);
-      if (originalRule.onHandlerApply) {
-        originalRule.onHandlerApply(state, tr, matchResult);
-      }
-    };
-    return _objectSpread(_objectSpread({}, originalRule), {}, {
-      onHandlerApply: onHandlerApply
-    });
-  };
-};
-exports.ruleWithTransform = ruleWithTransform;
 var createRule = function createRule(match, handler) {
   return {
     match: match,

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "180.1.0";
+var version = "181.0.0";
 exports.version = version;
 var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "180.1.0",
+	"version": "181.0.0",
 	"sideEffects": false
 }

package/dist/es2019/actions/index.js

@@ -1,17 +1,16 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Node } from 'prosemirror-model';
-import { TextSelection, NodeSelection } from 'prosemirror-state';
-import { findParentNode } from 'prosemirror-utils';
-import { toJSON } from '../utils';
-import { processRawValue, isEmptyDocument, processRawFragmentValue } from '../utils/document';
-import { getEditorValueWithMedia, __temporaryFixForConfigPanel } from '../utils/action';
-import { createDispatch } from '../event-dispatcher';
-import { safeInsert } from 'prosemirror-utils';
 import { analyticsEventKey } from '@atlaskit/editor-common/utils';
+import { NodeSelection, TextSelection } from 'prosemirror-state';
+import { findParentNode, safeInsert } from 'prosemirror-utils';
+import { createDispatch } from '../event-dispatcher';
+import { getCollabProvider } from '../plugins/collab-edit/native-collab-provider-plugin';
 import { findNodePosWithLocalId } from '../plugins/extension/utils';
 import { getFeatureFlags } from '../plugins/feature-flags-context/get-feature-flags';
-import { getCollabProvider } from '../plugins/collab-edit/native-collab-provider-plugin';
+import { toJSON } from '../utils';
+import { getEditorValueWithMedia, __temporaryFixForConfigPanel } from '../utils/action';
 import deprecationWarnings from '../utils/deprecation-warnings';
+import { isEmptyDocument, processRawFragmentValue, processRawValue } from '../utils/document';
 import { findNodePosByFragmentLocalIds } from '../utils/nodes-by-localIds';
 export default class EditorActions {
   constructor() {
@@ -100,7 +99,22 @@ export default class EditorActions {
     if (!this.editorView || this.editorView.hasFocus()) {
       return false;
     }
-    this.editorView.focus();
+
+    // If we focus on componentDidMount the editor can crash due to a prosemirror error.
+    // This is fixed in prosemirror-view@1.23.7
+    // See: https:github.com/ProseMirror/prosemirror-view/commit/735b88107d1cbe7575a188edb85f05c22fb56e35
+    //
+    // We don't want this error to crash the editor in the case we can't
+    // focus correctly.
+    // Revert workaround in: https://product-fabric.atlassian.net/browse/ED-17172
+    try {
+      this.editorView.focus();
+    } catch (err) {
+      if (process.env.NODE_ENV !== 'production') {
+        // eslint-disable-next-line no-console
+        console.error('EditorView focus failed with an error', err);
+      }
+    }
     this.editorView.dispatch(this.editorView.state.tr.scrollIntoView());
     return true;
   }

package/dist/es2019/analytics-api/attach-payload-into-transaction.js

@@ -17,7 +17,7 @@ export const attachPayloadIntoTransaction = ({
   tr.step(new AnalyticsStep([{
     payload,
     channel
-  }], actionsToIgnore, tr.selection.$from.pos) // We need to create the step based on a position, this prevent split history for relative changes.
+  }], actionsToIgnore, editorState.selection.$from.pos) // We need to create the step based on a position, this prevent split history for relative changes.
   );
 
   // When you add a new step all the storedMarks are removed it

package/dist/es2019/create-editor/ReactEditorView.js

@@ -1,9 +1,4 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { ReactEditorView as BaseReactEditorView } from './ReactEditorViewInternal';
-import getEditorPlugins from '../utils/get-editor-plugins';
 import { injectIntl } from 'react-intl-next';
 export class ReactEditorView extends BaseReactEditorView {}
-_defineProperty(ReactEditorView, "defaultProps", {
-  getEditorPlugins
-});
 export default injectIntl(ReactEditorView);