@atlaskit/editor-plugin-floating-toolbar 9.1.14 → 9.1.16

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 9.1.16
+
+### Patch Changes
+
+- [`7ef3027df8198`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7ef3027df8198) -
+  remove platform_editor_lovability_user_intent experiment
+- Updated dependencies
+
+## 9.1.15
+
+### Patch Changes
+
+- [`34c3a60cb9325`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/34c3a60cb9325) -
+  Cleanup FG platform_editor_fix_confirm_table_removal
+
 ## 9.1.14
 
 ### Patch Changes

package/dist/cjs/floatingToolbarPlugin.js

@@ -25,8 +25,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expValEqualsNoExposure = require("@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("./pm-plugins/commands");
 var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
 var _commands2 = require("./pm-plugins/toolbar-data/commands");
@@ -240,14 +238,11 @@ function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    'blockControls']),
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
-    userIntentState = _useSharedPluginState.userIntentState,
-    blockControlsState = _useSharedPluginState.blockControlsState;
+    userIntentState = _useSharedPluginState.userIntentState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
@@ -257,11 +252,7 @@ function ContentComponent(_ref5) {
   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;
   }
-  var userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_user_intent', 'isEnabled', true));
-  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && (0, _expValEquals.expValEquals)('platform_editor_block_menu', 'isEnabled', true)) && !userIntentEnabled) {
-    return null;
-  }
-  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent)) {
     return null;
   }
   var config = configWithNodeInfo.config,
@@ -394,29 +385,20 @@ function ContentComponent(_ref5) {
 
   // Confirm dialog
   var confirmButtonItem;
-  if ((0, _platformFeatureFlags.fg)('platform_editor_fix_confirm_table_removal')) {
-    var _ref7 = floatingToolbarData || {},
-      confirmDialogForItem = _ref7.confirmDialogForItem,
-      confirmDialogForItemOption = _ref7.confirmDialogForItemOption;
-    var matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
-      confirmButtonItem = matchingItem;
-    }
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
-      var matchingItemOption = matchingItem.options[confirmDialogForItemOption];
+  var _ref7 = floatingToolbarData || {},
+    confirmDialogForItem = _ref7.confirmDialogForItem,
+    confirmDialogForItemOption = _ref7.confirmDialogForItemOption;
+  var matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
+    confirmButtonItem = matchingItem;
+  }
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
+    var matchingItemOption = matchingItem.options[confirmDialogForItemOption];
 
-      // OverflowDropdownOption is the only member of the union that does not have a 'type' property
-      if (!('type' in matchingItemOption)) {
-        confirmButtonItem = matchingItemOption;
-      }
+    // OverflowDropdownOption is the only member of the union that does not have a 'type' property
+    if (!('type' in matchingItemOption)) {
+      confirmButtonItem = matchingItemOption;
     }
-  } else {
-    var _ref8 = floatingToolbarData || {},
-      _confirmDialogForItem = _ref8.confirmDialogForItem;
-    confirmButtonItem = _confirmDialogForItem ?
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    toolbarItems[_confirmDialogForItem] : undefined;
   }
   var scrollable = config.scrollable;
   var confirmDialogOptions = typeof ((_confirmButtonItem = confirmButtonItem) === null || _confirmButtonItem === void 0 ? void 0 : _confirmButtonItem.confirmDialog) === 'function' ? (_confirmButtonItem2 = confirmButtonItem) === null || _confirmButtonItem2 === void 0 ? void 0 : _confirmButtonItem2.confirmDialog() : (_confirmButtonItem3 = confirmButtonItem) === null || _confirmButtonItem3 === void 0 ? void 0 : _confirmButtonItem3.confirmDialog;
@@ -558,12 +540,7 @@ function floatingToolbarPluginFactory(options) {
       var config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
         var _api$userIntent;
-        var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_user_intent', 'isEnabled', true));
-        if (config.__suppressAllToolbars && (0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && !userIntentEnabled) {
-          activeConfigs = undefined;
-          break;
-        }
-        if (userIntentEnabled && SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) || '')) {
+        if (SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) || '')) {
           activeConfigs = undefined;
           break;
         }
