@atlaskit/editor-plugin-card 5.4.16 → 5.4.19

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @atlaskit/editor-plugin-card
 
+## 5.4.19
+
+### Patch Changes
+
+- [#145180](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/145180)
+  [`46856892862ec`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/46856892862ec) -
+  Clean up FG platform_linking_enable_transaction_filtering
+- Updated dependencies
+
+## 5.4.18
+
+### 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
+
+## 5.4.17
+
+### Patch Changes
+
+- [#144829](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/144829)
+  [`14b488c2295de`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/14b488c2295de) -
+  [ux] ED27537 Update alignment dropdown in media and embed card floating toolbar
+- Updated dependencies
+
 ## 5.4.16
 
 ### Patch Changes

package/dist/cjs/pm-plugins/main.js

@@ -155,18 +155,14 @@ var createPlugin = exports.createPlugin = function createPlugin(options, pluginI
         }
       },
       filterTransaction: function filterTransaction(tr) {
-        if ((0, _platformFeatureFlags.fg)('platform_linking_enable_transaction_filtering')) {
-          var isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
-          if (isOutsideClicked) {
-            var isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
-            if (isInlineEditingActive) {
-              return false;
-            }
+        var isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
+        if (isOutsideClicked) {
+          var isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
+          if (isInlineEditingActive) {
+            return false;
           }
-          return true;
-        } else {
-          return true;
         }
+        return true;
       },
       view: function view(_view) {
         var domAtPos = _view.domAtPos.bind(_view);

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

@@ -19,6 +19,7 @@ var _linkProvider = require("@atlaskit/link-provider");
 var _menu = require("@atlaskit/menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _utils = require("../../pm-plugins/utils");
 var _editDatasourceAction = require("../editDatasourceAction");
 var _useFetchDatasourceDataInfo = require("../useFetchDatasourceDataInfo");
@@ -105,7 +106,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editLink)), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editLink)), (!(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
       }
     case 'edit-datasource':
       {
@@ -118,7 +119,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editDatasourceStandalone)), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editDatasourceStandalone)), (!(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
       }
     case 'edit-dropdown':
       {
@@ -140,7 +141,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.cardMessages.editDropdownTriggerTitle)), (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.cardMessages.editDropdownTriggerTitle)), (!(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
         return (0, _react2.jsx)(_compiled.Flex, {
           ref: containerRef
         }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {

package/dist/cjs/ui/toolbar.js

@@ -31,6 +31,7 @@ var _remove = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/remove
 var _settings2 = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/settings"));
 var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink"));
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
@@ -174,7 +175,13 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
   };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
-  return (0, _card.buildLayoutButtons)(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6')) {
+    return (0, _card.buildLayoutDropdown)(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  }
+  var layoutButtons = (0, _card.buildLayoutButtons)(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  return (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? layoutButtons.filter(function (item) {
+    return item.type !== 'separator';
+  }) : layoutButtons;
 };
 var withToolbarMetadata = function withToolbarMetadata(command) {
   return (0, _card.commandWithMetadata)(command, {
@@ -343,9 +350,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         icon: _edit.default,
         testId: 'link-toolbar-edit-link-button',
         onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
-      }, {
+      }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? [] : [{
         type: 'separator'
-      }].concat((0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]), (0, _toConsumableArray2.default)(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -361,7 +368,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       if (currentAppearance === 'embed') {
         var _pluginInjectionApi$a4;
         var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions, cardOptions);
-        if (alignmentOptions.length) {
+        if (alignmentOptions.length && (!(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') || !(0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6'))) {
           alignmentOptions.push({
             type: 'separator'
           });
@@ -418,9 +425,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
             });
           }
-        }] : []), [{
+        }] : []), (0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? [] : [{
           type: 'separator'
-        }]));
+        }])));
       }
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
         var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
