@atlaskit/editor-core 180.0.0 → 181.0.0

package/dist/esm/plugins/image-upload/pm-plugins/main.js

@@ -9,15 +9,51 @@ import { isDroppedFile } from '../../../utils/drag-drop';
 import { canInsertMedia, isMediaSelected } from '../utils';
 import { insertExternalImage, startImageUpload } from './commands';
 import { stateKey } from './plugin-key';
+
+/**
+ * Microsoft Office includes a screenshot image when copying text content.
+ *
+ * This function determines whether or not we can ignore the image if it
+ * came from MS Office. We do this by checking for
+ *
+ * - plain text
+ * - HTML text which includes the MS Office namespace
+ * - the number of files and the file name/type
+ *
+ * It is easy to manually verify this using by using Office on Mac
+ * (or Excel if on Windows) and pasting into
+ * https://evercoder.github.io/clipboard-inspector/
+ *
+ * Note: image content in Word is stored in the `text/html` portion
+ * of the clipboard, not under `files` attachment like the screenshot.
+ *
+ * @returns boolean True if the paste event contains a screenshot from MS Office
+ */
+var hasScreenshotImageFromMSOffice = function hasScreenshotImageFromMSOffice(ev) {
+  var _ref = ev,
+    clipboardData = _ref.clipboardData;
+  if (!clipboardData || clipboardData.files.length !== 1) {
+    return false;
+  }
+  var textPlain = !!clipboardData.getData('text/plain');
+  var textHtml = clipboardData.getData('text/html');
+  var isOfficeXMLNamespace = textHtml.includes('urn:schemas-microsoft-com:office:office');
+  var file = clipboardData.files[0];
+  var isImagePNG = file.type === 'image/png' && file.name === 'image.png';
+  return isImagePNG && textPlain && isOfficeXMLNamespace;
+};
 var createDOMHandler = function createDOMHandler(pred, eventName) {
   return function (view, event) {
     if (!pred(event)) {
       return false;
     }
-    event.preventDefault();
-    event.stopPropagation();
-    startImageUpload(event)(view.state, view.dispatch);
-    return true;
+    var shouldUpload = !hasScreenshotImageFromMSOffice(event);
+    if (shouldUpload) {
+      event.preventDefault();
+      event.stopPropagation();
+      startImageUpload(event)(view.state, view.dispatch);
+    }
+    return shouldUpload;
   };
 };
 var getNewActiveUpload = function getNewActiveUpload(tr, pluginState) {
@@ -29,9 +65,9 @@ var getNewActiveUpload = function getNewActiveUpload(tr, pluginState) {
   }
   return pluginState.activeUpload;
 };
