@atlaskit/editor-plugin-media 1.43.14 → 1.44.1

package/dist/esm/nodeviews/mediaSingleNext.js

@@ -78,7 +78,7 @@ var useMediaNodeUpdater = function useMediaNodeUpdater(_ref) {
 };
 var mediaAsyncOperations = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(props) {
-    var updatedDimensions, currentAttrs, updatingNode, contextId, hasDifferentContextId, copyNode;
+    var updatedDimensions, currentAttrs, updatingNode, contextId, shouldNodeBeDeepCopied, copyNode;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -110,10 +110,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/esm/pm-plugins/main.js

@@ -30,7 +30,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';
@@ -108,7 +108,7 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
     _defineProperty(this, "destroyed", false);
     _defineProperty(this, "removeOnCloseListener", function () {});
     _defineProperty(this, "onPopupToggleCallback", function () {});
-    _defineProperty(this, "nodeCount", new Map());
+    _defineProperty(this, "identifierCount", new Map());
     _defineProperty(this, "taskManager", new MediaTaskManager());
     _defineProperty(this, "pickers", []);
     _defineProperty(this, "pickerPromises", []);
@@ -266,23 +266,51 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
       }
       removeMediaNode(_this.view, getNode, getPos);
     });
+    _defineProperty(this, "getIdentifierKey", function (identifier) {
+      if (identifier.mediaItemType === 'file') {
+        return identifier.id;
+      } else {
+        return identifier.dataURI;
+      }
+    });
     _defineProperty(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 = 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
+      });
     });
     _defineProperty(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 = 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
+      });
+    });
+    _defineProperty(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
@@ -300,8 +328,8 @@ export var MediaPluginStateImplementation = /*#__PURE__*/function () {
      */
     _defineProperty(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/types/nodeviews/__mocks__/mediaNodeUpdater.d.ts

@@ -14,6 +14,7 @@ export declare class MediaNodeUpdater {
     getRemoteDimensions(): Promise<void>;
     isNodeFromDifferentCollection(): Promise<void>;
     hasDifferentContextId(): Promise<void>;
+    shouldNodeBeDeepCopied(): Promise<void>;
     copyNode(): Promise<void>;
     copyNodeFromPos(): Promise<void>;
     updateMediaSingleFileAttrs(): Promise<void>;

package/dist/types/nodeviews/mediaNodeUpdater.d.ts

@@ -3,7 +3,7 @@ import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaTraceContext } from '@atlaskit/media-common';
-import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
+import type { MediaOptions, MediaPluginState, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 type RemoteDimensions = {
     id: string;
     height: number;
@@ -20,6 +20,7 @@ export interface MediaNodeUpdaterProps {
 }
 export declare class MediaNodeUpdater {
     props: MediaNodeUpdaterProps;
+    mediaPluginState: MediaPluginState | undefined;
     constructor(props: MediaNodeUpdaterProps);
     setProps(newComponentProps: Partial<MediaNodeUpdaterProps>): void;
     isMediaBlobUrl(): boolean;
@@ -35,6 +36,7 @@ export declare class MediaNodeUpdater {
     getNodeContextId: () => string | null;
     updateDimensions: (dimensions: RemoteDimensions) => void;
     getRemoteDimensions(): Promise<false | RemoteDimensions>;
+    shouldNodeBeDeepCopied: () => Promise<boolean>;
     hasDifferentContextId: () => Promise<boolean>;
     isNodeFromDifferentCollection: () => Promise<boolean>;
     handleExternalMedia(getPos: ProsemirrorGetPosHandler): Promise<void>;

package/dist/types/pm-plugins/main.d.ts

@@ -9,6 +9,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaNextEditorPluginType } from '../mediaPluginType';
 import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
@@ -51,7 +52,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     private removeOnCloseListener;
     private openMediaPickerBrowser?;
     private onPopupToggleCallback;
-    private nodeCount;
+    private identifierCount;
     private taskManager;
     pickers: PickerFacade[];
     pickerPromises: Array<Promise<PickerFacade>>;
@@ -101,8 +102,10 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
      * inside of it
      */
     handleMediaNodeRemoval: (node: PMNode | undefined, getPos: ProsemirrorGetPosHandler) => void;
+    private getIdentifierKey;
     trackMediaNodeAddition: (node: PMNode) => void;
     trackMediaNodeRemoval: (node: PMNode) => void;
+    isIdentifierInEditorScope: (identifier: Identifier) => boolean;
     /**
      * Called from React UI Component on componentDidMount
      */

package/dist/types/pm-plugins/types.d.ts

@@ -4,6 +4,7 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaOptions, MediaState, MediaStateEventSubscriber, ProsemirrorGetPosHandler } from '../types';
 import type { MediaPluginOptions } from '../types/media-plugin-options';
@@ -60,6 +61,7 @@ export interface MediaPluginState {
     removeSelectedMediaContainer: () => boolean;
     selectedMediaContainerNode: () => PMNode | undefined;
     handleDrag: (dragState: 'enter' | 'leave') => void;
+    isIdentifierInEditorScope: (identifier: Identifier) => boolean;
     updateElement(): void;
     setIsResizing(isResizing: boolean): void;
     setResizingWidth(width: number): void;

package/dist/types/types/index.d.ts

@@ -14,6 +14,7 @@ interface PlaceholderTextOptions {
 }
 export type MediaStateStatus = 'unknown' | 'ready' | 'cancelled' | 'preview' | 'error' | 'mobile-upload-end';
 export type MediaSingleWithType = 'pixel' | 'percentage';
+export type MediaCopyScope = 'editor' | 'context';
 export interface MediaOptions {
     provider?: Providers['mediaProvider'];
     /**
@@ -53,6 +54,7 @@ export interface MediaOptions {
     allowCommentsOnMedia?: boolean;
     editorAppearance?: EditorAppearance;
     forceHandlePositioning?: HandlePositioning;
+    mediaShallowCopyScope?: MediaCopyScope;
 }
 export interface MediaSingleOptions {
     disableLayout?: boolean;

package/dist/types-ts4.5/nodeviews/__mocks__/mediaNodeUpdater.d.ts

@@ -14,6 +14,7 @@ export declare class MediaNodeUpdater {
     getRemoteDimensions(): Promise<void>;
     isNodeFromDifferentCollection(): Promise<void>;
     hasDifferentContextId(): Promise<void>;
+    shouldNodeBeDeepCopied(): Promise<void>;
     copyNode(): Promise<void>;
     copyNodeFromPos(): Promise<void>;
     updateMediaSingleFileAttrs(): Promise<void>;

package/dist/types-ts4.5/nodeviews/mediaNodeUpdater.d.ts

@@ -3,7 +3,7 @@ import type { ContextIdentifierProvider, MediaProvider } from '@atlaskit/editor-
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { MediaTraceContext } from '@atlaskit/media-common';
-import type { MediaOptions, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
+import type { MediaOptions, MediaPluginState, getPosHandler as ProsemirrorGetPosHandler, SupportedMediaAttributes } from '../types';
 type RemoteDimensions = {
     id: string;
     height: number;
@@ -20,6 +20,7 @@ export interface MediaNodeUpdaterProps {
 }
 export declare class MediaNodeUpdater {
     props: MediaNodeUpdaterProps;
+    mediaPluginState: MediaPluginState | undefined;
     constructor(props: MediaNodeUpdaterProps);
     setProps(newComponentProps: Partial<MediaNodeUpdaterProps>): void;
     isMediaBlobUrl(): boolean;
@@ -35,6 +36,7 @@ export declare class MediaNodeUpdater {
     getNodeContextId: () => string | null;
     updateDimensions: (dimensions: RemoteDimensions) => void;
     getRemoteDimensions(): Promise<false | RemoteDimensions>;
+    shouldNodeBeDeepCopied: () => Promise<boolean>;
     hasDifferentContextId: () => Promise<boolean>;
     isNodeFromDifferentCollection: () => Promise<boolean>;
     handleExternalMedia(getPos: ProsemirrorGetPosHandler): Promise<void>;

package/dist/types-ts4.5/pm-plugins/main.d.ts

@@ -9,6 +9,7 @@ import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node as PMNode, Schema } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaNextEditorPluginType } from '../mediaPluginType';
 import type { MediaOptions, MediaState, MediaStateEventSubscriber, getPosHandlerNode as ProsemirrorGetPosHandler } from '../types';
@@ -51,7 +52,7 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
     private removeOnCloseListener;
     private openMediaPickerBrowser?;
     private onPopupToggleCallback;
-    private nodeCount;
+    private identifierCount;
     private taskManager;
     pickers: PickerFacade[];
     pickerPromises: Array<Promise<PickerFacade>>;
@@ -101,8 +102,10 @@ export declare class MediaPluginStateImplementation implements MediaPluginState
      * inside of it
      */
     handleMediaNodeRemoval: (node: PMNode | undefined, getPos: ProsemirrorGetPosHandler) => void;
+    private getIdentifierKey;
     trackMediaNodeAddition: (node: PMNode) => void;
     trackMediaNodeRemoval: (node: PMNode) => void;
+    isIdentifierInEditorScope: (identifier: Identifier) => boolean;
     /**
      * Called from React UI Component on componentDidMount
      */

package/dist/types-ts4.5/pm-plugins/types.d.ts

@@ -4,6 +4,7 @@ import type { Dispatch } from '@atlaskit/editor-common/event-dispatcher';
 import type { MediaProvider } from '@atlaskit/editor-common/provider-factory';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Identifier } from '@atlaskit/media-client';
 import type { MediaClientConfig } from '@atlaskit/media-core';
 import type { MediaOptions, MediaState, MediaStateEventSubscriber, ProsemirrorGetPosHandler } from '../types';
 import type { MediaPluginOptions } from '../types/media-plugin-options';
@@ -60,6 +61,7 @@ export interface MediaPluginState {
     removeSelectedMediaContainer: () => boolean;
     selectedMediaContainerNode: () => PMNode | undefined;
     handleDrag: (dragState: 'enter' | 'leave') => void;
+    isIdentifierInEditorScope: (identifier: Identifier) => boolean;
     updateElement(): void;
     setIsResizing(isResizing: boolean): void;
     setResizingWidth(width: number): void;

package/dist/types-ts4.5/types/index.d.ts

@@ -14,6 +14,7 @@ interface PlaceholderTextOptions {
 }
 export type MediaStateStatus = 'unknown' | 'ready' | 'cancelled' | 'preview' | 'error' | 'mobile-upload-end';
 export type MediaSingleWithType = 'pixel' | 'percentage';
+export type MediaCopyScope = 'editor' | 'context';
 export interface MediaOptions {
     provider?: Providers['mediaProvider'];
     /**
@@ -53,6 +54,7 @@ export interface MediaOptions {
     allowCommentsOnMedia?: boolean;
     editorAppearance?: EditorAppearance;
     forceHandlePositioning?: HandlePositioning;
+    mediaShallowCopyScope?: MediaCopyScope;
 }
 export interface MediaSingleOptions {
     disableLayout?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.43.14",
+	"version": "1.44.1",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -36,10 +36,10 @@
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
 		"@atlaskit/analytics-next": "^10.2.0",
 		"@atlaskit/button": "^20.3.0",
-		"@atlaskit/editor-common": "^98.2.0",
-		"@atlaskit/editor-palette": "1.6.3",
+		"@atlaskit/editor-common": "^99.0.0",
+		"@atlaskit/editor-palette": "1.6.4",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-annotation": "1.26.10",
+		"@atlaskit/editor-plugin-annotation": "1.26.11",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/form": "^11.0.0",
-		"@atlaskit/icon": "^23.2.0",
+		"@atlaskit/icon": "^23.3.0",
 		"@atlaskit/media-card": "^78.18.0",
 		"@atlaskit/media-client": "^29.0.0",
 		"@atlaskit/media-client-react": "^2.5.0",
@@ -68,7 +68,7 @@
 		"@atlaskit/textfield": "^6.7.0",
 		"@atlaskit/theme": "^14.0.0",
 		"@atlaskit/tmp-editor-statsig": "^2.33.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tokens": "^3.0.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",