@atlaskit/editor-core 187.8.0 → 187.8.7

package/dist/cjs/plugins/media/pm-plugins/linking/index.js

@@ -8,11 +8,11 @@ exports.mediaLinkingPluginKey = exports.getMediaLinkingState = exports.default =
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _pluginStateFactory = require("../../../../utils/plugin-state-factory");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var _reducer = _interopRequireDefault(require("./reducer"));
 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 mediaLinkingPluginKey = new _prosemirrorState.PluginKey('mediaLinking');
+var mediaLinkingPluginKey = new _state.PluginKey('mediaLinking');
 exports.mediaLinkingPluginKey = mediaLinkingPluginKey;
 var initialState = {
   visible: false,
@@ -29,7 +29,7 @@ function mapping(tr, pluginState) {
   return pluginState;
 }
 function onSelectionChanged(tr) {
-  var isNodeSelection = tr.selection instanceof _prosemirrorState.NodeSelection;
+  var isNodeSelection = tr.selection instanceof _state.NodeSelection;
   if (!isNodeSelection) {
     return initialState;
   }

package/dist/cjs/plugins/media/pm-plugins/linking/keymap.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = keymapPlugin;
-var _prosemirrorKeymap = require("prosemirror-keymap");
+var _keymap = require("@atlaskit/editor-prosemirror/keymap");
 var keymaps = _interopRequireWildcard(require("../../../../keymaps"));
 var _linking = require("../../commands/linking");
 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); }
@@ -13,5 +13,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 function keymapPlugin(schema) {
   var list = {};
   keymaps.bindKeymapWithCommand(keymaps.addLink.common, _linking.showLinkingToolbarWithMediaTypeCheck, list);
-  return (0, _prosemirrorKeymap.keymap)(list);
+  return (0, _keymap.keymap)(list);
 }

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

@@ -20,12 +20,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorTransform = require("prosemirror-transform");
-var _prosemirrorView = require("prosemirror-view");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
+var _transform = require("@atlaskit/editor-prosemirror/transform");
+var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _utils = require("@atlaskit/editor-common/utils");
 var _assert = _interopRequireDefault(require("assert"));
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _mediaSingle = require("../utils/media-single");
 var _DropPlaceholder = _interopRequireDefault(require("../ui/Media/DropPlaceholder"));
 var _mediaFiles = require("../utils/media-files");
@@ -36,7 +36,7 @@ var _pickerFacade = _interopRequireDefault(require("../picker-facade"));
 var _types = require("../../analytics/types");
 var _document = require("../../../utils/document");
 var _mediaCommon2 = require("@atlaskit/media-common");
-var _utils2 = require("../../../utils");
+var _utils3 = require("../../../utils");
 var _CaptionPlaceholder = require("../ui/CaptionPlaceholder");
 var _reactIntlNext = require("react-intl-next");
 var _mediaTaskManager = require("./mediaTaskManager");
