@atlaskit/editor-plugin-floating-toolbar 1.4.8 → 1.6.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.6.0
+
+### Minor Changes
+
+- [#108718](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108718)
+  [`1aad4f15416c2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1aad4f15416c2) -
+  [EDF-737] Add content warning to the floating toolbar of the ai panels, extended extensions
+  floating toolbar API to allow custom JSX
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.5.0
+
+### Minor Changes
+
+- [#108458](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/108458)
+  [`66522b500303c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/66522b500303c) -
+  [ED-23469] Add featureFlag plugin as optional plugin dependency and switch to read
+  platform_editor_element_drag_and_drop gate value
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.4.8
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -18,7 +18,6 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _ui = require("@atlaskit/editor-common/ui");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
 var _commands = require("./pm-plugins/toolbar-data/commands");
 var _plugin = require("./pm-plugins/toolbar-data/plugin");
@@ -189,7 +188,7 @@ var floatingToolbarPlugin = exports.floatingToolbarPlugin = function floatingToo
   };
 };
 function ContentComponent(_ref5) {
-  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$b, _pluginInjectionApi$c, _pluginInjectionApi$d;
+  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$c, _pluginInjectionApi$d;
   var pluginInjectionApi = _ref5.pluginInjectionApi,
     editorView = _ref5.editorView,
     popupsMountPoint = _ref5.popupsMountPoint,
@@ -197,17 +196,19 @@ function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode']),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'featureFlags', 'blockControls']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
+    editorViewModeState = _useSharedPluginState.editorViewModeState,
+    featureFlagsState = _useSharedPluginState.featureFlagsState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.drag-and-drop_wmv9t') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && (_pluginInjectionApi$b = pluginInjectionApi.blockControls) !== null && _pluginInjectionApi$b !== void 0 && (_pluginInjectionApi$b = _pluginInjectionApi$b.sharedState) !== null && _pluginInjectionApi$b !== void 0 && (_pluginInjectionApi$b = _pluginInjectionApi$b.currentState()) !== null && _pluginInjectionApi$b !== void 0 && _pluginInjectionApi$b.isDragging) {
+  if (featureFlagsState !== null && featureFlagsState !== void 0 && featureFlagsState.elementDragAndDrop && blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
     return null;
   }
   var config = configWithNodeInfo.config,

package/dist/cjs/ui/DropdownMenu.js

@@ -34,13 +34,14 @@ var spacerStyles = (0, _react2.css)({
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 var menuContainerStyles = (0, _react2.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   minWidth: "".concat(menuItemDimensions.width, "px"),
   // temporary solution to retain spacing defined by @atlaskit/Item
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '& button': {
     minHeight: "var(--ds-space-400, 32px)",
     padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-100, 8px)", " 7px"),
-    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& > [data-item-elem-before]': {
       marginRight: "var(--ds-space-050, 4px)"
     }

package/dist/cjs/ui/ExtensionsPlaceholder.js

@@ -84,14 +84,27 @@ var ExtensionButton = function ExtensionButton(props) {
     var targetNodeAdf = (0, _utils.nodeToJSON)(node);
     item.action(targetNodeAdf, extensionApi);
   };
+  var getAriaLabel = function getAriaLabel() {
+    if (item.ariaLabel) {
+      return item.ariaLabel;
+    }
+    if (typeof item.tooltip === 'string') {
+      return item.tooltip;
+    }
+    if (item.label) {
+      return item.label;
+    }
+    return '';
+  };
   return /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarButton, {
     title: item.label,
-    ariaLabel: item.tooltip,
+    ariaLabel: getAriaLabel(),
     icon: ButtonIcon ? /*#__PURE__*/_react.default.createElement(ButtonIcon, {
       label: item.label || ''
     }) : undefined,
     onClick: onClick,
     tooltipContent: item.tooltip,
+    tooltipStyle: item.tooltipStyle,
     disabled: item.disabled
   }, item.label);
 };

package/dist/cjs/ui/Input.js

@@ -66,7 +66,7 @@ var TextField = exports.default = /*#__PURE__*/function (_Component) {
       return (0, _react2.jsx)("form", {
         onSubmit: this.handleSubmit
       }, (0, _react2.jsx)("input", {
-        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         css: _ui.panelTextInput,
         value: this.state.text,
         onChange: this.handleChange,

package/dist/cjs/ui/Toolbar.js

@@ -309,43 +309,79 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     display: 'flex',
     lineHeight: 1,
     boxSizing: 'border-box',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& > div > div': {
       alignItems: 'center'
     }
-  }, scrollable ? (0, _react2.css)(hasSelect ? (0, _react2.css)({
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollable ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  hasSelect ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     height: '40px'
-  }) : (0, _react2.css)({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     height: '32px'
   }), {
     overflow: 'hidden'
-  }) : (0, _react2.css)({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)")
-  }, firstElementIsSelect && (0, _react2.css)({
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  firstElementIsSelect &&
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     paddingLeft: "var(--ds-space-050, 4px)"
   })));
 };
 
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
 var toolbarOverflow = function toolbarOverflow(scrollable, scrollDisabled, firstElementIsSelect) {
-  return (0, _react2.css)(scrollable ? (0, _react2.css)(scrollDisabled ? (0, _react2.css)({
+  return (0, _react2.css)(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollable ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollDisabled ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     overflow: 'hidden'
-  }) : (0, _react2.css)({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     overflowX: 'auto',
     overflowY: 'hidden'
   }), {
     WebkitOverflowScrolling: 'touch',
     padding: "var(--ds-space-050, 4px)".concat(" 0 ", "var(--ds-space-600, 48px)"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '> div': {
-      '> div:first-child': firstElementIsSelect ? (0, _react2.css)({
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      '> div:first-child': firstElementIsSelect ?
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      (0, _react2.css)({
         marginLeft: "var(--ds-space-050, 4px)"
-      }) : (0, _react2.css)({
+      }) :
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      (0, _react2.css)({
         marginLeft: "var(--ds-space-100, 8px)"
       }),
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
       '> div:last-child': {
         marginRight: "var(--ds-space-100, 8px)"
       }
     }
-  }) : (0, _react2.css)({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  (0, _react2.css)({
     display: 'flex'
   }));
 };

package/dist/es2019/plugin.js

@@ -8,7 +8,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
 import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/toolbar-data/plugin';
@@ -183,12 +182,14 @@ export function ContentComponent({
   providerFactory,
   dispatchAnalyticsEvent
 }) {
-  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$b, _pluginInjectionApi$b2, _pluginInjectionApi$b3, _pluginInjectionApi$c, _pluginInjectionApi$d;
+  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$c, _pluginInjectionApi$d;
   const {
     floatingToolbarState,
     editorDisabledState,
-    editorViewModeState
-  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode']);
+    editorViewModeState,
+    featureFlagsState,
+    blockControlsState
+  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'featureFlags', 'blockControls']);
   const {
     configWithNodeInfo,
     floatingToolbarData
@@ -196,7 +197,7 @@ export function ContentComponent({
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if (getBooleanFF('platform.editor.drag-and-drop_wmv9t') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && (_pluginInjectionApi$b = pluginInjectionApi.blockControls) !== null && _pluginInjectionApi$b !== void 0 && (_pluginInjectionApi$b2 = _pluginInjectionApi$b.sharedState) !== null && _pluginInjectionApi$b2 !== void 0 && (_pluginInjectionApi$b3 = _pluginInjectionApi$b2.currentState()) !== null && _pluginInjectionApi$b3 !== void 0 && _pluginInjectionApi$b3.isDragging) {
+  if (featureFlagsState !== null && featureFlagsState !== void 0 && featureFlagsState.elementDragAndDrop && blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
     return null;
   }
   const {

package/dist/es2019/ui/DropdownMenu.js

@@ -24,13 +24,14 @@ const spacerStyles = css({
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 const menuContainerStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   minWidth: `${menuItemDimensions.width}px`,
   // temporary solution to retain spacing defined by @atlaskit/Item
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '& button': {
     minHeight: "var(--ds-space-400, 32px)",
     padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-100, 8px)"} 7px`,
-    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& > [data-item-elem-before]': {
       marginRight: "var(--ds-space-050, 4px)"
     }

package/dist/es2019/ui/ExtensionsPlaceholder.js

@@ -33,14 +33,27 @@ const ExtensionButton = props => {
     const targetNodeAdf = nodeToJSON(node);
     item.action(targetNodeAdf, extensionApi);
   };
+  const getAriaLabel = () => {
+    if (item.ariaLabel) {
+      return item.ariaLabel;
+    }
+    if (typeof item.tooltip === 'string') {
+      return item.tooltip;
+    }
+    if (item.label) {
+      return item.label;
+    }
+    return '';
+  };
   return /*#__PURE__*/React.createElement(Button, {
     title: item.label,
-    ariaLabel: item.tooltip,
+    ariaLabel: getAriaLabel(),
     icon: ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
       label: item.label || ''
     }) : undefined,
     onClick: onClick,
     tooltipContent: item.tooltip,
+    tooltipStyle: item.tooltipStyle,
     disabled: item.disabled
   }, item.label);
 };

package/dist/es2019/ui/Input.js

@@ -42,7 +42,7 @@ export default class TextField extends Component {
     return jsx("form", {
       onSubmit: this.handleSubmit
     }, jsx("input", {
-      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+      // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
       css: panelTextInput,
       value: this.state.text,
       onChange: this.handleChange,

package/dist/es2019/ui/Toolbar.js

@@ -274,41 +274,77 @@ const toolbarContainer = (scrollable, hasSelect, firstElementIsSelect) => css({
   display: 'flex',
   lineHeight: 1,
   boxSizing: 'border-box',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '& > div > div': {
     alignItems: 'center'
   }
-}, scrollable ? css(hasSelect ? css({
+},
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+scrollable ?
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css(
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+hasSelect ?
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   height: '40px'
-}) : css({
+}) :
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   height: '32px'
 }), {
   overflow: 'hidden'
-}) : css({
+}) :
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   padding: `${"var(--ds-space-050, 4px)"} ${"var(--ds-space-100, 8px)"}`
-}, firstElementIsSelect && css({
+},
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+firstElementIsSelect &&
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   paddingLeft: "var(--ds-space-050, 4px)"
 })));
 
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
-const toolbarOverflow = (scrollable, scrollDisabled, firstElementIsSelect) => css(scrollable ? css(scrollDisabled ? css({
+const toolbarOverflow = (scrollable, scrollDisabled, firstElementIsSelect) => css(
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+scrollable ?
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css(
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+scrollDisabled ?
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   overflow: 'hidden'
-}) : css({
+}) :
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   overflowX: 'auto',
   overflowY: 'hidden'
 }), {
   WebkitOverflowScrolling: 'touch',
   padding: `${"var(--ds-space-050, 4px)"} 0 ${"var(--ds-space-600, 48px)"}`,
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '> div': {
-    '> div:first-child': firstElementIsSelect ? css({
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+    '> div:first-child': firstElementIsSelect ?
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+    css({
       marginLeft: "var(--ds-space-050, 4px)"
-    }) : css({
+    }) :
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+    css({
       marginLeft: "var(--ds-space-100, 8px)"
     }),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '> div:last-child': {
       marginRight: "var(--ds-space-100, 8px)"
     }
   }
-}) : css({
+}) :
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+css({
   display: 'flex'
 }));
 // eslint-disable-next-line @repo/internal/react/no-class-components

package/dist/esm/plugin.js

@@ -11,7 +11,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { AllSelection, PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
 import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/toolbar-data/plugin';
@@ -179,7 +178,7 @@ export var floatingToolbarPlugin = function floatingToolbarPlugin(_ref) {
   };
 };
 export function ContentComponent(_ref5) {
-  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$b, _pluginInjectionApi$c, _pluginInjectionApi$d;
+  var _configWithNodeInfo$c, _configWithNodeInfo$c2, _pluginInjectionApi$c, _pluginInjectionApi$d;
   var pluginInjectionApi = _ref5.pluginInjectionApi,
     editorView = _ref5.editorView,
     popupsMountPoint = _ref5.popupsMountPoint,
@@ -187,17 +186,19 @@ export function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'featureFlags', 'blockControls']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
-    editorViewModeState = _useSharedPluginState.editorViewModeState;
+    editorViewModeState = _useSharedPluginState.editorViewModeState,
+    featureFlagsState = _useSharedPluginState.featureFlagsState,
+    blockControlsState = _useSharedPluginState.blockControlsState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
   if (!configWithNodeInfo || !configWithNodeInfo.config || typeof ((_configWithNodeInfo$c = configWithNodeInfo.config) === null || _configWithNodeInfo$c === void 0 ? void 0 : _configWithNodeInfo$c.visible) !== 'undefined' && !((_configWithNodeInfo$c2 = configWithNodeInfo.config) !== null && _configWithNodeInfo$c2 !== void 0 && _configWithNodeInfo$c2.visible)) {
     return null;
   }
-  if (getBooleanFF('platform.editor.drag-and-drop_wmv9t') && pluginInjectionApi !== null && pluginInjectionApi !== void 0 && (_pluginInjectionApi$b = pluginInjectionApi.blockControls) !== null && _pluginInjectionApi$b !== void 0 && (_pluginInjectionApi$b = _pluginInjectionApi$b.sharedState) !== null && _pluginInjectionApi$b !== void 0 && (_pluginInjectionApi$b = _pluginInjectionApi$b.currentState()) !== null && _pluginInjectionApi$b !== void 0 && _pluginInjectionApi$b.isDragging) {
+  if (featureFlagsState !== null && featureFlagsState !== void 0 && featureFlagsState.elementDragAndDrop && blockControlsState !== null && blockControlsState !== void 0 && blockControlsState.isDragging) {
     return null;
   }
   var config = configWithNodeInfo.config,

package/dist/esm/ui/DropdownMenu.js

@@ -25,13 +25,14 @@ var spacerStyles = css({
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 var menuContainerStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
   minWidth: "".concat(menuItemDimensions.width, "px"),
   // temporary solution to retain spacing defined by @atlaskit/Item
-  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+  // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   '& button': {
     minHeight: "var(--ds-space-400, 32px)",
     padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-100, 8px)", " 7px"),
-    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles
+    // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& > [data-item-elem-before]': {
       marginRight: "var(--ds-space-050, 4px)"
     }

package/dist/esm/ui/ExtensionsPlaceholder.js

@@ -74,14 +74,27 @@ var ExtensionButton = function ExtensionButton(props) {
     var targetNodeAdf = nodeToJSON(node);
     item.action(targetNodeAdf, extensionApi);
   };
+  var getAriaLabel = function getAriaLabel() {
+    if (item.ariaLabel) {
+      return item.ariaLabel;
+    }
+    if (typeof item.tooltip === 'string') {
+      return item.tooltip;
+    }
+    if (item.label) {
+      return item.label;
+    }
+    return '';
+  };
   return /*#__PURE__*/React.createElement(Button, {
     title: item.label,
-    ariaLabel: item.tooltip,
+    ariaLabel: getAriaLabel(),
     icon: ButtonIcon ? /*#__PURE__*/React.createElement(ButtonIcon, {
       label: item.label || ''
     }) : undefined,
     onClick: onClick,
     tooltipContent: item.tooltip,
+    tooltipStyle: item.tooltipStyle,
     disabled: item.disabled
   }, item.label);
 };

package/dist/esm/ui/Input.js

@@ -57,7 +57,7 @@ var TextField = /*#__PURE__*/function (_Component) {
       return jsx("form", {
         onSubmit: this.handleSubmit
       }, jsx("input", {
-        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
+        // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
         css: panelTextInput,
         value: this.state.text,
         onChange: this.handleChange,

package/dist/esm/ui/Toolbar.js

@@ -300,43 +300,79 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     display: 'flex',
     lineHeight: 1,
     boxSizing: 'border-box',
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '& > div > div': {
       alignItems: 'center'
     }
-  }, scrollable ? css(hasSelect ? css({
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollable ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  hasSelect ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     height: '40px'
-  }) : css({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     height: '32px'
   }), {
     overflow: 'hidden'
-  }) : css({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     padding: "var(--ds-space-050, 4px)".concat(" ", "var(--ds-space-100, 8px)")
-  }, firstElementIsSelect && css({
+  },
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  firstElementIsSelect &&
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     paddingLeft: "var(--ds-space-050, 4px)"
   })));
 };
 
 // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage
 var toolbarOverflow = function toolbarOverflow(scrollable, scrollDisabled, firstElementIsSelect) {
-  return css(scrollable ? css(scrollDisabled ? css({
+  return css(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollable ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css(
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+  scrollDisabled ?
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     overflow: 'hidden'
-  }) : css({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     overflowX: 'auto',
     overflowY: 'hidden'
   }), {
     WebkitOverflowScrolling: 'touch',
     padding: "var(--ds-space-050, 4px)".concat(" 0 ", "var(--ds-space-600, 48px)"),
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
     '> div': {
-      '> div:first-child': firstElementIsSelect ? css({
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
+      '> div:first-child': firstElementIsSelect ?
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      css({
         marginLeft: "var(--ds-space-050, 4px)"
-      }) : css({
+      }) :
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+      css({
         marginLeft: "var(--ds-space-100, 8px)"
       }),
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
       '> div:last-child': {
         marginRight: "var(--ds-space-100, 8px)"
       }
     }
-  }) : css({
+  }) :
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
+  css({
     display: 'flex'
   }));
 };

package/dist/types/types.d.ts

@@ -6,6 +6,7 @@ import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export type ConfigWithNodeInfo = {
@@ -32,7 +33,8 @@ export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
         CopyButtonPlugin,
         EditorDisabledPlugin,
         OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<BlockControlsPlugin>
+        OptionalPlugin<BlockControlsPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         forceFocusSelector: ForceFocusSelector;

package/dist/types-ts4.5/types.d.ts

@@ -6,6 +6,7 @@ import type { DecorationsPlugin } from '@atlaskit/editor-plugin-decorations';
 import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
 import type { ExtensionPlugin } from '@atlaskit/editor-plugin-extension';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 export type ConfigWithNodeInfo = {
@@ -32,7 +33,8 @@ export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
         CopyButtonPlugin,
         EditorDisabledPlugin,
         OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<BlockControlsPlugin>
+        OptionalPlugin<BlockControlsPlugin>,
+        OptionalPlugin<FeatureFlagsPlugin>
     ];
     actions: {
         forceFocusSelector: ForceFocusSelector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-floating-toolbar",
-  "version": "1.4.8",
+  "version": "1.6.0",
   "description": "Floating toolbar plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -27,7 +27,7 @@
     "@atlaskit/adf-utils": "^19.2.0",
     "@atlaskit/button": "^17.17.0",
     "@atlaskit/checkbox": "^13.4.0",
-    "@atlaskit/editor-common": "^82.0.0",
+    "@atlaskit/editor-common": "^82.5.0",
     "@atlaskit/editor-palette": "1.6.0",
     "@atlaskit/editor-plugin-block-controls": "^1.4.1",
     "@atlaskit/editor-plugin-context-panel": "^1.1.0",
@@ -36,16 +36,16 @@
     "@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
     "@atlaskit/editor-plugin-editor-viewmode": "^1.1.0",
     "@atlaskit/editor-plugin-extension": "^1.5.0",
-    "@atlaskit/editor-plugin-table": "^7.16.0",
+    "@atlaskit/editor-plugin-table": "^7.17.0",
     "@atlaskit/editor-prosemirror": "4.0.1",
     "@atlaskit/emoji": "^67.6.0",
     "@atlaskit/icon": "^22.3.0",
-    "@atlaskit/menu": "^2.3.0",
+    "@atlaskit/menu": "^2.4.0",
     "@atlaskit/modal-dialog": "^12.13.0",
     "@atlaskit/platform-feature-flags": "^0.2.5",
     "@atlaskit/select": "^17.10.0",
-    "@atlaskit/theme": "^12.8.0",
-    "@atlaskit/tokens": "^1.49.0",
+    "@atlaskit/theme": "^12.9.0",
+    "@atlaskit/tokens": "^1.50.0",
     "@atlaskit/tooltip": "^18.4.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -111,9 +111,6 @@
     },
     "platform.editor.a11y-table-floating-toolbar-dropdown-menu_zkb33": {
       "type": "boolean"
-    },
-    "platform.editor.drag-and-drop_wmv9t": {
-      "type": "boolean"
     }
   }
 }