@atlaskit/editor-plugin-table 13.0.7 → 13.1.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-table
 
+## 13.1.0
+
+### Minor Changes
+
+- [`c0113eeccb2df`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c0113eeccb2df) -
+  [ux] ED-29120 add a new config option for default editor preset
+  (`toolbar.enableNewToolbarExperience`) which allows the new toolbar to be disabled. This is needed
+  for editors that can't be excluded at the experiment level.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 13.0.8
+
+### Patch Changes
+
+- [`a8630c1107c3d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/a8630c1107c3d) -
+  [ED-28781] Hide inline text toolbar when other popups are open
+- Updated dependencies
+
 ## 13.0.7
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableResizer.js

@@ -26,6 +26,7 @@ var _utils = require("@atlaskit/editor-tables/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 _commandsWithAnalytics = require("../pm-plugins/commands/commands-with-analytics");
 var _misc = require("../pm-plugins/commands/misc");
 var _tableAnalytics = require("../pm-plugins/table-analytics");
@@ -258,7 +259,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
     tr.setMeta(_tableAnalytics.META_KEYS.OVERFLOW_TRIGGER, {
       name: _analytics.TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
     });
-    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) || (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$u = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u === void 0 || _pluginInjectionApi$u.commands.setCurrentUserIntent('resizing')({
         tr: tr
@@ -335,7 +336,7 @@ var TableResizer = exports.TableResizer = function TableResizer(_ref) {
       tableRef: null
     });
     tr.setMeta('is-resizer-resizing', false);
-    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true)) {
+    if ((0, _expValEqualsNoExposure.expValEqualsNoExposure)('platform_editor_block_menu', 'isEnabled', true) || (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u2;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$u2 = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u2 === void 0 || _pluginInjectionApi$u2.commands.setCurrentUserIntent('default')({
         tr: tr

package/dist/cjs/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.js

@@ -21,16 +21,19 @@ var containerStyles = (0, _primitives.xcss)({
 });
 var FloatingAlignmentButtons = exports.FloatingAlignmentButtons = function FloatingAlignmentButtons(_ref) {
   var alignmentButtons = _ref.alignmentButtons,
-    dispatchCommand = _ref.dispatchCommand;
+    dispatchCommand = _ref.dispatchCommand,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   return (0, _react.jsx)(_primitives.Box, {
     xcss: containerStyles
   }, (0, _react.jsx)(_button.ButtonGroup, null, alignmentButtons.map(function (item, idx) {
     switch (item.type) {
       case 'separator':
+        return (0, _react.jsx)(_ui.FloatingToolbarSeparator
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
-        return (0, _react.jsx)(_ui.FloatingToolbarSeparator, {
-          key: idx
+        , {
+          key: idx,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
       case 'button':
         // Ignored via go/ees005
@@ -49,7 +52,8 @@ var FloatingAlignmentButtons = exports.FloatingAlignmentButtons = function Float
           disabled: item.disabled,
           onClick: function onClick() {
             dispatchCommand(item.onClick);
-          }
+          },
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
     }
   })));

package/dist/cjs/ui/FloatingDragMenu/DragMenu.js

@@ -16,6 +16,7 @@ var _messages = require("@atlaskit/editor-common/messages");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiColor = require("@atlaskit/editor-common/ui-color");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
+var _userIntent = require("@atlaskit/editor-common/user-intent");
 var _utils = require("@atlaskit/editor-common/utils");
 var _editorPalette = require("@atlaskit/editor-palette");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
@@ -24,6 +25,7 @@ var _utils2 = require("@atlaskit/editor-tables/utils");
 var _paintBucketEditorBackgroundColor = _interopRequireDefault(require("@atlaskit/icon/core/migration/paint-bucket--editor-background-color"));
 var _primitives = require("@atlaskit/primitives");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _toggle = _interopRequireDefault(require("@atlaskit/toggle"));
 var _commands = require("../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../pm-plugins/commands/commands-with-analytics");
@@ -508,7 +510,7 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
       items: [createRowNumbersMenuItem()]
     });
   }
-  return (0, _react2.jsx)(_DropdownMenu.DropdownMenu, {
+  var Menu = (0, _react2.jsx)(_DropdownMenu.DropdownMenu, {
     disableKeyboardHandling: isSubmenuOpen,
     section: {
       hasSeparator: true
@@ -524,5 +526,8 @@ var DragMenu = /*#__PURE__*/_react.default.memo(function (_ref) {
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });
+  return (0, _experiments.editorExperiment)('platform_editor_toolbar_aifc', true) && (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? (0, _react2.jsx)(_userIntent.UserIntentPopupWrapper, {
+    api: api
+  }, Menu) : Menu;
 });
 var _default = exports.default = (0, _reactIntlNext.injectIntl)(DragMenu);

package/dist/cjs/ui/toolbar.js

@@ -374,7 +374,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
       var isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
       var nodeType = state.schema.nodes.table;
       var toolbarTitle = 'Table floating controls';
-      var isNewEditorToolbarEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)();
+      var areAnyNewToolbarFlagsEnabled = (0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
       if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1')) {
         var _api$editorViewMode;
         var isDragHandleMenuOpened = false;
@@ -430,10 +430,10 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           return element;
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
-        var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
+        var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
         var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
         var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
-        var colorPicker = !isNewEditorToolbarEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
+        var colorPicker = !areAnyNewToolbarFlagsEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
 
         // Check if we need to show confirm dialog for delete button
         var confirmDialog;
@@ -512,12 +512,12 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           },
           zIndex: _editorSharedStyles.akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu].concat((0, _toConsumableArray2.default)(!isNewEditorToolbarEnabled ? [separator(menu.hidden)] : []), (0, _toConsumableArray2.default)(alignmentMenu), (0, _toConsumableArray2.default)(!isNewEditorToolbarEnabled ? [separator(alignmentMenu.length === 0)] : []), (0, _toConsumableArray2.default)(cellItems), (0, _toConsumableArray2.default)(columnSettingsItems), (0, _toConsumableArray2.default)(colorPicker), (0, _toConsumableArray2.default)(!isNewEditorToolbarEnabled ? [{
+          items: [menu].concat((0, _toConsumableArray2.default)(!areAnyNewToolbarFlagsEnabled ? [separator(menu.hidden)] : []), (0, _toConsumableArray2.default)(alignmentMenu), (0, _toConsumableArray2.default)(!areAnyNewToolbarFlagsEnabled ? [separator(alignmentMenu.length === 0)] : []), (0, _toConsumableArray2.default)(cellItems), (0, _toConsumableArray2.default)(columnSettingsItems), (0, _toConsumableArray2.default)(colorPicker), (0, _toConsumableArray2.default)(!areAnyNewToolbarFlagsEnabled ? [{
             type: 'extensions-placeholder',
             separator: 'end'
           }, copyButton, {
             type: 'separator'
-          }, deleteButton] : [isNewEditorToolbarEnabled && {
+          }, deleteButton] : [areAnyNewToolbarFlagsEnabled && {
             type: 'separator',
             fullHeight: true
           }, {
@@ -544,10 +544,11 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
                   dropdownOptions: dropdownOptions,
                   disabled: function disabled(key) {
                     return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
-                  }
+                  },
+                  areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
                 });
               }
-            }].concat((0, _toConsumableArray2.default)(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)() ? [{
+            }].concat((0, _toConsumableArray2.default)(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !areAnyNewToolbarFlagsEnabled ? [{
               type: 'separator'
             }] : []), [_objectSpread({
               title: intl.formatMessage(_messages.default.copyToClipboard),
@@ -650,7 +651,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       disabled: !wouldChange
     });
   }
-  if (items.length !== 0 && !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)()) {
+  if (items.length !== 0 && !(0, _toolbarFlagCheck.areToolbarFlagsEnabled)(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
     items.push({
       type: 'separator'
     });
@@ -720,7 +721,7 @@ var highlightColumnsHandler = function highlightColumnsHandler(state, dispatch)
   }
   return false;
 };
-var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor, isCommentEditor) {
+var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, isFullWidthEditor, isCommentEditor) {
   var formatMessage = _ref6.formatMessage;
   var tableObject = (0, _utils3.findTable)(editorState.selection);
   if (!tableObject) {
@@ -777,7 +778,9 @@ var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState,
         alignmentButtons: alignmentButtons
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-      }, props));
+      }, props, {
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+      }));
     },
     width: 74,
     height: 32

package/dist/es2019/nodeviews/TableResizer.js

@@ -16,6 +16,7 @@ import { findTable } from '@atlaskit/editor-tables/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 { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
 import { updateWidthToWidest } from '../pm-plugins/commands/misc';
 import { META_KEYS } from '../pm-plugins/table-analytics';
@@ -251,7 +252,7 @@ export const TableResizer = ({
     tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
       name: TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
     });
-    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u;
       pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$u = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u === void 0 ? void 0 : _pluginInjectionApi$u.commands.setCurrentUserIntent('resizing')({
         tr
@@ -330,7 +331,7 @@ export const TableResizer = ({
       tableRef: null
     });
     tr.setMeta('is-resizer-resizing', false);
-    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u2;
       pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$u2 = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u2 === void 0 ? void 0 : _pluginInjectionApi$u2.commands.setCurrentUserIntent('default')({
         tr

package/dist/es2019/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.js

@@ -13,17 +13,20 @@ const containerStyles = xcss({
 });
 export const FloatingAlignmentButtons = ({
   alignmentButtons,
-  dispatchCommand
+  dispatchCommand,
+  areAnyNewToolbarFlagsEnabled
 }) => {
   return jsx(Box, {
     xcss: containerStyles
   }, jsx(ButtonGroup, null, alignmentButtons.map((item, idx) => {
     switch (item.type) {
       case 'separator':
+        return jsx(FloatingToolbarSeparator
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
-        return jsx(FloatingToolbarSeparator, {
-          key: idx
+        , {
+          key: idx,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
       case 'button':
         // Ignored via go/ees005
@@ -42,7 +45,8 @@ export const FloatingAlignmentButtons = ({
           disabled: item.disabled,
           onClick: () => {
             dispatchCommand(item.onClick);
-          }
+          },
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
     }
   })));

package/dist/es2019/ui/FloatingDragMenu/DragMenu.js

@@ -14,6 +14,7 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DropdownMenuSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { backgroundPaletteTooltipMessages, cellBackgroundColorPalette, ColorPalette, getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
@@ -23,6 +24,7 @@ import PaintBucketIcon from '@atlaskit/icon/core/migration/paint-bucket--editor-
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../pm-plugins/commands/commands-with-analytics';
@@ -507,7 +509,7 @@ const DragMenu = /*#__PURE__*/React.memo(({
       items: [createRowNumbersMenuItem()]
     });
   }
-  return jsx(DropdownMenu, {
+  const Menu = jsx(DropdownMenu, {
     disableKeyboardHandling: isSubmenuOpen,
     section: {
       hasSeparator: true
@@ -523,5 +525,8 @@ const DragMenu = /*#__PURE__*/React.memo(({
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });
+  return editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? jsx(UserIntentPopupWrapper, {
+    api: api
+  }, Menu) : Menu;
 });
 export default injectIntl(DragMenu);

package/dist/es2019/ui/toolbar.js

@@ -354,7 +354,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
   const isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
   const nodeType = state.schema.nodes.table;
   const toolbarTitle = 'Table floating controls';
-  const isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
+  const areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
   if (editorExperiment('platform_editor_controls', 'variant1')) {
     var _api$editorViewMode, _api$editorViewMode$s;
     let isDragHandleMenuOpened = false;
@@ -409,10 +409,10 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       return element;
     };
     const menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
-    const alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
+    const alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
     const cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
     const columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
-    const colorPicker = !isNewEditorToolbarEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
+    const colorPicker = !areAnyNewToolbarFlagsEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
 
     // Check if we need to show confirm dialog for delete button
     let confirmDialog;
@@ -482,12 +482,12 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       },
       zIndex: akEditorFloatingPanelZIndex + 1,
       // Place the context menu slightly above the others
-      items: [menu, ...(!isNewEditorToolbarEnabled ? [separator(menu.hidden)] : []), ...alignmentMenu, ...(!isNewEditorToolbarEnabled ? [separator(alignmentMenu.length === 0)] : []), ...cellItems, ...columnSettingsItems, ...colorPicker, ...(!isNewEditorToolbarEnabled ? [{
+      items: [menu, ...(!areAnyNewToolbarFlagsEnabled ? [separator(menu.hidden)] : []), ...alignmentMenu, ...(!areAnyNewToolbarFlagsEnabled ? [separator(alignmentMenu.length === 0)] : []), ...cellItems, ...columnSettingsItems, ...colorPicker, ...(!areAnyNewToolbarFlagsEnabled ? [{
         type: 'extensions-placeholder',
         separator: 'end'
       }, copyButton, {
         type: 'separator'
-      }, deleteButton] : [isNewEditorToolbarEnabled && {
+      }, deleteButton] : [areAnyNewToolbarFlagsEnabled && {
         type: 'separator',
         fullHeight: true
       }, {
@@ -514,10 +514,11 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
               dropdownOptions: dropdownOptions,
               disabled: key => {
                 return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
-              }
+              },
+              areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
             });
           }
-        }, ...(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !areToolbarFlagsEnabled() ? [{
+        }, ...(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !areAnyNewToolbarFlagsEnabled ? [{
           type: 'separator'
         }] : []), {
           title: intl.formatMessage(commonMessages.copyToClipboard),
@@ -606,7 +607,7 @@ const getColumnSettingItems = (editorState, editorView, {
       disabled: !wouldChange
     });
   }
-  if (items.length !== 0 && !areToolbarFlagsEnabled()) {
+  if (items.length !== 0 && !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
     items.push({
       type: 'separator'
     });
@@ -674,7 +675,7 @@ const highlightColumnsHandler = (state, dispatch) => {
 };
 const getAlignmentOptionsConfig = (editorState, {
   formatMessage
-}, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor, isCommentEditor) => {
+}, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, isFullWidthEditor, isCommentEditor) => {
   const tableObject = findTable(editorState.selection);
   if (!tableObject) {
     return [];
@@ -729,7 +730,9 @@ const getAlignmentOptionsConfig = (editorState, {
         alignmentButtons: alignmentButtons
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-      }, props));
+      }, props, {
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+      }));
     },
     width: 74,
     height: 32

package/dist/esm/nodeviews/TableResizer.js

@@ -20,6 +20,7 @@ import { findTable } from '@atlaskit/editor-tables/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 { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
 import { updateWidthToWidest } from '../pm-plugins/commands/misc';
 import { META_KEYS } from '../pm-plugins/table-analytics';
@@ -249,7 +250,7 @@ export var TableResizer = function TableResizer(_ref) {
     tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
       name: TABLE_OVERFLOW_CHANGE_TRIGGER.RESIZED
     });
-    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$u = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u === void 0 || _pluginInjectionApi$u.commands.setCurrentUserIntent('resizing')({
         tr: tr
@@ -326,7 +327,7 @@ export var TableResizer = function TableResizer(_ref) {
       tableRef: null
     });
     tr.setMeta('is-resizer-resizing', false);
-    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true)) {
+    if (expValEqualsNoExposure('platform_editor_block_menu', 'isEnabled', true) || editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true)) {
       var _pluginInjectionApi$u2;
       pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$u2 = pluginInjectionApi.userIntent) === null || _pluginInjectionApi$u2 === void 0 || _pluginInjectionApi$u2.commands.setCurrentUserIntent('default')({
         tr: tr

package/dist/esm/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.js

@@ -13,16 +13,19 @@ var containerStyles = xcss({
 });
 export var FloatingAlignmentButtons = function FloatingAlignmentButtons(_ref) {
   var alignmentButtons = _ref.alignmentButtons,
-    dispatchCommand = _ref.dispatchCommand;
+    dispatchCommand = _ref.dispatchCommand,
+    areAnyNewToolbarFlagsEnabled = _ref.areAnyNewToolbarFlagsEnabled;
   return jsx(Box, {
     xcss: containerStyles
   }, jsx(ButtonGroup, null, alignmentButtons.map(function (item, idx) {
     switch (item.type) {
       case 'separator':
+        return jsx(FloatingToolbarSeparator
         // Ignored via go/ees005
         // eslint-disable-next-line react/no-array-index-key
-        return jsx(FloatingToolbarSeparator, {
-          key: idx
+        , {
+          key: idx,
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
       case 'button':
         // Ignored via go/ees005
@@ -41,7 +44,8 @@ export var FloatingAlignmentButtons = function FloatingAlignmentButtons(_ref) {
           disabled: item.disabled,
           onClick: function onClick() {
             dispatchCommand(item.onClick);
-          }
+          },
+          areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
         });
     }
   })));

package/dist/esm/ui/FloatingDragMenu/DragMenu.js

@@ -16,6 +16,7 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { DropdownMenuSharedCssClassName } from '@atlaskit/editor-common/styles';
 import { backgroundPaletteTooltipMessages, cellBackgroundColorPalette, ColorPalette, getSelectedRowAndColumnFromPalette } from '@atlaskit/editor-common/ui-color';
 import { ArrowKeyNavigationProvider, ArrowKeyNavigationType } from '@atlaskit/editor-common/ui-menu';
+import { UserIntentPopupWrapper } from '@atlaskit/editor-common/user-intent';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
@@ -25,6 +26,7 @@ import PaintBucketIcon from '@atlaskit/icon/core/migration/paint-bucket--editor-
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 import { Box, xcss } from '@atlaskit/primitives';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Toggle from '@atlaskit/toggle';
 import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
 import { setColorWithAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics } from '../../pm-plugins/commands/commands-with-analytics';
@@ -497,7 +499,7 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
       items: [createRowNumbersMenuItem()]
     });
   }
-  return jsx(DropdownMenu, {
+  var Menu = jsx(DropdownMenu, {
     disableKeyboardHandling: isSubmenuOpen,
     section: {
       hasSeparator: true
@@ -513,5 +515,8 @@ var DragMenu = /*#__PURE__*/React.memo(function (_ref) {
     boundariesElement: boundariesElement,
     scrollableElement: scrollableElement
   });
+  return editorExperiment('platform_editor_toolbar_aifc', true) && expValEquals('platform_editor_toolbar_aifc_patch_2', 'isEnabled', true) ? jsx(UserIntentPopupWrapper, {
+    api: api
+  }, Menu) : Menu;
 });
 export default injectIntl(DragMenu);

package/dist/esm/ui/toolbar.js

@@ -367,7 +367,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
       var isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
       var nodeType = state.schema.nodes.table;
       var toolbarTitle = 'Table floating controls';
-      var isNewEditorToolbarEnabled = areToolbarFlagsEnabled();
+      var areAnyNewToolbarFlagsEnabled = areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar));
       if (editorExperiment('platform_editor_controls', 'variant1')) {
         var _api$editorViewMode;
         var isDragHandleMenuOpened = false;
@@ -423,10 +423,10 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           return element;
         };
         var menu = getToolbarMenuConfig(config, pluginState, intl, editorAnalyticsAPI, isTableScalingWithFixedColumnWidthsOptionShown, areTableColumWidthsFixed);
-        var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
+        var alignmentMenu = config.allowTableAlignment && !isNested ? getAlignmentOptionsConfig(state, intl, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
         var cellItems = pluginState.isDragAndDropEnabled ? [] : getCellItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, options === null || options === void 0 ? void 0 : options.isCommentEditor);
         var columnSettingsItems = pluginState.isDragAndDropEnabled ? getColumnSettingItems(state, editorView, intl, getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, options === null || options === void 0 ? void 0 : options.isCommentEditor) : [];
-        var colorPicker = !isNewEditorToolbarEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
+        var colorPicker = !areAnyNewToolbarFlagsEnabled ? getColorPicker(state, menu, intl, editorAnalyticsAPI, getEditorView) : [];
 
         // Check if we need to show confirm dialog for delete button
         var confirmDialog;
@@ -505,12 +505,12 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           },
           zIndex: akEditorFloatingPanelZIndex + 1,
           // Place the context menu slightly above the others
-          items: [menu].concat(_toConsumableArray(!isNewEditorToolbarEnabled ? [separator(menu.hidden)] : []), _toConsumableArray(alignmentMenu), _toConsumableArray(!isNewEditorToolbarEnabled ? [separator(alignmentMenu.length === 0)] : []), _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), _toConsumableArray(!isNewEditorToolbarEnabled ? [{
+          items: [menu].concat(_toConsumableArray(!areAnyNewToolbarFlagsEnabled ? [separator(menu.hidden)] : []), _toConsumableArray(alignmentMenu), _toConsumableArray(!areAnyNewToolbarFlagsEnabled ? [separator(alignmentMenu.length === 0)] : []), _toConsumableArray(cellItems), _toConsumableArray(columnSettingsItems), _toConsumableArray(colorPicker), _toConsumableArray(!areAnyNewToolbarFlagsEnabled ? [{
             type: 'extensions-placeholder',
             separator: 'end'
           }, copyButton, {
             type: 'separator'
-          }, deleteButton] : [isNewEditorToolbarEnabled && {
+          }, deleteButton] : [areAnyNewToolbarFlagsEnabled && {
             type: 'separator',
             fullHeight: true
           }, {
@@ -537,10 +537,11 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
                   dropdownOptions: dropdownOptions,
                   disabled: function disabled(key) {
                     return isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(key);
-                  }
+                  },
+                  areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
                 });
               }
-            }].concat(_toConsumableArray(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !areToolbarFlagsEnabled() ? [{
+            }].concat(_toConsumableArray(extensionApi && extensionState !== null && extensionState !== void 0 && extensionState.extensionProvider && !areAnyNewToolbarFlagsEnabled ? [{
               type: 'separator'
             }] : []), [_objectSpread({
               title: intl.formatMessage(commonMessages.copyToClipboard),
@@ -643,7 +644,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
       disabled: !wouldChange
     });
   }
-  if (items.length !== 0 && !areToolbarFlagsEnabled()) {
+  if (items.length !== 0 && !areToolbarFlagsEnabled(Boolean(api === null || api === void 0 ? void 0 : api.toolbar))) {
     items.push({
       type: 'separator'
     });
@@ -713,7 +714,7 @@ var highlightColumnsHandler = function highlightColumnsHandler(state, dispatch)
   }
   return false;
 };
-var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor, isCommentEditor) {
+var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState, _ref6, editorAnalyticsAPI, getEditorContainerWidth, editorView, shouldUseIncreasedScalingPercent, areAnyNewToolbarFlagsEnabled, isFullWidthEditor, isCommentEditor) {
   var formatMessage = _ref6.formatMessage;
   var tableObject = findTable(editorState.selection);
   if (!tableObject) {
@@ -770,7 +771,9 @@ var getAlignmentOptionsConfig = function getAlignmentOptionsConfig(editorState,
         alignmentButtons: alignmentButtons
         // Ignored via go/ees005
         // eslint-disable-next-line react/jsx-props-no-spreading
-      }, props));
+      }, props, {
+        areAnyNewToolbarFlagsEnabled: areAnyNewToolbarFlagsEnabled
+      }));
     },
     width: 74,
     height: 32

package/dist/types/tablePluginType.d.ts

@@ -11,6 +11,7 @@ import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { LimitedModePlugin } from '@atlaskit/editor-plugin-limited-mode';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginConfig, TableSharedState } from './types';
@@ -53,7 +54,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<ExtensionPlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<UserIntentPlugin>
+    OptionalPlugin<UserIntentPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     actions: TablePluginActions;

package/dist/types/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.d.ts

@@ -6,7 +6,8 @@ import { jsx } from '@emotion/react';
 import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 type Props = {
     alignmentButtons: FloatingToolbarItem<Command>[];
+    areAnyNewToolbarFlagsEnabled: boolean;
     dispatchCommand: (command: Command) => void;
 };
-export declare const FloatingAlignmentButtons: ({ alignmentButtons, dispatchCommand }: Props) => jsx.JSX.Element;
+export declare const FloatingAlignmentButtons: ({ alignmentButtons, dispatchCommand, areAnyNewToolbarFlagsEnabled }: Props) => jsx.JSX.Element;
 export {};

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

@@ -11,6 +11,7 @@ import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
 import type { InteractionPlugin } from '@atlaskit/editor-plugin-interaction';
 import type { LimitedModePlugin } from '@atlaskit/editor-plugin-limited-mode';
 import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { ToolbarPlugin } from '@atlaskit/editor-plugin-toolbar';
 import type { UserIntentPlugin } from '@atlaskit/editor-plugin-user-intent';
 import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { PluginConfig, TableSharedState } from './types';
@@ -53,7 +54,8 @@ export type TablePluginDependencies = [
     OptionalPlugin<FeatureFlagsPlugin>,
     OptionalPlugin<ExtensionPlugin>,
     OptionalPlugin<InteractionPlugin>,
-    OptionalPlugin<UserIntentPlugin>
+    OptionalPlugin<UserIntentPlugin>,
+    OptionalPlugin<ToolbarPlugin>
 ];
 export type TablePlugin = NextEditorPlugin<'table', {
     actions: TablePluginActions;

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

@@ -6,7 +6,8 @@ import { jsx } from '@emotion/react';
 import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 type Props = {
     alignmentButtons: FloatingToolbarItem<Command>[];
+    areAnyNewToolbarFlagsEnabled: boolean;
     dispatchCommand: (command: Command) => void;
 };
-export declare const FloatingAlignmentButtons: ({ alignmentButtons, dispatchCommand }: Props) => jsx.JSX.Element;
+export declare const FloatingAlignmentButtons: ({ alignmentButtons, dispatchCommand, areAnyNewToolbarFlagsEnabled }: Props) => jsx.JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "13.0.7",
+	"version": "13.1.0",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -42,6 +42,7 @@
 		"@atlaskit/editor-plugin-interaction": "^6.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^1.0.0",
 		"@atlaskit/editor-plugin-selection": "^4.0.0",
+		"@atlaskit/editor-plugin-toolbar": "^1.2.0",
 		"@atlaskit/editor-plugin-user-intent": "^2.0.0",
 		"@atlaskit/editor-plugin-width": "^5.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -55,12 +56,12 @@
 		"@atlaskit/pragmatic-drag-and-drop": "^1.7.0",
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
-		"@atlaskit/primitives": "^14.13.0",
+		"@atlaskit/primitives": "^14.14.0",
 		"@atlaskit/react-ufo": "^4.5.0",
 		"@atlaskit/theme": "^20.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.5.0",
+		"@atlaskit/tmp-editor-statsig": "^12.8.0",
 		"@atlaskit/toggle": "^15.1.0",
-		"@atlaskit/tokens": "^6.2.0",
+		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -71,7 +72,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^108.3.0",
+		"@atlaskit/editor-common": "^108.6.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"