@atlaskit/editor-plugin-table 10.6.5 → 10.6.7

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @atlaskit/editor-plugin-table
 
+## 10.6.7
+
+### Patch Changes
+
+- [#137753](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/137753)
+  [`fe189a7e249e9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe189a7e249e9) -
+  EDITOR-317 Cleans up feature gate `platform_editor_nested_tables_resizing`
+- Updated dependencies
+
+## 10.6.6
+
+### Patch Changes
+
+- [#138280](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/138280)
+  [`f2eac0d6772c2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f2eac0d6772c2) -
+  [ux] Adds a new temporary floating toolbar's config option to hide any toolbars when any table's
+  menu is opened.
+- Updated dependencies
+
 ## 10.6.5
 
 ### Patch Changes

package/dist/cjs/pm-plugins/table-resizing/event-handlers.js

@@ -8,7 +8,6 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _styles = require("@atlaskit/editor-common/styles");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils = require("@atlaskit/editor-tables/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _columnResize = require("../commands/column-resize");
 var _misc = require("../commands/misc");
 var _pluginFactory = require("../plugin-factory");
@@ -161,7 +160,7 @@ var handleMouseDown = exports.handleMouseDown = function handleMouseDown(view, e
       // There may be a more elegant solution to this, to avoid a jarring experience. This used to
       // be an equality check but that caused issues when a nested table would change (eg. when it
       // dynamically updates its width on resize)
-      if ((0, _platformFeatureFlags.fg)('platform_editor_nested_tables_resizing') ? !(0, _nodes.tablesHaveDifferentNoOfColumns)(originalTable, table) : table.eq(originalTable)) {
+      if (!(0, _nodes.tablesHaveDifferentNoOfColumns)(originalTable, table)) {
         var _table$attrs;
         var map = _tableMap.TableMap.get(table);
         var colIndex = map.colCount($cell.pos - start) + ($cell.nodeAfter ? $cell.nodeAfter.attrs.colspan : 1) - 1;

package/dist/cjs/pm-plugins/table-resizing/utils/scale-table.js

@@ -10,7 +10,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _nodeWidth = require("@atlaskit/editor-common/node-width");
 var _styles = require("@atlaskit/editor-common/styles");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _columnWidth = require("../../transforms/column-width");
 var _nodes = require("../../utils/nodes");
 var _misc = require("../utils/misc");
@@ -178,11 +177,9 @@ var scaleTable = exports.scaleTable = function scaleTable(tableRef, options, dom
     }
     if (resizeState) {
       tr = (0, _columnWidth.updateColumnWidths)(resizeState, node, start, api)(tr);
-      if ((0, _platformFeatureFlags.fg)('platform_editor_nested_tables_resizing')) {
-        // Avoid adding this transaction separately to the history as these are automatic updates
-        // as a consequence of another action
-        tr.setMeta('addToHistory', false);
-      }
+      // Avoid adding this transaction separately to the history as these are automatic updates
+      // as a consequence of another action
+      tr.setMeta('addToHistory', false);
       if (tr.docChanged) {
         tr.setMeta('scrollIntoView', false);
         // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/dist/cjs/tablePlugin.js

@@ -610,7 +610,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, function () {
+      floatingToolbar: (0, _toolbar.getToolbarConfig)(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, function () {
         return editorViewRef.current;
       }, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)((0, _createPluginConfig.pluginConfig)(options === null || options === void 0 ? void 0 : options.tableOptions))
     },

package/dist/cjs/ui/toolbar.js

@@ -37,7 +37,8 @@ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _commands = require("../pm-plugins/commands");
 var _commandsWithAnalytics = require("../pm-plugins/commands/commands-with-analytics");
-var _pluginFactory = require("../pm-plugins/plugin-factory");
+var _pluginFactory = require("../pm-plugins/drag-and-drop/plugin-factory");
+var _pluginFactory2 = require("../pm-plugins/plugin-factory");
 var _pluginKey = require("../pm-plugins/table-resizing/plugin-key");
 var _misc = require("../pm-plugins/table-resizing/utils/misc");
 var _resizeState = require("../pm-plugins/table-resizing/utils/resize-state");
@@ -155,7 +156,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
     left = initialSelectionRect.left;
   var numberOfColumns = right - left;
   var numberOfRows = bottom - top;
-  var pluginState = (0, _pluginFactory.getPluginState)(editorState);
+  var pluginState = (0, _pluginFactory2.getPluginState)(editorState);
   var options = [{
     id: 'editor.table.insertColumn',
     title: formatMessage(_messages.tableMessages.insertColumn),
@@ -318,7 +319,7 @@ var getToolbarCellOptionsConfig = exports.getToolbarCellOptionsConfig = function
       0: Math.max(numberOfColumns, numberOfRows)
     }),
     onClick: function onClick(state, dispatch) {
-      var _getPluginState = (0, _pluginFactory.getPluginState)(state),
+      var _getPluginState = (0, _pluginFactory2.getPluginState)(state),
         targetCellPosition = _getPluginState.targetCellPosition;
       (0, _commandsWithAnalytics.emptyMultipleCellsWithAnalytics)(editorAnalyticsAPI)(_analytics.INPUT_METHOD.FLOATING_TB, targetCellPosition)(state, dispatch);
       return true;
@@ -361,21 +362,46 @@ var getClosestSelectionOrTableRect = function getClosestSelectionOrTableRect(sta
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   return (0, _utils3.isSelectionType)(selection, 'cell') ? (0, _utils3.getSelectionRect)(selection) : tableRect;
 };
-var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options) {
-  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options) {
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   return function (config) {
     return function (state, intl) {
       var tableObject = (0, _utils3.findTable)(state.selection);
-      var pluginState = (0, _pluginFactory.getPluginState)(state);
+      var pluginState = (0, _pluginFactory2.getPluginState)(state);
       var resizeState = _pluginKey.pluginKey.getState(state);
       var tableWidthState = _tableWidth.pluginKey.getState(state);
       var isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
+      var nodeType = state.schema.nodes.table;
+      var toolbarTitle = 'Table floating controls';
+      if ((0, _experiments.editorExperiment)('platform_editor_controls', 'variant1') && (0, _platformFeatureFlags.fg)('platform_editor_controls_patch_3')) {
+        var isDragHandleMenuOpened = false;
+        var isTableRowOrColumnDragged = false;
+        if (options !== null && options !== void 0 && options.dragAndDropEnabled) {
+          var _getDragDropPluginSta = (0, _pluginFactory.getPluginState)(state),
+            _getDragDropPluginSta2 = _getDragDropPluginSta.isDragMenuOpen,
+            isDragMenuOpen = _getDragDropPluginSta2 === void 0 ? false : _getDragDropPluginSta2,
+            _getDragDropPluginSta3 = _getDragDropPluginSta.isDragging,
+            isDragging = _getDragDropPluginSta3 === void 0 ? false : _getDragDropPluginSta3;
+          isDragHandleMenuOpened = isDragMenuOpen;
+          isTableRowOrColumnDragged = isDragging;
+        }
+        var isTableOrColumnResizing = !!(resizeState !== null && resizeState !== void 0 && resizeState.dragging || tableWidthState !== null && tableWidthState !== void 0 && tableWidthState.resizing);
+        var isTableMenuOpened = pluginState.isContextualMenuOpen || isDragHandleMenuOpened;
+        var shouldSuppressAllToolbars = !pluginState.editorHasFocus || isTableMenuOpened || isTableOrColumnResizing || isTableRowOrColumnDragged;
+        if (shouldSuppressAllToolbars) {
+          return {
+            title: toolbarTitle,
+            items: [],
+            nodeType: nodeType,
+            __suppressAllToolbars: true
+          };
+        }
+      }
 
       // We don't want to show floating toolbar while resizing the table
       var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
-        var nodeType = state.schema.nodes.table;
         var isNested = pluginState.tablePos && (0, _nodes.isTableNested)(state, pluginState.tablePos);
         var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
         var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -463,7 +489,7 @@ var getToolbarConfig = exports.getToolbarConfig = function getToolbarConfig(getE
           } : undefined;
         };
         return {
-          title: 'Table floating controls',
+          title: toolbarTitle,
           getDomRef: getDomRef,
           nodeType: nodeType,
           offset: [0, 18],
@@ -581,7 +607,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
   var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var isTableFixedColumnWidthsOptionEnabled = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
   var isCommentEditor = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
-  var pluginState = (0, _pluginFactory.getPluginState)(editorState);
+  var pluginState = (0, _pluginFactory2.getPluginState)(editorState);
   var selectionOrTableRect = getClosestSelectionOrTableRect(editorState);
   if (!selectionOrTableRect || !editorView) {
     return [];
@@ -617,7 +643,7 @@ var getColumnSettingItems = function getColumnSettingItems(editorState, editorVi
 var getColorPicker = function getColorPicker(state, menu, _ref5, editorAnalyticsAPI, getEditorView) {
   var _node$attrs;
   var formatMessage = _ref5.formatMessage;
-  var _getPluginState2 = (0, _pluginFactory.getPluginState)(state),
+  var _getPluginState2 = (0, _pluginFactory2.getPluginState)(state),
     targetCellPosition = _getPluginState2.targetCellPosition,
     pluginConfig = _getPluginState2.pluginConfig;
   if (!pluginConfig.allowBackgroundColor) {

package/dist/es2019/pm-plugins/table-resizing/event-handlers.js

@@ -2,7 +2,6 @@ import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION, TABLE_OVERFLOW_
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { stopKeyboardColumnResizing } from '../commands/column-resize';
 import { updateResizeHandleDecorations } from '../commands/misc';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
@@ -169,7 +168,7 @@ export const handleMouseDown = (view, event, localResizeHandlePos, getEditorCont
       // There may be a more elegant solution to this, to avoid a jarring experience. This used to
       // be an equality check but that caused issues when a nested table would change (eg. when it
       // dynamically updates its width on resize)
-      if (fg('platform_editor_nested_tables_resizing') ? !tablesHaveDifferentNoOfColumns(originalTable, table) : table.eq(originalTable)) {
+      if (!tablesHaveDifferentNoOfColumns(originalTable, table)) {
         var _table$attrs;
         const map = TableMap.get(table);
         const colIndex = map.colCount($cell.pos - start) + ($cell.nodeAfter ? $cell.nodeAfter.attrs.colspan : 1) - 1;

package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js

@@ -1,7 +1,6 @@
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { updateColumnWidths } from '../../transforms/column-width';
 import { getTableWidth } from '../../utils/nodes';
 import { getLayoutSize } from '../utils/misc';
@@ -164,11 +163,9 @@ export const scaleTable = (tableRef, options, domAtPos, api, isTableScalingEnabl
   }
   if (resizeState) {
     tr = updateColumnWidths(resizeState, node, start, api)(tr);
-    if (fg('platform_editor_nested_tables_resizing')) {
-      // Avoid adding this transaction separately to the history as these are automatic updates
-      // as a consequence of another action
-      tr.setMeta('addToHistory', false);
-    }
+    // Avoid adding this transaction separately to the history as these are automatic updates
+    // as a consequence of another action
+    tr.setMeta('addToHistory', false);
     if (tr.docChanged) {
       tr.setMeta('scrollIntoView', false);
       // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/dist/es2019/tablePlugin.js

@@ -605,7 +605,7 @@ const tablesPlugin = ({
           return tr;
         }
       }],
-      floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, () => editorViewRef.current, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
+      floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, () => editorViewRef.current, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
     },
     usePluginHook({
       editorView

package/dist/es2019/ui/toolbar.js

@@ -32,6 +32,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearHoverSelection, hoverColumns, hoverMergedCells, hoverRows, hoverTable, removeDescendantNodes } from '../pm-plugins/commands';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, deleteTableWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, mergeCellsWithAnalytics, setColorWithAnalytics, setTableAlignmentWithAnalytics, sortColumnWithAnalytics, splitCellWithAnalytics, toggleFixedColumnWidthsOptionAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics, wrapTableInExpandWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
+import { getPluginState as getDragDropPluginState } from '../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
 import { getStaticTableScalingPercent } from '../pm-plugins/table-resizing/utils/misc';
@@ -344,17 +345,41 @@ const getClosestSelectionOrTableRect = state => {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   return isSelectionType(selection, 'cell') ? getSelectionRect(selection) : tableRect;
 };
-export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => config => (state, intl) => {
+export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => config => (state, intl) => {
   const tableObject = findTable(state.selection);
   const pluginState = getPluginState(state);
   const resizeState = tableResizingPluginKey.getState(state);
   const tableWidthState = tableWidthPluginKey.getState(state);
   const isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
+  const nodeType = state.schema.nodes.table;
+  const toolbarTitle = 'Table floating controls';
+  if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3')) {
+    let isDragHandleMenuOpened = false;
+    let isTableRowOrColumnDragged = false;
+    if (options !== null && options !== void 0 && options.dragAndDropEnabled) {
+      const {
+        isDragMenuOpen = false,
+        isDragging = false
+      } = getDragDropPluginState(state);
+      isDragHandleMenuOpened = isDragMenuOpen;
+      isTableRowOrColumnDragged = isDragging;
+    }
+    const isTableOrColumnResizing = !!(resizeState !== null && resizeState !== void 0 && resizeState.dragging || tableWidthState !== null && tableWidthState !== void 0 && tableWidthState.resizing);
+    const isTableMenuOpened = pluginState.isContextualMenuOpen || isDragHandleMenuOpened;
+    const shouldSuppressAllToolbars = !pluginState.editorHasFocus || isTableMenuOpened || isTableOrColumnResizing || isTableRowOrColumnDragged;
+    if (shouldSuppressAllToolbars) {
+      return {
+        title: toolbarTitle,
+        items: [],
+        nodeType,
+        __suppressAllToolbars: true
+      };
+    }
+  }
 
   // We don't want to show floating toolbar while resizing the table
   const isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
   if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
-    const nodeType = state.schema.nodes.table;
     const isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
     const isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
     const areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -433,7 +458,7 @@ export const getToolbarConfig = (getEditorContainerWidth, api, editorAnalyticsAP
       onBlur: clearHoverSelection()
     } : undefined;
     return {
-      title: 'Table floating controls',
+      title: toolbarTitle,
       getDomRef,
       nodeType,
       offset: [0, 18],

package/dist/esm/pm-plugins/table-resizing/event-handlers.js

@@ -2,7 +2,6 @@ import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION, TABLE_OVERFLOW_
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { stopKeyboardColumnResizing } from '../commands/column-resize';
 import { updateResizeHandleDecorations } from '../commands/misc';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
@@ -155,7 +154,7 @@ export var handleMouseDown = function handleMouseDown(view, event, localResizeHa
       // There may be a more elegant solution to this, to avoid a jarring experience. This used to
       // be an equality check but that caused issues when a nested table would change (eg. when it
       // dynamically updates its width on resize)
-      if (fg('platform_editor_nested_tables_resizing') ? !tablesHaveDifferentNoOfColumns(originalTable, table) : table.eq(originalTable)) {
+      if (!tablesHaveDifferentNoOfColumns(originalTable, table)) {
         var _table$attrs;
         var map = TableMap.get(table);
         var colIndex = map.colCount($cell.pos - start) + ($cell.nodeAfter ? $cell.nodeAfter.attrs.colspan : 1) - 1;

package/dist/esm/pm-plugins/table-resizing/utils/scale-table.js

@@ -4,7 +4,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { updateColumnWidths } from '../../transforms/column-width';
 import { getTableWidth } from '../../utils/nodes';
 import { getLayoutSize } from '../utils/misc';
@@ -170,11 +169,9 @@ export var scaleTable = function scaleTable(tableRef, options, domAtPos, api) {
     }
     if (resizeState) {
       tr = updateColumnWidths(resizeState, node, start, api)(tr);
-      if (fg('platform_editor_nested_tables_resizing')) {
-        // Avoid adding this transaction separately to the history as these are automatic updates
-        // as a consequence of another action
-        tr.setMeta('addToHistory', false);
-      }
+      // Avoid adding this transaction separately to the history as these are automatic updates
+      // as a consequence of another action
+      tr.setMeta('addToHistory', false);
       if (tr.docChanged) {
         tr.setMeta('scrollIntoView', false);
         // TODO: ED-8995 - We need to do this check to reduce the number of race conditions when working with tables.

package/dist/esm/tablePlugin.js

@@ -601,7 +601,7 @@ var tablesPlugin = function tablesPlugin(_ref) {
           }
         }];
       },
-      floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags, function () {
+      floatingToolbar: getToolbarConfig(defaultGetEditorContainerWidth, api, editorAnalyticsAPI, function () {
         return editorViewRef.current;
       }, options, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(pluginConfig(options === null || options === void 0 ? void 0 : options.tableOptions))
     },

package/dist/esm/ui/toolbar.js

@@ -36,6 +36,7 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { clearHoverSelection, hoverColumns, hoverMergedCells, hoverRows, hoverTable, removeDescendantNodes } from '../pm-plugins/commands';
 import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics, deleteTableWithAnalytics, distributeColumnsWidthsWithAnalytics, emptyMultipleCellsWithAnalytics, insertColumnWithAnalytics, insertRowWithAnalytics, mergeCellsWithAnalytics, setColorWithAnalytics, setTableAlignmentWithAnalytics, sortColumnWithAnalytics, splitCellWithAnalytics, toggleFixedColumnWidthsOptionAnalytics, toggleHeaderColumnWithAnalytics, toggleHeaderRowWithAnalytics, toggleNumberColumnWithAnalytics, wrapTableInExpandWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
+import { getPluginState as getDragDropPluginState } from '../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
 import { getStaticTableScalingPercent } from '../pm-plugins/table-resizing/utils/misc';
@@ -353,9 +354,9 @@ var getClosestSelectionOrTableRect = function getClosestSelectionOrTableRect(sta
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   return isSelectionType(selection, 'cell') ? getSelectionRect(selection) : tableRect;
 };
-export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorFeatureFlags, getEditorView, options) {
-  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var shouldUseIncreasedScalingPercent = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth, api, editorAnalyticsAPI, getEditorView, options) {
+  var isTableFixedColumnWidthsOptionEnabled = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
+  var shouldUseIncreasedScalingPercent = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   return function (config) {
     return function (state, intl) {
       var tableObject = findTable(state.selection);
@@ -363,11 +364,36 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
       var resizeState = tableResizingPluginKey.getState(state);
       var tableWidthState = tableWidthPluginKey.getState(state);
       var isTableScalingEnabled = (options === null || options === void 0 ? void 0 : options.isTableScalingEnabled) || false;
+      var nodeType = state.schema.nodes.table;
+      var toolbarTitle = 'Table floating controls';
+      if (editorExperiment('platform_editor_controls', 'variant1') && fg('platform_editor_controls_patch_3')) {
+        var isDragHandleMenuOpened = false;
+        var isTableRowOrColumnDragged = false;
+        if (options !== null && options !== void 0 && options.dragAndDropEnabled) {
+          var _getDragDropPluginSta = getDragDropPluginState(state),
+            _getDragDropPluginSta2 = _getDragDropPluginSta.isDragMenuOpen,
+            isDragMenuOpen = _getDragDropPluginSta2 === void 0 ? false : _getDragDropPluginSta2,
+            _getDragDropPluginSta3 = _getDragDropPluginSta.isDragging,
+            isDragging = _getDragDropPluginSta3 === void 0 ? false : _getDragDropPluginSta3;
+          isDragHandleMenuOpened = isDragMenuOpen;
+          isTableRowOrColumnDragged = isDragging;
+        }
+        var isTableOrColumnResizing = !!(resizeState !== null && resizeState !== void 0 && resizeState.dragging || tableWidthState !== null && tableWidthState !== void 0 && tableWidthState.resizing);
+        var isTableMenuOpened = pluginState.isContextualMenuOpen || isDragHandleMenuOpened;
+        var shouldSuppressAllToolbars = !pluginState.editorHasFocus || isTableMenuOpened || isTableOrColumnResizing || isTableRowOrColumnDragged;
+        if (shouldSuppressAllToolbars) {
+          return {
+            title: toolbarTitle,
+            items: [],
+            nodeType: nodeType,
+            __suppressAllToolbars: true
+          };
+        }
+      }
 
       // We don't want to show floating toolbar while resizing the table
       var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
       if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
-        var nodeType = state.schema.nodes.table;
         var isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
         var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
         var areTableColumWidthsFixed = tableObject.node.attrs.displayMode === 'fixed';
@@ -455,7 +481,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
           } : undefined;
         };
         return {
-          title: 'Table floating controls',
+          title: toolbarTitle,
           getDomRef: getDomRef,
           nodeType: nodeType,
           offset: [0, 18],

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

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command, FloatingToolbarDropdown, FloatingToolbarHandler, FloatingToolbarItem, GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
+import type { Command, FloatingToolbarDropdown, FloatingToolbarHandler, FloatingToolbarItem, GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { Rect } from '@atlaskit/editor-tables/table-map';
@@ -8,4 +8,4 @@ import type { PluginConfig, PluginInjectionAPI, ToolbarMenuConfig, ToolbarMenuCo
 export declare const getToolbarMenuConfig: (config: ToolbarMenuConfig, state: ToolbarMenuState, { formatMessage }: ToolbarMenuContext, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isTableScalingWithFixedColumnWidthsOptionShown?: boolean, areTableColumnWidthsFixed?: boolean) => FloatingToolbarItem<Command>;
 export declare const getToolbarCellOptionsConfig: (editorState: EditorState, editorView: EditorView | undefined | null, initialSelectionRect: Rect, { formatMessage }: ToolbarMenuContext, getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isTableScalingEnabled?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, isCommentEditor?: boolean) => FloatingToolbarDropdown<Command>;
 export declare const getClosestSelectionRect: (state: EditorState) => Rect | undefined;
-export declare const getToolbarConfig: (getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, getEditorFeatureFlags: GetEditorFeatureFlags, getEditorView: () => EditorView | null, options?: TablePluginOptions, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => (config: PluginConfig) => FloatingToolbarHandler;
+export declare const getToolbarConfig: (getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, getEditorView: () => EditorView | null, options?: TablePluginOptions, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => (config: PluginConfig) => FloatingToolbarHandler;

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

@@ -1,5 +1,5 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { Command, FloatingToolbarDropdown, FloatingToolbarHandler, FloatingToolbarItem, GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
+import type { Command, FloatingToolbarDropdown, FloatingToolbarHandler, FloatingToolbarItem, GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { Rect } from '@atlaskit/editor-tables/table-map';
@@ -8,4 +8,4 @@ import type { PluginConfig, PluginInjectionAPI, ToolbarMenuConfig, ToolbarMenuCo
 export declare const getToolbarMenuConfig: (config: ToolbarMenuConfig, state: ToolbarMenuState, { formatMessage }: ToolbarMenuContext, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isTableScalingWithFixedColumnWidthsOptionShown?: boolean, areTableColumnWidthsFixed?: boolean) => FloatingToolbarItem<Command>;
 export declare const getToolbarCellOptionsConfig: (editorState: EditorState, editorView: EditorView | undefined | null, initialSelectionRect: Rect, { formatMessage }: ToolbarMenuContext, getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, isTableScalingEnabled?: boolean, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean, isCommentEditor?: boolean) => FloatingToolbarDropdown<Command>;
 export declare const getClosestSelectionRect: (state: EditorState) => Rect | undefined;
-export declare const getToolbarConfig: (getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, getEditorFeatureFlags: GetEditorFeatureFlags, getEditorView: () => EditorView | null, options?: TablePluginOptions, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => (config: PluginConfig) => FloatingToolbarHandler;
+export declare const getToolbarConfig: (getEditorContainerWidth: GetEditorContainerWidth, api: PluginInjectionAPI | undefined | null, editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null, getEditorView: () => EditorView | null, options?: TablePluginOptions, isTableFixedColumnWidthsOptionEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => (config: PluginConfig) => FloatingToolbarHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "10.6.5",
+	"version": "10.6.7",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -132,9 +132,6 @@
 		"platform_editor_live_page_prevent_table_recreation": {
 			"type": "boolean"
 		},
-		"platform_editor_nested_tables_resizing": {
-			"type": "boolean"
-		},
 		"platform_editor_disable_table_lnv": {
 			"type": "boolean"
 		},
@@ -200,6 +197,9 @@
 		},
 		"platform_editor_controls_patch_2": {
 			"type": "boolean"
+		},
+		"platform_editor_controls_patch_3": {
+			"type": "boolean"
 		}
 	}
 }

package/src/pm-plugins/table-resizing/event-handlers.ts

@@ -13,7 +13,6 @@ import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/e
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 
 import type { PluginInjectionAPI } from '../../types';
 import { stopKeyboardColumnResizing } from '../commands/column-resize';
@@ -203,11 +202,7 @@ export const handleMouseDown = (
 			// There may be a more elegant solution to this, to avoid a jarring experience. This used to
 			// be an equality check but that caused issues when a nested table would change (eg. when it
 			// dynamically updates its width on resize)
-			if (
-				fg('platform_editor_nested_tables_resizing')
-					? !tablesHaveDifferentNoOfColumns(originalTable, table)
-					: table.eq(originalTable)
-			) {
+			if (!tablesHaveDifferentNoOfColumns(originalTable, table)) {
 				const map = TableMap.get(table);
 				const colIndex =
 					map.colCount($cell.pos - start) +

package/src/pm-plugins/table-resizing/utils/scale-table.ts

@@ -4,7 +4,6 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { DomAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 
 import type { PluginInjectionAPI } from '../../../types';
 import { updateColumnWidths } from '../../transforms/column-width';
@@ -268,11 +267,9 @@ export const scaleTable =
 
 		if (resizeState) {
 			tr = updateColumnWidths(resizeState, node, start, api)(tr);
-			if (fg('platform_editor_nested_tables_resizing')) {
-				// Avoid adding this transaction separately to the history as these are automatic updates
-				// as a consequence of another action
-				tr.setMeta('addToHistory', false);
-			}
+			// Avoid adding this transaction separately to the history as these are automatic updates
+			// as a consequence of another action
+			tr.setMeta('addToHistory', false);
 
 			if (tr.docChanged) {
 				tr.setMeta('scrollIntoView', false);

package/src/tablePlugin.tsx

@@ -768,7 +768,6 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 				defaultGetEditorContainerWidth,
 				api,
 				editorAnalyticsAPI,
-				options?.getEditorFeatureFlags || defaultGetEditorFeatureFlags,
 				() => editorViewRef.current,
 				options,
 				isTableFixedColumnWidthsOptionEnabled,

package/src/ui/toolbar.tsx

@@ -23,7 +23,6 @@ import type {
 	FloatingToolbarHandler,
 	FloatingToolbarItem,
 	GetEditorContainerWidth,
-	GetEditorFeatureFlags,
 	Icon,
 	typeOption,
 } from '@atlaskit/editor-common/types';
@@ -87,6 +86,7 @@ import {
 	toggleNumberColumnWithAnalytics,
 	wrapTableInExpandWithAnalytics,
 } from '../pm-plugins/commands/commands-with-analytics';
+import { getPluginState as getDragDropPluginState } from '../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing/plugin-key';
 import { getStaticTableScalingPercent } from '../pm-plugins/table-resizing/utils/misc';
@@ -479,7 +479,6 @@ export const getToolbarConfig =
 		getEditorContainerWidth: GetEditorContainerWidth,
 		api: PluginInjectionAPI | undefined | null,
 		editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null,
-		getEditorFeatureFlags: GetEditorFeatureFlags,
 		getEditorView: () => EditorView | null,
 		options?: TablePluginOptions,
 		isTableFixedColumnWidthsOptionEnabled = false,
@@ -492,12 +491,42 @@ export const getToolbarConfig =
 		const resizeState = tableResizingPluginKey.getState(state);
 		const tableWidthState = tableWidthPluginKey.getState(state);
 		const isTableScalingEnabled = options?.isTableScalingEnabled || false;
+		const nodeType = state.schema.nodes.table;
+		const toolbarTitle = 'Table floating controls';
+
+		if (
+			editorExperiment('platform_editor_controls', 'variant1') &&
+			fg('platform_editor_controls_patch_3')
+		) {
+			let isDragHandleMenuOpened = false;
+			let isTableRowOrColumnDragged = false;
+			if (options?.dragAndDropEnabled) {
+				const { isDragMenuOpen = false, isDragging = false } = getDragDropPluginState(state);
+				isDragHandleMenuOpened = isDragMenuOpen;
+				isTableRowOrColumnDragged = isDragging;
+			}
+
+			const isTableOrColumnResizing = !!(resizeState?.dragging || tableWidthState?.resizing);
+			const isTableMenuOpened = pluginState.isContextualMenuOpen || isDragHandleMenuOpened;
+			const shouldSuppressAllToolbars =
+				!pluginState.editorHasFocus ||
+				isTableMenuOpened ||
+				isTableOrColumnResizing ||
+				isTableRowOrColumnDragged;
+			if (shouldSuppressAllToolbars) {
+				return {
+					title: toolbarTitle,
+					items: [],
+					nodeType,
+					__suppressAllToolbars: true,
+				};
+			}
+		}
 
 		// We don't want to show floating toolbar while resizing the table
 		const isWidthResizing = tableWidthState?.resizing;
 
 		if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
-			const nodeType = state.schema.nodes.table;
 			const isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
 			const isTableScalingWithFixedColumnWidthsOptionShown =
 				isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;
@@ -645,7 +674,7 @@ export const getToolbarConfig =
 					: undefined;
 
 			return {
-				title: 'Table floating controls',
+				title: toolbarTitle,
 				getDomRef,
 				nodeType,
 				offset: [0, 18],