@atlaskit/editor-plugin-media 13.3.1 → 13.4.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-media
 
+## 13.4.0
+
+### Minor Changes
+
+- [`1b0c575cc96b6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1b0c575cc96b6) -
+  make remix generated images identifiable from regular images
+
 ## 13.3.1
 
 ### Patch Changes

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

@@ -66,7 +66,7 @@ var clearAIGenerating = exports.clearAIGenerating = function clearAIGenerating(m
   };
 };
 var insertMediaAsMediaSingleCommand = exports.insertMediaAsMediaSingleCommand = function insertMediaAsMediaSingleCommand(editorAnalyticsAPI, allowPixelResizing) {
-  return function (mediaAttrs, inputMethod, insertMediaVia, positions) {
-    return (0, _mediaSingle.createInsertMediaAsMediaSingleCommand)(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions);
+  return function (mediaAttrs, inputMethod, insertMediaVia, positions, dataConsumerSource) {
+    return (0, _mediaSingle.createInsertMediaAsMediaSingleCommand)(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource);
   };
 };

package/dist/cjs/pm-plugins/utils/media-single.js

@@ -183,7 +183,7 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     insertMediaVia: insertMediaVia
   })(state, dispatch);
 };
-var createInsertMediaAsMediaSingleCommand = exports.createInsertMediaAsMediaSingleCommand = function createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions) {
+var createInsertMediaAsMediaSingleCommand = exports.createInsertMediaAsMediaSingleCommand = function createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource) {
   return function (_ref4) {
     var _mediaAttrs$__fileMim, _mediaAttrs$width, _mediaAttrs$__fileMim2;
     var tr = _ref4.tr;
@@ -201,7 +201,10 @@ var createInsertMediaAsMediaSingleCommand = exports.createInsertMediaAsMediaSing
       width: (0, _mediaSingle.getMediaSingleInitialWidth)((_mediaAttrs$width = mediaAttrs.width) !== null && _mediaAttrs$width !== void 0 ? _mediaAttrs$width : _mediaSingle.DEFAULT_IMAGE_WIDTH),
       layout: 'center'
     } : {};
-    var mediaNode = media.create(mediaAttrs);
+    var dataConsumerMarkType = dataConsumerSource ? tr.doc.type.schema.marks.dataConsumer : undefined;
+    var mediaNode = dataConsumerSource && dataConsumerMarkType ? media.create(mediaAttrs, undefined, [dataConsumerMarkType.create({
+      sources: [dataConsumerSource]
+    })]) : media.create(mediaAttrs);
     var mediaSingleNode = mediaSingle.create(mediaSingleAttrs, mediaNode);
     var nodes = [mediaSingleNode];
     var analyticsAttributes = {

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

@@ -52,4 +52,4 @@ export const setAIGenerating = (mediaId, source) => ({
 export const clearAIGenerating = mediaId => ({
   tr
 }) => clearAIGeneratingMeta(tr, mediaId);
-export const insertMediaAsMediaSingleCommand = (editorAnalyticsAPI, allowPixelResizing) => (mediaAttrs, inputMethod, insertMediaVia, positions) => createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions);
+export const insertMediaAsMediaSingleCommand = (editorAnalyticsAPI, allowPixelResizing) => (mediaAttrs, inputMethod, insertMediaVia, positions, dataConsumerSource) => createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource);

package/dist/es2019/pm-plugins/utils/media-single.js

@@ -181,7 +181,7 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     insertMediaVia
   })(state, dispatch);
 };
-export const createInsertMediaAsMediaSingleCommand = (mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions) => {
+export const createInsertMediaAsMediaSingleCommand = (mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource) => {
   return ({
     tr
   }) => {
@@ -201,7 +201,10 @@ export const createInsertMediaAsMediaSingleCommand = (mediaAttrs, inputMethod, e
       width: getMediaSingleInitialWidth((_mediaAttrs$width = mediaAttrs.width) !== null && _mediaAttrs$width !== void 0 ? _mediaAttrs$width : DEFAULT_IMAGE_WIDTH),
       layout: 'center'
     } : {};
-    const mediaNode = media.create(mediaAttrs);
+    const dataConsumerMarkType = dataConsumerSource ? tr.doc.type.schema.marks.dataConsumer : undefined;
+    const mediaNode = dataConsumerSource && dataConsumerMarkType ? media.create(mediaAttrs, undefined, [dataConsumerMarkType.create({
+      sources: [dataConsumerSource]
+    })]) : media.create(mediaAttrs);
     const mediaSingleNode = mediaSingle.create(mediaSingleAttrs, mediaNode);
     const nodes = [mediaSingleNode];
     const analyticsAttributes = {

package/dist/esm/pm-plugins/commands.js

@@ -60,7 +60,7 @@ export var clearAIGenerating = function clearAIGenerating(mediaId) {
   };
 };
 export var insertMediaAsMediaSingleCommand = function insertMediaAsMediaSingleCommand(editorAnalyticsAPI, allowPixelResizing) {
-  return function (mediaAttrs, inputMethod, insertMediaVia, positions) {
-    return createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions);
+  return function (mediaAttrs, inputMethod, insertMediaVia, positions, dataConsumerSource) {
+    return createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource);
   };
 };

package/dist/esm/pm-plugins/utils/media-single.js

@@ -176,7 +176,7 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     insertMediaVia: insertMediaVia
   })(state, dispatch);
 };
-export var createInsertMediaAsMediaSingleCommand = function createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions) {
+export var createInsertMediaAsMediaSingleCommand = function createInsertMediaAsMediaSingleCommand(mediaAttrs, inputMethod, editorAnalyticsAPI, insertMediaVia, allowPixelResizing, positions, dataConsumerSource) {
   return function (_ref4) {
     var _mediaAttrs$__fileMim, _mediaAttrs$width, _mediaAttrs$__fileMim2;
     var tr = _ref4.tr;
@@ -194,7 +194,10 @@ export var createInsertMediaAsMediaSingleCommand = function createInsertMediaAsM
       width: getMediaSingleInitialWidth((_mediaAttrs$width = mediaAttrs.width) !== null && _mediaAttrs$width !== void 0 ? _mediaAttrs$width : DEFAULT_IMAGE_WIDTH),
       layout: 'center'
     } : {};
-    var mediaNode = media.create(mediaAttrs);
+    var dataConsumerMarkType = dataConsumerSource ? tr.doc.type.schema.marks.dataConsumer : undefined;
+    var mediaNode = dataConsumerSource && dataConsumerMarkType ? media.create(mediaAttrs, undefined, [dataConsumerMarkType.create({
+      sources: [dataConsumerSource]
+    })]) : media.create(mediaAttrs);
     var mediaSingleNode = mediaSingle.create(mediaSingleAttrs, mediaNode);
     var nodes = [mediaSingleNode];
     var analyticsAttributes = {

package/dist/types/mediaPluginType.d.ts

@@ -85,7 +85,7 @@ export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
          * @param insertMediaVia - Optional parameter indicating how the media was inserted
          * @param positions - Optional parameter indicating the positions for the insertion
          */
-        insertMediaSingle: (attrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [number, number]) => EditorCommand;
+        insertMediaSingle: (attrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [number, number], dataConsumerSource?: string) => EditorCommand;
         /**
          * Sets the AI-generating decoration on a media node identified by `mediaId`.
          * Renders an AI border around the media node while AI is generating/replacing it.

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

@@ -18,4 +18,4 @@ export declare const setAIGenerating: (mediaId: string, source?: AIGeneratingSou
  * `mediaId`. Removes the AI border visual from that media's NodeView.
  */
 export declare const clearAIGenerating: (mediaId: string) => EditorCommand;
-export declare const insertMediaAsMediaSingleCommand: (editorAnalyticsAPI?: EditorAnalyticsAPI, allowPixelResizing?: boolean) => (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [number, number]) => EditorCommand;
+export declare const insertMediaAsMediaSingleCommand: (editorAnalyticsAPI?: EditorAnalyticsAPI, allowPixelResizing?: boolean) => (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [number, number], dataConsumerSource?: string) => EditorCommand;

package/dist/types/pm-plugins/utils/media-single.d.ts

@@ -9,7 +9,7 @@ import type { MediaState } from '../../types';
 export declare const isMediaSingle: (schema: Schema, fileMimeType?: string) => boolean;
 export type InsertMediaAsMediaSingle = (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean) => boolean;
 export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean) => boolean;
-export declare const createInsertMediaAsMediaSingleCommand: (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean, positions?: [number, number]) => EditorCommand;
+export declare const createInsertMediaAsMediaSingleCommand: (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean, positions?: [number, number], dataConsumerSource?: string) => EditorCommand;
 export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: (id: string, selectionPosition: number) => void, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, allowPixelResizing?: boolean) => boolean;
 export declare const isVideo: MemoizedFn<(fileType?: string) => boolean>;

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

@@ -88,7 +88,7 @@ export type MediaNextEditorPluginType = NextEditorPlugin<'media', {
         insertMediaSingle: (attrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [
             number,
             number
-        ]) => EditorCommand;
+        ], dataConsumerSource?: string) => EditorCommand;
         /**
          * Sets the AI-generating decoration on a media node identified by `mediaId`.
          * Renders an AI border around the media node while AI is generating/replacing it.

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

@@ -21,4 +21,4 @@ export declare const clearAIGenerating: (mediaId: string) => EditorCommand;
 export declare const insertMediaAsMediaSingleCommand: (editorAnalyticsAPI?: EditorAnalyticsAPI, allowPixelResizing?: boolean) => (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, insertMediaVia?: InsertMediaVia, positions?: [
     number,
     number
-]) => EditorCommand;
+], dataConsumerSource?: string) => EditorCommand;

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

@@ -12,7 +12,7 @@ export declare const insertMediaAsMediaSingle: (view: EditorView, node: PMNode,
 export declare const createInsertMediaAsMediaSingleCommand: (mediaAttrs: MediaADFAttrs, inputMethod: InputMethodInsertMedia, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean, positions?: [
     number,
     number
-]) => EditorCommand;
+], dataConsumerSource?: string) => EditorCommand;
 export declare const insertMediaSingleNode: (view: EditorView, mediaState: MediaState, inputMethod?: InputMethodInsertMedia, collection?: string, alignLeftOnInsert?: boolean, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, onNodeInserted?: (id: string, selectionPosition: number) => void, insertMediaVia?: InsertMediaVia, allowPixelResizing?: boolean) => boolean;
 export declare const changeFromMediaInlineToMediaSingleNode: (view: EditorView, fromNode: PMNode, widthPluginState?: WidthPluginState | undefined, editorAnalyticsAPI?: EditorAnalyticsAPI | undefined, allowPixelResizing?: boolean) => boolean;
 export declare const isVideo: MemoizedFn<(fileType?: string) => boolean>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "13.3.1",
+	"version": "13.4.0",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -65,7 +65,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/textfield": "^8.3.0",
-		"@atlaskit/tmp-editor-statsig": "^90.0.0",
+		"@atlaskit/tmp-editor-statsig": "^90.1.0",
 		"@atlaskit/tokens": "^13.3.0",
 		"@atlaskit/tooltip": "^22.6.0",
 		"@babel/runtime": "^7.0.0",