@atlaskit/editor-plugin-media 2.3.12 → 2.3.14

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 2.3.14
+
+### Patch Changes
+
+- [#130717](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130717)
+  [`ee87c286f2f80`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ee87c286f2f80) -
+  ED-27126 Multiple images upload overridden fix
+- Updated dependencies
+
+## 2.3.13
+
+### Patch Changes
+
+- [#130882](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/130882)
+  [`df1c29f476539`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/df1c29f476539) -
+  [ux] Adds a new i18n message and updates icons and tooltips on links, media and extensions.
+- Updated dependencies
+
 ## 2.3.12
 
 ### Patch Changes

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

@@ -61,8 +61,19 @@ function insertNodesWithOptionalParagraph(_ref) {
     if (state.selection.empty) {
       var insertFrom = (0, _selection.atTheBeginningOfBlock)(state) && (0, _platformFeatureFlags.fg)('platform_editor_axe_leading_paragraph_from_media') ? state.selection.$from.before() : state.selection.from;
       if ((0, _platformFeatureFlags.fg)('platform_editor_axe_leading_paragraph_from_media')) {
-        var shouldInsertFrom = !(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state);
-        updatedTr = (0, _selection.atTheBeginningOfBlock)(state) ? (0, _utils2.safeInsert)(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        if ((0, _platformFeatureFlags.fg)('platform_editor_multi_images_overridden_upload_fix')) {
+          // the use of pmSafeInsert causes the node selection to media single node.
+          // It leads to discrepancy between the full-page and comment editor - not sure why :shrug:
+          // When multiple images are uploaded, the node selection is set to the previous node
+          // and got overridden by the next node inserted.
+          // It also causes the images position shifted when the images are uploaded.
+          // E.g the images are uploaded after a table, the images will be inserted inside the table.
+          // so we revert to use tr.insert instead. No extra paragraph is added.
+          updatedTr = updatedTr.insert(insertFrom, nodes);
+        } else {
+          var shouldInsertFrom = !(0, _mediaCommon.isInsidePotentialEmptyParagraph)(state);
+          updatedTr = (0, _selection.atTheBeginningOfBlock)(state) ? (0, _utils2.safeInsert)(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        }
       } else {
         updatedTr.insert(insertFrom, nodes);
       }

package/dist/cjs/ui/toolbar/index.js

@@ -377,17 +377,19 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           });
         } else {
           var _pluginInjectionApi$a5;
+          var inlineTitle = intl.formatMessage(_messages.mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           var _options2 = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: (0, _commands3.changeMediaSingleToMediaInline)(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/_react.default.createElement(_imageInline.default, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: _card.IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

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

@@ -55,8 +55,19 @@ function insertNodesWithOptionalParagraph({
     if (state.selection.empty) {
       const insertFrom = atTheBeginningOfBlock(state) && fg('platform_editor_axe_leading_paragraph_from_media') ? state.selection.$from.before() : state.selection.from;
       if (fg('platform_editor_axe_leading_paragraph_from_media')) {
-        const shouldInsertFrom = !isInsidePotentialEmptyParagraph(state);
-        updatedTr = atTheBeginningOfBlock(state) ? pmSafeInsert(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        if (fg('platform_editor_multi_images_overridden_upload_fix')) {
+          // the use of pmSafeInsert causes the node selection to media single node.
+          // It leads to discrepancy between the full-page and comment editor - not sure why :shrug:
+          // When multiple images are uploaded, the node selection is set to the previous node
+          // and got overridden by the next node inserted.
+          // It also causes the images position shifted when the images are uploaded.
+          // E.g the images are uploaded after a table, the images will be inserted inside the table.
+          // so we revert to use tr.insert instead. No extra paragraph is added.
+          updatedTr = updatedTr.insert(insertFrom, nodes);
+        } else {
+          const shouldInsertFrom = !isInsidePotentialEmptyParagraph(state);
+          updatedTr = atTheBeginningOfBlock(state) ? pmSafeInsert(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        }
       } else {
         updatedTr.insert(insertFrom, nodes);
       }

package/dist/es2019/ui/toolbar/index.js

@@ -364,17 +364,19 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
           });
         } else {
           var _pluginInjectionApi$a5;
+          const inlineTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           const options = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: changeMediaSingleToMediaInline(pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

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

@@ -54,8 +54,19 @@ function insertNodesWithOptionalParagraph(_ref) {
     if (state.selection.empty) {
       var insertFrom = atTheBeginningOfBlock(state) && fg('platform_editor_axe_leading_paragraph_from_media') ? state.selection.$from.before() : state.selection.from;
       if (fg('platform_editor_axe_leading_paragraph_from_media')) {
-        var shouldInsertFrom = !isInsidePotentialEmptyParagraph(state);
-        updatedTr = atTheBeginningOfBlock(state) ? pmSafeInsert(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        if (fg('platform_editor_multi_images_overridden_upload_fix')) {
+          // the use of pmSafeInsert causes the node selection to media single node.
+          // It leads to discrepancy between the full-page and comment editor - not sure why :shrug:
+          // When multiple images are uploaded, the node selection is set to the previous node
+          // and got overridden by the next node inserted.
+          // It also causes the images position shifted when the images are uploaded.
+          // E.g the images are uploaded after a table, the images will be inserted inside the table.
+          // so we revert to use tr.insert instead. No extra paragraph is added.
+          updatedTr = updatedTr.insert(insertFrom, nodes);
+        } else {
+          var shouldInsertFrom = !isInsidePotentialEmptyParagraph(state);
+          updatedTr = atTheBeginningOfBlock(state) ? pmSafeInsert(nodes[0], shouldInsertFrom ? insertFrom : undefined, false)(updatedTr) : updatedTr.insert(insertFrom, nodes);
+        }
       } else {
         updatedTr.insert(insertFrom, nodes);
       }

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

@@ -367,17 +367,19 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
           });
         } else {
           var _pluginInjectionApi$a5;
+          var inlineTitle = intl.formatMessage(mediaAndEmbedToolbarMessages.changeToMediaInlineImage);
           var _options2 = [{
             id: 'editor.media.convert.mediainline',
-            title: inlineSwitcherTitle,
+            title: inlineTitle,
             onClick: changeMediaSingleToMediaInline(pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions),
             icon: /*#__PURE__*/React.createElement(ImageInlineIcon, {
               color: "currentColor",
               spacing: "spacious",
-              label: inlineSwitcherTitle,
+              label: inlineTitle,
               LEGACY_size: "medium",
               LEGACY_fallbackIcon: IconInline
-            })
+            }),
+            tooltip: hasCaption ? inlineSwitcherTitle : undefined
           }, {
             id: 'editor.media.convert.mediasingle',
             title: floatingSwitcherTitle,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.3.12",
+	"version": "2.3.14",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -69,7 +69,7 @@
 		"@atlaskit/primitives": "^14.2.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.3.0",
+		"@atlaskit/tmp-editor-statsig": "^4.4.0",
 		"@atlaskit/tokens": "^4.5.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -167,6 +167,9 @@
 		},
 		"platform_editor_render_media_viewer_as_inline": {
 			"type": "boolean"
+		},
+		"platform_editor_multi_images_overridden_upload_fix": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {