@atlaskit/editor-plugin-media 5.2.0 → 5.2.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-media
 
+## 5.2.2
+
+### Patch Changes
+
+- [#189903](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/189903)
+  [`f5ccd32e607db`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f5ccd32e607db) -
+  [ED-28567] Add/remove missing/extra separators in media, table and panel toolbars shown in Jira
+- Updated dependencies
+
+## 5.2.1
+
+### Patch Changes
+
+- [#188952](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/188952)
+  [`1a88e6e2601ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1a88e6e2601ae) -
+  Migrated usage of renamed/deprecated icons
+- Updated dependencies
+
 ## 5.2.0
 
 ### Minor Changes

package/dist/cjs/nodeviews/mediaGroupNext.js

@@ -15,7 +15,7 @@ var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _media = require("@atlaskit/editor-common/media");
 var _utils = require("@atlaskit/editor-common/utils");
-var _closeEditorClose = _interopRequireDefault(require("@atlaskit/icon/core/migration/close--editor-close"));
+var _crossEditorClose = _interopRequireDefault(require("@atlaskit/icon/core/migration/cross--editor-close"));
 var _mediaCommon = require("@atlaskit/media-common");
 var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -83,7 +83,7 @@ var prepareFilmstripItem = function prepareFilmstripItem(_ref) {
           shouldEnableDownloadButton: enableDownloadButton,
           actions: [{
             handler: handleMediaNodeRemoval.bind(null, undefined, getNodePos),
-            icon: /*#__PURE__*/_react.default.createElement(_closeEditorClose.default, {
+            icon: /*#__PURE__*/_react.default.createElement(_crossEditorClose.default, {
               label: intl.formatMessage(_media.nodeViewsMessages.mediaGroupDeleteLabel)
             })
           }]

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

@@ -377,7 +377,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         addLayoutDropdownToToolbar();
       } else {
         toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), (0, _toConsumableArray2.default)(layoutButtons));
-        if (layoutButtons.length) {
+        if (layoutButtons.length && !isNewEditorToolbarEnabled) {
           toolbarButtons.push({
             type: 'separator'
           });
@@ -437,6 +437,14 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       }
     }
 
+    // A separator is needed regardless switcher is enabled or not
+    if ((0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+      toolbarButtons.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
+
     // Pixel Entry Toolbar Support
     var selection = state.selection;
     var isWithinTable = (0, _utils.hasParentNodeOfType)([state.schema.nodes.table])(selection);

package/dist/es2019/nodeviews/mediaGroupNext.js

@@ -3,7 +3,7 @@ import { injectIntl } from 'react-intl-next';
 import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeViewsMessages as messages } from '@atlaskit/editor-common/media';
 import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlaskit/editor-common/utils';
-import EditorCloseIcon from '@atlaskit/icon/core/migration/close--editor-close';
+import EditorCloseIcon from '@atlaskit/icon/core/migration/cross--editor-close';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
 import { fg } from '@atlaskit/platform-feature-flags';

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

@@ -369,7 +369,7 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         addLayoutDropdownToToolbar();
       } else {
         toolbarButtons = [...toolbarButtons, ...layoutButtons];
-        if (layoutButtons.length) {
+        if (layoutButtons.length && !isNewEditorToolbarEnabled) {
           toolbarButtons.push({
             type: 'separator'
           });
@@ -425,6 +425,14 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
       }
     }
 
+    // A separator is needed regardless switcher is enabled or not
+    if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+      toolbarButtons.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
+
     // Pixel Entry Toolbar Support
     const {
       selection

package/dist/esm/nodeviews/mediaGroupNext.js

@@ -9,7 +9,7 @@ import { injectIntl } from 'react-intl-next';
 import { usePreviousState } from '@atlaskit/editor-common/hooks';
 import { nodeViewsMessages as messages } from '@atlaskit/editor-common/media';
 import { isNodeSelectedOrInRange, SelectedState, setNodeSelection } from '@atlaskit/editor-common/utils';
-import EditorCloseIcon from '@atlaskit/icon/core/migration/close--editor-close';
+import EditorCloseIcon from '@atlaskit/icon/core/migration/cross--editor-close';
 import { getMediaFeatureFlag } from '@atlaskit/media-common';
 import { Filmstrip } from '@atlaskit/media-filmstrip';
 import { fg } from '@atlaskit/platform-feature-flags';

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

@@ -368,7 +368,7 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         addLayoutDropdownToToolbar();
       } else {
         toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), _toConsumableArray(layoutButtons));
-        if (layoutButtons.length) {
+        if (layoutButtons.length && !isNewEditorToolbarEnabled) {
           toolbarButtons.push({
             type: 'separator'
           });
@@ -428,6 +428,14 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
       }
     }
 
+    // A separator is needed regardless switcher is enabled or not
+    if (expValEquals('platform_editor_toolbar_aifc', 'isEnabled', true)) {
+      toolbarButtons.push({
+        type: 'separator',
+        fullHeight: true
+      });
+    }
+
     // Pixel Entry Toolbar Support
     var selection = state.selection;
     var isWithinTable = hasParentNodeOfType([state.schema.nodes.table])(selection);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "5.2.0",
+	"version": "5.2.2",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/editor-shared-styles": "^3.5.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/form": "^12.0.0",
-		"@atlaskit/icon": "^27.5.0",
+		"@atlaskit/icon": "^27.6.0",
 		"@atlaskit/icon-lab": "^5.2.0",
 		"@atlaskit/media-card": "^79.4.0",
 		"@atlaskit/media-client": "^35.1.0",
@@ -69,7 +69,7 @@
 		"@atlaskit/primitives": "^14.10.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.9.0",
+		"@atlaskit/tmp-editor-statsig": "^9.10.0",
 		"@atlaskit/tokens": "^5.6.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
@@ -84,7 +84,7 @@
 		"typescript": "~5.4.2"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.9.0",
+		"@atlaskit/editor-common": "^107.12.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",