@@ -573,18 +550,7 @@ function floatingToolbarPluginFactory(options) {
     var relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  var getIsToolbarSuppressed = function getIsToolbarSuppressed(editorState) {
-    var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && (0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_lovability_user_intent', 'isEnabled', true));
-    if (userIntentEnabled) {
-      return false;
-    }
-    for (var index = 0; index < floatingToolbarHandlers.length; index++) {
-      var handler = floatingToolbarHandlers[index];
-      var config = handler(editorState, intl, providerFactory);
-      if (config !== null && config !== void 0 && config.__suppressAllToolbars) {
-        return true;
-      }
-    }
+  var getIsToolbarSuppressed = function getIsToolbarSuppressed() {
     return false;
   };
   var apply = function apply() {
@@ -601,8 +567,8 @@ function floatingToolbarPluginFactory(options) {
           getConfigWithNodeInfo: getConfigWithNodeInfo
         };
       },
-      apply: (0, _expValEquals.expValEquals)('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? function (_tr, _pluginState, __oldEditorState, newEditorState) {
-        var suppressedToolbar = getIsToolbarSuppressed(newEditorState);
+      apply: (0, _expValEquals.expValEquals)('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? function (_tr, _pluginState, __oldEditorState) {
+        var suppressedToolbar = getIsToolbarSuppressed();
         var newPluginState = {
           getConfigWithNodeInfo: getConfigWithNodeInfo,
           suppressedToolbar: suppressedToolbar

package/dist/cjs/ui/Toolbar.js

@@ -26,7 +26,6 @@ var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _forceFocus = require("../pm-plugins/force-focus");
 var _commands = require("../pm-plugins/toolbar-data/commands");
@@ -195,25 +194,20 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           return item.render(editorView, idx, dispatchAnalyticsEvent);
         }
       case 'overflow-dropdown':
-        var options;
-        if ((0, _platformFeatureFlags.fg)('platform_editor_fix_confirm_table_removal')) {
-          // if an option has a confirmDialog, we need to replace its onClick handler
-          // to set the state to show the confirm dialog
+        // if an option has a confirmDialog, we need to replace its onClick handler
+        // to set the state to show the confirm dialog
 
-          // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
-          // which would need knowledge of indexes, showConfirmDialog etc.
-          options = item.options.map(function (option, optionIndex) {
-            if (!('type' in option) && option.confirmDialog) {
-              var onClick = option.confirmDialog ? (0, _commands.showConfirmDialog)(idx, optionIndex) : option.onClick;
-              return _objectSpread(_objectSpread({}, option), {}, {
-                onClick: onClick
-              });
-            }
-            return option;
-          });
-        } else {
-          options = item.options;
-        }
+        // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
+        // which would need knowledge of indexes, showConfirmDialog etc.
+        var options = item.options.map(function (option, optionIndex) {
+          if (!('type' in option) && option.confirmDialog) {
+            var onClick = option.confirmDialog ? (0, _commands.showConfirmDialog)(idx, optionIndex) : option.onClick;
+            return _objectSpread(_objectSpread({}, option), {}, {
+              onClick: onClick
+            });
+          }
+          return option;
+        });
         return (0, _react2.jsx)(_Dropdown.default, {
           alignX: areAnyNewToolbarFlagsEnabled ? 'right' : undefined,
           key: idx,

package/dist/es2019/floatingToolbarPlugin.js

@@ -14,8 +14,6 @@ import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemi
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
@@ -230,12 +228,8 @@ export function ContentComponent({
     floatingToolbarState,
     editorDisabledState,
     editorViewModeState,
-    userIntentState,
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    blockControlsState
-  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-  // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-  'blockControls']);
+    userIntentState
+  } = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent']);
   const {
     configWithNodeInfo,
     floatingToolbarData
@@ -246,11 +240,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;
   }
-  const userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true)) && !userIntentEnabled) {
-    return null;
-  }
-  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent)) {
     return null;
   }
   const {
@@ -377,31 +367,21 @@ export function ContentComponent({
 
   // Confirm dialog
   let confirmButtonItem;
-  if (fg('platform_editor_fix_confirm_table_removal')) {
-    const {
-      confirmDialogForItem,
-      confirmDialogForItemOption
-    } = floatingToolbarData || {};
-    const matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
-      confirmButtonItem = matchingItem;
-    }
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
-      const matchingItemOption = matchingItem.options[confirmDialogForItemOption];
+  const {
+    confirmDialogForItem,
+    confirmDialogForItemOption
+  } = floatingToolbarData || {};
+  const matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
+    confirmButtonItem = matchingItem;
+  }
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
+    const matchingItemOption = matchingItem.options[confirmDialogForItemOption];
 
-      // OverflowDropdownOption is the only member of the union that does not have a 'type' property
-      if (!('type' in matchingItemOption)) {
-        confirmButtonItem = matchingItemOption;
-      }
+    // OverflowDropdownOption is the only member of the union that does not have a 'type' property
+    if (!('type' in matchingItemOption)) {
+      confirmButtonItem = matchingItemOption;
     }
-  } else {
-    const {
-      confirmDialogForItem
-    } = floatingToolbarData || {};
-    confirmButtonItem = confirmDialogForItem ?
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    toolbarItems[confirmDialogForItem] : undefined;
   }
   const scrollable = config.scrollable;
   const confirmDialogOptions = typeof ((_confirmButtonItem = confirmButtonItem) === null || _confirmButtonItem === void 0 ? void 0 : _confirmButtonItem.confirmDialog) === 'function' ? (_confirmButtonItem2 = confirmButtonItem) === null || _confirmButtonItem2 === void 0 ? void 0 : _confirmButtonItem2.confirmDialog() : (_confirmButtonItem3 = confirmButtonItem) === null || _confirmButtonItem3 === void 0 ? void 0 : _confirmButtonItem3.confirmDialog;
@@ -543,12 +523,7 @@ export function floatingToolbarPluginFactory(options) {
       const config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
         var _api$userIntent, _api$userIntent$share;
-        const userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1') && !userIntentEnabled) {
-          activeConfigs = undefined;
-          break;
-        }
-        if (userIntentEnabled && SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) || '')) {
+        if (SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 ? void 0 : (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 ? void 0 : (_api$userIntent$share = _api$userIntent.sharedState.currentState()) === null || _api$userIntent$share === void 0 ? void 0 : _api$userIntent$share.currentUserIntent) || '')) {
           activeConfigs = undefined;
           break;
         }
@@ -558,18 +533,7 @@ export function floatingToolbarPluginFactory(options) {
     const relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  const getIsToolbarSuppressed = editorState => {
-    const userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-    if (userIntentEnabled) {
-      return false;
-    }
-    for (let index = 0; index < floatingToolbarHandlers.length; index++) {
-      const handler = floatingToolbarHandlers[index];
-      const config = handler(editorState, intl, providerFactory);
-      if (config !== null && config !== void 0 && config.__suppressAllToolbars) {
-        return true;
-      }
-    }
+  const getIsToolbarSuppressed = () => {
     return false;
   };
   const apply = () => {
@@ -586,8 +550,8 @@ export function floatingToolbarPluginFactory(options) {
           getConfigWithNodeInfo
         };
       },
-      apply: expValEquals('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? (_tr, _pluginState, __oldEditorState, newEditorState) => {
-        const suppressedToolbar = getIsToolbarSuppressed(newEditorState);
+      apply: expValEquals('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? (_tr, _pluginState, __oldEditorState) => {
+        const suppressedToolbar = getIsToolbarSuppressed();
         const newPluginState = {
           getConfigWithNodeInfo,
           suppressedToolbar

package/dist/es2019/ui/Toolbar.js

@@ -19,7 +19,6 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
@@ -171,26 +170,21 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           return item.render(editorView, idx, dispatchAnalyticsEvent);
         }
       case 'overflow-dropdown':
-        let options;
-        if (fg('platform_editor_fix_confirm_table_removal')) {
-          // if an option has a confirmDialog, we need to replace its onClick handler
-          // to set the state to show the confirm dialog
+        // if an option has a confirmDialog, we need to replace its onClick handler
+        // to set the state to show the confirm dialog
 
-          // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
-          // which would need knowledge of indexes, showConfirmDialog etc.
-          options = item.options.map((option, optionIndex) => {
-            if (!('type' in option) && option.confirmDialog) {
-              const onClick = option.confirmDialog ? showConfirmDialog(idx, optionIndex) : option.onClick;
-              return {
-                ...option,
-                onClick
-              };
-            }
-            return option;
-          });
-        } else {
-          options = item.options;
-        }
+        // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
+        // which would need knowledge of indexes, showConfirmDialog etc.
+        const options = item.options.map((option, optionIndex) => {
+          if (!('type' in option) && option.confirmDialog) {
+            const onClick = option.confirmDialog ? showConfirmDialog(idx, optionIndex) : option.onClick;
+            return {
+              ...option,
+              onClick
+            };
+          }
+          return option;
+        });
         return jsx(Dropdown, {
           alignX: areAnyNewToolbarFlagsEnabled ? 'right' : undefined,
           key: idx,

package/dist/esm/floatingToolbarPlugin.js

@@ -18,8 +18,6 @@ import { AllSelection, PluginKey, TextSelection } from '@atlaskit/editor-prosemi
 import { findDomRefAtPos, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equals-no-exposure';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { copyNode as _copyNode } from './pm-plugins/commands';
 import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
@@ -230,14 +228,11 @@ export function ContentComponent(_ref5) {
     popupsScrollableElement = _ref5.popupsScrollableElement,
     providerFactory = _ref5.providerFactory,
     dispatchAnalyticsEvent = _ref5.dispatchAnalyticsEvent;
-  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent',
-    // @ts-expect-error - excluded from FloatingToolbarPlugin dependencies to avoid circular dependency
-    'blockControls']),
+  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['floatingToolbar', 'editorDisabled', 'editorViewMode', 'userIntent']),
     floatingToolbarState = _useSharedPluginState.floatingToolbarState,
     editorDisabledState = _useSharedPluginState.editorDisabledState,
     editorViewModeState = _useSharedPluginState.editorViewModeState,
-    userIntentState = _useSharedPluginState.userIntentState,
-    blockControlsState = _useSharedPluginState.blockControlsState;
+    userIntentState = _useSharedPluginState.userIntentState;
   var _ref6 = floatingToolbarState !== null && floatingToolbarState !== void 0 ? floatingToolbarState : {},
     configWithNodeInfo = _ref6.configWithNodeInfo,
     floatingToolbarData = _ref6.floatingToolbarData;
@@ -247,11 +242,7 @@ export function ContentComponent(_ref5) {
   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;
   }
-  var userIntentEnabled = Boolean((pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : pluginInjectionApi.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-  if (((userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'dragging' || (userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) === 'blockMenuOpen' && expValEquals('platform_editor_block_menu', 'isEnabled', true)) && !userIntentEnabled) {
-    return null;
-  }
-  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent) && userIntentEnabled) {
+  if (userIntentState !== null && userIntentState !== void 0 && userIntentState.currentUserIntent && SUPPRESS_TOOLBAR_USER_INTENTS.includes(userIntentState === null || userIntentState === void 0 ? void 0 : userIntentState.currentUserIntent)) {
     return null;
   }
   var config = configWithNodeInfo.config,
@@ -384,29 +375,20 @@ export function ContentComponent(_ref5) {
 
   // Confirm dialog
   var confirmButtonItem;
-  if (fg('platform_editor_fix_confirm_table_removal')) {
-    var _ref7 = floatingToolbarData || {},
-      confirmDialogForItem = _ref7.confirmDialogForItem,
-      confirmDialogForItemOption = _ref7.confirmDialogForItemOption;
-    var matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
-      confirmButtonItem = matchingItem;
-    }
-    if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
-      var matchingItemOption = matchingItem.options[confirmDialogForItemOption];
+  var _ref7 = floatingToolbarData || {},
+    confirmDialogForItem = _ref7.confirmDialogForItem,
+    confirmDialogForItemOption = _ref7.confirmDialogForItemOption;
+  var matchingItem = confirmDialogForItem ? toolbarItems === null || toolbarItems === void 0 ? void 0 : toolbarItems[confirmDialogForItem] : undefined;
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'button') {
+    confirmButtonItem = matchingItem;
+  }
+  if ((matchingItem === null || matchingItem === void 0 ? void 0 : matchingItem.type) === 'overflow-dropdown' && confirmDialogForItemOption !== undefined) {
+    var matchingItemOption = matchingItem.options[confirmDialogForItemOption];
 
-      // OverflowDropdownOption is the only member of the union that does not have a 'type' property
-      if (!('type' in matchingItemOption)) {
-        confirmButtonItem = matchingItemOption;
-      }
+    // OverflowDropdownOption is the only member of the union that does not have a 'type' property
+    if (!('type' in matchingItemOption)) {
+      confirmButtonItem = matchingItemOption;
     }
-  } else {
-    var _ref8 = floatingToolbarData || {},
-      _confirmDialogForItem = _ref8.confirmDialogForItem;
-    confirmButtonItem = _confirmDialogForItem ?
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    toolbarItems[_confirmDialogForItem] : undefined;
   }
   var scrollable = config.scrollable;
   var confirmDialogOptions = typeof ((_confirmButtonItem = confirmButtonItem) === null || _confirmButtonItem === void 0 ? void 0 : _confirmButtonItem.confirmDialog) === 'function' ? (_confirmButtonItem2 = confirmButtonItem) === null || _confirmButtonItem2 === void 0 ? void 0 : _confirmButtonItem2.confirmDialog() : (_confirmButtonItem3 = confirmButtonItem) === null || _confirmButtonItem3 === void 0 ? void 0 : _confirmButtonItem3.confirmDialog;
@@ -548,12 +530,7 @@ export function floatingToolbarPluginFactory(options) {
       var config = handler(editorState, intl, providerFactory, activeConfigs);
       if (config) {
         var _api$userIntent;
-        var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-        if (config.__suppressAllToolbars && editorExperiment('platform_editor_controls', 'variant1') && !userIntentEnabled) {
-          activeConfigs = undefined;
-          break;
-        }
-        if (userIntentEnabled && SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) || '')) {
+        if (SUPPRESS_TOOLBAR_USER_INTENTS.includes((api === null || api === void 0 || (_api$userIntent = api.userIntent) === null || _api$userIntent === void 0 || (_api$userIntent = _api$userIntent.sharedState.currentState()) === null || _api$userIntent === void 0 ? void 0 : _api$userIntent.currentUserIntent) || '')) {
           activeConfigs = undefined;
           break;
         }
@@ -563,18 +540,7 @@ export function floatingToolbarPluginFactory(options) {
     var relevantConfig = activeConfigs && getRelevantConfig(editorState.selection, activeConfigs);
     return relevantConfig;
   };
-  var getIsToolbarSuppressed = function getIsToolbarSuppressed(editorState) {
-    var userIntentEnabled = Boolean((api === null || api === void 0 ? void 0 : api.userIntent) && expValEqualsNoExposure('platform_editor_lovability_user_intent', 'isEnabled', true));
-    if (userIntentEnabled) {
-      return false;
-    }
-    for (var index = 0; index < floatingToolbarHandlers.length; index++) {
-      var handler = floatingToolbarHandlers[index];
-      var config = handler(editorState, intl, providerFactory);
-      if (config !== null && config !== void 0 && config.__suppressAllToolbars) {
-        return true;
-      }
-    }
+  var getIsToolbarSuppressed = function getIsToolbarSuppressed() {
     return false;
   };
   var apply = function apply() {
@@ -591,8 +557,8 @@ export function floatingToolbarPluginFactory(options) {
           getConfigWithNodeInfo: getConfigWithNodeInfo
         };
       },
-      apply: expValEquals('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? function (_tr, _pluginState, __oldEditorState, newEditorState) {
-        var suppressedToolbar = getIsToolbarSuppressed(newEditorState);
+      apply: expValEquals('platform_editor_lovability_suppress_toolbar_event', 'isEnabled', true) ? function (_tr, _pluginState, __oldEditorState) {
+        var suppressedToolbar = getIsToolbarSuppressed();
         var newPluginState = {
           getConfigWithNodeInfo: getConfigWithNodeInfo,
           suppressedToolbar: suppressedToolbar

package/dist/esm/ui/Toolbar.js

@@ -28,7 +28,6 @@ import { backgroundPaletteTooltipMessages } from '@atlaskit/editor-common/ui-col
 import { ColorPickerButton, ToolbarArrowKeyNavigationProvider } from '@atlaskit/editor-common/ui-menu';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { checkShouldForceFocusAndApply, forceFocusSelector } from '../pm-plugins/force-focus';
 import { showConfirmDialog } from '../pm-plugins/toolbar-data/commands';
@@ -189,25 +188,20 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           return item.render(editorView, idx, dispatchAnalyticsEvent);
         }
       case 'overflow-dropdown':
-        var options;
-        if (fg('platform_editor_fix_confirm_table_removal')) {
-          // if an option has a confirmDialog, we need to replace its onClick handler
-          // to set the state to show the confirm dialog
+        // if an option has a confirmDialog, we need to replace its onClick handler
+        // to set the state to show the confirm dialog
 
-          // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
-          // which would need knowledge of indexes, showConfirmDialog etc.
-          options = item.options.map(function (option, optionIndex) {
-            if (!('type' in option) && option.confirmDialog) {
-              var onClick = option.confirmDialog ? showConfirmDialog(idx, optionIndex) : option.onClick;
-              return _objectSpread(_objectSpread({}, option), {}, {
-                onClick: onClick
-              });
-            }
-            return option;
-          });
-        } else {
-          options = item.options;
-        }
+        // crudely done here to avoid greater coupling with DropdownMenuItem from `floating-toolbar`
+        // which would need knowledge of indexes, showConfirmDialog etc.
+        var options = item.options.map(function (option, optionIndex) {
+          if (!('type' in option) && option.confirmDialog) {
+            var onClick = option.confirmDialog ? showConfirmDialog(idx, optionIndex) : option.onClick;
+            return _objectSpread(_objectSpread({}, option), {}, {
+              onClick: onClick
+            });
+          }
+          return option;
+        });
         return jsx(Dropdown, {
           alignX: areAnyNewToolbarFlagsEnabled ? 'right' : undefined,
           key: idx,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "9.1.14",
+	"version": "9.1.16",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -27,12 +27,12 @@
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-plugin-analytics": "^7.0.0",
 		"@atlaskit/editor-plugin-context-panel": "^9.0.0",
-		"@atlaskit/editor-plugin-copy-button": "^7.0.0",
+		"@atlaskit/editor-plugin-copy-button": "^7.1.0",
 		"@atlaskit/editor-plugin-decorations": "^7.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^7.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^9.0.0",
 		"@atlaskit/editor-plugin-emoji": "^8.1.0",
-		"@atlaskit/editor-plugin-extension": "^10.0.0",
+		"@atlaskit/editor-plugin-extension": "^10.1.0",
 		"@atlaskit/editor-plugin-interaction": "^14.0.0",
 		"@atlaskit/editor-plugin-user-intent": "^5.0.0",
 		"@atlaskit/editor-prosemirror": "^7.3.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/primitives": "^18.0.0",
 		"@atlaskit/select": "^21.7.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^25.0.0",
+		"@atlaskit/tmp-editor-statsig": "^25.6.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@babel/runtime": "^7.0.0",
@@ -56,7 +56,7 @@
 		"react-loadable": "^5.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.12.0",
+		"@atlaskit/editor-common": "^111.15.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0"
 	},
@@ -112,9 +112,6 @@
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
-		"platform_editor_fix_confirm_table_removal": {
-			"type": "boolean"
-		},
 		"platform_editor_a11y_add_role_to_popup": {
 			"type": "boolean"
 		}