@atlaskit/editor-plugin-card 7.0.9 → 7.0.10

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-card
 
+## 7.0.10
+
+### Patch Changes
+
+- [#188597](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/188597)
+  [`4de5a96f3e24c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4de5a96f3e24c) -
+  [ED-28523] Enable new editor element toolbars UI for Jira
+- Updated dependencies
+
 ## 7.0.9
 
 ### Patch Changes

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

@@ -10,13 +10,13 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _messages = require("@atlaskit/editor-common/messages");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 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/core/migration/chevron-down"));
 var _menu = require("@atlaskit/menu");
 var _compiled = require("@atlaskit/primitives/compiled");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _utils = require("../../pm-plugins/utils");
 var _editDatasourceAction = require("../editDatasourceAction");
 /**
@@ -63,11 +63,11 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
       (0, _utils.focusEditorView)(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
-  var isControlsOn = (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1');
-  var icon = isControlsOn ? (0, _react2.jsx)(_edit.default, {
+  var isNewEditorToolbarEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
+  var icon = isNewEditorToolbarEnabled ? (0, _react2.jsx)(_edit.default, {
     label: ""
   }) : undefined;
-  var tooltipContent = isControlsOn ? intl.formatMessage(_messages.linkToolbarMessages.editLink) : undefined;
+  var tooltipContent = isNewEditorToolbarEnabled ? intl.formatMessage(_messages.linkToolbarMessages.editLink) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -78,10 +78,10 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           onClick: onEditLink,
           icon: icon,
           tooltipContent: tooltipContent
-        }, !isControlsOn && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
+        }, !isNewEditorToolbarEnabled && (0, _react2.jsx)(_reactIntlNext.FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , _messages.linkToolbarMessages.editLink)), !isControlsOn && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editLink)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
       }
     case 'edit-datasource':
       {
@@ -94,7 +94,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)), !isControlsOn && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.linkToolbarMessages.editDatasourceStandalone)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
       }
     case 'edit-dropdown':
       {
@@ -115,7 +115,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)), !isControlsOn && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
+        , _messages.cardMessages.editDropdownTriggerTitle)), !isNewEditorToolbarEnabled && (0, _react2.jsx)(_ui.FloatingToolbarSeparator, null));
         return (0, _react2.jsx)(_compiled.Flex, {
           ref: containerRef
         }, (0, _react2.jsx)(_uiMenu.DropdownContainer, {

package/dist/cjs/ui/HyperlinkToolbarAppearanceDropdown.js

@@ -11,12 +11,12 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _card = require("@atlaskit/editor-common/card");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _compiled = require("@atlaskit/primitives/compiled");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _LinkToolbarAppearanceDropdown = require("./LinkToolbarAppearanceDropdown");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
@@ -208,7 +208,7 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     allowDatasource: allowDatasource,
     dispatchCommand: dispatchCommand,
     settingsConfig: settingsConfig
-  })), !((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_15')) && /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, null));
+  })), !((0, _toolbarFlagCheck.areToolbarFlagsEnabled)() && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_15')) && /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, null));
 };
 var getCustomHyperlinkAppearanceDropdown = exports.getCustomHyperlinkAppearanceDropdown = function getCustomHyperlinkAppearanceDropdown(_ref3) {
   var url = _ref3.url,

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

@@ -25,6 +25,8 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
+
 var containerStyles = (0, _react2.css)({
   position: 'relative'
 });

package/dist/cjs/ui/toolbar.js

@@ -15,6 +15,7 @@ var _card = require("@atlaskit/editor-common/card");
 var _link = require("@atlaskit/editor-common/link");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _styles = require("@atlaskit/editor-common/styles");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _utils = require("@atlaskit/editor-common/utils");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
@@ -32,7 +33,6 @@ var _linkExternalShortcut = _interopRequireDefault(require("@atlaskit/icon/core/
 var _settingsEditorSettings = _interopRequireDefault(require("@atlaskit/icon/core/migration/settings--editor-settings"));
 var _settings = _interopRequireDefault(require("@atlaskit/icon/core/settings"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _doc = require("../pm-plugins/doc");
 var _pluginKey = require("../pm-plugins/plugin-key");
@@ -169,7 +169,7 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
   };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
     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);
   }
   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);
@@ -214,6 +214,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: title
       };
     }
+    var isNewEditorToolbarDisabled = !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
     var currentAppearance = (0, _utils3.appearanceForNodeType)(node.type);
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
@@ -322,7 +323,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         testId: 'link-toolbar-edit-link-button',
         onClick: (0, _EditLinkToolbar.getEditLinkCallback)(editorAnalyticsApi, true)
       }];
-      var toolbarItems = (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
+      var toolbarItems = isNewEditorToolbarDisabled ? [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: _linkExternal.default,
@@ -380,7 +381,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 && !(0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+        if (alignmentOptions.length && isNewEditorToolbarDisabled) {
           alignmentOptions.push({
             type: 'separator'
           });
@@ -395,7 +396,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       // For url appearance, please see HyperlinkToolbarAppearanceProps
       if (currentAppearance) {
         var showDatasourceAppearance = allowDatasource && url;
-        toolbarItems.unshift.apply(toolbarItems, (0, _toConsumableArray2.default)(getToolbarViewedItem(url, currentAppearance)).concat([(0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? {
+        toolbarItems.unshift.apply(toolbarItems, (0, _toConsumableArray2.default)(getToolbarViewedItem(url, currentAppearance)).concat([isNewEditorToolbarDisabled ? {
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -424,7 +425,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           showUpgradeDiscoverability: showUpgradeDiscoverability,
           settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
           isDatasourceView: isDatasource
-        })], (0, _toConsumableArray2.default)(showDatasourceAppearance && (0, _experiments.editorExperiment)('platform_editor_controls', 'control') ? [{
+        })], (0, _toConsumableArray2.default)(showDatasourceAppearance && isNewEditorToolbarDisabled ? [{
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -437,11 +438,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               inputMethod: _analytics.INPUT_METHOD.FLOATING_TB
             });
           }
-        }] : []), (0, _toConsumableArray2.default)((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+        }] : []), (0, _toConsumableArray2.default)(!isNewEditorToolbarDisabled ? [] : [{
           type: 'separator'
         }])));
       }
-      if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+      if (!isNewEditorToolbarDisabled) {
         var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
           return {
             onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
@@ -493,7 +494,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     icon: _linkBroken.default,
     iconFallback: _linkBrokenEditorUnlink.default,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }].concat((0, _toConsumableArray2.default)((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+  }].concat((0, _toConsumableArray2.default)((0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? [] : [{
     type: 'separator'
   }])) : [];
 };
@@ -512,6 +513,7 @@ var getSettingsButton = exports.getSettingsButton = function getSettingsButton(i
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, pluginInjectionApi) {
   var _node$attrs2;
   var toolbarItems = [];
+  var isNewEditorToolbarDisabled = !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
   var canShowAppearanceSwitch = function canShowAppearanceSwitch() {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -524,7 +526,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
     var url = metadata.url;
-    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'custom',
         fallback: [],
@@ -609,13 +611,13 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       href: node.attrs.url,
       target: '_blank'
     });
-    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'separator'
       });
     }
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+  if (isNewEditorToolbarDisabled) {
     toolbarItems.push({
       type: 'copy-button',
       supportsViewMode: true,
@@ -733,7 +735,7 @@ var getStartingToolbarItems = exports.getStartingToolbarItems = function getStar
     }, {
       type: 'separator'
     }];
-    if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+    if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
       var _api$analytics2, _api$analytics3;
       var hyperlinkAppearance = [(0, _HyperlinkToolbarAppearanceDropdown.getCustomHyperlinkAppearanceDropdown)({
         url: link,
@@ -797,7 +799,7 @@ var getEndingToolbarItems = exports.getEndingToolbarItems = function getEndingTo
      * Require either provider to be supplied (controls link preferences)
      * Or explicit user preferences config in order to enable button
      */
-    if ((options.provider || options.userPreferencesLink) && (0, _experiments.editorExperiment)('platform_editor_controls', 'control')) {
+    if ((options.provider || options.userPreferencesLink) && !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
       var _api$analytics5;
       return [{
         type: 'separator'

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

@@ -8,13 +8,13 @@ import { useCallback, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 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 ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { focusEditorView } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 const dropdownExpandContainer = css({
@@ -46,11 +46,11 @@ const EditToolbarButtonPresentation = ({
       focusEditorView(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
-  const isControlsOn = expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1');
-  const icon = isControlsOn ? jsx(EditIcon, {
+  const isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
+  const icon = isNewEditorToolbarEnabled ? jsx(EditIcon, {
     label: ""
   }) : undefined;
-  const tooltipContent = isControlsOn ? intl.formatMessage(linkToolbarMessages.editLink) : undefined;
+  const tooltipContent = isNewEditorToolbarEnabled ? intl.formatMessage(linkToolbarMessages.editLink) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -61,10 +61,10 @@ const EditToolbarButtonPresentation = ({
           onClick: onEditLink,
           icon: icon,
           tooltipContent: tooltipContent
-        }, !isControlsOn && jsx(FormattedMessage
+        }, !isNewEditorToolbarEnabled && jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editLink)), !isControlsOn && jsx(Separator, null));
+        , linkToolbarMessages.editLink)), !isNewEditorToolbarEnabled && jsx(Separator, null));
       }
     case 'edit-datasource':
       {
@@ -77,7 +77,7 @@ const EditToolbarButtonPresentation = ({
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editDatasourceStandalone)), !isControlsOn && jsx(Separator, null));
+        , linkToolbarMessages.editDatasourceStandalone)), !isNewEditorToolbarEnabled && jsx(Separator, null));
       }
     case 'edit-dropdown':
       {
@@ -98,7 +98,7 @@ const EditToolbarButtonPresentation = ({
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , messages.editDropdownTriggerTitle)), !isControlsOn && jsx(Separator, null));
+        , messages.editDropdownTriggerTitle)), !isNewEditorToolbarEnabled && jsx(Separator, null));
         return jsx(Flex, {
           ref: containerRef
         }, jsx(UiDropdown, {

package/dist/es2019/ui/HyperlinkToolbarAppearanceDropdown.js

@@ -1,11 +1,11 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { appearancePropsMap } from '@atlaskit/editor-common/card';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { LinkAppearanceMenu } from './LinkToolbarAppearanceDropdown';
 const CustomHyperlinkDropdown = props => {
   var _props$cardOptions3;
@@ -123,7 +123,7 @@ const CustomHyperlinkDropdown = props => {
     allowDatasource: allowDatasource,
     dispatchCommand: dispatchCommand,
     settingsConfig: settingsConfig
-  })), !(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, null));
+  })), !(areToolbarFlagsEnabled() && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, null));
 };
 export const getCustomHyperlinkAppearanceDropdown = ({
   url,

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

@@ -11,6 +11,7 @@ import { useIntl } from 'react-intl-next';
 import { cardMessages } from '@atlaskit/editor-common/messages';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import PanelRightIcon from '@atlaskit/icon/core/panel-right';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Pressable, Text, xcss } from '@atlaskit/primitives';
 const containerStyles = css({
   position: 'relative'

package/dist/es2019/ui/toolbar.js

@@ -5,6 +5,7 @@ import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@a
 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';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
@@ -22,7 +23,6 @@ import OpenIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
 import CogIcon from '@atlaskit/icon/core/migration/settings--editor-settings';
 import SettingsIcon from '@atlaskit/icon/core/settings';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -162,7 +162,7 @@ const unlinkCard = (node, state, editorAnalyticsApi) => {
   return () => false;
 };
 const buildAlignmentOptions = (state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) => {
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     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);
   }
   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);
@@ -205,6 +205,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       title: title
     };
   }
+  const isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
   const currentAppearance = appearanceForNodeType(node.type);
   const {
     hoverDecoration
@@ -312,7 +313,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
       testId: 'link-toolbar-edit-link-button',
       onClick: getEditLinkCallback(editorAnalyticsApi, true)
     }];
-    const toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [...editItems, ...commentItems, {
+    const toolbarItems = isNewEditorToolbarDisabled ? [...editItems, ...commentItems, {
       id: 'editor.link.openLink',
       type: 'button',
       icon: LinkExternalIcon,
@@ -370,7 +371,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 && !editorExperiment('platform_editor_controls', 'variant1')) {
+      if (alignmentOptions.length && isNewEditorToolbarDisabled) {
         alignmentOptions.push({
           type: 'separator'
         });
@@ -387,7 +388,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
     // For url appearance, please see HyperlinkToolbarAppearanceProps
     if (currentAppearance) {
       const showDatasourceAppearance = allowDatasource && url;
-      toolbarItems.unshift(...getToolbarViewedItem(url, currentAppearance), editorExperiment('platform_editor_controls', 'control') ? {
+      toolbarItems.unshift(...getToolbarViewedItem(url, currentAppearance), isNewEditorToolbarDisabled ? {
         type: 'custom',
         fallback: [],
         render: editorView => /*#__PURE__*/React.createElement(LinkToolbarAppearance, {
@@ -414,7 +415,7 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
         showUpgradeDiscoverability: showUpgradeDiscoverability,
         settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
         isDatasourceView: isDatasource
-      }), ...(showDatasourceAppearance && editorExperiment('platform_editor_controls', 'control') ? [{
+      }), ...(showDatasourceAppearance && isNewEditorToolbarDisabled ? [{
         type: 'custom',
         fallback: [],
         render: editorView => /*#__PURE__*/React.createElement(DatasourceAppearanceButton, {
@@ -425,11 +426,11 @@ const generateToolbarItems = (state, intl, providerFactory, cardOptions, lpLinkP
           editorState: state,
           inputMethod: INPUT_METHOD.FLOATING_TB
         })
-      }] : []), ...(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+      }] : []), ...(!isNewEditorToolbarDisabled ? [] : [{
         type: 'separator'
       }]));
     }
-    if (editorExperiment('platform_editor_controls', 'variant1')) {
+    if (!isNewEditorToolbarDisabled) {
       const hoverDecorationProps = (nodeType, className) => ({
         onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
         onMouseLeave: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, false, className),
@@ -480,7 +481,7 @@ const getUnlinkButtonGroup = (state, intl, node, inlineCard, editorAnalyticsApi)
     icon: LinkBrokenIcon,
     iconFallback: UnlinkIcon,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }, ...(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+  }, ...(areToolbarFlagsEnabled() ? [] : [{
     type: 'separator'
   }])] : [];
 };
@@ -499,6 +500,7 @@ export const getSettingsButton = (intl, editorAnalyticsApi, userPreferencesLink)
 const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, pluginInjectionApi) => {
   var _node$attrs2;
   const toolbarItems = [];
+  const isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
   const canShowAppearanceSwitch = () => {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -515,7 +517,7 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
     const {
       url
     } = metadata;
-    if (editorExperiment('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'custom',
         fallback: [],
@@ -596,13 +598,13 @@ const getDatasourceButtonGroup = (metadata, intl, editorAnalyticsApi, node, hove
       href: node.attrs.url,
       target: '_blank'
     });
-    if (editorExperiment('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'separator'
       });
     }
   }
-  if (editorExperiment('platform_editor_controls', 'control')) {
+  if (isNewEditorToolbarDisabled) {
     toolbarItems.push({
       type: 'copy-button',
       supportsViewMode: true,
@@ -720,7 +722,7 @@ export const getStartingToolbarItems = (options, api) => {
     }, {
       type: 'separator'
     }];
-    if (editorExperiment('platform_editor_controls', 'variant1')) {
+    if (areToolbarFlagsEnabled()) {
       var _api$analytics2, _api$analytics3;
       const hyperlinkAppearance = [getCustomHyperlinkAppearanceDropdown({
         url: link,
@@ -779,7 +781,7 @@ export const getEndingToolbarItems = (options, api) => (intl, link) => {
    * Require either provider to be supplied (controls link preferences)
    * Or explicit user preferences config in order to enable button
    */
-  if ((options.provider || options.userPreferencesLink) && editorExperiment('platform_editor_controls', 'control')) {
+  if ((options.provider || options.userPreferencesLink) && !areToolbarFlagsEnabled()) {
     var _api$analytics5;
     return [{
       type: 'separator'

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

@@ -9,13 +9,13 @@ import { useCallback, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
 import { linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 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 ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
 import { ButtonItem } from '@atlaskit/menu';
 import { Flex } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { focusEditorView } from '../../pm-plugins/utils';
 import { editDatasource } from '../editDatasourceAction';
 var dropdownExpandContainer = css({
@@ -55,11 +55,11 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
       focusEditorView(editorView);
     }
   }, [currentAppearance, datasourceId, editorAnalyticsApi, editorView, extensionKey]);
-  var isControlsOn = expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1');
-  var icon = isControlsOn ? jsx(EditIcon, {
+  var isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
+  var icon = isNewEditorToolbarEnabled ? jsx(EditIcon, {
     label: ""
   }) : undefined;
-  var tooltipContent = isControlsOn ? intl.formatMessage(linkToolbarMessages.editLink) : undefined;
+  var tooltipContent = isNewEditorToolbarEnabled ? intl.formatMessage(linkToolbarMessages.editLink) : undefined;
   switch (editVariant) {
     case 'edit-link':
       {
@@ -70,10 +70,10 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
           onClick: onEditLink,
           icon: icon,
           tooltipContent: tooltipContent
-        }, !isControlsOn && jsx(FormattedMessage
+        }, !isNewEditorToolbarEnabled && jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editLink)), !isControlsOn && jsx(Separator, null));
+        , linkToolbarMessages.editLink)), !isNewEditorToolbarEnabled && jsx(Separator, null));
       }
     case 'edit-datasource':
       {
@@ -86,7 +86,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , linkToolbarMessages.editDatasourceStandalone)), !isControlsOn && jsx(Separator, null));
+        , linkToolbarMessages.editDatasourceStandalone)), !isNewEditorToolbarEnabled && jsx(Separator, null));
       }
     case 'edit-dropdown':
       {
@@ -107,7 +107,7 @@ var EditToolbarButtonPresentation = function EditToolbarButtonPresentation(_ref)
         }, jsx(FormattedMessage
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-        , messages.editDropdownTriggerTitle)), !isControlsOn && jsx(Separator, null));
+        , messages.editDropdownTriggerTitle)), !isNewEditorToolbarEnabled && jsx(Separator, null));
         return jsx(Flex, {
           ref: containerRef
         }, jsx(UiDropdown, {

package/dist/esm/ui/HyperlinkToolbarAppearanceDropdown.js

@@ -3,12 +3,12 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useEffect, useRef, useState } from 'react';
 import { appearancePropsMap } from '@atlaskit/editor-common/card';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Flex } from '@atlaskit/primitives/compiled';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { LinkAppearanceMenu } from './LinkToolbarAppearanceDropdown';
 var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
   var _props$cardOptions3;
@@ -199,7 +199,7 @@ var CustomHyperlinkDropdown = function CustomHyperlinkDropdown(props) {
     allowDatasource: allowDatasource,
     dispatchCommand: dispatchCommand,
     settingsConfig: settingsConfig
-  })), !(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, null));
+  })), !(areToolbarFlagsEnabled() && fg('platform_editor_controls_patch_15')) && /*#__PURE__*/React.createElement(Separator, null));
 };
 export var getCustomHyperlinkAppearanceDropdown = function getCustomHyperlinkAppearanceDropdown(_ref3) {
   var url = _ref3.url,

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

@@ -12,6 +12,7 @@ import { useIntl } from 'react-intl-next';
 import { cardMessages } from '@atlaskit/editor-common/messages';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import PanelRightIcon from '@atlaskit/icon/core/panel-right';
+// eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, Pressable, Text, xcss } from '@atlaskit/primitives';
 var containerStyles = css({
   position: 'relative'

package/dist/esm/ui/toolbar.js

@@ -9,6 +9,7 @@ import { buildLayoutButtons, buildLayoutDropdown, commandWithMetadata } from '@a
 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';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { canRenderDatasource } from '@atlaskit/editor-common/utils';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
@@ -26,7 +27,6 @@ import OpenIcon from '@atlaskit/icon/core/migration/link-external--shortcut';
 import CogIcon from '@atlaskit/icon/core/migration/settings--editor-settings';
 import SettingsIcon from '@atlaskit/icon/core/settings';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
 import { pluginKey } from '../pm-plugins/plugin-key';
@@ -160,7 +160,7 @@ var unlinkCard = function unlinkCard(node, state, editorAnalyticsApi) {
   };
 };
 var buildAlignmentOptions = function buildAlignmentOptions(state, intl, widthPluginDependencyApi, analyticsApi, cardOptions) {
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     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);
   }
   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);
@@ -205,6 +205,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         title: title
       };
     }
+    var isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
     var currentAppearance = appearanceForNodeType(node.type);
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
@@ -313,7 +314,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
         testId: 'link-toolbar-edit-link-button',
         onClick: getEditLinkCallback(editorAnalyticsApi, true)
       }];
-      var toolbarItems = editorExperiment('platform_editor_controls', 'control') ? [].concat(editItems, commentItems, [{
+      var toolbarItems = isNewEditorToolbarDisabled ? [].concat(editItems, commentItems, [{
         id: 'editor.link.openLink',
         type: 'button',
         icon: LinkExternalIcon,
@@ -371,7 +372,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 && !editorExperiment('platform_editor_controls', 'variant1')) {
+        if (alignmentOptions.length && isNewEditorToolbarDisabled) {
           alignmentOptions.push({
             type: 'separator'
           });
@@ -386,7 +387,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
       // For url appearance, please see HyperlinkToolbarAppearanceProps
       if (currentAppearance) {
         var showDatasourceAppearance = allowDatasource && url;
-        toolbarItems.unshift.apply(toolbarItems, _toConsumableArray(getToolbarViewedItem(url, currentAppearance)).concat([editorExperiment('platform_editor_controls', 'control') ? {
+        toolbarItems.unshift.apply(toolbarItems, _toConsumableArray(getToolbarViewedItem(url, currentAppearance)).concat([isNewEditorToolbarDisabled ? {
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -415,7 +416,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
           showUpgradeDiscoverability: showUpgradeDiscoverability,
           settingsConfig: getSettingsButton(intl, editorAnalyticsApi, cardOptions.userPreferencesLink),
           isDatasourceView: isDatasource
-        })], _toConsumableArray(showDatasourceAppearance && editorExperiment('platform_editor_controls', 'control') ? [{
+        })], _toConsumableArray(showDatasourceAppearance && isNewEditorToolbarDisabled ? [{
           type: 'custom',
           fallback: [],
           render: function render(editorView) {
@@ -428,11 +429,11 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
               inputMethod: INPUT_METHOD.FLOATING_TB
             });
           }
-        }] : []), _toConsumableArray(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+        }] : []), _toConsumableArray(!isNewEditorToolbarDisabled ? [] : [{
           type: 'separator'
         }])));
       }
-      if (editorExperiment('platform_editor_controls', 'variant1')) {
+      if (!isNewEditorToolbarDisabled) {
         var hoverDecorationProps = function hoverDecorationProps(nodeType, className) {
           return {
             onMouseEnter: hoverDecoration === null || hoverDecoration === void 0 ? void 0 : hoverDecoration(nodeType, true, className),
@@ -484,7 +485,7 @@ var getUnlinkButtonGroup = function getUnlinkButtonGroup(state, intl, node, inli
     icon: LinkBrokenIcon,
     iconFallback: UnlinkIcon,
     onClick: withToolbarMetadata(unlinkCard(node, state, editorAnalyticsApi))
-  }].concat(_toConsumableArray(expValEqualsNoExposure('platform_editor_controls', 'cohort', 'variant1') ? [] : [{
+  }].concat(_toConsumableArray(areToolbarFlagsEnabled() ? [] : [{
     type: 'separator'
   }])) : [];
 };
@@ -503,6 +504,7 @@ export var getSettingsButton = function getSettingsButton(intl, editorAnalyticsA
 var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl, editorAnalyticsApi, node, hoverDecoration, datasourceId, state, cardOptions, currentAppearance, pluginInjectionApi) {
   var _node$attrs2;
   var toolbarItems = [];
+  var isNewEditorToolbarDisabled = !areToolbarFlagsEnabled();
   var canShowAppearanceSwitch = function canShowAppearanceSwitch() {
     // we do not show smart-link or the datasource icons when the node does not have a url to resolve
     if (!metadata.url) {
@@ -515,7 +517,7 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       allowEmbeds = cardOptions.allowEmbeds,
       showUpgradeDiscoverability = cardOptions.showUpgradeDiscoverability;
     var url = metadata.url;
-    if (editorExperiment('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'custom',
         fallback: [],
@@ -600,13 +602,13 @@ var getDatasourceButtonGroup = function getDatasourceButtonGroup(metadata, intl,
       href: node.attrs.url,
       target: '_blank'
     });
-    if (editorExperiment('platform_editor_controls', 'control')) {
+    if (isNewEditorToolbarDisabled) {
       toolbarItems.push({
         type: 'separator'
       });
     }
   }
-  if (editorExperiment('platform_editor_controls', 'control')) {
+  if (isNewEditorToolbarDisabled) {
     toolbarItems.push({
       type: 'copy-button',
       supportsViewMode: true,
@@ -724,7 +726,7 @@ export var getStartingToolbarItems = function getStartingToolbarItems(options, a
     }, {
       type: 'separator'
     }];
-    if (editorExperiment('platform_editor_controls', 'variant1')) {
+    if (areToolbarFlagsEnabled()) {
       var _api$analytics2, _api$analytics3;
       var hyperlinkAppearance = [getCustomHyperlinkAppearanceDropdown({
         url: link,
@@ -788,7 +790,7 @@ export var getEndingToolbarItems = function getEndingToolbarItems(options, api)
      * Require either provider to be supplied (controls link preferences)
      * Or explicit user preferences config in order to enable button
      */
-    if ((options.provider || options.userPreferencesLink) && editorExperiment('platform_editor_controls', 'control')) {
+    if ((options.provider || options.userPreferencesLink) && !areToolbarFlagsEnabled()) {
       var _api$analytics5;
       return [{
         type: 'separator'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "7.0.9",
+	"version": "7.0.10",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -49,20 +49,20 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.5.0",
 		"@atlaskit/frontend-utilities": "^3.1.0",
-		"@atlaskit/icon": "^27.3.0",
+		"@atlaskit/icon": "^27.5.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-analytics": "^10.0.0",
 		"@atlaskit/link-client-extension": "^5.0.0",
-		"@atlaskit/link-datasource": "^4.13.0",
-		"@atlaskit/linking-common": "^9.1.0",
+		"@atlaskit/link-datasource": "^4.14.0",
+		"@atlaskit/linking-common": "^9.2.0",
 		"@atlaskit/linking-types": "^14.0.0",
 		"@atlaskit/menu": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
-		"@atlaskit/smart-card": "^40.3.0",
+		"@atlaskit/smart-card": "^40.4.0",
 		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tmp-editor-statsig": "^9.8.0",
-		"@atlaskit/tokens": "^5.5.0",
+		"@atlaskit/tmp-editor-statsig": "^9.9.0",
+		"@atlaskit/tokens": "^5.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -71,7 +71,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.8.0",
+		"@atlaskit/editor-common": "^107.9.0",
 		"@atlaskit/link-provider": "^3.4.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"