@atlaskit/editor-plugin-floating-toolbar 5.0.4 → 5.0.6

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 5.0.6
+
+### 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
+
+## 5.0.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 5.0.4
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -19,6 +19,7 @@ var _errorBoundary = require("@atlaskit/editor-common/error-boundary");
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
@@ -288,7 +289,7 @@ function ContentComponent(_ref5) {
       return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
     });
   }
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
     var _items2;
     // Consolidate floating toolbar items
     var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/cjs/ui/Dropdown.js

@@ -14,11 +14,11 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
+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/chevron-down"));
 var _chevronDown2 = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron-down"));
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _Divider = require("./Divider");
 var _DropdownMenu = _interopRequireWildcard(require("./DropdownMenu"));
 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); }
@@ -172,7 +172,7 @@ var Dropdown = exports.default = /*#__PURE__*/function (_Component) {
           selected: isOpen,
           disabled: disabled,
           tooltipContent: tooltip,
-          ariaHasPopup: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? true : undefined,
+          ariaHasPopup: (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? true : undefined,
           onMount: onMount,
           pulse: pulse,
           spotlightConfig: spotlightConfig

package/dist/cjs/ui/DropdownMenu.js

@@ -8,9 +8,9 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _menu = require("@atlaskit/menu");
 var _constants = require("@atlaskit/theme/constants");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -64,7 +64,7 @@ var Dropdown = /*#__PURE__*/(0, _react.memo)(function (props) {
     editorView = props.editorView,
     _props$showSelected = props.showSelected,
     showSelected = _props$showSelected === void 0 ? true : _props$showSelected;
-  if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+  if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
     return (0, _react2.jsx)("div", {
       css: menuContainerStyles,
       role: "menu"

package/dist/cjs/ui/Toolbar.js

@@ -20,6 +20,7 @@ var _reactIntlNext = require("react-intl-next");
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _messages = _interopRequireDefault(require("@atlaskit/editor-common/messages"));
+var _toolbarFlagCheck = require("@atlaskit/editor-common/toolbar-flag-check");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -61,7 +62,7 @@ function groupItems(items) {
       } else {
         finalOutput.push(item);
       }
-    } else if (item.type === 'separator' && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+    } else if (item.type === 'separator' && (0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
       var _items;
       var isLeadingSeparator = i === 0;
       var isTrailingSeparator = i === items.length - 1;
@@ -340,7 +341,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           scrollable: scrollable
         });
       case 'separator':
-        if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
+        if ((0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
           return item.fullHeight ? (0, _react2.jsx)(_ui.FloatingToolbarSeparator, {
             key: idx,
             fullHeight: true
@@ -364,7 +365,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
         key: index,
-        css: (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ? buttonGroupStylesNew : buttonGroupStyles,
+        css: (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? buttonGroupStylesNew : buttonGroupStyles,
         role: "radiogroup",
         "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined,
         "data-testid": "editor-floating-toolbar-grouped-buttons"
@@ -430,7 +431,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     overflow: 'hidden'
   }) :
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ?
+  (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   (0, _react2.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -453,7 +454,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     paddingLeft: "var(--ds-space-050, 4px)"
   })),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ?
+  (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   (0, _react2.css)({
     minHeight: "var(--ds-space-500, 40px)"
@@ -506,7 +507,7 @@ var toolbarOverflow = function toolbarOverflow(_ref2) {
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') ?
+  (0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   (0, _react2.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -652,7 +653,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         intl = _this$props2.intl,
         scrollable = _this$props2.scrollable,
         mediaAssistiveMessage = _this$props2.mediaAssistiveMessage;
-      var isEditorControlsEnabled = (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1');
+      var isNewEditorToolbarEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
       if (!items || !items.length) {
         return null;
       }
@@ -684,11 +685,11 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: className,
-        onMouseDown: isEditorControlsEnabled ? this.captureMouseEvent : undefined
+        onMouseDown: isNewEditorToolbarEnabled ? this.captureMouseEvent : undefined
       }, (0, _react2.jsx)(_ui.Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer)) : intl.formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer),
         delay: 250
-      }), scrollable && isEditorControlsEnabled && (0, _react2.jsx)(_ScrollButton.ScrollButton, {
+      }), scrollable && isNewEditorToolbarEnabled && (0, _react2.jsx)(_ScrollButton.ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,
@@ -713,7 +714,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
         mounted: this.state.mounted
-      }))), scrollable && (isEditorControlsEnabled ? (0, _react2.jsx)(_ScrollButton.ScrollButton, {
+      }))), scrollable && (isNewEditorToolbarEnabled ? (0, _react2.jsx)(_ScrollButton.ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,

package/dist/es2019/floatingToolbarPlugin.js

@@ -8,6 +8,7 @@ import {
 useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -277,7 +278,7 @@ export function ContentComponent({
     const toolbarItemViewModeProp = 'supportsViewMode';
     items = iterableItems.filter(item => toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp]);
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     var _items2;
     // Consolidate floating toolbar items
     const toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/es2019/ui/Dropdown.js

@@ -9,11 +9,11 @@ import React, { Component } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { Divider } from './Divider';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';
 
@@ -154,7 +154,7 @@ export default class Dropdown extends Component {
         selected: isOpen,
         disabled: disabled,
         tooltipContent: tooltip,
-        ariaHasPopup: editorExperiment('platform_editor_controls', 'variant1') ? true : undefined,
+        ariaHasPopup: areToolbarFlagsEnabled() ? true : undefined,
         onMount: onMount,
         pulse: pulse,
         spotlightConfig: spotlightConfig

package/dist/es2019/ui/DropdownMenu.js

@@ -10,10 +10,10 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { DropdownMenuItem } from '@atlaskit/editor-common/floating-toolbar';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { HeadingItem } from '@atlaskit/menu';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export const menuItemDimensions = {
   width: 175,
   height: 32
@@ -57,7 +57,7 @@ const Dropdown = /*#__PURE__*/memo(props => {
     editorView,
     showSelected = true
   } = props;
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     return jsx("div", {
       css: menuContainerStyles,
       role: "menu"

package/dist/es2019/ui/Toolbar.js

@@ -13,6 +13,7 @@ import { injectIntl } from 'react-intl-next';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { areSameItems, messages } from '@atlaskit/editor-common/floating-toolbar';
 import commonMessages from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
@@ -50,7 +51,7 @@ export function groupItems(items) {
       } else {
         finalOutput.push(item);
       }
-    } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1')) {
+    } else if (item.type === 'separator' && areToolbarFlagsEnabled()) {
       var _items;
       const isLeadingSeparator = i === 0;
       const isTrailingSeparator = i === items.length - 1;
@@ -314,7 +315,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           scrollable: scrollable
         });
       case 'separator':
-        if (editorExperiment('platform_editor_controls', 'variant1')) {
+        if (areToolbarFlagsEnabled()) {
           return item.fullHeight ? jsx(Separator, {
             key: idx,
             fullHeight: true
@@ -336,7 +337,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
         key: index,
-        css: editorExperiment('platform_editor_controls', 'variant1') ? buttonGroupStylesNew : buttonGroupStyles,
+        css: areToolbarFlagsEnabled() ? buttonGroupStylesNew : buttonGroupStyles,
         role: "radiogroup",
         "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined,
         "data-testid": "editor-floating-toolbar-grouped-buttons"
@@ -397,7 +398,7 @@ css({
   overflow: 'hidden'
 }) :
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-editorExperiment('platform_editor_controls', 'variant1') ?
+areToolbarFlagsEnabled() ?
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -420,7 +421,7 @@ css({
   paddingLeft: "var(--ds-space-050, 4px)"
 })),
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-editorExperiment('platform_editor_controls', 'variant1') ?
+areToolbarFlagsEnabled() ?
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 css({
   minHeight: "var(--ds-space-500, 40px)"
@@ -472,7 +473,7 @@ css({
   }
 },
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-editorExperiment('platform_editor_controls', 'variant1') ?
+areToolbarFlagsEnabled() ?
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -606,7 +607,7 @@ class Toolbar extends Component {
       scrollable,
       mediaAssistiveMessage
     } = this.props;
-    const isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
+    const isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
     if (!items || !items.length) {
       return null;
     }
@@ -634,11 +635,11 @@ class Toolbar extends Component {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
       ,
       className: className,
-      onMouseDown: isEditorControlsEnabled ? this.captureMouseEvent : undefined
+      onMouseDown: isNewEditorToolbarEnabled ? this.captureMouseEvent : undefined
     }, jsx(Announcer, {
       text: mediaAssistiveMessage ? `${mediaAssistiveMessage}, ${intl.formatMessage(messages.floatingToolbarAnnouncer)}` : intl.formatMessage(messages.floatingToolbarAnnouncer),
       delay: 250
-    }), scrollable && isEditorControlsEnabled && jsx(ScrollButton, {
+    }), scrollable && isNewEditorToolbarEnabled && jsx(ScrollButton, {
       intl: intl,
       scrollContainerRef: this.scrollContainerRef,
       node: node,
@@ -663,7 +664,7 @@ class Toolbar extends Component {
       setDisableScroll: this.setDisableScroll.bind(this),
       mountRef: this.mountRef,
       mounted: this.state.mounted
-    }))), scrollable && (isEditorControlsEnabled ? jsx(ScrollButton, {
+    }))), scrollable && (isNewEditorToolbarEnabled ? jsx(ScrollButton, {
       intl: intl,
       scrollContainerRef: this.scrollContainerRef,
       node: node,

package/dist/esm/floatingToolbarPlugin.js

@@ -12,6 +12,7 @@ import {
 useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
@@ -279,7 +280,7 @@ export function ContentComponent(_ref5) {
       return toolbarItemViewModeProp in item && !!item[toolbarItemViewModeProp];
     });
   }
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     var _items2;
     // Consolidate floating toolbar items
     var toolbarItemsArray = Array.isArray(items) ? items : (_items2 = items) === null || _items2 === void 0 ? void 0 : _items2(node);

package/dist/esm/ui/Dropdown.js

@@ -18,11 +18,11 @@ import React, { Component } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { FloatingToolbarButton as Button } from '@atlaskit/editor-common/ui';
 import { ArrowKeyNavigationType, DropdownContainer as UiDropdown } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/chevron-down';
 import ExpandIcon from '@atlaskit/icon/glyph/chevron-down';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { Divider } from './Divider';
 import DropdownMenu, { itemSpacing, menuItemDimensions } from './DropdownMenu';
 
@@ -168,7 +168,7 @@ var Dropdown = /*#__PURE__*/function (_Component) {
           selected: isOpen,
           disabled: disabled,
           tooltipContent: tooltip,
-          ariaHasPopup: editorExperiment('platform_editor_controls', 'variant1') ? true : undefined,
+          ariaHasPopup: areToolbarFlagsEnabled() ? true : undefined,
           onMount: onMount,
           pulse: pulse,
           spotlightConfig: spotlightConfig

package/dist/esm/ui/DropdownMenu.js

@@ -10,10 +10,10 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { DropdownMenuItem } from '@atlaskit/editor-common/floating-toolbar';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { HeadingItem } from '@atlaskit/menu';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 export var menuItemDimensions = {
   width: 175,
   height: 32
@@ -56,7 +56,7 @@ var Dropdown = /*#__PURE__*/memo(function (props) {
     editorView = props.editorView,
     _props$showSelected = props.showSelected,
     showSelected = _props$showSelected === void 0 ? true : _props$showSelected;
-  if (editorExperiment('platform_editor_controls', 'variant1')) {
+  if (areToolbarFlagsEnabled()) {
     return jsx("div", {
       css: menuContainerStyles,
       role: "menu"

package/dist/esm/ui/Toolbar.js

@@ -20,6 +20,7 @@ import { injectIntl } from 'react-intl-next';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { areSameItems, messages } from '@atlaskit/editor-common/floating-toolbar';
 import commonMessages from '@atlaskit/editor-common/messages';
+import { areToolbarFlagsEnabled } from '@atlaskit/editor-common/toolbar-flag-check';
 import { Announcer, FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-color';
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
@@ -55,7 +56,7 @@ export function groupItems(items) {
       } else {
         finalOutput.push(item);
       }
-    } else if (item.type === 'separator' && editorExperiment('platform_editor_controls', 'variant1')) {
+    } else if (item.type === 'separator' && areToolbarFlagsEnabled()) {
       var _items;
       var isLeadingSeparator = i === 0;
       var isTrailingSeparator = i === items.length - 1;
@@ -334,7 +335,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           scrollable: scrollable
         });
       case 'separator':
-        if (editorExperiment('platform_editor_controls', 'variant1')) {
+        if (areToolbarFlagsEnabled()) {
           return item.fullHeight ? jsx(Separator, {
             key: idx,
             fullHeight: true
@@ -358,7 +359,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
         key: index,
-        css: editorExperiment('platform_editor_controls', 'variant1') ? buttonGroupStylesNew : buttonGroupStyles,
+        css: areToolbarFlagsEnabled() ? buttonGroupStylesNew : buttonGroupStyles,
         role: "radiogroup",
         "aria-label": groupLabel !== null && groupLabel !== void 0 ? groupLabel : undefined,
         "data-testid": "editor-floating-toolbar-grouped-buttons"
@@ -424,7 +425,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     overflow: 'hidden'
   }) :
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  editorExperiment('platform_editor_controls', 'variant1') ?
+  areToolbarFlagsEnabled() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -447,7 +448,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     paddingLeft: "var(--ds-space-050, 4px)"
   })),
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  editorExperiment('platform_editor_controls', 'variant1') ?
+  areToolbarFlagsEnabled() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   css({
     minHeight: "var(--ds-space-500, 40px)"
@@ -500,7 +501,7 @@ var toolbarOverflow = function toolbarOverflow(_ref2) {
     }
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values
-  editorExperiment('platform_editor_controls', 'variant1') ?
+  areToolbarFlagsEnabled() ?
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   css({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
@@ -646,7 +647,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         intl = _this$props2.intl,
         scrollable = _this$props2.scrollable,
         mediaAssistiveMessage = _this$props2.mediaAssistiveMessage;
-      var isEditorControlsEnabled = editorExperiment('platform_editor_controls', 'variant1');
+      var isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
       if (!items || !items.length) {
         return null;
       }
@@ -678,11 +679,11 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         ,
         className: className,
-        onMouseDown: isEditorControlsEnabled ? this.captureMouseEvent : undefined
+        onMouseDown: isNewEditorToolbarEnabled ? this.captureMouseEvent : undefined
       }, jsx(Announcer, {
         text: mediaAssistiveMessage ? "".concat(mediaAssistiveMessage, ", ").concat(intl.formatMessage(messages.floatingToolbarAnnouncer)) : intl.formatMessage(messages.floatingToolbarAnnouncer),
         delay: 250
-      }), scrollable && isEditorControlsEnabled && jsx(ScrollButton, {
+      }), scrollable && isNewEditorToolbarEnabled && jsx(ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,
@@ -707,7 +708,7 @@ var Toolbar = /*#__PURE__*/function (_Component) {
         setDisableScroll: this.setDisableScroll.bind(this),
         mountRef: this.mountRef,
         mounted: this.state.mounted
-      }))), scrollable && (isEditorControlsEnabled ? jsx(ScrollButton, {
+      }))), scrollable && (isNewEditorToolbarEnabled ? jsx(ScrollButton, {
         intl: intl,
         scrollContainerRef: this.scrollContainerRef,
         node: node,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "5.0.4",
+	"version": "5.0.6",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,19 +37,19 @@
 		"@atlaskit/editor-plugin-emoji": "^4.0.0",
 		"@atlaskit/editor-plugin-extension": "^6.0.0",
 		"@atlaskit/editor-plugin-interaction": "^4.0.0",
-		"@atlaskit/editor-plugin-table": "^11.1.0",
+		"@atlaskit/editor-plugin-table": "^12.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^1.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/emoji": "^69.3.0",
-		"@atlaskit/icon": "^27.3.0",
+		"@atlaskit/icon": "^27.5.0",
 		"@atlaskit/menu": "^8.0.0",
-		"@atlaskit/modal-dialog": "^14.2.0",
+		"@atlaskit/modal-dialog": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.10.0",
 		"@atlaskit/select": "^21.2.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",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -60,7 +60,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^107.8.0",
+		"@atlaskit/editor-common": "^107.9.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},