@@ -243,7 +243,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       }
       if ((0, _mediaSingle.isMediaSingle)(state.schema, mediaStateWithContext.fileMimeType)) {
         (0, _mediaSingle.insertMediaSingleNode)(_this.view, mediaStateWithContext, _this.getInputMethod(pickerType), collection, _this.mediaOptions && _this.mediaOptions.alignLeftOnInsert, _this.newInsertionBehaviour, _this.widthPluginState);
-      } else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0, _document.isInEmptyLine)(state) && (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _utils2.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state)) {
+      } else if ((0, _mediaCommon2.getMediaFeatureFlag)('mediaInline', (_this$mediaOptions2 = _this.mediaOptions) === null || _this$mediaOptions2 === void 0 ? void 0 : _this$mediaOptions2.featureFlags) && !(0, _document.isInEmptyLine)(state) && (!(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state) || (0, _utils3.isInListItem)(state)) && (0, _mediaFiles.canInsertMediaInline)(state)) {
         (0, _mediaFiles.insertMediaInlineNode)(_this.view, mediaStateWithContext, collection, _this.getInputMethod(pickerType));
       } else {
         (0, _mediaFiles.insertMediaGroupNode)(_this.view, [mediaStateWithContext], collection, _this.getInputMethod(pickerType));
@@ -443,7 +443,7 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     });
     (0, _defineProperty2.default)(this, "selectedMediaContainerNode", function () {
       var selection = _this.view.state.selection;
-      if (selection instanceof _prosemirrorState.NodeSelection && _this.isMediaSchemaNode(selection.node)) {
+      if (selection instanceof _state2.NodeSelection && _this.isMediaSchemaNode(selection.node)) {
         return selection.node;
       }
       return;
@@ -468,11 +468,11 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
       // @see https://product-fabric.atlassian.net/browse/MEX-2457
       // If the media node is the last selectable item in the current cursor position and it is located within a mediaGroup,
       // we relocate the cursor to the first child of the mediaGroup.
-      var sel = _prosemirrorState.Selection.findFrom(doc.resolve(selection.$from.pos - 1), -1);
-      if (sel && (0, _prosemirrorUtils.findSelectedNodeOfType)(media)(sel)) {
-        var parent = (0, _prosemirrorUtils.findParentNodeOfType)(mediaGroup)(sel);
+      var sel = _state2.Selection.findFrom(doc.resolve(selection.$from.pos - 1), -1);
+      if (sel && (0, _utils2.findSelectedNodeOfType)(media)(sel)) {
+        var parent = (0, _utils2.findParentNodeOfType)(mediaGroup)(sel);
         if (parent) {
-          tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, parent.start));
+          tr.setSelection(_state2.NodeSelection.create(tr.doc, parent.start));
         }
       }
 
@@ -514,13 +514,13 @@ var MediaPluginStateImplementation = /*#__PURE__*/function () {
     key: "getDomElement",
     value: function getDomElement(domAtPos) {
       var selection = this.view.state.selection;
-      if (!(selection instanceof _prosemirrorState.NodeSelection)) {
+      if (!(selection instanceof _state2.NodeSelection)) {
         return;
       }
       if (!this.isMediaSchemaNode(selection.node)) {
         return;
       }
-      var node = (0, _prosemirrorUtils.findDomRefAtPos)(selection.from, domAtPos);
+      var node = (0, _utils2.findDomRefAtPos)(selection.from, domAtPos);
       if (node) {
         if (!node.childNodes.length) {
           return node.parentNode;
@@ -669,7 +669,7 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
       try {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var transaction = _step.value;
-          var isSelectionOnMediaInsideMediaSingle = transaction.selectionSet && (0, _prosemirrorUtils.isNodeSelection)(transaction.selection) && transaction.selection.node.type === newState.schema.nodes.media && transaction.selection.$anchor.parent.type === newState.schema.nodes.mediaSingle;
+          var isSelectionOnMediaInsideMediaSingle = transaction.selectionSet && (0, _utils2.isNodeSelection)(transaction.selection) && transaction.selection.node.type === newState.schema.nodes.media && transaction.selection.$anchor.parent.type === newState.schema.nodes.mediaSingle;
 
           // Note: this causes an additional transaction when selecting a media node
           // through clicking  on it with the cursor.
@@ -678,7 +678,7 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
             // we shift it to the media single parent as other code is opinionated about
             // the selection landing there. In particular the caption insertion and selection
             // action.
-            return newState.tr.setSelection(_prosemirrorState.NodeSelection.create(newState.doc, transaction.selection.$from.pos - 1));
+            return newState.tr.setSelection(_state2.NodeSelection.create(newState.doc, transaction.selection.$from.pos - 1));
           }
         }
       } catch (err) {
@@ -708,10 +708,10 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
           doc = state.doc;
 
         // Find any media nodes in the current selection
-        if (state.selection instanceof _prosemirrorState.TextSelection || state.selection instanceof _prosemirrorState.AllSelection || state.selection instanceof _prosemirrorState.NodeSelection || state.selection instanceof _cellSelection.CellSelection) {
+        if (state.selection instanceof _state2.TextSelection || state.selection instanceof _state2.AllSelection || state.selection instanceof _state2.NodeSelection || state.selection instanceof _cellSelection.CellSelection) {
           doc.nodesBetween(state.selection.from, state.selection.to, function (node, pos) {
             if (node.type === schema.nodes.media) {
-              mediaNodes.push(_prosemirrorView.Decoration.node(pos, pos + node.nodeSize, {}, {
+              mediaNodes.push(_view2.Decoration.node(pos, pos + node.nodeSize, {}, {
                 type: 'media',
                 selected: true
               }));
@@ -722,31 +722,31 @@ var createPlugin = function createPlugin(_schema, options, reactContext, getIntl
         }
         var pluginState = getMediaPluginState(state);
         if (!pluginState.showDropzone) {
-          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
+          return _view2.DecorationSet.create(state.doc, mediaNodes);
         }
 
         // When a media is already selected
-        if (state.selection instanceof _prosemirrorState.NodeSelection) {
+        if (state.selection instanceof _state2.NodeSelection) {
           var node = state.selection.node;
           if (node.type === schema.nodes.mediaSingle) {
-            var deco = _prosemirrorView.Decoration.node(state.selection.from, state.selection.to, {
+            var deco = _view2.Decoration.node(state.selection.from, state.selection.to, {
               class: 'richMedia-selected'
             });
-            return _prosemirrorView.DecorationSet.create(state.doc, [deco].concat(mediaNodes));
+            return _view2.DecorationSet.create(state.doc, [deco].concat(mediaNodes));
           }
-          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
+          return _view2.DecorationSet.create(state.doc, mediaNodes);
         }
         var pos = $anchor.pos;
         if ($anchor.parent.type !== schema.nodes.paragraph && $anchor.parent.type !== schema.nodes.codeBlock) {
-          pos = (0, _prosemirrorTransform.insertPoint)(state.doc, pos, schema.nodes.mediaGroup);
+          pos = (0, _transform.insertPoint)(state.doc, pos, schema.nodes.mediaGroup);
         }
         if (pos === null || pos === undefined) {
-          return _prosemirrorView.DecorationSet.create(state.doc, mediaNodes);
+          return _view2.DecorationSet.create(state.doc, mediaNodes);
         }
-        var dropPlaceholders = [_prosemirrorView.Decoration.widget(pos, dropPlaceholder, {
+        var dropPlaceholders = [_view2.Decoration.widget(pos, dropPlaceholder, {
           key: 'drop-placeholder'
         })].concat(mediaNodes);
-        return _prosemirrorView.DecorationSet.create(state.doc, dropPlaceholders);
+        return _view2.DecorationSet.create(state.doc, dropPlaceholders);
       },
       nodeViews: options.nodeViews,
       handleTextInput: function handleTextInput(view) {

package/dist/cjs/plugins/media/pm-plugins/media-editor-plugin-factory.js

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

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

package/dist/cjs/plugins/media/toolbar/commands.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toggleBorderMark = exports.setBorderMark = exports.removeInlineCard = exports.changeMediaCardToInline = exports.changeInlineToMediaCard = exports.DEFAULT_BORDER_SIZE = exports.DEFAULT_BORDER_COLOR = void 0;
-var _prosemirrorModel = require("prosemirror-model");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _model = require("@atlaskit/editor-prosemirror/model");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _analytics = require("../../analytics");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _currentMediaNode = require("../utils/current-media-node");
 var DEFAULT_BORDER_COLOR = '#091e4224';
 exports.DEFAULT_BORDER_COLOR = DEFAULT_BORDER_COLOR;
@@ -19,7 +19,7 @@ var changeInlineToMediaCard = function changeInlineToMediaCard(state, dispatch)
     media = _state$schema$nodes.media,
     mediaInline = _state$schema$nodes.mediaInline,
     mediaGroup = _state$schema$nodes.mediaGroup;
-  var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node.type === mediaInline && state.selection.node;
+  var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node.type === mediaInline && state.selection.node;
   if (!selectedNode) {
     return false;
   }
@@ -35,8 +35,8 @@ var changeInlineToMediaCard = function changeInlineToMediaCard(state, dispatch)
   var group = mediaGroup.createChecked({}, mediaNode);
   var nodePos = state.tr.doc.resolve(state.selection.from).end();
   var tr = state.tr;
-  tr = (0, _prosemirrorUtils.removeSelectedNode)(tr);
-  tr = (0, _prosemirrorUtils.safeInsert)(group, nodePos, true)(tr);
+  tr = (0, _utils.removeSelectedNode)(tr);
+  tr = (0, _utils.safeInsert)(group, nodePos, true)(tr);
   if (dispatch) {
     (0, _analytics.addAnalytics)(state, tr, {
       action: _analytics.ACTION.CHANGED_TYPE,
@@ -57,7 +57,7 @@ var changeMediaCardToInline = function changeMediaCardToInline(state, dispatch)
     media = _state$schema$nodes2.media,
     mediaInline = _state$schema$nodes2.mediaInline,
     paragraph = _state$schema$nodes2.paragraph;
-  var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node;
+  var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
 
   // @ts-ignore - [unblock prosemirror bump] redundant check comparing boolean to media
   if (!selectedNode || !selectedNode.type === media) {
@@ -68,11 +68,11 @@ var changeMediaCardToInline = function changeMediaCardToInline(state, dispatch)
     collection: selectedNode.attrs.collection
   });
   var space = state.schema.text(' ');
-  var content = _prosemirrorModel.Fragment.from([mediaInlineNode, space]);
+  var content = _model.Fragment.from([mediaInlineNode, space]);
   var node = paragraph.createChecked({}, content);
   var nodePos = state.tr.doc.resolve(state.selection.from).start() - 1;
-  var tr = (0, _utils.removeMediaGroupNode)(state);
-  tr = (0, _prosemirrorUtils.safeInsert)(node, nodePos, true)(tr);
+  var tr = (0, _utils2.removeMediaGroupNode)(state);
+  tr = (0, _utils.safeInsert)(node, nodePos, true)(tr);
   if (dispatch) {
     (0, _analytics.addAnalytics)(state, tr, {
       action: _analytics.ACTION.CHANGED_TYPE,
@@ -89,9 +89,9 @@ var changeMediaCardToInline = function changeMediaCardToInline(state, dispatch)
 };
 exports.changeMediaCardToInline = changeMediaCardToInline;
 var removeInlineCard = function removeInlineCard(state, dispatch) {
-  if ((0, _prosemirrorUtils.isNodeSelection)(state.selection)) {
+  if ((0, _utils.isNodeSelection)(state.selection)) {
     if (dispatch) {
-      dispatch((0, _prosemirrorUtils.removeSelectedNode)(state.tr));
+      dispatch((0, _utils.removeSelectedNode)(state.tr));
     }
     return true;
   }
@@ -116,9 +116,9 @@ var toggleBorderMark = function toggleBorderMark(state, dispatch) {
   }));
   var tr = state.tr.setNodeMarkup(pos, node.type, node.attrs, marks);
   tr.setMeta('scrollIntoView', false);
-  if (state.selection instanceof _prosemirrorState.NodeSelection) {
+  if (state.selection instanceof _state.NodeSelection) {
     if (state.selection.$anchor.pos === state.selection.from) {
-      tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, state.selection.from));
+      tr.setSelection(_state.NodeSelection.create(tr.doc, state.selection.from));
     }
   }
   if (dispatch) {
@@ -172,9 +172,9 @@ var setBorderMark = function setBorderMark(attrs) {
     }));
     var tr = state.tr.setNodeMarkup(pos, node.type, node.attrs, marks);
     tr.setMeta('scrollIntoView', false);
-    if (state.selection instanceof _prosemirrorState.NodeSelection) {
+    if (state.selection instanceof _state.NodeSelection) {
       if (state.selection.$anchor.pos === state.selection.from) {
-        tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, state.selection.from));
+        tr.setSelection(_state.NodeSelection.create(tr.doc, state.selection.from));
       }
     }
     if (dispatch) {

package/dist/cjs/plugins/media/toolbar/index.js

@@ -8,8 +8,8 @@ exports.floatingToolbar = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _react = _interopRequireDefault(require("react"));
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _state2 = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove"));
 var _download = _interopRequireDefault(require("@atlaskit/icon/glyph/download"));
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
@@ -26,7 +26,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _mediaUi = require("@atlaskit/media-ui");
 var _messages2 = require("@atlaskit/editor-common/messages");
 var _filePreviewItem = require("./filePreviewItem");
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 var _commands = require("./commands");
 var _styles = require("../nodeviews/styles");
 var _ImageBorder = _interopRequireDefault(require("../ui/ImageBorder"));
@@ -36,12 +36,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 remove = function remove(state, dispatch) {
   if (dispatch) {
-    dispatch((0, _prosemirrorUtils.removeSelectedNode)(state.tr));
+    dispatch((0, _utils.removeSelectedNode)(state.tr));
   }
   return true;
 };
 var handleRemoveMediaGroup = function handleRemoveMediaGroup(state, dispatch) {
-  var tr = (0, _utils.removeMediaGroupNode)(state);
+  var tr = (0, _utils2.removeMediaGroupNode)(state);
   if (dispatch) {
     dispatch(tr);
   }
@@ -89,7 +89,7 @@ var generateMediaCardFloatingToolbar = function generateMediaCardFloatingToolbar
     type: 'button',
     icon: _download.default,
     onClick: function onClick() {
-      (0, _utils.downloadMedia)(mediaPluginState);
+      (0, _utils2.downloadMedia)(mediaPluginState);
       return true;
     },
     title: intl.formatMessage(_mediaUi.messages.download)
@@ -162,7 +162,7 @@ var generateMediaInlineFloatingToolbar = function generateMediaInlineFloatingToo
     type: 'button',
     icon: _download.default,
     onClick: function onClick() {
-      (0, _utils.downloadMedia)(mediaPluginState);
+      (0, _utils2.downloadMedia)(mediaPluginState);
       return true;
     },
     title: intl.formatMessage(_mediaUi.messages.download)
@@ -360,9 +360,9 @@ var floatingToolbar = function floatingToolbar(state, intl) {
     }
   }
   var items = [];
-  var parentMediaGroupNode = (0, _prosemirrorUtils.findParentNodeOfType)(mediaGroup)(state.selection);
+  var parentMediaGroupNode = (0, _utils.findParentNodeOfType)(mediaGroup)(state.selection);
   var selectedNodeType;
-  if (state.selection instanceof _prosemirrorState.NodeSelection) {
+  if (state.selection instanceof _state2.NodeSelection) {
     selectedNodeType = state.selection.node.type;
   }
   if (allowMediaInline && (parentMediaGroupNode === null || parentMediaGroupNode === void 0 ? void 0 : parentMediaGroupNode.node.type) === mediaGroup) {

package/dist/cjs/plugins/media/toolbar/linking-toolbar-appearance.js

@@ -26,7 +26,7 @@ var _templateObject;
 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; }
 // need this wrapper, need to have 4px between items.
-var wrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  margin-right: 4px;\n"])));
+var wrapper = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  display: flex;\n  align-items: center;\n  margin-right: ", ";\n"])), "var(--ds-space-050, 4px)");
 var LinkToolbarAppearance = function LinkToolbarAppearance(_ref) {
   var editorState = _ref.editorState,
     mediaLinkingState = _ref.mediaLinkingState,

package/dist/cjs/plugins/media/toolbar/utils.js

@@ -8,7 +8,7 @@ exports.removeMediaGroupNode = exports.getSelectedMediaContainerNodeAttrs = expo
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _mediaClient = require("@atlaskit/media-client");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var getSelectedMediaContainerNodeAttrs = function getSelectedMediaContainerNodeAttrs(mediaPluginState) {
   var selectedNode = mediaPluginState.selectedMediaContainerNode();
   if (selectedNode && selectedNode.attrs) {
@@ -58,13 +58,13 @@ var downloadMedia = /*#__PURE__*/function () {
 exports.downloadMedia = downloadMedia;
 var removeMediaGroupNode = function removeMediaGroupNode(state) {
   var mediaGroup = state.schema.nodes.mediaGroup;
-  var mediaGroupParent = (0, _prosemirrorUtils.findParentNodeOfType)(mediaGroup)(state.selection);
+  var mediaGroupParent = (0, _utils.findParentNodeOfType)(mediaGroup)(state.selection);
   var tr = state.tr;
   // If it is the last media group in filmstrip, remove the entire filmstrip
   if (mediaGroupParent && mediaGroupParent.node.childCount === 1) {
-    tr = (0, _prosemirrorUtils.removeParentNodeOfType)(mediaGroup)(tr);
+    tr = (0, _utils.removeParentNodeOfType)(mediaGroup)(tr);
   } else {
-    tr = (0, _prosemirrorUtils.removeSelectedNode)(tr);
+    tr = (0, _utils.removeSelectedNode)(tr);
   }
   return tr;
 };

package/dist/cjs/plugins/media/ui/ResizableMediaSingle/index.js

@@ -18,12 +18,12 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _mediaClient = require("@atlaskit/media-client");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _styled = require("./styled");
-var _utils = require("@atlaskit/editor-common/utils");
+var _utils2 = require("@atlaskit/editor-common/utils");
 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; } } /** @jsx jsx */
 var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
@@ -60,7 +60,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
       _this.setState({
         resizedPctWidth: newPct
       });
-      var newLayout = (0, _prosemirrorUtils.hasParentNodeOfType)(state.schema.nodes.table)(state.selection) ? layout : _this.calcUnwrappedLayout(newPct, newWidth);
+      var newLayout = (0, _utils.hasParentNodeOfType)(state.schema.nodes.table)(state.selection) ? layout : _this.calcUnwrappedLayout(newPct, newWidth);
       if (newPct <= 100) {
         if (_this.wrappedLayout && (stop ? newPct !== 100 : true)) {
           newLayout = layout;
@@ -125,7 +125,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
         table = _this$props$view$stat.table,
         expand = _this$props$view$stat.expand,
         nestedExpand = _this$props$view$stat.nestedExpand;
-      if (_this.$pos && !!(0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)(_this.$pos, [layoutColumn, table, expand, nestedExpand].filter(Boolean))) {
+      if (_this.$pos && !!(0, _utils.findParentNodeOfTypeClosestToPos)(_this.$pos, [layoutColumn, table, expand, nestedExpand].filter(Boolean))) {
         return [];
       }
       if (snapWidth > _editorSharedStyles.akEditorWideLayoutWidth) {
@@ -313,7 +313,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
         return false;
       }
       var listItem = this.props.view.state.schema.nodes.listItem;
-      return !!(0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($pos, [listItem]);
+      return !!(0, _utils.findParentNodeOfTypeClosestToPos)($pos, [listItem]);
     }
   }, {
     key: "insideLayout",
@@ -323,7 +323,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
         return false;
       }
       var layoutColumn = this.props.view.state.schema.nodes.layoutColumn;
-      return !!(0, _prosemirrorUtils.findParentNodeOfTypeClosestToPos)($pos, [layoutColumn]);
+      return !!(0, _utils.findParentNodeOfTypeClosestToPos)($pos, [layoutColumn]);
     }
   }, {
     key: "render",
@@ -380,7 +380,7 @@ var ResizableMediaSingle = /*#__PURE__*/function (_React$Component) {
         selected: selected,
         enable: enable,
         calcNewSize: this.calcNewSize,
-        snapPoints: (0, _utils.calculateSnapPoints)(snapPointsProps),
+        snapPoints: (0, _utils2.calculateSnapPoints)(snapPointsProps),
         scaleFactor: !this.wrappedLayout && !this.insideInlineLike ? 2 : 1,
         highlights: this.highlights,
         nodeType: "media",

package/dist/cjs/plugins/media/utils/current-media-node.js

@@ -4,12 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.currentMediaNodeWithPos = exports.currentMediaNodeBorderMark = exports.currentMediaNode = void 0;
-var _prosemirrorState = require("prosemirror-state");
+var _state = require("@atlaskit/editor-prosemirror/state");
 var currentMediaNodeWithPos = function currentMediaNodeWithPos(editorState) {
   var doc = editorState.doc,
     selection = editorState.selection,
     schema = editorState.schema;
-  if (!doc || !selection || !(selection instanceof _prosemirrorState.NodeSelection) || selection.node.type !== schema.nodes.mediaSingle) {
+  if (!doc || !selection || !(selection instanceof _state.NodeSelection) || selection.node.type !== schema.nodes.mediaSingle) {
     return;
   }
   var pos = selection.$anchor.pos + 1;

package/dist/cjs/plugins/media/utils/media-common.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.unwrapNestedMediaElements = exports.transformSliceToCorrectMediaWrapper = exports.splitMediaGroup = exports.removeMediaNode = exports.posOfPrecedingMediaGroup = exports.posOfParentMediaGroup = exports.posOfMediaGroupNearby = exports.isSelectionNonMediaBlockNode = exports.isSelectionMediaSingleNode = exports.isMediaBlobUrlFromAttrs = exports.isInsidePotentialEmptyParagraph = exports.getMediaNodeFromSelection = exports.copyOptionalAttrsFromMediaState = void 0;
-var _prosemirrorCommands = require("prosemirror-commands");
-var _prosemirrorState = require("prosemirror-state");
-var _prosemirrorUtils = require("prosemirror-utils");
-var _commands = require("../../../commands");
-var _utils = require("../../../utils");
+var _commands = require("@atlaskit/editor-prosemirror/commands");
+var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils = require("@atlaskit/editor-prosemirror/utils");
+var _commands2 = require("../../../commands");
+var _utils2 = require("../../../utils");
 var _slice = require("../../../utils/slice");
 var _dom = require("../../../utils/dom");
 var _isImage = require("./is-image");
@@ -128,7 +128,7 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
     return;
   }
   tr.deleteRange(currentMediaNodePos, currentMediaNodePos + node.nodeSize);
-  if ((0, _utils.isTemporary)(id)) {
+  if ((0, _utils2.isTemporary)(id)) {
     tr.setMeta('addToHistory', false);
   }
   var $currentMediaNodePos = doc.resolve(currentMediaNodePos);
@@ -140,9 +140,9 @@ var removeMediaNode = function removeMediaNode(view, node, getPos) {
   // Prosemirror didn't gave us the behaviour of moving left if the media node is not the last one.
   // So we handle it ourselves.
   if (selection.from === currentMediaNodePos && !isLastMediaNode && !(0, _position.atTheBeginningOfDoc)(state) && nodeBefore && nodeBefore.type.name === 'media') {
-    var _nodeBefore = (0, _prosemirrorUtils.findPositionOfNodeBefore)(tr.selection);
+    var _nodeBefore = (0, _utils.findPositionOfNodeBefore)(tr.selection);
     if (_nodeBefore) {
-      tr.setSelection(_prosemirrorState.NodeSelection.create(tr.doc, _nodeBefore));
+      tr.setSelection(_state.NodeSelection.create(tr.doc, _nodeBefore));
     }
   }
   view.dispatch(tr);
@@ -152,15 +152,15 @@ var splitMediaGroup = function splitMediaGroup(view) {
   var selection = view.state.selection;
 
   // if selection is not a media node, do nothing.
-  if (!(selection instanceof _prosemirrorState.NodeSelection) || selection.node.type !== view.state.schema.nodes.media) {
+  if (!(selection instanceof _state.NodeSelection) || selection.node.type !== view.state.schema.nodes.media) {
     return false;
   }
-  (0, _prosemirrorCommands.deleteSelection)(view.state, view.dispatch);
+  (0, _commands.deleteSelection)(view.state, view.dispatch);
   if (selection.$to.nodeAfter) {
-    (0, _prosemirrorCommands.splitBlock)(view.state, view.dispatch);
-    (0, _commands.createParagraphNear)(false)(view.state, view.dispatch);
+    (0, _commands.splitBlock)(view.state, view.dispatch);
+    (0, _commands2.createParagraphNear)(false)(view.state, view.dispatch);
   } else {
-    (0, _commands.createNewParagraphBelow)(view.state, view.dispatch);
+    (0, _commands2.createNewParagraphBelow)(view.state, view.dispatch);
   }
   return true;
 };

package/dist/cjs/plugins/media/utils/media-files.js

@@ -4,17 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.insertMediaInlineNode = exports.insertMediaGroupNode = exports.getPosInList = exports.canInsertMediaInline = void 0;
-var _prosemirrorModel = require("prosemirror-model");
+var _model = require("@atlaskit/editor-prosemirror/model");
 var _utils = require("../../../utils");
 var _utils2 = require("@atlaskit/editor-common/utils");
 var _mediaCommon = require("./media-common");
-var _prosemirrorUtils = require("prosemirror-utils");
+var _utils3 = require("@atlaskit/editor-prosemirror/utils");
 var _position = require("../../../utils/prosemirror/position");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _analytics2 = require("../../analytics");
 var canInsertMediaInline = function canInsertMediaInline(state) {
   var node = state.schema.nodes.mediaInline.create({});
-  return (0, _prosemirrorUtils.canInsert)(state.selection.$to, _prosemirrorModel.Fragment.from(node));
+  return (0, _utils3.canInsert)(state.selection.$to, _model.Fragment.from(node));
 };
 exports.canInsertMediaInline = canInsertMediaInline;
 var getInsertMediaGroupAnalytics = function getInsertMediaGroupAnalytics(mediaState, inputMethod) {
@@ -102,7 +102,7 @@ var insertMediaInlineNode = function insertMediaInlineNode(view, mediaState, col
   if ((0, _utils.isInListItem)(state) && (0, _mediaCommon.isInsidePotentialEmptyParagraph)(state)) {
     pos = pos + 1;
   }
-  var content = _prosemirrorModel.Fragment.from([mediaInlineNode, space]);
+  var content = _model.Fragment.from([mediaInlineNode, space]);
 
   // Delete the selection if a selection is made
   var deleteRange = findDeleteRange(state);
@@ -142,7 +142,7 @@ var insertMediaGroupNode = function insertMediaGroupNode(view, mediaStates, coll
   var resolvedInsertPos = tr.doc.resolve(mediaInsertPos);
   var parent = resolvedInsertPos.parent;
   var nodeAtInsertionPoint = tr.doc.nodeAt(mediaInsertPos);
-  var shouldSplit = !isSelectionMediaGroup(state) && (0, _utils2.isSupportedInParent)(state, _prosemirrorModel.Fragment.from(state.schema.nodes.mediaGroup.createChecked({}, mediaNodes)));
+  var shouldSplit = !isSelectionMediaGroup(state) && (0, _utils2.isSupportedInParent)(state, _model.Fragment.from(state.schema.nodes.mediaGroup.createChecked({}, mediaNodes)));
   var withParagraph = shouldAppendParagraph(state, nodeAtInsertionPoint);
   var content = parent.type === schema.nodes.mediaGroup ? mediaNodes // If parent is a mediaGroup do not wrap items again.
   : [schema.nodes.mediaGroup.createChecked({}, mediaNodes)];
@@ -168,7 +168,7 @@ var insertMediaGroupNode = function insertMediaGroupNode(view, mediaStates, coll
     content.push(paragraph.create());
   }
   (0, _analytics2.addAnalytics)(state, tr, getInsertMediaGroupAnalytics(mediaStates, inputMethod));
-  dispatch((0, _prosemirrorUtils.safeInsert)(_prosemirrorModel.Fragment.fromArray(content), mediaInsertPos)(tr));
+  dispatch((0, _utils3.safeInsert)(_model.Fragment.fromArray(content), mediaInsertPos)(tr));
 };
 exports.insertMediaGroupNode = insertMediaGroupNode;
 var createMediaFileNodes = function createMediaFileNodes(mediaStates, collection, media) {
@@ -209,7 +209,7 @@ var getPosInList = function getPosInList(state) {
     listItem = _state$schema$nodes2.listItem;
 
   // 1. Check if I am inside a list.
-  if ((0, _prosemirrorUtils.hasParentNode)(function (node) {
+  if ((0, _utils3.hasParentNode)(function (node) {
     return node.type === listItem;
   })(state.selection)) {
     // 2. Get end position of root list