@atlaskit/editor-plugin-media 1.43.12 → 1.43.14

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

@@ -39,14 +39,13 @@ var getInsertMediaAnalytics = function getInsertMediaAnalytics(inputMethod, file
 function shouldAddParagraph(state) {
   return (0, _selection.atTheBeginningOfBlock)(state) && !(0, _utils.checkNodeDown)(state.selection, state.doc, _utils.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;
@@ -56,7 +55,7 @@ function insertNodesWithOptionalParagraph(nodes) {
       newType = analyticsAttributes.newType,
       previousType = analyticsAttributes.previousType;
     var openEnd = 0;
-    if (shouldAddParagraph(state)) {
+    if (shouldAddParagraph(state) && !(0, _platformFeatureFlags.fg)('platform_editor_axe_leading_paragraph_from_media')) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
@@ -68,12 +67,14 @@ function insertNodesWithOptionalParagraph(nodes) {
       var grandparentEndPos = state.selection.$from.start(-1) + grandParentNode.nodeSize - 1;
       (0, _utils2.safeInsert)(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 = (0, _selection.atTheBeginningOfBlock)(state) && (0, _platformFeatureFlags.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 _state.TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      if (!(0, _platformFeatureFlags.fg)('platform_editor_axe_leading_paragraph_from_media')) {
+        tr.setSelection(new _state.TextSelection(tr.doc.resolve(endPos), tr.doc.resolve(endPos)));
+      }
     } else {
       tr.replaceSelection(new _model.Slice(_model.Fragment.from(nodes), 0, openEnd));
     }
@@ -123,7 +124,13 @@ var insertMediaAsMediaSingle = exports.insertMediaAsMediaSingle = function inser
     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) {
@@ -161,10 +168,16 @@ var insertMediaSingleNode = exports.insertMediaSingleNode = function insertMedia
     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 = (0, _insert.safeInsert)(node, state.selection.from)(state.tr);
@@ -208,11 +221,16 @@ var changeFromMediaInlineToMediaSingleNode = exports.changeFromMediaInlineToMedi
     grandParentNodeType: grandParentNodeType,
     content: node
   })) {
-    return insertNodesWithOptionalParagraph([node], {
-      fileExtension: fileExtension,
-      newType: _analytics.ACTION_SUBJECT_ID.MEDIA_SINGLE,
-      previousType: _analytics.ACTION_SUBJECT_ID.MEDIA_INLINE
-    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
+    return insertNodesWithOptionalParagraph({
+      nodes: [node],
+      analyticsAttributes: {
+        fileExtension: fileExtension,
+        newType: _analytics.ACTION_SUBJECT_ID.MEDIA_SINGLE,
+        previousType: _analytics.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;
@@ -238,12 +256,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/cjs/ui/MediaLinkingToolbar.js

@@ -31,6 +31,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var validationWrapper = (0, _react2.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/cjs/ui/toolbar/mediaInline.js

@@ -12,9 +12,9 @@ var _card = require("@atlaskit/editor-common/card");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _state2 = require("@atlaskit/editor-prosemirror/state");
 var _delete = _interopRequireDefault(require("@atlaskit/icon/core/delete"));
-var _growDiagonal = _interopRequireDefault(require("@atlaskit/icon/core/grow-diagonal"));
 var _imageFullscreen = _interopRequireDefault(require("@atlaskit/icon/core/image-fullscreen"));
 var _imageInline = _interopRequireDefault(require("@atlaskit/icon/core/image-inline"));
+var _maximize = _interopRequireDefault(require("@atlaskit/icon/core/maximize"));
 var _download = _interopRequireDefault(require("@atlaskit/icon/core/migration/download"));
 var _smartLinkCard = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-card"));
 var _filePreview = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/file-preview"));
@@ -77,7 +77,7 @@ var generateMediaInlineFloatingToolbar = exports.generateMediaInlineFloatingTool
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
-    icon: _growDiagonal.default,
+    icon: _maximize.default,
     iconFallback: _filePreview.default,
     title: intl.formatMessage(_mediaUi.messages.preview),
     onClick: function onClick() {
@@ -249,7 +249,7 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
-      icon: _growDiagonal.default,
+      icon: _maximize.default,
       iconFallback: _filePreview.default,
       title: intl.formatMessage(_mediaUi.messages.preview),
       onClick: function onClick() {

package/dist/es2019/nodeviews/mediaNodeUpdater.js

@@ -224,6 +224,34 @@ export class MediaNodeUpdater {
       }
       return false;
     });
+    _defineProperty(this, "handleCopyFileSwitcher", async attrs => {
+      const {
+        mediaClient,
+        source,
+        destination,
+        traceContext
+      } = attrs;
+      if (fg('platform_media_copy_and_paste_v2')) {
+        // don't need authProviders for v2 copy
+        const {
+          authProvider: _sourceAP,
+          ...copyV2Source
+        } = source;
+        const {
+          authProvider: _destAP,
+          ...copyV2Destination
+        } = destination;
+        const {
+          id
+        } = await mediaClient.file.copyFile(copyV2Source, copyV2Destination, undefined, traceContext);
+        return id;
+      } else {
+        const {
+          id
+        } = await mediaClient.file.copyFile(source, destination, undefined, traceContext);
+        return id;
+      }
+    });
     _defineProperty(this, "copyNodeFromBlobUrl", async getPos => {
       const attrs = this.getAttrs();
       if (!attrs || attrs.type !== 'external') {
@@ -256,24 +284,26 @@ export class MediaNodeUpdater {
         return;
       }
       const mediaClient = getMediaClient(uploadMediaClientConfig);
-      const auth = await uploadMediaClientConfig.getAuthFromContext(contextId);
-      const source = {
-        id,
-        collection,
-        authProvider: () => Promise.resolve(auth)
-      };
-      const destination = {
-        collection: currentCollectionName,
-        authProvider: uploadMediaClientConfig.authProvider,
-        occurrenceKey: uuidV4()
-      };
-      const mediaFile = await mediaClient.file.copyFile(source, destination);
+      const getAuthFromContext = uploadMediaClientConfig.getAuthFromContext;
+      const mediaFileId = await this.handleCopyFileSwitcher({
+        mediaClient,
+        source: {
+          id,
+          collection,
+          authProvider: () => getAuthFromContext(contextId)
+        },
+        destination: {
+          collection: currentCollectionName,
+          authProvider: uploadMediaClientConfig.authProvider,
+          occurrenceKey: uuidV4()
+        }
+      });
       const pos = getPos();
       if (typeof pos !== 'number') {
         return;
       }
       replaceExternalMedia(pos + 1, {
-        id: mediaFile.id,
+        id: mediaFileId,
         collection: currentCollectionName,
         height,
         width,
@@ -323,22 +353,25 @@ export class MediaNodeUpdater {
         return;
       }
       const mediaClient = getMediaClient(uploadMediaClientConfig);
-      const auth = await uploadMediaClientConfig.getAuthFromContext(nodeContextId);
-      const objectId = await this.getObjectId();
-      const source = {
-        id,
-        collection,
-        authProvider: () => Promise.resolve(auth)
-      };
       const currentCollectionName = mediaProvider.uploadParams.collection;
-      const destination = {
-        collection: currentCollectionName,
-        authProvider: uploadMediaClientConfig.authProvider,
-        occurrenceKey: uuidV4()
-      };
-      const mediaFile = await mediaClient.file.copyFile(source, destination, undefined, traceContext);
+      const objectId = await this.getObjectId();
+      const getAuthFromContext = uploadMediaClientConfig.getAuthFromContext;
+      const mediaFileId = await this.handleCopyFileSwitcher({
+        mediaClient,
+        source: {
+          id,
+          collection,
+          authProvider: () => getAuthFromContext(nodeContextId)
+        },
+        destination: {
+          collection: currentCollectionName,
+          authProvider: uploadMediaClientConfig.authProvider,
+          occurrenceKey: uuidV4()
+        },
+        traceContext
+      });
       return {
-        id: mediaFile.id,
+        id: mediaFileId,
         collection: currentCollectionName,
         __contextId: objectId
       };

package/dist/es2019/pm-plugins/alt-text/ui/AltTextEdit.js

@@ -26,6 +26,7 @@ const supportTextStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   fontSize: relativeFontSizeToBase16(12),
   padding: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-500, 40px)"}`,
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: '20px',
   borderTop: `1px solid ${`var(--ds-border, ${N30})`}`,
   margin: 0
@@ -36,16 +37,19 @@ const containerStyles = css({
   display: 'flex',
   flexDirection: 'column',
   overflow: 'auto',
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 2
 });
 const inputWrapperStyles = css({
   display: 'flex',
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 0,
   padding: `${"var(--ds-space-075, 6px)"} 0`,
   alignItems: 'center'
 });
 const validationWrapperStyles = css({
   display: 'flex',
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 0,
   padding: `${"var(--ds-space-150, 12px)"} ${"var(--ds-space-300, 24px)"} ${"var(--ds-space-150, 12px)"} 0`,
   margin: `0 ${"var(--ds-space-150, 12px)"} 0 ${"var(--ds-space-500, 40px)"}`,

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

@@ -27,10 +27,13 @@ const getInsertMediaAnalytics = (inputMethod, fileExtension, insertMediaVia) =>
 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, analyticsAttributes = {}, editorAnalyticsAPI, isNestingInQuoteSupported, insertMediaVia) {
+function insertNodesWithOptionalParagraph({
+  nodes,
+  analyticsAttributes = {},
+  editorAnalyticsAPI,
+  isNestingInQuoteSupported,
+  insertMediaVia
+}) {
   return function (state, dispatch) {
     const {
       tr,
@@ -46,7 +49,7 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
       previousType
     } = analyticsAttributes;
     let openEnd = 0;
-    if (shouldAddParagraph(state)) {
+    if (shouldAddParagraph(state) && !fg('platform_editor_axe_leading_paragraph_from_media')) {
       nodes.push(paragraph.create());
       openEnd = 1;
     }
@@ -58,10 +61,12 @@ function insertNodesWithOptionalParagraph(nodes, analyticsAttributes = {}, edito
       const 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
+      const insertFrom = atTheBeginningOfBlock(state) && fg('platform_editor_axe_leading_paragraph_from_media') ? state.selection.$from.before() : state.selection.from;
+      tr.insert(insertFrom, nodes);
       const endPos = state.selection.from + nodes.reduce((totalSize, currNode) => 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));
     }
@@ -112,7 +117,13 @@ export const insertMediaAsMediaSingle = (view, node, inputMethod, editorAnalytic
     inputMethod,
     fileExtension: node.attrs.__fileMimeType
   };
-  return insertNodesWithOptionalParagraph(nodes, analyticsAttributes, editorAnalyticsAPI, isNestingInQuoteSupported, insertMediaVia)(state, dispatch);
+  return insertNodesWithOptionalParagraph({
+    nodes,
+    analyticsAttributes,
+    editorAnalyticsAPI,
+    isNestingInQuoteSupported,
+    insertMediaVia
+  })(state, dispatch);
 };
 const getFileExtension = fileName => {
   if (fileName) {
@@ -152,10 +163,16 @@ export const insertMediaSingleNode = (view, mediaState, inputMethod, collection,
     grandParentNodeType,
     content: node
   })) {
-    insertNodesWithOptionalParagraph([node], {
-      fileExtension,
-      inputMethod
-    }, editorAnalyticsAPI, isNestingInQuoteSupported, insertMediaVia)(state, dispatch);
+    insertNodesWithOptionalParagraph({
+      nodes: [node],
+      analyticsAttributes: {
+        fileExtension,
+        inputMethod
+      },
+      editorAnalyticsAPI,
+      isNestingInQuoteSupported,
+      insertMediaVia
+    })(state, dispatch);
   } else {
     let tr = null;
     tr = safeInsert(node, state.selection.from)(state.tr);
@@ -203,11 +220,16 @@ export const changeFromMediaInlineToMediaSingleNode = (view, fromNode, widthPlug
     grandParentNodeType,
     content: node
   })) {
-    return insertNodesWithOptionalParagraph([node], {
-      fileExtension,
-      newType: ACTION_SUBJECT_ID.MEDIA_SINGLE,
-      previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
-    }, editorAnalyticsAPI, isNestingInQuoteSupported)(state, dispatch);
+    return insertNodesWithOptionalParagraph({
+      nodes: [node],
+      analyticsAttributes: {
+        fileExtension,
+        newType: ACTION_SUBJECT_ID.MEDIA_SINGLE,
+        previousType: ACTION_SUBJECT_ID.MEDIA_INLINE
+      },
+      editorAnalyticsAPI,
+      isNestingInQuoteSupported
+    })(state, dispatch);
   } else {
     const nodePos = state.tr.doc.resolve(state.selection.from).end();
     let tr = null;

package/dist/es2019/ui/MediaLinkingToolbar.js

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

package/dist/es2019/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';
@@ -69,7 +69,7 @@ export const generateMediaInlineFloatingToolbar = (state, intl, mediaPluginState
     id: 'editor.media.viewer',
     testId: 'file-preview-toolbar-button',
     type: 'button',
-    icon: ExpandIcon,
+    icon: MaximizeIcon,
     iconFallback: FilePreviewIcon,
     title: intl.formatMessage(messages.preview),
     onClick: () => {
@@ -249,7 +249,7 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
       id: 'editor.media.viewer',
       testId: 'file-preview-toolbar-button',
       type: 'button',
-      icon: ExpandIcon,
+      icon: MaximizeIcon,
       iconFallback: FilePreviewIcon,
       title: intl.formatMessage(messages.preview),
       onClick: () => {