@atlaskit/editor-common 74.29.0 → 74.29.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-common
 
+## 74.29.2
+
+### Patch Changes
+
+- [`4e6f1bf8511`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e6f1bf8511) - [ED-19233] Import prosemirror libraries from internal facade package
+
+## 74.29.1
+
+### Patch Changes
+
+- [`f0153f75b5d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/f0153f75b5d) - Added generateDefaultGuideline to editor-common/guideline
+
 ## 74.29.0
 
 ### Minor Changes

package/dist/cjs/card/MediaAndEmbedsToolbar/index.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-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 _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _alignImageCenter = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/align-image-center"));
 var _alignImageLeft = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/align-image-left"));
@@ -20,7 +20,7 @@ var _mediaWrapRight = _interopRequireDefault(require("@atlaskit/icon/glyph/edito
 var _analytics = require("../../analytics");
 var _coreUtils = require("../../core-utils");
 var _messages = _interopRequireWildcard(require("../../messages"));
-var _utils = require("../../utils");
+var _utils2 = 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; }
 // Workaround as we don't want to import this package into `editor-common`
@@ -84,16 +84,16 @@ var makeAlign = function makeAlign(layout, nodeType, widthPluginDependencyApi, a
       return false;
     }
     var nodeWidth = getNodeWidth(node, state.schema);
-    var newAttrs = (0, _utils.alignAttributes)(layout, node.attrs, undefined, nodeWidth, widthPluginState.lineLength);
+    var newAttrs = (0, _utils2.alignAttributes)(layout, node.attrs, undefined, nodeWidth, widthPluginState.lineLength);
     var tr = state.tr.setNodeMarkup(state.selection.from, undefined, newAttrs);
     tr.setMeta('scrollIntoView', false);
     // when image captions are enabled, the wrong node gets selected after
     // setNodeMarkup is called
-    tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, state.selection.from));
+    tr.setSelection(_state.NodeSelection.create(tr.doc, state.selection.from));
     var paragraph = tr.doc.type.schema.nodes.paragraph;
 
     // see https://product-fabric.atlassian.net/browse/ED-15518 insert a new paragraph when an embedded card is wrapped left or right
-    if (layout.startsWith('wrap') && paragraph && !tr.doc.nodeAt(state.selection.to) && ((0, _coreUtils.insideTable)(state) || (0, _utils.isInLayoutColumn)(state))) {
+    if (layout.startsWith('wrap') && paragraph && !tr.doc.nodeAt(state.selection.to) && ((0, _coreUtils.insideTable)(state) || (0, _utils2.isInLayoutColumn)(state))) {
       var emptyParaghraph = paragraph.createAndFill();
       if (emptyParaghraph) {
         tr.insert(state.selection.to, emptyParaghraph);
@@ -129,13 +129,13 @@ var mapIconsToToolbarItem = function mapIconsToToolbarItem(icons, layout, intl,
 };
 var shouldHideLayoutToolbar = function shouldHideLayoutToolbar(selection, _ref2, allowResizingInTables) {
   var nodes = _ref2.nodes;
-  return (0, _prosemirrorUtils.hasParentNodeOfType)([nodes.bodiedExtension, nodes.listItem, nodes.expand, nodes.nestedExpand].concat((0, _toConsumableArray2.default)(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
+  return (0, _utils.hasParentNodeOfType)([nodes.bodiedExtension, nodes.listItem, nodes.expand, nodes.nestedExpand].concat((0, _toConsumableArray2.default)(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
 };
 var buildLayoutButtons = function buildLayoutButtons(state, intl, nodeType, widthPluginDependencyApi, analyticsApi, allowResizing, allowResizingInTables) {
   var allowWrapping = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
   var allowAlignment = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : true;
   var selection = state.selection;
-  if (!(selection instanceof _prosemirrorState.NodeSelection) || !selection.node || !nodeType || shouldHideLayoutToolbar(selection, state.schema, allowResizingInTables)) {
+  if (!(selection instanceof _state.NodeSelection) || !selection.node || !nodeType || shouldHideLayoutToolbar(selection, state.schema, allowResizingInTables)) {
     return [];
   }
   var layout = selection.node.attrs.layout;

package/dist/cjs/core-utils/inside.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insideTable = void 0;
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var insideTable = function insideTable(state) {
   var _state$schema$nodes = state.schema.nodes,
     table = _state$schema$nodes.table,
     tableCell = _state$schema$nodes.tableCell;
-  return (0, _prosemirrorUtils.hasParentNodeOfType)([table, tableCell])(state.selection);
+  return (0, _utils.hasParentNodeOfType)([table, tableCell])(state.selection);
 };
 exports.insideTable = insideTable;

package/dist/cjs/guideline/defaultGuideline.js

@@ -0,0 +1,57 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateDefaultGuidelines = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _utils = require("./utils");
+var getDefaultGuidelines = (0, _memoizeOne.default)(function (editorWidth) {
+  return [-6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6].map(function (val, index) {
+    return {
+      key: "grid_".concat(index),
+      position: {
+        x: val / 12 * editorWidth
+      }
+    };
+  });
+});
+var getWideGuidelines = (0, _memoizeOne.default)(function (editorWidth) {
+  var wideSpacing = editorWidth * _editorSharedStyles.breakoutWideScaleRatio / 2;
+  return [{
+    key: "wide_left",
+    position: {
+      x: -wideSpacing
+    }
+  }, {
+    key: "wide_right",
+    position: {
+      x: wideSpacing
+    }
+  }];
+});
+var getFullWidthGuidelines = (0, _memoizeOne.default)(function (containerWidth) {
+  var fullWidth = (0, _utils.getContainerWidthOrFullEditorWidth)(containerWidth);
+  return [{
+    key: "full_width_left",
+    position: {
+      x: -fullWidth
+    }
+  }, {
+    key: "full_width_right",
+    position: {
+      x: fullWidth
+    }
+  }];
+});
+var generateDefaultGuidelines = function generateDefaultGuidelines(editorWidth, containerWidth) {
+  var isFullWidthMode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var innerGrids = getDefaultGuidelines(editorWidth);
+  var wideGuidelines = !isFullWidthMode ? getWideGuidelines(editorWidth) : [];
+  var fullWidthGuidelines = !isFullWidthMode ? getFullWidthGuidelines(containerWidth) : [];
+  return [].concat((0, _toConsumableArray2.default)(innerGrids), (0, _toConsumableArray2.default)(wideGuidelines), (0, _toConsumableArray2.default)(fullWidthGuidelines));
+};
+exports.generateDefaultGuidelines = generateDefaultGuidelines;

package/dist/cjs/guideline/dynamicGuideline.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.generateDynamicGuidelines = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-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 _mediaSingle = require("../media-single");
 var _constants = require("./constants");
 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 generateDynamicGuidelines = function generateDynamicGuidelines(state, editorWidth) {
-  var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node;
-  var mediaSingleNode = (0, _prosemirrorUtils.findChildren)(state.tr.doc, function (node) {
+  var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
+  var mediaSingleNode = (0, _utils.findChildren)(state.tr.doc, function (node) {
     return node.type === state.schema.nodes.mediaSingle;
   }, false // only top level
   );

package/dist/cjs/guideline/index.js

@@ -21,12 +21,24 @@ Object.defineProperty(exports, "createGuidesFromLengths", {
     return _fixedGuideline.createGuidesFromLengths;
   }
 });
+Object.defineProperty(exports, "generateDefaultGuidelines", {
+  enumerable: true,
+  get: function get() {
+    return _defaultGuideline.generateDefaultGuidelines;
+  }
+});
 Object.defineProperty(exports, "generateDynamicGuidelines", {
   enumerable: true,
   get: function get() {
     return _dynamicGuideline.generateDynamicGuidelines;
   }
 });
+Object.defineProperty(exports, "getContainerWidthOrFullEditorWidth", {
+  enumerable: true,
+  get: function get() {
+    return _utils.getContainerWidthOrFullEditorWidth;
+  }
+});
 Object.defineProperty(exports, "getGuidelinesWithHighlights", {
   enumerable: true,
   get: function get() {
@@ -41,6 +53,7 @@ Object.defineProperty(exports, "isVerticalPosition", {
 });
 var _dynamicGuideline = require("./dynamicGuideline");
 var _fixedGuideline = require("./fixedGuideline");
+var _defaultGuideline = require("./defaultGuideline");
 var _updateGuideline = require("./updateGuideline");
 var _constants = require("./constants");
 var _utils = require("./utils");

package/dist/cjs/guideline/utils.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isVerticalPosition = exports.isNumber = void 0;
+exports.isVerticalPosition = exports.isNumber = exports.getContainerWidthOrFullEditorWidth = void 0;
+var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var isNumber = function isNumber(x) {
   return typeof x === 'number' && !isNaN(x) && isFinite(x);
 };
@@ -11,4 +12,13 @@ exports.isNumber = isNumber;
 var isVerticalPosition = function isVerticalPosition(pos) {
   return isNumber(pos.x);
 };
-exports.isVerticalPosition = isVerticalPosition;
+
+/**
+ * Calculates container or full editor width taking in account editor full width layout
+ * width and editor gutter padding.
+ */
+exports.isVerticalPosition = isVerticalPosition;
+var getContainerWidthOrFullEditorWidth = function getContainerWidthOrFullEditorWidth(containerWidth) {
+  return Math.min(containerWidth - _editorSharedStyles.akEditorGutterPadding * 2, _editorSharedStyles.akEditorFullWidthLayoutWidth) / 2;
+};
+exports.getContainerWidthOrFullEditorWidth = getContainerWidthOrFullEditorWidth;

package/dist/cjs/insert/index.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.shouldSplitSelectedNodeOnNodeInsertion = exports.safeInsert = exports.normaliseNestedLayout = exports.insertSelectedItem = exports.LookDirection = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorTransform = require("prosemirror-transform");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _selection = require("../selection");
-var _utils = require("../utils");
+var _utils2 = 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 LookDirection = /*#__PURE__*/function (LookDirection) {
@@ -49,19 +49,19 @@ var isFirstChild = function isFirstChild($pos, doc) {
 };
 var nodeIsInsideAList = function nodeIsInsideAList(tr) {
   var nodes = tr.doc.type.schema.nodes;
-  return (0, _prosemirrorUtils.hasParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
+  return (0, _utils.hasParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
 };
 var selectionIsInsideAPanel = function selectionIsInsideAPanel(tr) {
   var nodes = tr.doc.type.schema.nodes;
-  return (0, _prosemirrorUtils.hasParentNodeOfType)(nodes.panel)(tr.selection);
+  return (0, _utils.hasParentNodeOfType)(nodes.panel)(tr.selection);
 };
 var selectionIsInNestedList = function selectionIsInNestedList(tr) {
   var nodes = tr.doc.type.schema.nodes;
-  var parentListNode = (0, _prosemirrorUtils.findParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
+  var parentListNode = (0, _utils.findParentNodeOfType)([nodes.orderedList, nodes.bulletList])(tr.selection);
   if (!parentListNode) {
     return false;
   }
-  return (0, _utils.isListItemNode)(tr.doc.resolve(parentListNode.pos).parent);
+  return (0, _utils2.isListItemNode)(tr.doc.resolve(parentListNode.pos).parent);
 };
 var insertBeforeOrAfter = function insertBeforeOrAfter(tr, lookDirection, $parentPos, $proposedPosition, content) {
   /**
@@ -90,24 +90,24 @@ var safeInsert = function safeInsert(content, position) {
     var _tr$selection$$from$n;
     var nodes = tr.doc.type.schema.nodes;
     var whitelist = [nodes.rule, nodes.mediaSingle];
-    if (content instanceof _prosemirrorModel.Fragment || !whitelist.includes(content.type)) {
+    if (content instanceof _model.Fragment || !whitelist.includes(content.type)) {
       return null;
     }
 
     // Check for selection
-    if (!tr.selection.empty || (0, _prosemirrorUtils.isNodeSelection)(tr.selection)) {
+    if (!tr.selection.empty || (0, _utils.isNodeSelection)(tr.selection)) {
       // NOT IMPLEMENTED
       return null;
     }
     var $from = tr.selection.$from;
-    var $insertPos = position ? tr.doc.resolve(position) : (0, _prosemirrorUtils.isNodeSelection)(tr.selection) ? tr.doc.resolve($from.pos + 1) : $from;
+    var $insertPos = position ? tr.doc.resolve(position) : (0, _utils.isNodeSelection)(tr.selection) ? tr.doc.resolve($from.pos + 1) : $from;
     var lookDirection;
     var insertPosEnd = $insertPos.end();
     var insertPosStart = $insertPos.start();
 
     // When parent node is an empty paragraph,
     // check the empty paragraph is the first or last node of its parent.
-    if ((0, _utils.isEmptyParagraph)($insertPos.parent)) {
+    if ((0, _utils2.isEmptyParagraph)($insertPos.parent)) {
       if (isLastChild($insertPos, tr.doc)) {
         lookDirection = LookDirection.After;
       } else if (isFirstChild($insertPos, tr.doc)) {
@@ -133,7 +133,7 @@ var safeInsert = function safeInsert(content, position) {
     var nonRuleNodeInListNode = !(content.type === nodes.rule) && nodeIsInsideAList(tr);
     if (ruleNodeInANestedListNode || noDirectionAndShouldNotSplit && nonRuleNodeInListNode || noDirectionAndShouldNotSplit && !nodeIsInsideAList(tr)) {
       // node to be inserted is an invalid child of selection so insert below selected node
-      return (0, _prosemirrorUtils.safeInsert)(content, tr.selection.from)(tr);
+      return (0, _utils.safeInsert)(content, tr.selection.from)(tr);
     }
 
     // if node is a rule and that is a flat list splitting and not at the end of a list
@@ -142,7 +142,7 @@ var safeInsert = function safeInsert(content, position) {
       to = _tr$selection.to;
     var ruleTypeInAList = content.type === nodes.rule && nodeIsInsideAList(tr);
     if (ruleTypeInAList && !($insertPos.pos === insertPosEnd)) {
-      return tr.replaceRange(from, to, new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.from(nodes.rule.createChecked()), 0, 0));
+      return tr.replaceRange(from, to, new _model.Slice(_model.Fragment.from(nodes.rule.createChecked()), 0, 0));
     }
     if (!lookDirection) {
       // fallback to consumer for now
@@ -150,7 +150,7 @@ var safeInsert = function safeInsert(content, position) {
     }
 
     // Replace empty paragraph
-    if ((0, _utils.isEmptyParagraph)($insertPos.parent) && (0, _prosemirrorUtils.canInsert)(tr.doc.resolve($insertPos[lookDirection]()), content)) {
+    if ((0, _utils2.isEmptyParagraph)($insertPos.parent) && (0, _utils.canInsert)(tr.doc.resolve($insertPos[lookDirection]()), content)) {
       return finaliseInsert(tr.replaceWith($insertPos.before(), $insertPos.after(), content), -1);
     }
     var $proposedPosition = $insertPos;
@@ -159,7 +159,7 @@ var safeInsert = function safeInsert(content, position) {
       var parentNode = $parentPos.node();
 
       // Insert at position (before or after target pos)
-      if ((0, _prosemirrorUtils.canInsert)($proposedPosition, content)) {
+      if ((0, _utils.canInsert)($proposedPosition, content)) {
         return finaliseInsert(tr.insert($proposedPosition.pos, content), content.nodeSize);
       }
 
@@ -169,7 +169,7 @@ var safeInsert = function safeInsert(content, position) {
 
         // Move selection to the closest text node, otherwise it defaults to the whatever the lookDirection is set to above
         if ([nodes.orderedList, nodes.bulletList].includes(parentNode.type) && nextTr) {
-          return nextTr.setSelection(_prosemirrorState.TextSelection.between(nextTr.selection.$from, nextTr.selection.$from));
+          return nextTr.setSelection(_state.TextSelection.between(nextTr.selection.$from, nextTr.selection.$from));
         } else {
           return nextTr;
         }
@@ -184,7 +184,7 @@ var safeInsert = function safeInsert(content, position) {
 exports.safeInsert = safeInsert;
 var finaliseInsert = function finaliseInsert(tr, nodeLength) {
   var lastStep = tr.steps[tr.steps.length - 1];
-  if (!(lastStep instanceof _prosemirrorTransform.ReplaceStep || lastStep instanceof _prosemirrorTransform.ReplaceAroundStep)) {
+  if (!(lastStep instanceof _transform.ReplaceStep || lastStep instanceof _transform.ReplaceAroundStep)) {
     return null;
   }
 
@@ -202,16 +202,16 @@ var insertSelectedItem = function insertSelectedItem(maybeNode) {
     if (!maybeNode) {
       return tr;
     }
-    var isInputFragment = maybeNode instanceof _prosemirrorModel.Fragment;
+    var isInputFragment = maybeNode instanceof _model.Fragment;
     var node;
     try {
-      node = maybeNode instanceof _prosemirrorModel.Node || isInputFragment ? maybeNode : typeof maybeNode === 'string' ? state.schema.text(maybeNode) : _prosemirrorModel.Node.fromJSON(state.schema, maybeNode);
+      node = maybeNode instanceof _model.Node || isInputFragment ? maybeNode : typeof maybeNode === 'string' ? state.schema.text(maybeNode) : _model.Node.fromJSON(state.schema, maybeNode);
     } catch (e) {
       // eslint-disable-next-line no-console
       console.error(e);
       return tr;
     }
-    if (node instanceof _prosemirrorModel.Node && node.isText) {
+    if (node instanceof _model.Node && node.isText) {
       tr = tr.replaceWith(start, start, node);
 
       /**
@@ -219,7 +219,7 @@ var insertSelectedItem = function insertSelectedItem(maybeNode) {
        * Replacing a type ahead query mark with a block node.
        *
        */
-    } else if (node instanceof _prosemirrorModel.Node && node.isBlock) {
+    } else if (node instanceof _model.Node && node.isBlock) {
       /**
        *
        * Rule has unique insertion behaviour
@@ -233,11 +233,11 @@ var insertSelectedItem = function insertSelectedItem(maybeNode) {
       // ED-17438 If the selection is not an empty paragraph we want to use pmSafeInsert
       // This fixes a bug where if a rule was inserted using safeInsert and the selection
       // was an empty paragraph it would not be inserted
-      !(0, _utils.isEmptyParagraph)(tr.selection.$from.parent)) {
+      !(0, _utils2.isEmptyParagraph)(tr.selection.$from.parent)) {
         var _safeInsert;
         tr = (_safeInsert = safeInsert(node, tr.selection.from)(tr)) !== null && _safeInsert !== void 0 ? _safeInsert : tr;
       } else {
-        tr = (0, _prosemirrorUtils.safeInsert)(normaliseNestedLayout(state, node), undefined, true)(tr);
+        tr = (0, _utils.safeInsert)(normaliseNestedLayout(state, node), undefined, true)(tr);
       }
 
       /**
@@ -245,15 +245,15 @@ var insertSelectedItem = function insertSelectedItem(maybeNode) {
        * Replacing a type ahead query mark with an inline node.
        *
        */
-    } else if (node instanceof _prosemirrorModel.Node && node.isInline || isInputFragment) {
-      var fragment = isInputFragment ? node : _prosemirrorModel.Fragment.fromArray([node, state.schema.text(' ')]);
+    } else if (node instanceof _model.Node && node.isInline || isInputFragment) {
+      var fragment = isInputFragment ? node : _model.Fragment.fromArray([node, state.schema.text(' ')]);
       tr = tr.replaceWith(start, start, fragment);
       if (opts.selectInlineNode) {
         // Select inserted node
-        tr = tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, start));
+        tr = tr.setSelection(_state.NodeSelection.create(tr.doc, start));
       } else {
         // Placing cursor after node + space.
-        tr = tr.setSelection(_prosemirrorState.Selection.near(tr.doc.resolve(start + fragment.size)));
+        tr = tr.setSelection(_state.Selection.near(tr.doc.resolve(start + fragment.size)));
       }
     }
     return tr;
@@ -270,7 +270,7 @@ var shouldSplitSelectedNodeOnNodeInsertion = function shouldSplitSelectedNodeOnN
   var parentNodeType = _ref2.parentNodeType,
     grandParentNodeType = _ref2.grandParentNodeType,
     content = _ref2.content;
-  if (parentNodeType.name === 'doc' || parentNodeType.name === 'paragraph' && grandParentNodeType.validContent(_prosemirrorModel.Fragment.from(content))) {
+  if (parentNodeType.name === 'doc' || parentNodeType.name === 'paragraph' && grandParentNodeType.validContent(_model.Fragment.from(content))) {
     return true;
   }
   return false;

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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 SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "74.29.0";
+var packageVersion = "74.29.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/node-width/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.layoutToWidth = exports.getTableContainerWidth = exports.getParentNodeWidth = void 0;
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _constants = require("@atlaskit/theme/constants");
 var _extension = require("../styles/shared/extension");
@@ -58,7 +58,7 @@ var getParentNodeWidth = function getParentNodeWidth(pos, state, containerWidth,
     if (containerWidth.width > _editorSharedStyles.gridMediumMaxWidth || ((_contextPanelPluginKe = contextPanelPluginKey.getState(state)) === null || _contextPanelPluginKe === void 0 ? void 0 : _contextPanelPluginKe.contents.length) > 0 && ((_contextPanelPluginKe2 = contextPanelPluginKey.getState(state)) === null || _contextPanelPluginKe2 === void 0 ? void 0 : _contextPanelPluginKe2.contents[0]) !== undefined) {
       parentWidth -= (_layout.LAYOUT_SECTION_MARGIN + 2) * (node.childCount - 1); // margin between sections
       var $pos = state.doc.resolve(pos);
-      var column = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.layoutColumn]);
+      var column = (0, _utils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.layoutColumn]);
       if (column && column.node && !isNaN(column.node.attrs.width)) {
         // get exact width of parent layout column using node attrs
         parentWidth = Math.round(parentWidth * column.node.attrs.width * 0.01);
@@ -98,7 +98,7 @@ var getNestedParentNode = function getNestedParentNode(tablePos, state) {
     return null;
   }
   var $pos = state.doc.resolve(tablePos);
-  var parent = (0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
+  var parent = (0, _utils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
   return parent ? parent.node : null;
 };
 var calcBreakoutNodeWidth = function calcBreakoutNodeWidth(layout, containerWidth, isFullWidthModeEnabled) {

package/dist/cjs/safe-plugin/index.js

@@ -10,7 +10,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 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; } }
 var SafePlugin = /*#__PURE__*/function (_Plugin) {
@@ -25,5 +25,5 @@ var SafePlugin = /*#__PURE__*/function (_Plugin) {
     return _super.call(this, spec);
   }
   return (0, _createClass2.default)(SafePlugin);
-}(_prosemirrorState.Plugin);
+}(_state.Plugin);
 exports.SafePlugin = SafePlugin;

package/dist/cjs/selection/gap-cursor/selection.js

@@ -12,8 +12,8 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _isValidTargetNode = require("./utils/is-valid-target-node");
 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; } }
@@ -46,7 +46,7 @@ var GapCursorSelection = /*#__PURE__*/function (_Selection) {
     key: "map",
     value: function map(doc, mapping) {
       var $pos = doc.resolve(mapping.map(this.head));
-      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos, this.side) : _prosemirrorState.Selection.near($pos);
+      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos, this.side) : _state.Selection.near($pos);
     }
   }, {
     key: "eq",
@@ -56,7 +56,7 @@ var GapCursorSelection = /*#__PURE__*/function (_Selection) {
   }, {
     key: "content",
     value: function content() {
-      return _prosemirrorModel.Slice.empty;
+      return _model.Slice.empty;
     }
   }, {
     key: "getBookmark",
@@ -135,9 +135,9 @@ var GapCursorSelection = /*#__PURE__*/function (_Selection) {
     }
   }]);
   return GapCursorSelection;
-}(_prosemirrorState.Selection);
+}(_state.Selection);
 exports.GapCursorSelection = GapCursorSelection;
-_prosemirrorState.Selection.jsonID(JSON_ID, GapCursorSelection);
+_state.Selection.jsonID(JSON_ID, GapCursorSelection);
 var GapBookmark = /*#__PURE__*/function () {
   function GapBookmark(pos) {
     (0, _classCallCheck2.default)(this, GapBookmark);
@@ -152,7 +152,7 @@ var GapBookmark = /*#__PURE__*/function () {
     key: "resolve",
     value: function resolve(doc) {
       var $pos = doc.resolve(this.pos);
-      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos) : _prosemirrorState.Selection.near($pos);
+      return GapCursorSelection.valid($pos) ? new GapCursorSelection($pos) : _state.Selection.near($pos);
     }
   }]);
   return GapBookmark;

package/dist/cjs/transforms/expand.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformSliceToRemoveOpenExpand = exports.transformSliceNestedExpandToExpand = exports.findExpand = void 0;
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _slice = require("../utils/slice");
 var findExpand = function findExpand(state, selection) {
   var _state$schema$nodes = state.schema.nodes,
     expand = _state$schema$nodes.expand,
     nestedExpand = _state$schema$nodes.nestedExpand;
-  return (0, _prosemirrorUtils.findSelectedNodeOfType)([expand, nestedExpand])(selection || state.selection) || (0, _prosemirrorUtils.findParentNodeOfType)([expand, nestedExpand])(selection || state.selection);
+  return (0, _utils.findSelectedNodeOfType)([expand, nestedExpand])(selection || state.selection) || (0, _utils.findParentNodeOfType)([expand, nestedExpand])(selection || state.selection);
 };
 
 // If the top level is a single expand, and the expand is not
@@ -21,7 +21,7 @@ var findExpand = function findExpand(state, selection) {
 exports.findExpand = findExpand;
 var transformSliceToRemoveOpenExpand = function transformSliceToRemoveOpenExpand(slice, schema) {
   if (slice.openStart > 1 && slice.openEnd > 1 && slice.content.childCount === 1 && slice.content.firstChild && slice.content.firstChild.type === schema.nodes.expand) {
-    return new _prosemirrorModel.Slice(slice.content.firstChild.content, slice.openStart - 1, slice.openEnd - 1);
+    return new _model.Slice(slice.content.firstChild.content, slice.openStart - 1, slice.openEnd - 1);
   }
   return slice;
 };
@@ -38,6 +38,6 @@ var transformSliceNestedExpandToExpand = function transformSliceNestedExpandToEx
       children.push(node);
     }
   });
-  return new _prosemirrorModel.Slice(_prosemirrorModel.Fragment.fromArray(children), slice.openStart, slice.openEnd);
+  return new _model.Slice(_model.Fragment.fromArray(children), slice.openStart, slice.openEnd);
 };
 exports.transformSliceNestedExpandToExpand = transformSliceNestedExpandToExpand;

package/dist/cjs/transforms/extension.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformSliceToRemoveOpenBodiedExtension = void 0;
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _slice = require("../utils/slice");
 /**
  * Lift content out of "open" top-level bodiedExtensions.
@@ -24,6 +24,6 @@ var transformSliceToRemoveOpenBodiedExtension = function transformSliceToRemoveO
   });
 
   // If the first/last child has changed - then we know we've removed a bodied extension & to decrement the open depth
-  return new _prosemirrorModel.Slice(fragment, fragment.firstChild && fragment.firstChild.type !== slice.content.firstChild.type ? slice.openStart - 1 : slice.openStart, fragment.lastChild && fragment.lastChild.type !== slice.content.lastChild.type ? slice.openEnd - 1 : slice.openEnd);
+  return new _model.Slice(fragment, fragment.firstChild && fragment.firstChild.type !== slice.content.firstChild.type ? slice.openStart - 1 : slice.openStart, fragment.lastChild && fragment.lastChild.type !== slice.content.lastChild.type ? slice.openEnd - 1 : slice.openEnd);
 };
 exports.transformSliceToRemoveOpenBodiedExtension = transformSliceToRemoveOpenBodiedExtension;

package/dist/cjs/transforms/layout.js

@@ -7,13 +7,13 @@ exports.removeLayoutFromFirstChild = removeLayoutFromFirstChild;
 exports.removeLayoutFromLastChild = removeLayoutFromLastChild;
 exports.transformSliceToRemoveOpenLayoutNodes = transformSliceToRemoveOpenLayoutNodes;
 exports.unwrapContentFromLayout = unwrapContentFromLayout;
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _slice = require("../utils/slice");
 var isLayoutNode = function isLayoutNode(node) {
   return node.type === node.type.schema.nodes.layoutSection || node.type === node.type.schema.nodes.layoutColumn;
 };
 function unwrapContentFromLayout(maybeLayoutSection) {
-  var fragment = (0, _slice.mapFragment)(_prosemirrorModel.Fragment.from(maybeLayoutSection), function (node) {
+  var fragment = (0, _slice.mapFragment)(_model.Fragment.from(maybeLayoutSection), function (node) {
     return isLayoutNode(node) ? node.content : node;
   });
   var nodes = [];
@@ -44,7 +44,7 @@ function transformSliceToRemoveOpenLayoutNodes(slice, schema) {
   if (slice.openStart && slice.openEnd && slice.content.childCount === 1) {
     var maybeLayoutSection = slice.content.firstChild;
     if (maybeLayoutSection.type === schema.nodes.layoutSection) {
-      return new _prosemirrorModel.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromFirstChild),
+      return new _model.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromFirstChild),
       // '-2' here because we've removed the layoutSection/layoutColumn; reducing the open depth.
       slice.openStart - 2, slice.openEnd - 2);
     }
@@ -52,12 +52,12 @@ function transformSliceToRemoveOpenLayoutNodes(slice, schema) {
 
   // Case 2: A slice starting inside a layoutSection and finishing outside
   if (slice.openStart && slice.content.firstChild.type === schema.nodes.layoutSection) {
-    slice = new _prosemirrorModel.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromFirstChild), slice.openStart - 2, slice.openEnd);
+    slice = new _model.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromFirstChild), slice.openStart - 2, slice.openEnd);
   }
 
   // Case 3: A slice starting outside a layoutSection and finishing inside
   if (slice.openEnd && slice.content.lastChild.type === schema.nodes.layoutSection) {
-    slice = new _prosemirrorModel.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromLastChild), slice.openStart, slice.openEnd - 2);
+    slice = new _model.Slice((0, _slice.flatmap)(slice.content, removeLayoutFromLastChild), slice.openStart, slice.openEnd - 2);
   }
 
   // Case 2 & 3 also handles a slice starting in one layoutSection & finishing in a different layoutSection