@@ -470,9 +477,9 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     icon: _linkBroken.default,
     iconFallback: _unlink.default,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }, {
+  }].concat((0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_controls_patch_6') ? [] : [{
     type: 'separator'
-  }] : [];
+  }])) : [];
 };
 var getSettingsButton = exports.getSettingsButton = function getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
   return {

package/dist/es2019/pm-plugins/main.js

@@ -148,18 +148,14 @@ export const createPlugin = (options, pluginInjectionApi) => pmPluginFactoryPara
       }
     },
     filterTransaction(tr) {
-      if (fg('platform_linking_enable_transaction_filtering')) {
-        const isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
-        if (isOutsideClicked) {
-          const isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
-          if (isInlineEditingActive) {
-            return false;
-          }
+      const isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
+      if (isOutsideClicked) {
+        const isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
+        if (isInlineEditingActive) {
+          return false;
         }
-        return true;
-      } else {
-        return true;
       }
+      return true;
     },
     view(view) {
       const domAtPos = view.domAtPos.bind(view);

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

@@ -16,6 +16,7 @@ import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { focusEditorView, isDatasourceConfigEditable } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 import { useFetchDatasourceDataInfo } from '../useFetchDatasourceDataInfo';
@@ -90,7 +91,7 @@ const EditToolbarButtonWithCardContext = props => {
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editLink)), jsx(Separator, null));
+        , linkToolbarMessages.editLink)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
       }
     case 'edit-datasource':
       {
@@ -103,7 +104,7 @@ const EditToolbarButtonWithCardContext = props => {
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editDatasourceStandalone)), jsx(Separator, null));
+        , linkToolbarMessages.editDatasourceStandalone)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
       }
     case 'edit-dropdown':
       {
@@ -125,7 +126,7 @@ const EditToolbarButtonWithCardContext = props => {
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , messages.editDropdownTriggerTitle)), jsx(Separator, null));
+        , messages.editDropdownTriggerTitle)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
         return jsx(Flex, {
           ref: containerRef
         }, jsx(UiDropdown, {

package/dist/es2019/ui/toolbar.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
 import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
@@ -21,6 +21,7 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -167,7 +168,11 @@ const unlinkCard = (node, state, editorAnalyticsApi) => {
   return () => false;
 };
 const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) => {
-  return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
+    return buildLayoutDropdown(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  }
+  const layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  return editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6') ? layoutButtons.filter(item => item.type !== 'separator') : layoutButtons;
 };
 const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB
@@ -335,9 +340,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       icon: EditIcon,
       testId: 'link-toolbar-edit-link-button',
       onClick: getEditLinkCallback(editorAnalyticsApi, true)
-    }, {
+    }, ...(fg('platform_editor_controls_patch_6') ? [] : [{
       type: 'separator'
-    }, ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi), {
+    }]), ...getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi), {
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -353,7 +358,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     if (currentAppearance === 'embed') {
       var _pluginInjectionApi$a5;
       const alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$a5 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a5 === void 0 ? void 0 : _pluginInjectionApi$a5.actions, cardOptions);
-      if (alignmentOptions.length) {
+      if (alignmentOptions.length && (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6'))) {
         alignmentOptions.push({
           type: 'separator'
         });
@@ -408,9 +413,9 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
           editorState: state,
           inputMethod: INPUT_METHOD.FLOATING_TB
         })
-      }] : []), {
+      }] : []), ...(fg('platform_editor_controls_patch_6') ? [] : [{
         type: 'separator'
-      });
+      }]));
     }
     if (editorExperiment('platform_editor_controls', 'variant1')) {
       const hoverDecorationProps = (nodeType, className) => ({
@@ -459,9 +464,9 @@ const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi)
     icon: LinkBrokenIcon,
     iconFallback: UnlinkIcon,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }, {
+  }, ...(fg('platform_editor_controls_patch_6') ? [] : [{
     type: 'separator'
-  }] : [];
+  }])] : [];
 };
 export const getSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink) => {
   return {

package/dist/esm/pm-plugins/main.js

@@ -148,18 +148,14 @@ export var createPlugin = function createPlugin(options, pluginInjectionApi) {
         }
       },
       filterTransaction: function filterTransaction(tr) {
-        if (fg('platform_linking_enable_transaction_filtering')) {
-          var isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
-          if (isOutsideClicked) {
-            var isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
-            if (isInlineEditingActive) {
-              return false;
-            }
+        var isOutsideClicked = tr.getMeta('outsideProsemirrorEditorClicked');
+        if (isOutsideClicked) {
+          var isInlineEditingActive = document.getElementById('sllv-active-inline-edit');
+          if (isInlineEditingActive) {
+            return false;
           }
-          return true;
-        } else {
-          return true;
         }
+        return true;
       },
       view: function view(_view) {
         var domAtPos = _view.domAtPos.bind(_view);

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

@@ -19,6 +19,7 @@ import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { focusEditorView, isDatasourceConfigEditable } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 import { useFetchDatasourceDataInfo } from '../useFetchDatasourceDataInfo';
@@ -99,7 +100,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editLink)), jsx(Separator, null));
+        , linkToolbarMessages.editLink)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
       }
     case 'edit-datasource':
       {
@@ -112,7 +113,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editDatasourceStandalone)), jsx(Separator, null));
+        , linkToolbarMessages.editDatasourceStandalone)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
       }
     case 'edit-dropdown':
       {
@@ -134,7 +135,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , messages.editDropdownTriggerTitle)), jsx(Separator, null));
+        , messages.editDropdownTriggerTitle)), (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6')) && jsx(Separator, null));
         return jsx(Flex, {
           ref: containerRef
         }, jsx(UiDropdown, {

package/dist/esm/ui/toolbar.js

@@ -5,7 +5,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID as ACTION_SUBJECTID, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@atlaskit/editor-common/card';
 import { getLinkPreferencesURLFromENV } from '@atlaskit/editor-common/link';
 import commonMessages, { annotationMessages, linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
@@ -25,6 +25,7 @@ import RemoveIcon from '@atlaskit/icon/glyph/editor/remove';
 import CogIcon from '@atlaskit/icon/glyph/editor/settings';
 import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -164,7 +165,13 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
   };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
-  return buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6')) {
+    return buildLayoutDropdown(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  }
+  var layoutButtons = buildLayoutButtons(state, intl, state.schema.nodes.embedCard, widthPluginDependencyApi, analyticsApi, true, true, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowWrapping, cardOptions === null || cardOptions === void 0 ? void 0 : cardOptions.allowAlignment);
+  return editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_6') ? layoutButtons.filter(function (item) {
+    return item.type !== 'separator';
+  }) : layoutButtons;
 };
 var withToolbarMetadata = function withToolbarMetadata(command) {
   return commandWithMetadata(command, {
@@ -333,9 +340,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         icon: EditIcon,
         testId: 'link-toolbar-edit-link-button',
         onClick: getEditLinkCallback(editorAnalyticsApi, true)
-      }, {
+      }].concat(_toConsumableArray(fg('platform_editor_controls_patch_6') ? [] : [{
         type: 'separator'
-      }].concat(_toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
+      }]), _toConsumableArray(getUnlinkButtonGroup(state, intl, node, inlineCard, editorAnalyticsApi)), [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -351,7 +358,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       if (currentAppearance === 'embed') {
         var _pluginInjectionApi$a4;
         var alignmentOptions = buildAlignmentOptions(state, intl, pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.width, pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a4 = pluginInjectionApi.analytics) === null || _pluginInjectionApi$a4 === void 0 ? void 0 : _pluginInjectionApi$a4.actions, cardOptions);
-        if (alignmentOptions.length) {
+        if (alignmentOptions.length && (!editorExperiment('platform_editor_controls', 'variant1') || !fg('platform_editor_controls_patch_6'))) {
           alignmentOptions.push({
             type: 'separator'
           });
@@ -408,9 +415,9 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               inputMethod: INPUT_METHOD.FLOATING_TB
             });
           }
-        }] : []), [{
+        }] : []), _toConsumableArray(fg('platform_editor_controls_patch_6') ? [] : [{
           type: 'separator'
-        }]));
+        }])));
       }
       if (editorExperiment('platform_editor_controls', 'variant1')) {
         var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
@@ -460,9 +467,9 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     icon: LinkBrokenIcon,
     iconFallback: UnlinkIcon,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }, {
+  }].concat(_toConsumableArray(fg('platform_editor_controls_patch_6') ? [] : [{
     type: 'separator'
-  }] : [];
+  }])) : [];
 };
 export var getSettingsButton = function getSettingsButton(intl, editorAnalyticsApi, userPreferencesLink) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "5.4.16",
+	"version": "5.4.19",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,7 +37,7 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.0.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^103.12.0",
+		"@atlaskit/editor-common": "^103.15.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-plugin-base": "^2.3.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
@@ -54,15 +54,15 @@
 		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/link-analytics": "^9.1.0",
 		"@atlaskit/link-client-extension": "^4.0.0",
-		"@atlaskit/link-datasource": "^4.5.0",
+		"@atlaskit/link-datasource": "^4.6.0",
 		"@atlaskit/linking-common": "^8.0.0",
 		"@atlaskit/linking-types": "^9.9.0",
 		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.4.0",
-		"@atlaskit/smart-card": "^36.8.0",
+		"@atlaskit/smart-card": "^36.9.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.12.0",
+		"@atlaskit/tmp-editor-statsig": "^4.13.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -122,9 +122,6 @@
 		"hardcoded-embeds-only-on-new-line": {
 			"type": "boolean"
 		},
-		"platform_linking_enable_transaction_filtering": {
-			"type": "boolean"
-		},
 		"linking_platform_smart_links_in_live_pages": {
 			"type": "boolean"
 		},