-export var createPlugin = function createPlugin(_ref) {
-  var dispatch = _ref.dispatch,
-    providerFactory = _ref.providerFactory;
+export var createPlugin = function createPlugin(_ref2) {
+  var dispatch = _ref2.dispatch,
+    providerFactory = _ref2.providerFactory;
   var uploadHandler;
   return new SafePlugin({
     state: {
@@ -61,7 +97,7 @@ export var createPlugin = function createPlugin(_ref) {
     key: stateKey,
     view: function view() {
       var handleProvider = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(name, provider) {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(name, provider) {
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -91,7 +127,7 @@ export var createPlugin = function createPlugin(_ref) {
           }, _callee, null, [[2, 8]]);
         }));
         return function handleProvider(_x, _x2) {
-          return _ref2.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }();
       providerFactory.subscribe('imageUploadProvider', handleProvider);
@@ -103,9 +139,12 @@ export var createPlugin = function createPlugin(_ref) {
           // if we've add a new upload to the state, execute the uploadHandler
           var oldState = stateKey.getState(prevState);
           if (currentState.activeUpload !== oldState.activeUpload && currentState.activeUpload && uploadHandler) {
-            uploadHandler(currentState.activeUpload.event, function (options) {
-              return insertExternalImage(options)(view.state, view.dispatch);
-            });
+            var event = currentState.activeUpload.event;
+            if (!event || !hasScreenshotImageFromMSOffice(event)) {
+              uploadHandler(event, function (options) {
+                return insertExternalImage(options)(view.state, view.dispatch);
+              });
+            }
           }
         },
         destroy: function destroy() {

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-element-browser.js

@@ -26,6 +26,7 @@ export var BlockInsertElementBrowser = function BlockInsertElementBrowser(props)
     selected: props.open,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     label: props.label,
     "aria-keyshortcuts": "/"

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu-legacy.js

@@ -27,6 +27,7 @@ export var BlockInsertMenuLegacy = function BlockInsertMenuLegacy(props) {
     selected: props.open,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     label: props.label,
     "aria-keyshortcuts": "/"

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/block-insert-menu.js

@@ -14,6 +14,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
       selected: props.open,
       disabled: props.disabled,
       onClick: props.onClick,
+      onKeyDown: props.onKeyDown,
       spacing: props.spacing,
       label: props.label,
       "aria-keyshortcuts": "/"
@@ -26,6 +27,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
       items: props.items,
       label: props.label,
       onClick: props.onClick,
+      onKeyDown: props.onKeyDown,
       onInsert: props.onInsert,
       onRef: props.onPlusButtonRef,
       open: props.open,
@@ -43,6 +45,7 @@ export var BlockInsertMenu = function BlockInsertMenu(props) {
     items: props.items,
     label: props.label,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     onItemActivated: props.onItemActivated,
     onOpenChange: props.onOpenChange,
     onRef: props.onRef,

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/dropdown-button.js

@@ -24,6 +24,7 @@ export var DropDownButton = /*#__PURE__*/React.memo(function (props) {
     selected: props.selected,
     disabled: props.disabled,
     onClick: props.onClick,
+    onKeyDown: props.onKeyDown,
     spacing: props.spacing,
     "aria-expanded": props['aria-expanded'],
     "aria-haspopup": props['aria-haspopup'],

package/dist/esm/plugins/insert-block/ui/ToolbarInsertBlock/index.js

@@ -57,6 +57,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "state", {
       isPlusMenuOpen: false,
       emojiPickerOpen: false,
+      isOpenedByKeyboard: false,
       buttons: [],
       dropdownItems: []
     });
@@ -156,6 +157,15 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
     _defineProperty(_assertThisInitialized(_this), "handleClick", function () {
       _this.togglePlusMenuVisibility();
     });
+    _defineProperty(_assertThisInitialized(_this), "handleOpenByKeyboard", function (event) {
+      if (event.key === 'Enter' || event.key === ' ') {
+        _this.setState(_objectSpread(_objectSpread({}, _this.state), {}, {
+          isOpenedByKeyboard: true
+        }));
+        event.preventDefault();
+        _this.togglePlusMenuVisibility();
+      }
+    });
     _defineProperty(_assertThisInitialized(_this), "toggleLinkPanel", function (inputMethod) {
       var editorView = _this.props.editorView;
       showLinkToolbar(inputMethod)(editorView.state, editorView.dispatch);
@@ -378,6 +388,17 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
           emojiPickerOpen: false
         });
       }
+      if (this.state.isOpenedByKeyboard) {
+        var _this$dropdownButtonR;
+        var downArrowEvent = new KeyboardEvent('keydown', {
+          bubbles: true,
+          key: 'ArrowDown'
+        });
+        (_this$dropdownButtonR = this.dropdownButtonRef) === null || _this$dropdownButtonR === void 0 ? void 0 : _this$dropdownButtonR.dispatchEvent(downArrowEvent);
+        this.setState(_objectSpread(_objectSpread({}, this.state), {}, {
+          isOpenedByKeyboard: false
+        }));
+      }
     }
   }, {
     key: "renderPopup",
@@ -463,6 +484,7 @@ export var ToolbarInsertBlock = /*#__PURE__*/function (_React$PureComponent) {
         onRef: this.handleDropDownButtonRef,
         onPlusButtonRef: this.handlePlusButtonRef,
         onClick: this.handleClick,
+        onKeyDown: this.handleOpenByKeyboard,
         onItemActivated: this.insertInsertMenuItem,
         onInsert: this.insertInsertMenuItem,
         onOpenChange: this.onOpenChange,

package/dist/esm/plugins/layout/styles.js

@@ -2,10 +2,19 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 import { css } from '@emotion/react';
 import { gridSize } from '@atlaskit/theme/constants';
-import { N40A, N50A } from '@atlaskit/theme/colors';
+import { N40A, N50A, DN70, DN80 } from '@atlaskit/theme/colors';
+import { themed } from '@atlaskit/theme/components';
 import { columnLayoutSharedStyle, LAYOUT_SECTION_MARGIN, LAYOUT_COLUMN_PADDING } from '@atlaskit/editor-common/styles';
 import { gridMediumMaxWidth, akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akLayoutGutterOffset, akEditorSwoopCubicBezier, SelectionStyle, getSelectionStyles, akEditorSelectedNodeClassName } from '@atlaskit/editor-shared-styles';
 import { TableCssClassName } from '@atlaskit/editor-plugin-table/types';
 import { tableMarginFullWidthMode } from '@atlaskit/editor-plugin-table/ui/consts';
 export { LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN };
-export var layoutStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", " [data-layout-section] {\n      margin: ", "px -", "px 0;\n      transition: border-color 0.3s ", ";\n      cursor: pointer;\n\n      /* Inner cursor located 26px from left */\n      [data-layout-column] {\n        flex: 1;\n        min-width: 0;\n        border: ", "px solid\n          ", ";\n        border-radius: 4px;\n        padding: ", "px;\n        box-sizing: border-box;\n\n        > div {\n          > :not(style):first-child,\n          > style:first-child + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + *,\n          > style:first-child + .ProseMirror-gapcursor + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + span + *,\n          > style:first-child + .ProseMirror-gapcursor:first-child + span + * {\n            margin-top: 0;\n          }\n\n          > .embedCardView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-child\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor.-right\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > .ProseMirror-gapcursor.-right:first-of-type\n            + .embedCardView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          /* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n             and shrinking layout's node selectable area (leniency margin) */\n          > [data-node-type='decisionList'] {\n            li:first-of-type [data-decision-wrapper] {\n              margin-top: 0;\n            }\n          }\n        }\n\n        /* Make the 'content' fill the entire height of the layout column to allow click\n           handler of layout section nodeview to target only data-layout-column */\n        [data-layout-content] {\n          height: 100%;\n          cursor: text;\n        }\n      }\n\n      [data-layout-column] + [data-layout-column] {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        [data-layout-column] + [data-layout-column] {\n          margin-left: 0;\n        }\n      }\n\n      // TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.\n      // This is because the default state already uses the same token and, as such, the hover style won't change anything.\n      // https://product-fabric.atlassian.net/browse/DSP-4441\n      /* Shows the border when cursor is inside a layout */\n      &.selected [data-layout-column],\n      &:hover [data-layout-column] {\n        border-color: ", ";\n      }\n\n      &.selected.danger > [data-layout-column] {\n        background-color: ", ";\n        border-color: ", ";\n      }\n\n      &.", ":not(.danger) {\n        [data-layout-column] {\n          ", "\n        }\n      }\n    }\n  }\n\n  .fabric-editor--full-width-mode .ProseMirror {\n    [data-layout-section] {\n      .", " {\n        margin: 0 ", "px;\n      }\n    }\n  }\n"])), columnLayoutSharedStyle, gridSize() - 1, akLayoutGutterOffset, akEditorSwoopCubicBezier, akEditorSelectedBorderSize, "var(--ds-border, ".concat(N40A, ")"), LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN, gridMediumMaxWidth, "var(--ds-border, ".concat(N50A, ")"), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Border, SelectionStyle.Blanket]), TableCssClassName.TABLE_CONTAINER, tableMarginFullWidthMode);
+export var layoutStyles = function layoutStyles(props) {
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .ProseMirror {\n    ", " [data-layout-section] {\n      margin: ", "px -", "px 0;\n      transition: border-color 0.3s ", ";\n      cursor: pointer;\n\n      /* Inner cursor located 26px from left */\n      [data-layout-column] {\n        flex: 1;\n        min-width: 0;\n        border: ", "px solid\n          ", ";\n        border-radius: 4px;\n        padding: ", "px;\n        box-sizing: border-box;\n\n        > div {\n          > :not(style):first-child,\n          > style:first-child + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + *,\n          > style:first-child + .ProseMirror-gapcursor + * {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child + span + *,\n          > style:first-child + .ProseMirror-gapcursor:first-child + span + * {\n            margin-top: 0;\n          }\n\n          > .embedCardView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .mediaSingleView-content-wrap:first-of-type .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor.-right:first-child\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor.-right\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > .ProseMirror-gapcursor.-right:first-of-type\n            + .embedCardView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          > .ProseMirror-gapcursor:first-child\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item,\n          > style:first-child\n            + .ProseMirror-gapcursor\n            + span\n            + .mediaSingleView-content-wrap\n            .rich-media-item {\n            margin-top: 0;\n          }\n\n          /* Prevent first DecisionWrapper's margin-top: 8px from shifting decisions down\n             and shrinking layout's node selectable area (leniency margin) */\n          > [data-node-type='decisionList'] {\n            li:first-of-type [data-decision-wrapper] {\n              margin-top: 0;\n            }\n          }\n        }\n\n        /* Make the 'content' fill the entire height of the layout column to allow click\n           handler of layout section nodeview to target only data-layout-column */\n        [data-layout-content] {\n          height: 100%;\n          cursor: text;\n        }\n      }\n\n      [data-layout-column] + [data-layout-column] {\n        margin-left: ", "px;\n      }\n\n      @media screen and (max-width: ", "px) {\n        [data-layout-column] + [data-layout-column] {\n          margin-left: 0;\n        }\n      }\n\n      // TODO: Remove the border styles below once design tokens have been enabled and fallbacks are no longer triggered.\n      // This is because the default state already uses the same token and, as such, the hover style won't change anything.\n      // https://product-fabric.atlassian.net/browse/DSP-4441\n      /* Shows the border when cursor is inside a layout */\n      &.selected [data-layout-column],\n      &:hover [data-layout-column] {\n        border: ", "px solid\n          ", ";\n      }\n\n      &.selected.danger > [data-layout-column] {\n        background-color: ", ";\n        border-color: ", ";\n      }\n\n      &.", ":not(.danger) {\n        [data-layout-column] {\n          ", "\n        }\n      }\n    }\n  }\n\n  .fabric-editor--full-width-mode .ProseMirror {\n    [data-layout-section] {\n      .", " {\n        margin: 0 ", "px;\n      }\n    }\n  }\n"])), columnLayoutSharedStyle, gridSize() - 1, akLayoutGutterOffset, akEditorSwoopCubicBezier, akEditorSelectedBorderSize, themed({
+    light: "var(--ds-border, ".concat(N40A, ")"),
+    dark: "var(--ds-border, ".concat(DN70, ")")
+  })(props), LAYOUT_COLUMN_PADDING, LAYOUT_SECTION_MARGIN, gridMediumMaxWidth, akEditorSelectedBorderSize, themed({
+    light: "var(--ds-border, ".concat(N50A, ")"),
+    dark: "var(--ds-border, ".concat(DN80, ")")
+  })(props), "var(--ds-background-danger, ".concat(akEditorDeleteBackground, ")"), "var(--ds-border-danger, ".concat(akEditorDeleteBorder, ")"), akEditorSelectedNodeClassName, getSelectionStyles([SelectionStyle.Border, SelectionStyle.Blanket]), TableCssClassName.TABLE_CONTAINER, tableMarginFullWidthMode);
+};

package/dist/esm/plugins/list/utils/find.js

@@ -1,32 +1,5 @@
 import { findParentNodeClosestToPos } from 'prosemirror-utils';
 import { isListNode, isListItemNode } from './node';
-export function findFirstNestedList($pos) {
-  var currentNode = $pos.doc.nodeAt($pos.pos);
-  var currentListItemPos = null;
-  if (isListItemNode(currentNode)) {
-    currentListItemPos = $pos.pos;
-  } else {
-    var result = findParentNodeClosestToPos($pos, isListItemNode);
-    currentListItemPos = (result === null || result === void 0 ? void 0 : result.pos) || null;
-  }
-  if (!currentListItemPos) {
-    return null;
-  }
-  var currentListItemNode = $pos.doc.nodeAt(currentListItemPos);
-  if (!currentListItemNode) {
-    return null;
-  }
-  var lastListItemChild = currentListItemNode.child(currentListItemNode.childCount - 1);
-  if (!isListNode(lastListItemChild)) {
-    return null;
-  }
-  var firstNestedListPosition = currentListItemNode.nodeSize - lastListItemChild.nodeSize;
-  var firstNestedListNode = $pos.doc.nodeAt(firstNestedListPosition);
-  if (!isListNode(firstNestedListNode)) {
-    return null;
-  }
-  return $pos.doc.resolve(firstNestedListPosition);
-}
 export function findFirstParentListNode($pos) {
   var currentNode = $pos.doc.nodeAt($pos.pos);
   var listNodePosition = null;

package/dist/esm/plugins/list/utils/indentation.js

@@ -15,29 +15,6 @@ export var getListLiftTarget = function getListLiftTarget(resPos) {
   }
   return target - 1;
 };
-export var getNextSiblingListItemPosition = function getNextSiblingListItemPosition($pos) {
-  var _$pos$doc$nodeAt;
-  var target = $pos.depth;
-  var found = false;
-  for (var i = $pos.depth; i > 0; i--) {
-    var node = $pos.node(i);
-    if (isListItemNode(node)) {
-      target = i;
-      found = true;
-    }
-    if (found) {
-      break;
-    }
-  }
-  var listItemPosition = target - 1;
-  var listItemNodePosition = ((_$pos$doc$nodeAt = $pos.doc.nodeAt(listItemPosition)) === null || _$pos$doc$nodeAt === void 0 ? void 0 : _$pos$doc$nodeAt.nodeSize) || 0;
-  var nextListItemPosition = listItemPosition + listItemNodePosition;
-  var nextListItemNode = $pos.doc.nodeAt(nextListItemPosition);
-  if (nextListItemNode) {
-    return $pos.doc.resolve(nextListItemPosition);
-  }
-  return null;
-};
 export var hasValidListIndentationLevel = function hasValidListIndentationLevel(_ref) {
   var tr = _ref.tr,
     maxIndentation = _ref.maxIndentation;

package/dist/esm/plugins/list/utils/node.js

@@ -1,7 +1,4 @@
 import { Fragment } from 'prosemirror-model';
-export function isDocumentNode(node) {
-  return Boolean(node && node.type && node.type.name === 'doc');
-}
 export function isListNode(node) {
   return Boolean(node && node.type && ['orderedList', 'bulletList'].includes(node.type.name));
 }
@@ -14,7 +11,7 @@ export function isListItemNode(node) {
 export function isBulletList(node) {
   return Boolean(node && node.type && 'bulletList' === node.type.name);
 }
-export function isListNodeValidContent(node) {
+function isListNodeValidContent(node) {
   var bulletList = node.type.schema.nodes.bulletList;
   if (!bulletList) {
     return false;

package/dist/esm/plugins/list/utils/selection.js

@@ -107,12 +107,12 @@ export var normalizeListItemsSelection = function normalizeListItemsSelection(_r
   var anchor = resolvePositionToEndOfListItem($to);
   return new TextSelection(anchor, head);
 };
-export var resolvePositionToStartOfListItem = function resolvePositionToStartOfListItem($pos) {
+var resolvePositionToStartOfListItem = function resolvePositionToStartOfListItem($pos) {
   var fromRange = $pos.blockRange($pos, isListItemNode);
   var fromPosition = fromRange && $pos.textOffset === 0 && fromRange.end - 1 === $pos.pos ? Selection.near($pos.doc.resolve(fromRange.end + 1), 1).$from : $pos;
   return fromPosition;
 };
-export var resolvePositionToEndOfListItem = function resolvePositionToEndOfListItem($pos) {
+var resolvePositionToEndOfListItem = function resolvePositionToEndOfListItem($pos) {
   var toRange = $pos.blockRange($pos, isListItemNode);
   var toPosition = toRange && $pos.textOffset === 0 && toRange.start + 1 === $pos.pos ? Selection.near($pos.doc.resolve(toRange.start - 1), -1).$to : $pos;
   return toPosition;
@@ -126,14 +126,4 @@ export var createListNodeRange = function createListNodeRange(_ref2) {
     return null;
   }
   return range;
-};
-export var createListItemNodeRange = function createListItemNodeRange(_ref3) {
-  var selection = _ref3.selection;
-  var $from = selection.$from,
-    $to = selection.$to;
-  var range = $from.blockRange($to, isListItemNode);
-  if (!range) {
-    return null;
-  }
-  return range;
 };

package/dist/esm/plugins/media/commands/helpers.js

@@ -3,6 +3,11 @@ 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) { _defineProperty(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; }
 import { stateKey as mediaPluginKey } from '../pm-plugins/plugin-key';
 import { SetAttrsStep } from '@atlaskit/adf-schema/steps';
+/**
+ * Note that Media Inline is inserted like a media single node into the media plugin state.
+ * Though it is not of type mediaSingle, it shares the same `findMediaSingleNode` method
+ *
+ */
 export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
 
@@ -18,52 +23,21 @@ export var findMediaSingleNode = function findMediaSingleNode(mediaPluginState,
     return memo;
   }, null);
 };
-
-/**
- * Finds the media inline node with the given id.
- * Media Inline is inserted like a media single node into the media plugin state.
- * However it is not of type mediaSingle.
- *
- * @param mediaPluginState
- * @param id
- * @param isMediaSingle
- * @returns {MediaNodeWithPosHandler | null}
- */
-export var findMediaInlineNode = function findMediaInlineNode(mediaPluginState, id, isMediaSingle) {
-  if (!isMediaSingle) {
-    return findMediaSingleNode(mediaPluginState, id);
-  }
-  return null;
-};
 export var findAllMediaSingleNodes = function findAllMediaSingleNodes(mediaPluginState, id) {
   var mediaNodes = mediaPluginState.mediaNodes;
   return mediaNodes.filter(function (nodeWithHandler) {
     return nodeWithHandler.node.attrs.id === id;
   });
 };
-export var findMediaNode = function findMediaNode(mediaPluginState, id, isMediaSingle) {
-  var mediaNodeWithPos = isMediaSingle ? findMediaSingleNode(mediaPluginState, id) : mediaPluginState.mediaGroupNodes[id];
-
-  // Should attempt to find media inline node if media single node or media group node is not found
-  if (!mediaNodeWithPos) {
-    return findMediaInlineNode(mediaPluginState, id, isMediaSingle);
-  }
-  return mediaNodeWithPos;
-};
 export var isMediaNode = function isMediaNode(pos, state) {
   var node = state.doc.nodeAt(pos);
   return node && ['media', 'mediaInline'].includes(node.type.name);
 };
-export var updateAllMediaNodesAttrs = function updateAllMediaNodesAttrs(id, attrs, isMediaSingle) {
+export var updateAllMediaSingleNodesAttrs = function updateAllMediaSingleNodesAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
     var mediaNodes;
-    if (isMediaSingle) {
-      mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
-    } else {
-      var mediaGroupNode = findMediaNode(mediaPluginState, id, isMediaSingle);
-      mediaNodes = mediaGroupNode ? [mediaGroupNode] : [];
-    }
+    mediaNodes = findAllMediaSingleNodes(mediaPluginState, id);
     var validMediaNodePositions = mediaNodes.reduce(function (acc, _ref) {
       var getPos = _ref.getPos;
       var pos = getPos();
@@ -102,10 +76,10 @@ export var updateCurrentMediaNodeAttrs = function updateCurrentMediaNodeAttrs(at
     return true;
   };
 };
-export var updateMediaNodeAttrs = function updateMediaNodeAttrs(id, attrs, isMediaSingle) {
+export var updateMediaSingleNodeAttrs = function updateMediaSingleNodeAttrs(id, attrs) {
   return function (state, dispatch) {
     var mediaPluginState = mediaPluginKey.getState(state);
-    var mediaNodeWithPos = findMediaNode(mediaPluginState, id, isMediaSingle);
+    var mediaNodeWithPos = findMediaSingleNode(mediaPluginState, id);
     if (!mediaNodeWithPos) {
       return false;
     }

package/dist/esm/plugins/media/commands/index.js

@@ -1 +1 @@
-export { updateMediaNodeAttrs, updateAllMediaNodesAttrs, replaceExternalMedia } from './helpers';
+export { updateMediaSingleNodeAttrs, updateAllMediaSingleNodesAttrs, replaceExternalMedia } from './helpers';

package/dist/esm/plugins/media/nodeviews/mediaGroup.js

@@ -70,7 +70,6 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
         var getPos = function getPos() {
           return props.getPos() + childOffset + 1;
         };
-        _this.mediaPluginState.setMediaGroupNode(item, getPos);
         _this.mediaNodes.push(item);
         if (updatedAttrs) {
           _this.updateNodeAttrs(props, item, getPos);
@@ -159,7 +158,7 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
       this.updateMediaClientConfig();
       this.mediaNodes.forEach( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(node) {
-          var _this2$props, view, mediaProvider, contextIdentifierProvider, mediaNodeUpdater, contextId, hasDifferentContextId;
+          var _this2$props, view, mediaProvider, contextIdentifierProvider, mediaNodeUpdater, getPos, contextId, hasDifferentContextId;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -178,27 +177,30 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
                     node: node,
                     isMediaSingle: false
                   });
+                  getPos = function getPos() {
+                    return _this2.props.getPos() + 1;
+                  };
                   contextId = mediaNodeUpdater.getNodeContextId();
                   if (contextId) {
-                    _context.next = 8;
+                    _context.next = 9;
                     break;
                   }
-                  _context.next = 8;
-                  return mediaNodeUpdater.updateContextId();
-                case 8:
-                  _context.next = 10;
+                  _context.next = 9;
+                  return mediaNodeUpdater.updateNodeContextId(getPos);
+                case 9:
+                  _context.next = 11;
                   return mediaNodeUpdater.hasDifferentContextId();
-                case 10:
+                case 11:
                   hasDifferentContextId = _context.sent;
                   if (!hasDifferentContextId) {
-                    _context.next = 14;
+                    _context.next = 15;
                     break;
                   }
-                  _context.next = 14;
-                  return mediaNodeUpdater.copyNode({
+                  _context.next = 15;
+                  return mediaNodeUpdater.copyNodeFromPos(getPos, {
                     traceId: node.attrs.__mediaTraceId
                   });
-                case 14:
+                case 15:
                 case "end":
                   return _context.stop();
               }

package/dist/esm/plugins/media/nodeviews/mediaInline.js

@@ -85,7 +85,7 @@ export var updateMediaNodeAttributes = /*#__PURE__*/function () {
             return _context.abrupt("return");
           case 23:
             _context.next = 25;
-            return mediaNodeUpdater.updateFileAttrs();
+            return mediaNodeUpdater.updateMediaSingleFileAttrs();
           case 25:
           case "end":
             return _context.stop();