@atlaskit/editor-plugin-media 1.43.12 → 1.43.14

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

@@ -32,14 +32,13 @@ var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, file
 function shouldAddParagraph(state) {
   return atTheBeginningOfBlock(state) && !checkNodeDown(state.selection, state.doc, isEmptyParagraph);
 }
-
-// Ignored via go/ees005
-// eslint-disable-next-line @typescript-eslint/max-params
-function insertNodesWithOptionalParagraph(nodes) {
-  var analyticsAttributes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var editorAnalyticsAPI = arguments.length > 2 ? arguments[2] : undefined;
-  var isNestingInQuoteSupported = arguments.length > 3 ? arguments[3] : undefined;
-  var insertMediaVia = arguments.length > 4 ? arguments[4] : undefined;
+function insertNodesWithOptionalParagraph(_ref) {
+  var nodes = _ref.nodes,
+    _ref$analyticsAttribu = _ref.analyticsAttributes,
+    analyticsAttributes = _ref$analyticsAttribu === void 0 ? {} : _ref$analyticsAttribu,
+    editorAnalyticsAPI = _ref.editorAnalyticsAPI,
+    isNestingInQuoteSupported = _ref.isNestingInQuoteSupported,
+    insertMediaVia = _ref.insertMediaVia;
   return function (state, dispatch) {
     var tr = state.tr,
       schema = state.schema;
@@ -49,7 +48,7 @@ function insertNodesWithOptionalParagraph(nodes) {
       newType = analyticsAttributes.newType,
       previousType = analyticsAttributes.previousType;
     var openEnd = 0;
-    if (shouldAddParagraph(state)) {
+    if (shouldAddParagraph(state) && !fg('platform_editor_axe_leading_paragraph_from_media')) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
@@ -61,12 +60,14 @@ function insertNodesWithOptionalParagraph(nodes) {
       var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
       pmSafeInsert(nodes[0], grandparentEndPos)(tr).scrollIntoView();
     } else if (state.selection.empty) {
-      tr.insert(state.selection.from, nodes);
-      // Set the cursor position at the end of the insertion
+      var insertFrom = atTheBeginningOfBlock(state) && fg('platform_editor_axe_leading_paragraph_from_media') ? state.selection.$from.before() : state.selection.from;
+      tr.insert(insertFrom, nodes);
       var endPos = state.selection.from + nodes.reduce(function (totalSize, currNode) {
         return totalSize + currNode.nodeSize;
       }, 0);
-      tr.setSelection(new TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      if (!fg('platform_editor_axe_leading_paragraph_from_media')) {
+        tr.setSelection(new TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      }
     } else {
       tr.replaceSelection(new Slice(Fragment.from(nodes), 0, openEnd));
     }
@@ -116,7 +117,13 @@ export var insertMediaAsMediaSingle = function insertMediaAsMediaSingle(view, no
     inputMethod: inputMethod,
     fileExtension: node.attrs.__fileMimeType
   };
-  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI, isNestingInQuoteSupported, insertMediaVia)(state, dispatch);
+  return insertNodesWithOptionalParagraph({
+    nodes: nodes,
+    analyticsAttributes: analyticsAttributes,
+    editorAnalyticsAPI: editorAnalyticsAPI,
+    isNestingInQuoteSupported: isNestingInQuoteSupported,
+    insertMediaVia: insertMediaVia
+  })(state, dispatch);
 };
 var getFileExtension = function getFileExtension(fileName) {
   if (fileName) {
@@ -154,10 +161,16 @@ export var insertMediaSingleNode = function insertMediaSingleNode(view, mediaSta
     grandParentNodeType: grandParentNodeType,
     content: node
   })) {
-    insertNodesWithOptionalParagraph([node], {
-      fileExtension: fileExtension,
-      inputMethod: inputMethod
-    }, editorAnalyticsAPI, isNestingInQuoteSupported, insertMediaVia)(state, dispatch);
+    insertNodesWithOptionalParagraph({
+      nodes: [node],
+      analyticsAttributes: {
+        fileExtension: fileExtension,
+        inputMethod: inputMethod
+      },
+      editorAnalyticsAPI: editorAnalyticsAPI,
+      isNestingInQuoteSupported: isNestingInQuoteSupported,
+      insertMediaVia: insertMediaVia
+    })(state, dispatch);
   } else {
     var tr = null;
     tr = safeInsert(node, state.selection.from)(state.tr);
@@ -201,11 +214,16 @@ export var changeFromMediaInlineToMediaSingleNode = function changeFromMediaInli
     grandParentNodeType: grandParentNodeType,
     content: node
   })) {
-    return insertNodesWithOptionalParagraph([node], {
-      fileExtension: fileExtension,
-      newType: ACTION_SUBJECT_ID.MEDIA_SINGLE,
-      previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
-    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
+    return insertNodesWithOptionalParagraph({
+      nodes: [node],
+      analyticsAttributes: {
+        fileExtension: fileExtension,
+        newType: ACTION_SUBJECT_ID.MEDIA_SINGLE,
+        previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
+      },
+      editorAnalyticsAPI: editorAnalyticsAPI,
+      isNestingInQuoteSupported: isNestingInQuoteSupported
+    })(state, dispatch);
   } else {
     var nodePos = state.tr.doc.resolve(state.selection.from).end();
     var tr = null;
@@ -231,12 +249,12 @@ var createMediaSingleNode = function createMediaSingleNode(schema, collection, m
       _mediaState$scaleFact = mediaState.scaleFactor,
       scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact,
       fileName = mediaState.fileName;
-    var _ref = dimensions || {
+    var _ref2 = dimensions || {
         height: undefined,
         width: undefined
       },
-      width = _ref.width,
-      height = _ref.height;
+      width = _ref2.width,
+      height = _ref2.height;
     var _schema$nodes = schema.nodes,
       media = _schema$nodes.media,
       mediaSingle = _schema$nodes.mediaSingle;

package/dist/esm/ui/MediaLinkingToolbar.js

@@ -26,6 +26,7 @@ import ChevronLeftLargeIcon from '@atlaskit/icon/glyph/chevron-left-large';
 import EditorUnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import { R400 } from '@atlaskit/theme/colors';
 var validationWrapper = css({
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 0,
   padding: "var(--ds-space-150, 12px)".concat(" ", "var(--ds-space-300, 24px)", " ", "var(--ds-space-150, 12px)", " 0"),
   margin: "0 ".concat("var(--ds-space-050, 4px)", " 0 ", "var(--ds-space-400, 32px)"),

package/dist/esm/ui/toolbar/mediaInline.js

@@ -4,9 +4,9 @@ import { IconCard, IconEmbed, IconInline } from '@atlaskit/editor-common/card';
 import commonMessages, { cardMessages, mediaAndEmbedToolbarMessages } from '@atlaskit/editor-common/messages';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import DeleteIcon from '@atlaskit/icon/core/delete';
-import ExpandIcon from '@atlaskit/icon/core/grow-diagonal';
 import ImageFullscreenIcon from '@atlaskit/icon/core/image-fullscreen';
 import ImageInlineIcon from '@atlaskit/icon/core/image-inline';
+import MaximizeIcon from '@atlaskit/icon/core/maximize';
 import DownloadIcon from '@atlaskit/icon/core/migration/download';
 import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import FilePreviewIcon from '@atlaskit/icon/glyph/editor/file-preview';
@@ -67,7 +67,7 @@ export var generateMediaInlineFloatingToolbar = function generateMediaInlineFloa
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
-    icon: ExpandIcon,
+    icon: MaximizeIcon,
     iconFallback: FilePreviewIcon,
     title: intl.formatMessage(messages.preview),
     onClick: function onClick() {
@@ -239,7 +239,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
-      icon: ExpandIcon,
+      icon: MaximizeIcon,
       iconFallback: FilePreviewIcon,
       title: intl.formatMessage(messages.preview),
       onClick: function onClick() {

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

@@ -38,6 +38,7 @@ export declare class MediaNodeUpdater {
     hasDifferentContextId: () => Promise<boolean>;
     isNodeFromDifferentCollection: () => Promise<boolean>;
     handleExternalMedia(getPos: ProsemirrorGetPosHandler): Promise<void>;
+    private handleCopyFileSwitcher;
     copyNodeFromBlobUrl: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
     copyNodeFromPos: (getPos: ProsemirrorGetPosHandler, traceContext?: MediaTraceContext) => Promise<void>;
     copyNode: (traceContext?: MediaTraceContext) => Promise<void>;

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

@@ -38,6 +38,7 @@ export declare class MediaNodeUpdater {
     hasDifferentContextId: () => Promise<boolean>;
     isNodeFromDifferentCollection: () => Promise<boolean>;
     handleExternalMedia(getPos: ProsemirrorGetPosHandler): Promise<void>;
+    private handleCopyFileSwitcher;
     copyNodeFromBlobUrl: (getPos: ProsemirrorGetPosHandler) => Promise<void>;
     copyNodeFromPos: (getPos: ProsemirrorGetPosHandler, traceContext?: MediaTraceContext) => Promise<void>;
     copyNode: (traceContext?: MediaTraceContext) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "1.43.12",
+	"version": "1.43.14",
 	"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.0.0",
+		"@atlaskit/editor-common": "^98.2.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-annotation": "1.26.9",
+		"@atlaskit/editor-plugin-annotation": "1.26.10",
 		"@atlaskit/editor-plugin-connectivity": "^1.1.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -54,20 +54,20 @@
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
 		"@atlaskit/form": "^11.0.0",
-		"@atlaskit/icon": "^23.1.0",
-		"@atlaskit/media-card": "^78.17.0",
+		"@atlaskit/icon": "^23.2.0",
+		"@atlaskit/media-card": "^78.18.0",
 		"@atlaskit/media-client": "^29.0.0",
 		"@atlaskit/media-client-react": "^2.5.0",
 		"@atlaskit/media-common": "^11.7.0",
 		"@atlaskit/media-filmstrip": "^48.1.0",
 		"@atlaskit/media-picker": "^67.0.0",
-		"@atlaskit/media-ui": "^27.2.0",
-		"@atlaskit/media-viewer": "^49.5.0",
+		"@atlaskit/media-ui": "^27.3.0",
+		"@atlaskit/media-viewer": "^49.6.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/textfield": "^6.7.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.31.0",
+		"@atlaskit/tmp-editor-statsig": "^2.33.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -127,6 +127,9 @@
 		"platform_editor_react18_phase2__media_single": {
 			"type": "boolean"
 		},
+		"platform_media_copy_and_paste_v2": {
+			"type": "boolean"
+		},
 		"platform_editor_media_extended_resize_experience": {
 			"type": "boolean"
 		},
@@ -162,6 +165,9 @@
 		},
 		"platform_editor_fix_edit_caption_on_edge": {
 			"type": "boolean"
+		},
+		"platform_editor_axe_leading_paragraph_from_media": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {