@atlaskit/editor-plugin-media 1.43.14 → 1.44.0

package/dist/cjs/nodeviews/mediaSingleNext.js

@@ -85,7 +85,7 @@ var useMediaNodeUpdater = function useMediaNodeUpdater(_ref) {
 };
 var mediaAsyncOperations = /*#__PURE__*/function () {
   var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(props) {
-    var updatedDimensions, currentAttrs, updatingNode, contextId, hasDifferentContextId, copyNode;
+    var updatedDimensions, currentAttrs, updatingNode, contextId, shouldNodeBeDeepCopied, copyNode;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -117,10 +117,10 @@ var mediaAsyncOperations = /*#__PURE__*/function () {
           return props.updater.updateContextId();
         case 15:
           _context.next = 17;
-          return props.updater.hasDifferentContextId();
+          return props.updater.shouldNodeBeDeepCopied();
         case 17:
-          hasDifferentContextId = _context.sent;
-          if (!hasDifferentContextId) {
+          shouldNodeBeDeepCopied = _context.sent;
+          if (!shouldNodeBeDeepCopied) {
             _context.next = 28;
             break;
           }

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

@@ -117,7 +117,7 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
     (0, _defineProperty2.default)(this, "destroyed", false);
     (0, _defineProperty2.default)(this, "removeOnCloseListener", function () {});
     (0, _defineProperty2.default)(this, "onPopupToggleCallback", function () {});
-    (0, _defineProperty2.default)(this, "nodeCount", new Map());
+    (0, _defineProperty2.default)(this, "identifierCount", new Map());
     (0, _defineProperty2.default)(this, "taskManager", new _mediaTaskManager.MediaTaskManager());
     (0, _defineProperty2.default)(this, "pickers", []);
     (0, _defineProperty2.default)(this, "pickerPromises", []);
@@ -275,23 +275,51 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
       }
       (0, _mediaCommon2.removeMediaNode)(_this.view, getNode, getPos);
     });
+    (0, _defineProperty2.default)(this, "getIdentifierKey", function (identifier) {
+      if (identifier.mediaItemType === "file") {
+        return identifier.id;
+      } else {
+        return identifier.dataURI;
+      }
+    });
     (0, _defineProperty2.default)(this, "trackMediaNodeAddition", function (node) {
-      var _this$nodeCount$get;
-      var id = node.attrs.id;
-      var count = (_this$nodeCount$get = _this.nodeCount.get(id)) !== null && _this$nodeCount$get !== void 0 ? _this$nodeCount$get : 0;
+      var _this$identifierCount;
+      var identifier = (0, _mediaCommon2.getIdentifier)(node.attrs);
+      var key = _this.getIdentifierKey(identifier);
+      var _ref2 = (_this$identifierCount = _this.identifierCount.get(key)) !== null && _this$identifierCount !== void 0 ? _this$identifierCount : {
+          count: 0
+        },
+        count = _ref2.count;
       if (count === 0) {
-        _this.taskManager.resumePendingTask(id);
+        _this.taskManager.resumePendingTask(key);
       }
-      _this.nodeCount.set(id, count + 1);
+      _this.identifierCount.set(key, {
+        identifier: identifier,
+        count: count + 1
+      });
     });
     (0, _defineProperty2.default)(this, "trackMediaNodeRemoval", function (node) {
-      var _this$nodeCount$get2;
-      var id = node.attrs.id;
-      var count = (_this$nodeCount$get2 = _this.nodeCount.get(id)) !== null && _this$nodeCount$get2 !== void 0 ? _this$nodeCount$get2 : 0;
+      var _this$identifierCount2;
+      var identifier = (0, _mediaCommon2.getIdentifier)(node.attrs);
+      var key = _this.getIdentifierKey(identifier);
+      var _ref3 = (_this$identifierCount2 = _this.identifierCount.get(key)) !== null && _this$identifierCount2 !== void 0 ? _this$identifierCount2 : {
+          count: 0
+        },
+        count = _ref3.count;
       if (count === 1) {
-        _this.taskManager.cancelPendingTask(id);
+        _this.taskManager.cancelPendingTask(key);
       }
-      _this.nodeCount.set(id, count - 1);
+      _this.identifierCount.set(key, {
+        identifier: identifier,
+        count: count - 1
+      });
+    });
+    (0, _defineProperty2.default)(this, "isIdentifierInEditorScope", function (identifier) {
+      var key = _this.getIdentifierKey(identifier);
+
+      // rely on has instead of count > 0 because if the user cuts and pastes the same media
+      // the count will temporarily be 0 but the media is still in the scope of editor.
+      return _this.identifierCount.has(key);
     });
     /**
      * Called from React UI Component on componentDidMount
@@ -309,8 +337,8 @@ var MediaPluginStateImplementation = exports.MediaPluginStateImplementation = /*
      */
     (0, _defineProperty2.default)(this, "handleMediaNodeUnmount", function (oldNode) {
       _this.trackMediaNodeRemoval(oldNode);
-      _this.mediaNodes = _this.mediaNodes.filter(function (_ref2) {
-        var node = _ref2.node;
+      _this.mediaNodes = _this.mediaNodes.filter(function (_ref4) {
+        var node = _ref4.node;
         return oldNode !== node;
       });
     });

package/dist/es2019/nodeviews/mediaGroup.js

@@ -211,8 +211,8 @@ class MediaGroup extends React.Component {
       if (!contextId) {
         await mediaNodeUpdater.updateNodeContextId(getPos);
       }
-      const hasDifferentContextId = await mediaNodeUpdater.hasDifferentContextId();
-      if (hasDifferentContextId) {
+      const shouldNodeBeDeepCopied = await mediaNodeUpdater.shouldNodeBeDeepCopied();
+      if (shouldNodeBeDeepCopied) {
         await mediaNodeUpdater.copyNodeFromPos(getPos, {
           traceId: node.attrs.__mediaTraceId
         });

package/dist/es2019/nodeviews/mediaGroupNext.js

@@ -116,8 +116,8 @@ const runMediaNodeUpdate = async ({
   if (!contextId) {
     await mediaNodeUpdater.updateNodeContextId(getPos);
   }
-  const hasDifferentContextId = await mediaNodeUpdater.hasDifferentContextId();
-  if (hasDifferentContextId) {
+  const shouldNodeBeDeepCopied = await mediaNodeUpdater.shouldNodeBeDeepCopied();
+  if (shouldNodeBeDeepCopied) {
     await mediaNodeUpdater.copyNodeFromPos(getPos, {
       traceId: node.attrs.__mediaTraceId
     });

package/dist/es2019/nodeviews/mediaInline.js

@@ -45,8 +45,8 @@ const updateMediaNodeAttributes = async (props, mediaNodeUpdater) => {
   if (!contextId) {
     await mediaNodeUpdater.updateContextId();
   }
-  const hasDifferentContextId = await mediaNodeUpdater.hasDifferentContextId();
-  if (hasDifferentContextId) {
+  const shouldNodeBeDeepCopied = await mediaNodeUpdater.shouldNodeBeDeepCopied();
+  if (shouldNodeBeDeepCopied) {
     // Copy paste flow (different pages)
     try {
       const copyNode = mediaNodeUpdater.copyNode({
@@ -71,10 +71,10 @@ export const handleNewNode = props => {
 export const MediaInline = props => {
   var _props$node, _props$node$marks;
   const [viewMediaClientConfig, setViewMediaClientConfig] = useState();
-  const [isContextIdUnsync, setIsContextIdUnsync] = useState(true);
+  const [isNodeScopeUnsync, setIsNodeScopeUnsync] = useState(true);
   useEffect(() => {
     const mediaNodeUpdater = createMediaNodeUpdater(props);
-    mediaNodeUpdater.hasDifferentContextId().then(setIsContextIdUnsync);
+    mediaNodeUpdater.shouldNodeBeDeepCopied().then(setIsNodeScopeUnsync);
     handleNewNode(props);
     updateMediaNodeAttributes(props, mediaNodeUpdater);
     updateViewMediaClientConfig(props);
@@ -115,7 +115,7 @@ export const MediaInline = props => {
    * to prevent calling the media API (in mounting of `MediaInlineCard`)
    * before the prerequisites meet
    */
-  if (!viewMediaClientConfig || isContextIdUnsync) {
+  if (!viewMediaClientConfig || isNodeScopeUnsync) {
     return jsx(MediaInlineCardLoadingView, {
       message: "",
       isSelected: false

package/dist/es2019/nodeviews/mediaNodeUpdater.js

@@ -6,7 +6,9 @@ import { getAttrsFromUrl, isImageRepresentationReady, isMediaBlobUrl } from '@at
 import { getMediaClient } from '@atlaskit/media-client-react';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { replaceExternalMedia, updateAllMediaNodesAttrs, updateCurrentMediaNodeAttrs, updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
+import { stateKey as mediaStateKey } from '../pm-plugins/plugin-key';
 import { batchMediaNodeAttrsUpdate } from '../pm-plugins/utils/batchMediaNodeAttrs';
+import { getIdentifier } from '../pm-plugins/utils/media-common';
 const isMediaTypeSupported = type => {
   if (type) {
     return ['image', 'file'].includes(type);
@@ -196,6 +198,21 @@ export class MediaNodeUpdater {
         })(this.props.view.state, this.props.view.dispatch);
       }
     });
+    _defineProperty(this, "shouldNodeBeDeepCopied", async () => {
+      var _ref, _this$props$mediaOpti, _this$props$mediaOpti2, _this$mediaPluginStat, _this$mediaPluginStat2;
+      const scope = (_ref = (_this$props$mediaOpti = (_this$props$mediaOpti2 = this.props.mediaOptions) === null || _this$props$mediaOpti2 === void 0 ? void 0 : _this$props$mediaOpti2.mediaShallowCopyScope) !== null && _this$props$mediaOpti !== void 0 ? _this$props$mediaOpti : (_this$mediaPluginStat = this.mediaPluginState) === null || _this$mediaPluginStat === void 0 ? void 0 : (_this$mediaPluginStat2 = _this$mediaPluginStat.mediaOptions) === null || _this$mediaPluginStat2 === void 0 ? void 0 : _this$mediaPluginStat2.mediaShallowCopyScope) !== null && _ref !== void 0 ? _ref : 'context';
+      if (scope === 'context') {
+        return await this.hasDifferentContextId();
+      } else {
+        const attrs = this.getAttrs();
+        if (!attrs || !this.mediaPluginState) {
+          return false;
+        }
+        const id = getIdentifier(attrs);
+        const isIdentifierOutsideEditorScope = !(await this.mediaPluginState.isIdentifierInEditorScope(id));
+        return isIdentifierOutsideEditorScope;
+      }
+    });
     _defineProperty(this, "hasDifferentContextId", async () => {
       const nodeContextId = this.getNodeContextId();
       const currentContextId = await this.getObjectId();
@@ -377,6 +394,7 @@ export class MediaNodeUpdater {
       };
     });
     this.props = props;
+    this.mediaPluginState = mediaStateKey.getState(props.view.state);
   }
   setProps(newComponentProps) {
     this.props = {

package/dist/es2019/nodeviews/mediaSingle.js

@@ -110,8 +110,8 @@ export default class MediaSingleNode extends Component {
         var _this$mediaNodeUpdate5;
         await ((_this$mediaNodeUpdate5 = this.mediaNodeUpdater) === null || _this$mediaNodeUpdate5 === void 0 ? void 0 : _this$mediaNodeUpdate5.updateContextId());
       }
-      const hasDifferentContextId = await ((_this$mediaNodeUpdate6 = this.mediaNodeUpdater) === null || _this$mediaNodeUpdate6 === void 0 ? void 0 : _this$mediaNodeUpdate6.hasDifferentContextId());
-      if (hasDifferentContextId) {
+      const shouldNodeBeDeepCopied = await ((_this$mediaNodeUpdate6 = this.mediaNodeUpdater) === null || _this$mediaNodeUpdate6 === void 0 ? void 0 : _this$mediaNodeUpdate6.shouldNodeBeDeepCopied());
+      if (shouldNodeBeDeepCopied) {
         this.setState({
           isCopying: true
         });

package/dist/es2019/nodeviews/mediaSingleNext.js

@@ -88,8 +88,8 @@ const mediaAsyncOperations = async props => {
   if (!contextId) {
     await props.updater.updateContextId();
   }
-  const hasDifferentContextId = await props.updater.hasDifferentContextId();
-  if (hasDifferentContextId) {
+  const shouldNodeBeDeepCopied = await props.updater.shouldNodeBeDeepCopied();
+  if (shouldNodeBeDeepCopied) {
     try {
       const copyNode = props.updater.copyNode({
         traceId: props.mediaNode.attrs.__mediaTraceId

package/dist/es2019/pm-plugins/main.js

@@ -21,7 +21,7 @@ import { updateMediaNodeAttrs } from '../pm-plugins/commands/helpers';
 // Ignored via go/ees005
 // eslint-disable-next-line import/no-namespace
 import * as helpers from '../pm-plugins/commands/helpers';
-import { getMediaFromSupportedMediaNodesFromSelection, isNodeDoubleClickSupportedInLivePagesViewMode, removeMediaNode, splitMediaGroup } from '../pm-plugins/utils/media-common';
+import { getIdentifier, getMediaFromSupportedMediaNodesFromSelection, isNodeDoubleClickSupportedInLivePagesViewMode, removeMediaNode, splitMediaGroup } from '../pm-plugins/utils/media-common';
 import { insertMediaGroupNode, insertMediaInlineNode } from '../pm-plugins/utils/media-files';
 import { getMediaNodeInsertionType } from '../pm-plugins/utils/media-inline';
 import { insertMediaSingleNode } from '../pm-plugins/utils/media-single';
@@ -92,7 +92,7 @@ export class MediaPluginStateImplementation {
     _defineProperty(this, "destroyed", false);
     _defineProperty(this, "removeOnCloseListener", () => {});
     _defineProperty(this, "onPopupToggleCallback", () => {});
-    _defineProperty(this, "nodeCount", new Map());
+    _defineProperty(this, "identifierCount", new Map());
     _defineProperty(this, "taskManager", new MediaTaskManager());
     _defineProperty(this, "pickers", []);
     _defineProperty(this, "pickerPromises", []);
@@ -247,23 +247,53 @@ export class MediaPluginStateImplementation {
       }
       removeMediaNode(this.view, getNode, getPos);
     });
+    _defineProperty(this, "getIdentifierKey", identifier => {
+      if (identifier.mediaItemType === "file") {
+        return identifier.id;
+      } else {
+        return identifier.dataURI;
+      }
+    });
     _defineProperty(this, "trackMediaNodeAddition", node => {
-      var _this$nodeCount$get;
-      const id = node.attrs.id;
-      const count = (_this$nodeCount$get = this.nodeCount.get(id)) !== null && _this$nodeCount$get !== void 0 ? _this$nodeCount$get : 0;
+      var _this$identifierCount;
+      const identifier = getIdentifier(node.attrs);
+      const key = this.getIdentifierKey(identifier);
+      const {
+        count
+      } = (_this$identifierCount = this.identifierCount.get(key)) !== null && _this$identifierCount !== void 0 ? _this$identifierCount : {
+        count: 0
+      };
       if (count === 0) {
-        this.taskManager.resumePendingTask(id);
+        this.taskManager.resumePendingTask(key);
       }
-      this.nodeCount.set(id, count + 1);
+      this.identifierCount.set(key, {
+        identifier,
+        count: count + 1
+      });
     });
     _defineProperty(this, "trackMediaNodeRemoval", node => {
-      var _this$nodeCount$get2;
-      const id = node.attrs.id;
-      const count = (_this$nodeCount$get2 = this.nodeCount.get(id)) !== null && _this$nodeCount$get2 !== void 0 ? _this$nodeCount$get2 : 0;
+      var _this$identifierCount2;
+      const identifier = getIdentifier(node.attrs);
+      const key = this.getIdentifierKey(identifier);
+      const {
+        count
+      } = (_this$identifierCount2 = this.identifierCount.get(key)) !== null && _this$identifierCount2 !== void 0 ? _this$identifierCount2 : {
+        count: 0
+      };
       if (count === 1) {
-        this.taskManager.cancelPendingTask(id);
+        this.taskManager.cancelPendingTask(key);
       }
-      this.nodeCount.set(id, count - 1);
+      this.identifierCount.set(key, {
+        identifier,
+        count: count - 1
+      });
+    });
+    _defineProperty(this, "isIdentifierInEditorScope", identifier => {
+      const key = this.getIdentifierKey(identifier);
+
+      // rely on has instead of count > 0 because if the user cuts and pastes the same media
+      // the count will temporarily be 0 but the media is still in the scope of editor.
+      return this.identifierCount.has(key);
     });
     /**
      * Called from React UI Component on componentDidMount

package/dist/esm/nodeviews/mediaGroup.js

@@ -193,7 +193,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, getPos, contextId, hasDifferentContextId;
+          var _this2$props, view, mediaProvider, contextIdentifierProvider, mediaNodeUpdater, getPos, contextId, shouldNodeBeDeepCopied;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -232,10 +232,10 @@ var MediaGroup = /*#__PURE__*/function (_React$Component) {
                 return mediaNodeUpdater.updateNodeContextId(getPos);
               case 9:
                 _context.next = 11;
-                return mediaNodeUpdater.hasDifferentContextId();
+                return mediaNodeUpdater.shouldNodeBeDeepCopied();
               case 11:
-                hasDifferentContextId = _context.sent;
-                if (!hasDifferentContextId) {
+                shouldNodeBeDeepCopied = _context.sent;
+                if (!shouldNodeBeDeepCopied) {
                   _context.next = 15;
                   break;
                 }

package/dist/esm/nodeviews/mediaGroupNext.js

@@ -117,7 +117,7 @@ var useLatestMediaGroupNode = function useLatestMediaGroupNode(nextMediaNode) {
 };
 var runMediaNodeUpdate = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(_ref2) {
-    var mediaNodeUpdater, getPos, node, updateAttrs, contextId, hasDifferentContextId;
+    var mediaNodeUpdater, getPos, node, updateAttrs, contextId, shouldNodeBeDeepCopied;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -138,10 +138,10 @@ var runMediaNodeUpdate = /*#__PURE__*/function () {
           return mediaNodeUpdater.updateNodeContextId(getPos);
         case 8:
           _context.next = 10;
-          return mediaNodeUpdater.hasDifferentContextId();
+          return mediaNodeUpdater.shouldNodeBeDeepCopied();
         case 10:
-          hasDifferentContextId = _context.sent;
-          if (!hasDifferentContextId) {
+          shouldNodeBeDeepCopied = _context.sent;
+          if (!shouldNodeBeDeepCopied) {
             _context.next = 14;
             break;
           }

package/dist/esm/nodeviews/mediaInline.js

@@ -49,7 +49,7 @@ var createMediaNodeUpdater = function createMediaNodeUpdater(props) {
  */
 var updateMediaNodeAttributes = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(props, mediaNodeUpdater) {
-    var addPendingTask, node, contextId, hasDifferentContextId, copyNode;
+    var addPendingTask, node, contextId, shouldNodeBeDeepCopied, copyNode;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -70,10 +70,10 @@ var updateMediaNodeAttributes = /*#__PURE__*/function () {
           return mediaNodeUpdater.updateContextId();
         case 8:
           _context.next = 10;
-          return mediaNodeUpdater.hasDifferentContextId();
+          return mediaNodeUpdater.shouldNodeBeDeepCopied();
         case 10:
-          hasDifferentContextId = _context.sent;
-          if (!hasDifferentContextId) {
+          shouldNodeBeDeepCopied = _context.sent;
+          if (!shouldNodeBeDeepCopied) {
             _context.next = 22;
             break;
           }
@@ -120,11 +120,11 @@ export var MediaInline = function MediaInline(props) {
     setViewMediaClientConfig = _useState2[1];
   var _useState3 = useState(true),
     _useState4 = _slicedToArray(_useState3, 2),
-    isContextIdUnsync = _useState4[0],
-    setIsContextIdUnsync = _useState4[1];
+    isNodeScopeUnsync = _useState4[0],
+    setIsNodeScopeUnsync = _useState4[1];
   useEffect(function () {
     var mediaNodeUpdater = createMediaNodeUpdater(props);
-    mediaNodeUpdater.hasDifferentContextId().then(setIsContextIdUnsync);
+    mediaNodeUpdater.shouldNodeBeDeepCopied().then(setIsNodeScopeUnsync);
     handleNewNode(props);
     updateMediaNodeAttributes(props, mediaNodeUpdater);
     updateViewMediaClientConfig(props);
@@ -179,7 +179,7 @@ export var MediaInline = function MediaInline(props) {
    * to prevent calling the media API (in mounting of `MediaInlineCard`)
    * before the prerequisites meet
    */
-  if (!viewMediaClientConfig || isContextIdUnsync) {
+  if (!viewMediaClientConfig || isNodeScopeUnsync) {
     return jsx(MediaInlineCardLoadingView, {
       message: "",
       isSelected: false