@atlaskit/editor-plugin-media 0.11.5 → 0.11.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-media
 
+## 0.11.7
+
+### Patch Changes
+
+- [#68380](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68380) [`180e570d3332`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/180e570d3332) - Consolidate media grouped layout ff to inline image base ff
+
+## 0.11.6
+
+### Patch Changes
+
+- [#67912](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67912) [`d24fdd20c0de`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d24fdd20c0de) - [ux] ED-21869 auto populate alt attribute when inserting inline image
+- [#67822](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67822) [`2010719ccc04`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2010719ccc04) - [ux] ED-21870 Fix - divider is removed from document when switching between media single to image inline
+- Updated dependencies
+
 ## 0.11.5
 
 ### Patch Changes

package/dist/cjs/toolbar/commands.js

@@ -298,7 +298,7 @@ var changeMediaSingleToMediaInline = exports.changeMediaSingleToMediaInline = fu
     var from = state.selection.from;
     var tr = state.tr;
     tr = (0, _utils.removeSelectedNode)(tr);
-    tr = (0, _utils.safeInsert)(node, from, true)(tr);
+    tr = (0, _utils.safeInsert)(node, from, false)(tr);
     // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
     tr.setSelection(_state.TextSelection.create(tr.doc, from + 3));
     if (dispatch) {

package/dist/cjs/toolbar/index.js

@@ -219,7 +219,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       }
     }
     var layoutButtons = (0, _card.buildLayoutButtons)(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.grouped-layout') && selectedNode) {
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.inline-image.base-support') && selectedNode) {
       var selectedLayoutIcon = (0, _utils2.getSelectedLayoutIcon)([].concat((0, _toConsumableArray2.default)(_card.alignmentIcons), (0, _toConsumableArray2.default)(_card.wrappingIcons)), selectedNode.node);
       if (selectedLayoutIcon && layoutButtons.length) {
         var _options = {

package/dist/cjs/utils/media-files.js

@@ -95,7 +95,8 @@ var insertMediaInlineNode = exports.insertMediaInlineNode = function insertMedia
     var id = mediaState.id,
       dimensions = mediaState.dimensions,
       _mediaState$scaleFact = mediaState.scaleFactor,
-      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact;
+      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact,
+      fileName = mediaState.fileName;
     var mediaInlineAttrs = {
       id: id,
       collection: collection
@@ -112,6 +113,7 @@ var insertMediaInlineNode = exports.insertMediaInlineNode = function insertMedia
       mediaInlineAttrs.width = scaledWidth;
       mediaInlineAttrs.height = scaledHeight;
       mediaInlineAttrs.type = 'image';
+      mediaInlineAttrs.alt = fileName;
     }
     var mediaInlineNode = mediaInline.create(mediaInlineAttrs);
     var space = state.schema.text(' ');

package/dist/es2019/toolbar/commands.js

@@ -278,7 +278,7 @@ export const changeMediaSingleToMediaInline = editorAnalyticsAPI => (state, disp
   } = state.selection;
   let tr = state.tr;
   tr = removeSelectedNode(tr);
-  tr = safeInsert(node, from, true)(tr);
+  tr = safeInsert(node, from, false)(tr);
   // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
   tr.setSelection(TextSelection.create(tr.doc, from + 3));
   if (dispatch) {

package/dist/es2019/toolbar/index.js

@@ -212,7 +212,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       }
     }
     const layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
-    if (getBooleanFF('platform.editor.media.grouped-layout') && selectedNode) {
+    if (getBooleanFF('platform.editor.media.inline-image.base-support') && selectedNode) {
       const selectedLayoutIcon = getSelectedLayoutIcon([...alignmentIcons, ...wrappingIcons], selectedNode.node);
       if (selectedLayoutIcon && layoutButtons.length) {
         const options = {

package/dist/es2019/utils/media-files.js

@@ -102,7 +102,8 @@ export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, co
   const {
     id,
     dimensions,
-    scaleFactor = 1
+    scaleFactor = 1,
+    fileName
   } = mediaState;
   let mediaInlineAttrs = {
     id,
@@ -121,6 +122,7 @@ export const insertMediaInlineNode = editorAnalyticsAPI => (view, mediaState, co
     mediaInlineAttrs.width = scaledWidth;
     mediaInlineAttrs.height = scaledHeight;
     mediaInlineAttrs.type = 'image';
+    mediaInlineAttrs.alt = fileName;
   }
   const mediaInlineNode = mediaInline.create(mediaInlineAttrs);
   const space = state.schema.text(' ');

package/dist/esm/toolbar/commands.js

@@ -291,7 +291,7 @@ export var changeMediaSingleToMediaInline = function changeMediaSingleToMediaInl
     var from = state.selection.from;
     var tr = state.tr;
     tr = removeSelectedNode(tr);
-    tr = safeInsert(node, from, true)(tr);
+    tr = safeInsert(node, from, false)(tr);
     // 3 accounts for  paragraph 1 + mediaInline size 1 + space 1
     tr.setSelection(TextSelection.create(tr.doc, from + 3));
     if (dispatch) {

package/dist/esm/toolbar/index.js

@@ -209,7 +209,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       }
     }
     var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.mediaSingle, widthPlugin, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a3 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a3 === void 0 ? void 0 : _pluginInjectionApi$a3.actions, allowResizing, allowResizingInTables, true, true, isChangingLayoutDisabled);
-    if (getBooleanFF('platform.editor.media.grouped-layout') && selectedNode) {
+    if (getBooleanFF('platform.editor.media.inline-image.base-support') && selectedNode) {
       var selectedLayoutIcon = getSelectedLayoutIcon([].concat(_toConsumableArray(alignmentIcons), _toConsumableArray(wrappingIcons)), selectedNode.node);
       if (selectedLayoutIcon && layoutButtons.length) {
         var _options = {

package/dist/esm/utils/media-files.js

@@ -89,7 +89,8 @@ export var insertMediaInlineNode = function insertMediaInlineNode(editorAnalytic
     var id = mediaState.id,
       dimensions = mediaState.dimensions,
       _mediaState$scaleFact = mediaState.scaleFactor,
-      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact;
+      scaleFactor = _mediaState$scaleFact === void 0 ? 1 : _mediaState$scaleFact,
+      fileName = mediaState.fileName;
     var mediaInlineAttrs = {
       id: id,
       collection: collection
@@ -106,6 +107,7 @@ export var insertMediaInlineNode = function insertMediaInlineNode(editorAnalytic
       mediaInlineAttrs.width = scaledWidth;
       mediaInlineAttrs.height = scaledHeight;
       mediaInlineAttrs.type = 'image';
+      mediaInlineAttrs.alt = fileName;
     }
     var mediaInlineNode = mediaInline.create(mediaInlineAttrs);
     var space = state.schema.text(' ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-media",
-  "version": "0.11.5",
+  "version": "0.11.7",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -51,7 +51,7 @@
     "@atlaskit/editor-plugin-width": "^0.2.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
-    "@atlaskit/editor-tables": "^2.3.0",
+    "@atlaskit/editor-tables": "^2.4.0",
     "@atlaskit/form": "^9.0.3",
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/media-card": "^77.7.0",
@@ -65,7 +65,7 @@
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/textfield": "^6.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.33.0",
+    "@atlaskit/tokens": "^1.34.0",
     "@atlaskit/tooltip": "^18.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -135,9 +135,6 @@
     "platform.editor.media.inline-image.base-support": {
       "type": "boolean"
     },
-    "platform.editor.media.grouped-layout": {
-      "type": "boolean"
-    },
     "platform.media-experience.media-viewer-v2_hgsii": {
       "type": "boolean",
       "referenceOnly": "true"