@atlaskit/editor-plugin-card 5.4.19 → 5.4.21

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-card
 
+## 5.4.21
+
+### Patch Changes
+
+- [#146194](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/146194)
+  [`dc301c3dad7a8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/dc301c3dad7a8) -
+  [ux] Feature gate cleanup: platform-editor-plugin-card-icon-migration
+- Updated dependencies
+
+## 5.4.20
+
+### Patch Changes
+
+- [#145382](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/145382)
+  [`09a75a68f9d26`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/09a75a68f9d26) -
+  Clean up FG linking-platform-contenteditable-false-live-view
+- Updated dependencies
+
 ## 5.4.19
 
 ### Patch Changes

package/dist/cjs/nodeviews/blockCard.js

@@ -132,20 +132,17 @@ var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   return (0, _createClass2.default)(BlockCard, [{
     key: "createDomRef",
     value: function createDomRef() {
-      var _this3 = this;
+      var _this$reactComponentP,
+        _this3 = this,
+        _this$reactComponentP2;
       var domRef = document.createElement('div');
       // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
       // see also: https://github.com/ProseMirror/prosemirror/issues/884
-      if ((0, _platformFeatureFlags.fg)('linking-platform-contenteditable-false-live-view')) {
-        var _this$reactComponentP, _this$reactComponentP2;
-        this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref2) {
-          var nextSharedState = _ref2.nextSharedState;
-          return _this3.updateContentEditable(nextSharedState, domRef);
-        });
-        this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
-      } else {
-        domRef.contentEditable = 'true';
-      }
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref2) {
+        var nextSharedState = _ref2.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
+      });
+      this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
       return domRef;
     }

package/dist/cjs/nodeviews/embedCard.js

@@ -360,19 +360,16 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "createDomRef",
     value: function createDomRef() {
-      var _this3 = this;
+      var _this$reactComponentP,
+        _this3 = this,
+        _this$reactComponentP2;
       var domRef = document.createElement('div');
       // It is a tradeoff for the bug mentioned that occurs in Chrome: https://product-fabric.atlassian.net/browse/ED-5379, https://github.com/ProseMirror/prosemirror/issues/884
-      if ((0, _platformFeatureFlags.fg)('linking-platform-contenteditable-false-live-view')) {
-        var _this$reactComponentP, _this$reactComponentP2;
-        this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
-          var nextSharedState = _ref3.nextSharedState;
-          return _this3.updateContentEditable(nextSharedState, domRef);
-        });
-        this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
-      } else {
-        domRef.contentEditable = 'true';
-      }
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
+        var nextSharedState = _ref3.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
+      });
+      this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
       return domRef;
     }

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

@@ -7,9 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.DatasourceIcon = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
-var _icon = _interopRequireDefault(require("@atlaskit/icon"));
 var _smartLinkList = _interopRequireDefault(require("@atlaskit/icon/core/smart-link-list"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var IconDatasourceGlyph = function IconDatasourceGlyph(props) {
   return /*#__PURE__*/_react.default.createElement("svg", (0, _extends2.default)({
@@ -37,12 +35,8 @@ var wrapperStyles = (0, _primitives.xcss)({
 var DatasourceIcon = exports.DatasourceIcon = function DatasourceIcon(props) {
   return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
     xcss: wrapperStyles
-  }, (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? /*#__PURE__*/_react.default.createElement(_smartLinkList.default, {
+  }, /*#__PURE__*/_react.default.createElement(_smartLinkList.default, {
     LEGACY_fallbackIcon: IconDatasourceGlyph,
     label: props === null || props === void 0 ? void 0 : props.label
-  }) : /*#__PURE__*/_react.default.createElement(_icon.default, (0, _extends2.default)({
-    glyph: IconDatasourceGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  }));
 };

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

@@ -13,8 +13,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _edit = _interopRequireDefault(require("@atlaskit/icon/core/edit"));
-var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _menu = require("@atlaskit/menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
@@ -80,7 +79,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, (0, _experiments.editorExperiment)('platform_editor_controls', 'control') && (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':
       {
@@ -93,7 +92,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, (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':
       {
@@ -103,9 +102,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           testId: "edit-dropdown-trigger",
           iconAfter: (0, _react2.jsx)("span", {
             css: dropdownExpandContainer
-          }, (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? (0, _react2.jsx)(_chevronDown2.default, {
-            label: intl.formatMessage(_messages.cardMessages.editDropdownTriggerTitle)
-          }) : (0, _react2.jsx)(_chevronDown.default, {
+          }, (0, _react2.jsx)(_chevronDown.default, {
             label: intl.formatMessage(_messages.cardMessages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,
@@ -115,7 +112,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, (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/EditToolbarButton/index.js

@@ -13,8 +13,7 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
+var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/utility/migration/chevron-down"));
 var _linkProvider = require("@atlaskit/link-provider");
 var _menu = require("@atlaskit/menu");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -129,9 +128,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           testId: "edit-dropdown-trigger",
           iconAfter: (0, _react2.jsx)("span", {
             css: dropdownExpandContainer
-          }, (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? (0, _react2.jsx)(_chevronDown2.default, {
-            label: intl.formatMessage(_messages.cardMessages.editDropdownTriggerTitle)
-          }) : (0, _react2.jsx)(_chevronDown.default, {
+          }, (0, _react2.jsx)(_chevronDown.default, {
             label: intl.formatMessage(_messages.cardMessages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,

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

@@ -17,8 +17,6 @@ var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _customizePreferences = _interopRequireDefault(require("@atlaskit/icon/core/migration/customize--preferences"));
-var _preferences = _interopRequireDefault(require("@atlaskit/icon/glyph/preferences"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _utils = require("./utils");
 var _excluded = ["children", "isSelected", "isVisible", "testId", "url"];
@@ -260,14 +258,10 @@ var InlineCardOverlay = function InlineCardOverlay(_ref) {
       className: ICON_AND_LABEL_CLASSNAME
     }, (0, _react2.jsx)("span", {
       css: iconStyles
-    }, (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? (0, _react2.jsx)(_customizePreferences.default, {
+    }, (0, _react2.jsx)(_customizePreferences.default, {
       label: label,
       LEGACY_size: iconSize.current,
       testId: "".concat(testId, "-icon")
-    }) : (0, _react2.jsx)(_preferences.default, {
-      label: label,
-      size: iconSize.current,
-      testId: "".concat(testId, "-icon")
     })), showLabel && (0, _react2.jsx)("span", {
       css: labelStyles
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

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

@@ -15,10 +15,7 @@ var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _utils = require("@atlaskit/editor-common/utils");
 var _growHorizontalEditorExpand = _interopRequireDefault(require("@atlaskit/icon/core/migration/grow-horizontal--editor-expand"));
 var _shrinkHorizontalEditorCollapse = _interopRequireDefault(require("@atlaskit/icon/core/migration/shrink-horizontal--editor-collapse"));
-var _collapse = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/collapse"));
-var _expand = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/expand"));
 var _linkingCommon = require("@atlaskit/linking-common");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _actions = require("../../pm-plugins/actions");
 var _utils2 = require("../../pm-plugins/utils");
@@ -58,16 +55,6 @@ var LayoutButton = exports.LayoutButton = function LayoutButton(_ref) {
   if (!targetElement) {
     return null;
   }
-  var collapseIcon = (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? (0, _react2.jsx)(_shrinkHorizontalEditorCollapse.default, {
-    label: title
-  }) : (0, _react2.jsx)(_collapse.default, {
-    label: title
-  });
-  var expandIcon = (0, _platformFeatureFlags.fg)('platform-editor-plugin-card-icon-migration') ? (0, _react2.jsx)(_growHorizontalEditorExpand.default, {
-    label: title
-  }) : (0, _react2.jsx)(_expand.default, {
-    label: title
-  });
   return (0, _react2.jsx)(_ui.Popup, {
     mountTo: mountPoint,
     boundariesElement: boundariesElement,
@@ -83,7 +70,11 @@ var LayoutButton = exports.LayoutButton = function LayoutButton(_ref) {
     css: toolbarButtonWrapperStyles,
     title: title,
     onClick: handleClick,
-    iconBefore: layout === 'full-width' ? collapseIcon : expandIcon
+    iconBefore: layout === 'full-width' ? (0, _react2.jsx)(_shrinkHorizontalEditorCollapse.default, {
+      label: title
+    }) : (0, _react2.jsx)(_growHorizontalEditorExpand.default, {
+      label: title
+    })
   }));
 };
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {

package/dist/cjs/ui/toolbar.js

@@ -178,10 +178,7 @@ var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPlu
   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;
+  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);
 };
 var withToolbarMetadata = function withToolbarMetadata(command) {
   return (0, _card.commandWithMetadata)(command, {

package/dist/es2019/nodeviews/blockCard.js

@@ -107,18 +107,14 @@ export class BlockCard extends ReactNodeView {
     });
   }
   createDomRef() {
+    var _this$reactComponentP, _this$reactComponentP2, _this$reactComponentP3, _this$reactComponentP4;
     const domRef = document.createElement('div');
     // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
     // see also: https://github.com/ProseMirror/prosemirror/issues/884
-    if (fg('linking-platform-contenteditable-false-live-view')) {
-      var _this$reactComponentP, _this$reactComponentP2, _this$reactComponentP3, _this$reactComponentP4;
-      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.onChange(({
-        nextSharedState
-      }) => this.updateContentEditable(nextSharedState, domRef));
-      this.updateContentEditable((_this$reactComponentP3 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP3 === void 0 ? void 0 : (_this$reactComponentP4 = _this$reactComponentP3.editorViewMode) === null || _this$reactComponentP4 === void 0 ? void 0 : _this$reactComponentP4.sharedState.currentState(), domRef);
-    } else {
-      domRef.contentEditable = 'true';
-    }
+    this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.onChange(({
+      nextSharedState
+    }) => this.updateContentEditable(nextSharedState, domRef));
+    this.updateContentEditable((_this$reactComponentP3 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP3 === void 0 ? void 0 : (_this$reactComponentP4 = _this$reactComponentP3.editorViewMode) === null || _this$reactComponentP4 === void 0 ? void 0 : _this$reactComponentP4.sharedState.currentState(), domRef);
     domRef.setAttribute('spellcheck', 'false');
     return domRef;
   }

package/dist/es2019/nodeviews/embedCard.js

@@ -341,17 +341,13 @@ export class EmbedCard extends ReactNodeView {
     return super.viewShouldUpdate(nextNode);
   }
   createDomRef() {
+    var _this$reactComponentP, _this$reactComponentP2, _this$reactComponentP3, _this$reactComponentP4;
     const domRef = document.createElement('div');
     // It is a tradeoff for the bug mentioned that occurs in Chrome: https://product-fabric.atlassian.net/browse/ED-5379, https://github.com/ProseMirror/prosemirror/issues/884
-    if (fg('linking-platform-contenteditable-false-live-view')) {
-      var _this$reactComponentP, _this$reactComponentP2, _this$reactComponentP3, _this$reactComponentP4;
-      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.onChange(({
-        nextSharedState
-      }) => this.updateContentEditable(nextSharedState, domRef));
-      this.updateContentEditable((_this$reactComponentP3 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP3 === void 0 ? void 0 : (_this$reactComponentP4 = _this$reactComponentP3.editorViewMode) === null || _this$reactComponentP4 === void 0 ? void 0 : _this$reactComponentP4.sharedState.currentState(), domRef);
-    } else {
-      domRef.contentEditable = 'true';
-    }
+    this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 ? void 0 : (_this$reactComponentP2 = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.onChange(({
+      nextSharedState
+    }) => this.updateContentEditable(nextSharedState, domRef));
+    this.updateContentEditable((_this$reactComponentP3 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP3 === void 0 ? void 0 : (_this$reactComponentP4 = _this$reactComponentP3.editorViewMode) === null || _this$reactComponentP4 === void 0 ? void 0 : _this$reactComponentP4.sharedState.currentState(), domRef);
     domRef.setAttribute('spellcheck', 'false');
     return domRef;
   }

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

@@ -1,8 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import Icon from '@atlaskit/icon';
 import SmartLinkListIcon from '@atlaskit/icon/core/smart-link-list';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 const IconDatasourceGlyph = props => {
   return /*#__PURE__*/React.createElement("svg", _extends({
@@ -30,12 +28,8 @@ const wrapperStyles = xcss({
 export const DatasourceIcon = props => {
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: wrapperStyles
-  }, fg('platform-editor-plugin-card-icon-migration') ? /*#__PURE__*/React.createElement(SmartLinkListIcon, {
+  }, /*#__PURE__*/React.createElement(SmartLinkListIcon, {
     LEGACY_fallbackIcon: IconDatasourceGlyph,
     label: props === null || props === void 0 ? void 0 : props.label
-  }) : /*#__PURE__*/React.createElement(Icon, _extends({
-    glyph: IconDatasourceGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  }));
 };

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

@@ -11,7 +11,6 @@ import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import EditIcon from '@atlaskit/icon/core/edit';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -63,7 +62,7 @@ const EditToolbarButtonPresentation = ({
         }, editorExperiment('platform_editor_controls', 'control') && 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':
       {
@@ -76,7 +75,7 @@ const EditToolbarButtonPresentation = ({
         }, 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':
       {
@@ -86,9 +85,7 @@ const EditToolbarButtonPresentation = ({
           testId: "edit-dropdown-trigger",
           iconAfter: jsx("span", {
             css: dropdownExpandContainer
-          }, fg('platform-editor-plugin-card-icon-migration') ? jsx(ChevronDownIcon, {
-            label: intl.formatMessage(messages.editDropdownTriggerTitle)
-          }) : jsx(ExpandIcon, {
+          }, jsx(ChevronDownIcon, {
             label: intl.formatMessage(messages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,
@@ -98,7 +95,7 @@ const EditToolbarButtonPresentation = ({
         }, 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/EditToolbarButton/index.js

@@ -10,7 +10,6 @@ import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
@@ -114,9 +113,7 @@ const EditToolbarButtonWithCardContext = props => {
           testId: "edit-dropdown-trigger",
           iconAfter: jsx("span", {
             css: dropdownExpandContainer
-          }, fg('platform-editor-plugin-card-icon-migration') ? jsx(ChevronDownIcon, {
-            label: intl.formatMessage(messages.editDropdownTriggerTitle)
-          }) : jsx(ExpandIcon, {
+          }, jsx(ChevronDownIcon, {
             label: intl.formatMessage(messages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,

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

@@ -14,8 +14,6 @@ import { useIntl } from 'react-intl-next';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import CustomizeIcon from '@atlaskit/icon/core/migration/customize--preferences';
-import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { B100, N0, N700 } from '@atlaskit/theme/colors';
 import { getChildElement, getIconSize, getInlineCardAvailableWidth, getOverlayWidths, isOneLine } from './utils';
 const DEBOUNCE_IN_MS = 5;
@@ -240,14 +238,10 @@ const InlineCardOverlay = ({
       className: ICON_AND_LABEL_CLASSNAME
     }, jsx("span", {
       css: iconStyles
-    }, fg('platform-editor-plugin-card-icon-migration') ? jsx(CustomizeIcon, {
+    }, jsx(CustomizeIcon, {
       label: label,
       LEGACY_size: iconSize.current,
       testId: `${testId}-icon`
-    }) : jsx(PreferencesIcon, {
-      label: label,
-      size: iconSize.current,
-      testId: `${testId}-icon`
     })), showLabel && jsx("span", {
       css: labelStyles
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

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

@@ -13,10 +13,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
 import GrowHorizontalIcon from '@atlaskit/icon/core/migration/grow-horizontal--editor-expand';
 import ShrinkHorizontalIcon from '@atlaskit/icon/core/migration/shrink-horizontal--editor-collapse';
-import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
-import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { B300, N20A, N300 } from '@atlaskit/theme/colors';
 import { setCardLayout } from '../../pm-plugins/actions';
 import { isDatasourceNode } from '../../pm-plugins/utils';
@@ -52,16 +49,6 @@ export const LayoutButton = ({
   if (!targetElement) {
     return null;
   }
-  const collapseIcon = fg('platform-editor-plugin-card-icon-migration') ? jsx(ShrinkHorizontalIcon, {
-    label: title
-  }) : jsx(CollapseIcon, {
-    label: title
-  });
-  const expandIcon = fg('platform-editor-plugin-card-icon-migration') ? jsx(GrowHorizontalIcon, {
-    label: title
-  }) : jsx(ExpandIcon, {
-    label: title
-  });
   return jsx(Popup, {
     mountTo: mountPoint,
     boundariesElement: boundariesElement,
@@ -77,7 +64,11 @@ export const LayoutButton = ({
     css: toolbarButtonWrapperStyles,
     title: title,
     onClick: handleClick,
-    iconBefore: layout === 'full-width' ? collapseIcon : expandIcon
+    iconBefore: layout === 'full-width' ? jsx(ShrinkHorizontalIcon, {
+      label: title
+    }) : jsx(GrowHorizontalIcon, {
+      label: title
+    })
   }));
 };
 const LayoutButtonWrapper = ({

package/dist/es2019/ui/toolbar.js

@@ -171,8 +171,7 @@ const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, analyticsA
   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;
+  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);
 };
 const withToolbarMetadata = command => commandWithMetadata(command, {
   inputMethod: INPUT_METHOD.FLOATING_TB

package/dist/esm/nodeviews/blockCard.js

@@ -126,20 +126,17 @@ export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
   return _createClass(BlockCard, [{
     key: "createDomRef",
     value: function createDomRef() {
-      var _this3 = this;
+      var _this$reactComponentP,
+        _this3 = this,
+        _this$reactComponentP2;
       var domRef = document.createElement('div');
       // workaround Chrome bug in https://product-fabric.atlassian.net/browse/ED-5379
       // see also: https://github.com/ProseMirror/prosemirror/issues/884
-      if (fg('linking-platform-contenteditable-false-live-view')) {
-        var _this$reactComponentP, _this$reactComponentP2;
-        this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref2) {
-          var nextSharedState = _ref2.nextSharedState;
-          return _this3.updateContentEditable(nextSharedState, domRef);
-        });
-        this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
-      } else {
-        domRef.contentEditable = 'true';
-      }
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref2) {
+        var nextSharedState = _ref2.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
+      });
+      this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
       return domRef;
     }

package/dist/esm/nodeviews/embedCard.js

@@ -353,19 +353,16 @@ export var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "createDomRef",
     value: function createDomRef() {
-      var _this3 = this;
+      var _this$reactComponentP,
+        _this3 = this,
+        _this$reactComponentP2;
       var domRef = document.createElement('div');
       // It is a tradeoff for the bug mentioned that occurs in Chrome: https://product-fabric.atlassian.net/browse/ED-5379, https://github.com/ProseMirror/prosemirror/issues/884
-      if (fg('linking-platform-contenteditable-false-live-view')) {
-        var _this$reactComponentP, _this$reactComponentP2;
-        this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
-          var nextSharedState = _ref3.nextSharedState;
-          return _this3.updateContentEditable(nextSharedState, domRef);
-        });
-        this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
-      } else {
-        domRef.contentEditable = 'true';
-      }
+      this.unsubscribe = (_this$reactComponentP = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP === void 0 || (_this$reactComponentP = _this$reactComponentP.editorViewMode) === null || _this$reactComponentP === void 0 ? void 0 : _this$reactComponentP.sharedState.onChange(function (_ref3) {
+        var nextSharedState = _ref3.nextSharedState;
+        return _this3.updateContentEditable(nextSharedState, domRef);
+      });
+      this.updateContentEditable((_this$reactComponentP2 = this.reactComponentProps.pluginInjectionApi) === null || _this$reactComponentP2 === void 0 || (_this$reactComponentP2 = _this$reactComponentP2.editorViewMode) === null || _this$reactComponentP2 === void 0 ? void 0 : _this$reactComponentP2.sharedState.currentState(), domRef);
       domRef.setAttribute('spellcheck', 'false');
       return domRef;
     }

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

@@ -1,8 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import React from 'react';
-import Icon from '@atlaskit/icon';
 import SmartLinkListIcon from '@atlaskit/icon/core/smart-link-list';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex, xcss } from '@atlaskit/primitives';
 var IconDatasourceGlyph = function IconDatasourceGlyph(props) {
   return /*#__PURE__*/React.createElement("svg", _extends({
@@ -30,12 +28,8 @@ var wrapperStyles = xcss({
 export var DatasourceIcon = function DatasourceIcon(props) {
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: wrapperStyles
-  }, fg('platform-editor-plugin-card-icon-migration') ? /*#__PURE__*/React.createElement(SmartLinkListIcon, {
+  }, /*#__PURE__*/React.createElement(SmartLinkListIcon, {
     LEGACY_fallbackIcon: IconDatasourceGlyph,
     label: props === null || props === void 0 ? void 0 : props.label
-  }) : /*#__PURE__*/React.createElement(Icon, _extends({
-    glyph: IconDatasourceGlyph
-    // Ignored via go/ees005
-    // eslint-disable-next-line react/jsx-props-no-spreading
-  }, props)));
+  }));
 };

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

@@ -12,7 +12,6 @@ import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import EditIcon from '@atlaskit/icon/core/edit';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -72,7 +71,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, editorExperiment('platform_editor_controls', 'control') && 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':
       {
@@ -85,7 +84,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, 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':
       {
@@ -95,9 +94,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           testId: "edit-dropdown-trigger",
           iconAfter: jsx("span", {
             css: dropdownExpandContainer
-          }, fg('platform-editor-plugin-card-icon-migration') ? jsx(ChevronDownIcon, {
-            label: intl.formatMessage(messages.editDropdownTriggerTitle)
-          }) : jsx(ExpandIcon, {
+          }, jsx(ChevronDownIcon, {
             label: intl.formatMessage(messages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,
@@ -107,7 +104,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, 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/EditToolbarButton/index.js

@@ -13,7 +13,6 @@ import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
-import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
 import ChevronDownIcon from '@atlaskit/icon/utility/migration/chevron-down';
 import { useSmartLinkContext } from '@atlaskit/link-provider';
 import { ButtonItem } from '@atlaskit/menu';
@@ -123,9 +122,7 @@ var EditToolbarButtonWithCardContext = function EditToolbarButtonWithCardContext
           testId: "edit-dropdown-trigger",
           iconAfter: jsx("span", {
             css: dropdownExpandContainer
-          }, fg('platform-editor-plugin-card-icon-migration') ? jsx(ChevronDownIcon, {
-            label: intl.formatMessage(messages.editDropdownTriggerTitle)
-          }) : jsx(ExpandIcon, {
+          }, jsx(ChevronDownIcon, {
             label: intl.formatMessage(messages.editDropdownTriggerTitle)
           })),
           onClick: toggleOpen,

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

@@ -18,8 +18,6 @@ import { useIntl } from 'react-intl-next';
 import { cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_JOINER } from '@atlaskit/editor-common/whitespace';
 import CustomizeIcon from '@atlaskit/icon/core/migration/customize--preferences';
-import PreferencesIcon from '@atlaskit/icon/glyph/preferences';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { B100, N0, N700 } from '@atlaskit/theme/colors';
 import { getChildElement, getIconSize, getInlineCardAvailableWidth, getOverlayWidths, isOneLine } from './utils';
 var DEBOUNCE_IN_MS = 5;
@@ -251,14 +249,10 @@ var InlineCardOverlay = function InlineCardOverlay(_ref) {
       className: ICON_AND_LABEL_CLASSNAME
     }, jsx("span", {
       css: iconStyles
-    }, fg('platform-editor-plugin-card-icon-migration') ? jsx(CustomizeIcon, {
+    }, jsx(CustomizeIcon, {
       label: label,
       LEGACY_size: iconSize.current,
       testId: "".concat(testId, "-icon")
-    }) : jsx(PreferencesIcon, {
-      label: label,
-      size: iconSize.current,
-      testId: "".concat(testId, "-icon")
     })), showLabel && jsx("span", {
       css: labelStyles
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766

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

@@ -16,10 +16,7 @@ import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import { getNextBreakoutMode, getTitle } from '@atlaskit/editor-common/utils';
 import GrowHorizontalIcon from '@atlaskit/icon/core/migration/grow-horizontal--editor-expand';
 import ShrinkHorizontalIcon from '@atlaskit/icon/core/migration/shrink-horizontal--editor-collapse';
-import CollapseIcon from '@atlaskit/icon/glyph/editor/collapse';
-import ExpandIcon from '@atlaskit/icon/glyph/editor/expand';
 import { DATASOURCE_DEFAULT_LAYOUT } from '@atlaskit/linking-common';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { B300, N20A, N300 } from '@atlaskit/theme/colors';
 import { setCardLayout } from '../../pm-plugins/actions';
 import { isDatasourceNode } from '../../pm-plugins/utils';
@@ -54,16 +51,6 @@ export var LayoutButton = function LayoutButton(_ref) {
   if (!targetElement) {
     return null;
   }
-  var collapseIcon = fg('platform-editor-plugin-card-icon-migration') ? jsx(ShrinkHorizontalIcon, {
-    label: title
-  }) : jsx(CollapseIcon, {
-    label: title
-  });
-  var expandIcon = fg('platform-editor-plugin-card-icon-migration') ? jsx(GrowHorizontalIcon, {
-    label: title
-  }) : jsx(ExpandIcon, {
-    label: title
-  });
   return jsx(Popup, {
     mountTo: mountPoint,
     boundariesElement: boundariesElement,
@@ -79,7 +66,11 @@ export var LayoutButton = function LayoutButton(_ref) {
     css: toolbarButtonWrapperStyles,
     title: title,
     onClick: handleClick,
-    iconBefore: layout === 'full-width' ? collapseIcon : expandIcon
+    iconBefore: layout === 'full-width' ? jsx(ShrinkHorizontalIcon, {
+      label: title
+    }) : jsx(GrowHorizontalIcon, {
+      label: title
+    })
   }));
 };
 var LayoutButtonWrapper = function LayoutButtonWrapper(_ref2) {

package/dist/esm/ui/toolbar.js

@@ -168,10 +168,7 @@ var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPlu
   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;
+  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);
 };
 var withToolbarMetadata = function withToolbarMetadata(command) {
   return commandWithMetadata(command, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "5.4.19",
+	"version": "5.4.21",
 	"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.15.0",
+		"@atlaskit/editor-common": "^103.17.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.6.0",
+		"@atlaskit/link-datasource": "^4.8.0",
 		"@atlaskit/linking-common": "^8.0.0",
-		"@atlaskit/linking-types": "^9.9.0",
+		"@atlaskit/linking-types": "^9.10.0",
 		"@atlaskit/menu": "^3.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.4.0",
-		"@atlaskit/smart-card": "^36.9.0",
+		"@atlaskit/smart-card": "^36.10.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.13.0",
+		"@atlaskit/tmp-editor-statsig": "^4.14.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -113,9 +113,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"linking-platform-contenteditable-false-live-view": {
-			"type": "boolean"
-		},
 		"editor_inline_comments_paste_insert_nodes": {
 			"type": "boolean"
 		},
@@ -128,9 +125,6 @@
 		"platform_editor_fix_card_plugin_state": {
 			"type": "boolean"
 		},
-		"platform-editor-plugin-card-icon-migration": {
-			"type": "boolean"
-		},
 		"confluence-issue-terminology-refresh": {
 			"type": "boolean"
 		},