@atlaskit/editor-plugin-media 2.6.5 → 2.6.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-media
 
+## 2.6.6
+
+### Patch Changes
+
+- [#144194](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144194)
+  [`542b82e03416e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/542b82e03416e) -
+  [ux] Remove separators within group in Editor floating toolbar
+- Updated dependencies
+
 ## 2.6.5
 
 ### Patch Changes

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

@@ -272,9 +272,11 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         });
       }
     });
-    toolbarButtons.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) {
+      toolbarButtons.push({
+        type: 'separator'
+      });
+    }
   }
   if (allowAdvancedToolBarOptions) {
     var _pluginInjectionApi$a3;
@@ -319,9 +321,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             title: intl.formatMessage(_card.layoutToMessages[selectedLayoutIcon.value]),
             icon: selectedLayoutIcon.icon
           };
-          toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), [trigger, {
+          toolbarButtons = [].concat((0, _toConsumableArray2.default)(toolbarButtons), [trigger], (0, _toConsumableArray2.default)(isEditorControlsEnabled && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? [] : [{
             type: 'separator'
-          }]);
+          }]));
         }
       }
     };

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

@@ -21,6 +21,7 @@ var _deleteEditorRemove = _interopRequireDefault(require("@atlaskit/icon/core/mi
 var _download = _interopRequireDefault(require("@atlaskit/icon/core/migration/download"));
 var _smartLinkCard = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-card"));
 var _mediaUi = require("@atlaskit/media-ui");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _linking = require("../../pm-plugins/commands/linking");
 var _linking2 = require("../../pm-plugins/linking");
@@ -224,9 +225,11 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
         });
       }
     });
-    inlineImageItems.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) {
+      inlineImageItems.push({
+        type: 'separator'
+      });
+    }
   }
   var download = {
     id: 'editor.media.image.download',

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

@@ -263,9 +263,11 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
         });
       }
     });
-    toolbarButtons.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !fg('platform_editor_controls_patch_6')) {
+      toolbarButtons.push({
+        type: 'separator'
+      });
+    }
   }
   if (allowAdvancedToolBarOptions) {
     var _pluginInjectionApi$a3;
@@ -310,9 +312,9 @@ const generateMediaSingleFloatingToolbar = (state, intl, options, pluginState, m
             title: intl.formatMessage(layoutToMessages[selectedLayoutIcon.value]),
             icon: selectedLayoutIcon.icon
           };
-          toolbarButtons = [...toolbarButtons, trigger, {
+          toolbarButtons = [...toolbarButtons, trigger, ...(isEditorControlsEnabled && fg('platform_editor_controls_patch_6') ? [] : [{
             type: 'separator'
-          }];
+          }])];
         }
       }
     };

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

@@ -12,6 +12,7 @@ import RemoveIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
 import DownloadIcon from '@atlaskit/icon/core/migration/download';
 import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import { messages } from '@atlaskit/media-ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
@@ -213,9 +214,11 @@ const getMediaInlineImageToolbar = (state, intl, mediaPluginState, hoverDecorati
         });
       }
     });
-    inlineImageItems.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !fg('platform_editor_controls_patch_6')) {
+      inlineImageItems.push({
+        type: 'separator'
+      });
+    }
   }
   const download = {
     id: 'editor.media.image.download',

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

@@ -262,9 +262,11 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
         });
       }
     });
-    toolbarButtons.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !fg('platform_editor_controls_patch_6')) {
+      toolbarButtons.push({
+        type: 'separator'
+      });
+    }
   }
   if (allowAdvancedToolBarOptions) {
     var _pluginInjectionApi$a3;
@@ -309,9 +311,9 @@ var generateMediaSingleFloatingToolbar = function generateMediaSingleFloatingToo
             title: intl.formatMessage(layoutToMessages[selectedLayoutIcon.value]),
             icon: selectedLayoutIcon.icon
           };
-          toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), [trigger, {
+          toolbarButtons = [].concat(_toConsumableArray(toolbarButtons), [trigger], _toConsumableArray(isEditorControlsEnabled && fg('platform_editor_controls_patch_6') ? [] : [{
             type: 'separator'
-          }]);
+          }]));
         }
       }
     };

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

@@ -15,6 +15,7 @@ import RemoveIcon from '@atlaskit/icon/core/migration/delete--editor-remove';
 import DownloadIcon from '@atlaskit/icon/core/migration/download';
 import SmartLinkCardIcon from '@atlaskit/icon/core/smart-link-card';
 import { messages } from '@atlaskit/media-ui';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { showLinkingToolbar } from '../../pm-plugins/commands/linking';
 import { getMediaLinkingState } from '../../pm-plugins/linking';
@@ -214,9 +215,11 @@ var getMediaInlineImageToolbar = function getMediaInlineImageToolbar(state, intl
         });
       }
     });
-    inlineImageItems.push({
-      type: 'separator'
-    });
+    if (!isEditorControlsEnabled || !fg('platform_editor_controls_patch_6')) {
+      inlineImageItems.push({
+        type: 'separator'
+      });
+    }
   }
   var download = {
     id: 'editor.media.image.download',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-media",
-	"version": "2.6.5",
+	"version": "2.6.6",
 	"description": "Media plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,7 +38,7 @@
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.0.0",
-		"@atlaskit/editor-common": "^103.14.0",
+		"@atlaskit/editor-common": "^103.15.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-annotation": "^2.7.0",