@atlaskit/editor-plugin-media 0.11.4 → 0.11.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-media
 
+## 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
+
+- [#67908](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67908) [`68ecca634a3a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/68ecca634a3a) - [ux] Unify order of alt and link floating bar positions for mediaInline and mediaSingle
+
 ## 0.11.4
 
 ### 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/mediaInline.js

@@ -205,12 +205,6 @@ var getMediaInlineImageToolbar = exports.getMediaInlineImageToolbar = function g
   }, {
     type: 'separator'
   });
-  if (options.allowAltTextOnImages) {
-    var _pluginInjectionApi$a4;
-    inlineImageItems.push((0, _altText.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions), {
-      type: 'separator'
-    });
-  }
   inlineImageItems.push({
     type: 'custom',
     fallback: [],
@@ -225,10 +219,10 @@ var getMediaInlineImageToolbar = exports.getMediaInlineImageToolbar = function g
         };
         var openLink = function openLink() {
           if (editorView) {
-            var _pluginInjectionApi$a5;
+            var _pluginInjectionApi$a4;
             var tr = editorView.state.tr,
               dispatch = editorView.dispatch;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 || _pluginInjectionApi$a5.actions.attachAnalyticsEvent({
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
               eventType: _analytics.EVENT_TYPE.TRACK,
               action: _analytics.ACTION.VISITED,
               actionSubject: _analytics.ACTION_SUBJECT.MEDIA,
@@ -251,7 +245,14 @@ var getMediaInlineImageToolbar = exports.getMediaInlineImageToolbar = function g
       }
       return null;
     }
-  }, {
+  });
+  if (options.allowAltTextOnImages) {
+    var _pluginInjectionApi$a5;
+    inlineImageItems.push((0, _altText.altTextButton)(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions), {
+      type: 'separator'
+    });
+  }
+  inlineImageItems.push({
     type: 'copy-button',
     items: [{
       state: state,

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/mediaInline.js

@@ -193,12 +193,6 @@ export const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverD
   }, {
     type: 'separator'
   });
-  if (options.allowAltTextOnImages) {
-    var _pluginInjectionApi$a4;
-    inlineImageItems.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions), {
-      type: 'separator'
-    });
-  }
   inlineImageItems.push({
     type: 'custom',
     fallback: [],
@@ -215,14 +209,14 @@ export const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverD
         };
         const openLink = () => {
           if (editorView) {
-            var _pluginInjectionApi$a5;
+            var _pluginInjectionApi$a4;
             const {
               state: {
                 tr
               },
               dispatch
             } = editorView;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions.attachAnalyticsEvent({
+            pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
               eventType: EVENT_TYPE.TRACK,
               action: ACTION.VISITED,
               actionSubject: ACTION_SUBJECT.MEDIA,
@@ -245,7 +239,14 @@ export const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverD
       }
       return null;
     }
-  }, {
+  });
+  if (options.allowAltTextOnImages) {
+    var _pluginInjectionApi$a5;
+    inlineImageItems.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions), {
+      type: 'separator'
+    });
+  }
+  inlineImageItems.push({
     type: 'copy-button',
     items: [{
       state,

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/mediaInline.js

@@ -195,12 +195,6 @@ export var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(stat
   }, {
     type: 'separator'
   });
-  if (options.allowAltTextOnImages) {
-    var _pluginInjectionApi$a4;
-    inlineImageItems.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions), {
-      type: 'separator'
-    });
-  }
   inlineImageItems.push({
     type: 'custom',
     fallback: [],
@@ -215,10 +209,10 @@ export var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(stat
         };
         var openLink = function openLink() {
           if (editorView) {
-            var _pluginInjectionApi$a5;
+            var _pluginInjectionApi$a4;
             var tr = editorView.state.tr,
               dispatch = editorView.dispatch;
-            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 || _pluginInjectionApi$a5.actions.attachAnalyticsEvent({
+            pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 || _pluginInjectionApi$a4.actions.attachAnalyticsEvent({
               eventType: EVENT_TYPE.TRACK,
               action: ACTION.VISITED,
               actionSubject: ACTION_SUBJECT.MEDIA,
@@ -241,7 +235,14 @@ export var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(stat
       }
       return null;
     }
-  }, {
+  });
+  if (options.allowAltTextOnImages) {
+    var _pluginInjectionApi$a5;
+    inlineImageItems.push(altTextButton(intl, state, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions), {
+      type: 'separator'
+    });
+  }
+  inlineImageItems.push({
     type: 'copy-button',
     items: [{
       state: state,

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.4",
+  "version": "0.11.6",
   "description": "Media plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -37,7 +37,7 @@
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/button": "^17.2.0",
-    "@atlaskit/editor-common": "^76.39.0",
+    "@atlaskit/editor-common": "^76.41.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-plugin-decorations": "^0.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",