@atlaskit/editor-plugin-table 22.4.11 → 22.4.13

package/dist/cjs/ui/TableMenu/row/items/NumberedRowsToggleItem.js

@@ -7,17 +7,44 @@ Object.defineProperty(exports, "__esModule", {
 exports.NumberedRowsToggleItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _messages = require("@atlaskit/editor-common/messages");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _toggle = _interopRequireDefault(require("@atlaskit/toggle"));
-var NumberedRowsToggleItem = exports.NumberedRowsToggleItem = function NumberedRowsToggleItem() {
+var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
+var NumberedRowsToggleItem = exports.NumberedRowsToggleItem = function NumberedRowsToggleItem(props) {
+  var api = props.api;
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorView = _useEditorToolbar.editorView;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var _states$tableState, _states$tableState2;
+      return {
+        isNumberColumnAllowed: (_states$tableState = states.tableState) === null || _states$tableState === void 0 || (_states$tableState = _states$tableState.pluginConfig) === null || _states$tableState === void 0 ? void 0 : _states$tableState.allowNumberColumn,
+        isNumberColumnEnabled: (_states$tableState2 = states.tableState) === null || _states$tableState2 === void 0 ? void 0 : _states$tableState2.isNumberColumnEnabled
+      };
+    }),
+    isNumberColumnAllowed = _useSharedPluginState.isNumberColumnAllowed,
+    isNumberColumnEnabled = _useSharedPluginState.isNumberColumnEnabled;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var label = formatMessage(_messages.tableMessages.numberedRows);
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    (0, _commandsWithAnalytics.toggleNumberColumnWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(editorView.state, editorView.dispatch);
+  };
+  if (!isNumberColumnAllowed) {
+    return null;
+  }
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    onClick: handleClick,
     elemAfter: /*#__PURE__*/_react.default.createElement(_toggle.default, {
       label: label,
-      isChecked: false
+      isChecked: !!isNumberColumnEnabled,
+      onChange: handleClick
     })
   }, label);
 };

package/dist/cjs/ui/TableMenu/shared/consts.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TABLE_MENU_WIDTH = exports.TABLE_MENU_SELECTOR = void 0;
+exports.TABLE_ROW = exports.TABLE_MENU_WIDTH = exports.TABLE_MENU_SELECTOR = exports.TABLE_COLUMN = void 0;
 var TABLE_MENU_WIDTH = exports.TABLE_MENU_WIDTH = 280;
-var TABLE_MENU_SELECTOR = exports.TABLE_MENU_SELECTOR = '[data-testid="column-handle-menu"], [data-testid="row-handle-menu"], [data-toolbar-nested-dropdown-menu]';
+var TABLE_MENU_SELECTOR = exports.TABLE_MENU_SELECTOR = '[data-testid="column-handle-menu"], [data-testid="row-handle-menu"], [data-toolbar-nested-dropdown-menu]';
+var TABLE_ROW = exports.TABLE_ROW = 'table-row';
+var TABLE_COLUMN = exports.TABLE_COLUMN = 'table-column';

package/dist/cjs/ui/TableMenu/shared/getSharedItems.js

@@ -12,7 +12,8 @@ var _keys3 = require("../row/keys");
 var _BackgroundColorItem = require("./items/BackgroundColorItem");
 var _ClearCellsItem = require("./items/ClearCellsItem");
 var _keys4 = require("./keys");
-var getSharedItems = exports.getSharedItems = function getSharedItems() {
+var getSharedItems = exports.getSharedItems = function getSharedItems(_ref) {
+  var api = _ref.api;
   return [{
     type: _keys4.BACKGROUND_COLOR_ITEM.type,
     key: _keys4.BACKGROUND_COLOR_ITEM.key,
@@ -49,7 +50,9 @@ var getSharedItems = exports.getSharedItems = function getSharedItems() {
       rank: _keys.CELL_DANGER_SECTION_RANK[_keys4.CLEAR_CELLS_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_ClearCellsItem.ClearCellsItem, null);
+      return /*#__PURE__*/_react.default.createElement(_ClearCellsItem.ClearCellsItem, {
+        api: api
+      });
     }
   }];
 };

package/dist/cjs/ui/TableMenu/shared/getTableMenuComponents.js

@@ -10,6 +10,6 @@ var _getCellMenuComponents = require("../cell/getCellMenuComponents");
 var _getColumnMenuComponents = require("../column/getColumnMenuComponents");
 var _getRowMenuComponents = require("../row/getRowMenuComponents");
 var _getSharedItems = require("./getSharedItems");
-var getTableMenuComponents = exports.getTableMenuComponents = function getTableMenuComponents() {
-  return [].concat((0, _toConsumableArray2.default)((0, _getRowMenuComponents.getRowMenuComponents)()), (0, _toConsumableArray2.default)((0, _getColumnMenuComponents.getColumnMenuComponents)()), (0, _toConsumableArray2.default)((0, _getCellMenuComponents.getCellMenuComponents)()), (0, _toConsumableArray2.default)((0, _getSharedItems.getSharedItems)()));
+var getTableMenuComponents = exports.getTableMenuComponents = function getTableMenuComponents(params) {
+  return [].concat((0, _toConsumableArray2.default)((0, _getRowMenuComponents.getRowMenuComponents)(params)), (0, _toConsumableArray2.default)((0, _getColumnMenuComponents.getColumnMenuComponents)(params)), (0, _toConsumableArray2.default)((0, _getCellMenuComponents.getCellMenuComponents)()), (0, _toConsumableArray2.default)((0, _getSharedItems.getSharedItems)(params)));
 };

package/dist/cjs/ui/TableMenu/shared/items/ClearCellsItem.js

@@ -7,14 +7,34 @@ Object.defineProperty(exports, "__esModule", {
 exports.ClearCellsItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
+var _analytics = require("@atlaskit/editor-common/analytics");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
+var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem() {
-  var _tooltip;
+var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
+var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
+var _TableMenuContext = require("../TableMenuContext");
+var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem(_ref) {
+  var _tableMenuContext$sel, _tableMenuContext$sel2, _tooltip;
+  var api = _ref.api;
+  var _useEditorToolbar = (0, _toolbar.useEditorToolbar)(),
+    editorView = _useEditorToolbar.editorView;
+  var tableMenuContext = (0, _TableMenuContext.useTableMenuContext)();
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
+  var selectedCellCount = Math.max((_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1, (_tableMenuContext$sel2 = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedRowCount) !== null && _tableMenuContext$sel2 !== void 0 ? _tableMenuContext$sel2 : 1);
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var _getPluginState = (0, _pluginFactory.getPluginState)(editorView.state),
+      targetCellPosition = _getPluginState.targetCellPosition;
+    (0, _commandsWithAnalytics.emptyMultipleCellsWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, targetCellPosition)(editorView.state, editorView.dispatch);
+  };
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.CrossIcon, {
       color: "currentColor",
       label: "",
@@ -24,6 +44,6 @@ var ClearCellsItem = exports.ClearCellsItem = function ClearCellsItem() {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.backspace)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
   }, formatMessage(_messages.tableMessages.clearCells, {
-    0: 1
+    0: selectedCellCount
   }));
 };

package/dist/cjs/ui/TableMenu/shared/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/es2019/tablePlugin.js

@@ -82,7 +82,9 @@ const tablePlugin = ({
   !(options !== null && options !== void 0 && options.isChromelessEditor) && !(options !== null && options !== void 0 && options.isCommentEditor) && (options === null || options === void 0 ? void 0 : (_options$getEditorFea2 = options.getEditorFeatureFlags) === null || _options$getEditorFea2 === void 0 ? void 0 : _options$getEditorFea2.call(options).tableSelector) && editorExperiment('platform_editor_controls', 'variant1');
   if (expValEquals('platform_editor_table_menu_updates', 'isEnabled', true)) {
     var _api$uiControlRegistr;
-    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getTableMenuComponents());
+    api === null || api === void 0 ? void 0 : (_api$uiControlRegistr = api.uiControlRegistry) === null || _api$uiControlRegistr === void 0 ? void 0 : _api$uiControlRegistr.actions.register(getTableMenuComponents({
+      api
+    }));
   }
   return {
     name: 'table',
@@ -110,6 +112,10 @@ const tablePlugin = ({
         wasMaxWidthModeEnabled: !!(options !== null && options !== void 0 && options.wasMaxWidthEnabled),
         isHeaderRowEnabled: tablePluginState.isHeaderRowEnabled,
         isHeaderColumnEnabled: tablePluginState.isHeaderColumnEnabled,
+        isNumberColumnEnabled: tablePluginState.isNumberColumnEnabled,
+        isCommentEditor: tablePluginState.isCommentEditor,
+        isTableScalingEnabled: tablePluginState.isTableScalingEnabled,
+        isTableFixedColumnWidthsOptionEnabled,
         ordering: tablePluginState.ordering,
         isResizing: !!(tableResizingPluginState !== null && tableResizingPluginState !== void 0 && tableResizingPluginState.dragging || tableWidthResizingPluginState !== null && tableWidthResizingPluginState !== void 0 && tableWidthResizingPluginState.resizing),
         isTableResizing: tableWidthResizingPluginState === null || tableWidthResizingPluginState === void 0 ? void 0 : tableWidthResizingPluginState.resizing,

package/dist/es2019/ui/TableMenu/column/getColumnMenuComponents.js

@@ -7,11 +7,14 @@ import { ColumnToggleSection } from './items/ColumnToggleSection';
 import { DeleteColumnItem } from './items/DeleteColumnItem';
 import { DistributeColumnsItem } from './items/DistributeColumnsItem';
 import { HeaderColumnToggleItem } from './items/HeaderColumnToggleItem';
+import { MoveColumnLeftItem } from './items/MoveColumnLeftItem';
 import { MoveColumnRightItem } from './items/MoveColumnRightItem';
 import { SortDecreasingItem } from './items/SortDecreasingItem';
 import { SortIncreasingItem } from './items/SortIncreasingItem';
-import { COLUMN_MENU, COLUMN_TOGGLE_SECTION, COLUMN_BACKGROUND_SECTION, COLUMN_SORT_SECTION, COLUMN_ADD_SECTION, COLUMN_DANGER_SECTION, COLUMN_SECTION_RANK, HEADER_COLUMN_TOGGLE_ITEM, SORT_INCREASING_ITEM, SORT_DECREASING_ITEM, ADD_COLUMN_LEFT_ITEM, ADD_COLUMN_RIGHT_ITEM, MOVE_COLUMN_RIGHT_ITEM, DISTRIBUTE_COLUMNS_ITEM, DELETE_COLUMN_ITEM, COLUMN_TOGGLE_SECTION_RANK, COLUMN_SORT_SECTION_RANK, COLUMN_ADD_SECTION_RANK, COLUMN_DANGER_SECTION_RANK } from './keys';
-export const getColumnMenuComponents = () => [
+import { COLUMN_MENU, COLUMN_TOGGLE_SECTION, COLUMN_BACKGROUND_SECTION, COLUMN_SORT_SECTION, COLUMN_ADD_SECTION, COLUMN_DANGER_SECTION, COLUMN_SECTION_RANK, HEADER_COLUMN_TOGGLE_ITEM, SORT_INCREASING_ITEM, SORT_DECREASING_ITEM, ADD_COLUMN_LEFT_ITEM, ADD_COLUMN_RIGHT_ITEM, MOVE_COLUMN_LEFT_ITEM, MOVE_COLUMN_RIGHT_ITEM, DISTRIBUTE_COLUMNS_ITEM, DELETE_COLUMN_ITEM, COLUMN_TOGGLE_SECTION_RANK, COLUMN_SORT_SECTION_RANK, COLUMN_ADD_SECTION_RANK, COLUMN_DANGER_SECTION_RANK } from './keys';
+export const getColumnMenuComponents = ({
+  api
+}) => [
 // --- Menu surface ---
 {
   type: COLUMN_MENU.type,
@@ -26,7 +29,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_MENU.key,
     rank: COLUMN_SECTION_RANK[COLUMN_TOGGLE_SECTION.key]
   }],
-  component: props => /*#__PURE__*/React.createElement(ColumnToggleSection, null, props.children)
+  component: props => /*#__PURE__*/React.createElement(ColumnToggleSection, {
+    api: api
+  }, props.children)
 }, {
   type: HEADER_COLUMN_TOGGLE_ITEM.type,
   key: HEADER_COLUMN_TOGGLE_ITEM.key,
@@ -35,7 +40,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_TOGGLE_SECTION.key,
     rank: COLUMN_TOGGLE_SECTION_RANK[HEADER_COLUMN_TOGGLE_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(HeaderColumnToggleItem, null)
+  component: () => /*#__PURE__*/React.createElement(HeaderColumnToggleItem, {
+    api: api
+  })
 },
 // --- Background color section ---
 {
@@ -46,7 +53,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_MENU.key,
     rank: COLUMN_SECTION_RANK[COLUMN_BACKGROUND_SECTION.key]
   }],
-  component: props => /*#__PURE__*/React.createElement(ColumnBackgroundSection, null, props.children)
+  component: props => /*#__PURE__*/React.createElement(ColumnBackgroundSection, {
+    api: api
+  }, props.children)
 },
 // --- Sort section ---
 {
@@ -68,7 +77,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_SORT_SECTION.key,
     rank: COLUMN_SORT_SECTION_RANK[SORT_INCREASING_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(SortIncreasingItem, null)
+  component: () => /*#__PURE__*/React.createElement(SortIncreasingItem, {
+    api: api
+  })
 }, {
   type: SORT_DECREASING_ITEM.type,
   key: SORT_DECREASING_ITEM.key,
@@ -77,7 +88,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_SORT_SECTION.key,
     rank: COLUMN_SORT_SECTION_RANK[SORT_DECREASING_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(SortDecreasingItem, null)
+  component: () => /*#__PURE__*/React.createElement(SortDecreasingItem, {
+    api: api
+  })
 },
 // --- Add / Move section ---
 {
@@ -99,7 +112,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_ADD_SECTION.key,
     rank: COLUMN_ADD_SECTION_RANK[ADD_COLUMN_LEFT_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(AddColumnLeftItem, null)
+  component: () => /*#__PURE__*/React.createElement(AddColumnLeftItem, {
+    api: api
+  })
 }, {
   type: ADD_COLUMN_RIGHT_ITEM.type,
   key: ADD_COLUMN_RIGHT_ITEM.key,
@@ -108,7 +123,20 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_ADD_SECTION.key,
     rank: COLUMN_ADD_SECTION_RANK[ADD_COLUMN_RIGHT_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(AddColumnRightItem, null)
+  component: () => /*#__PURE__*/React.createElement(AddColumnRightItem, {
+    api: api
+  })
+}, {
+  type: MOVE_COLUMN_LEFT_ITEM.type,
+  key: MOVE_COLUMN_LEFT_ITEM.key,
+  parents: [{
+    type: COLUMN_ADD_SECTION.type,
+    key: COLUMN_ADD_SECTION.key,
+    rank: COLUMN_ADD_SECTION_RANK[MOVE_COLUMN_LEFT_ITEM.key]
+  }],
+  component: () => /*#__PURE__*/React.createElement(MoveColumnLeftItem, {
+    api: api
+  })
 }, {
   type: MOVE_COLUMN_RIGHT_ITEM.type,
   key: MOVE_COLUMN_RIGHT_ITEM.key,
@@ -117,7 +145,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_ADD_SECTION.key,
     rank: COLUMN_ADD_SECTION_RANK[MOVE_COLUMN_RIGHT_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(MoveColumnRightItem, null)
+  component: () => /*#__PURE__*/React.createElement(MoveColumnRightItem, {
+    api: api
+  })
 }, {
   type: DISTRIBUTE_COLUMNS_ITEM.type,
   key: DISTRIBUTE_COLUMNS_ITEM.key,
@@ -126,7 +156,9 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_ADD_SECTION.key,
     rank: COLUMN_ADD_SECTION_RANK[DISTRIBUTE_COLUMNS_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(DistributeColumnsItem, null)
+  component: () => /*#__PURE__*/React.createElement(DistributeColumnsItem, {
+    api: api
+  })
 },
 // --- Danger section (Clear cells, Delete column) ---
 {
@@ -148,5 +180,7 @@ export const getColumnMenuComponents = () => [
     key: COLUMN_DANGER_SECTION.key,
     rank: COLUMN_DANGER_SECTION_RANK[DELETE_COLUMN_ITEM.key]
   }],
-  component: () => /*#__PURE__*/React.createElement(DeleteColumnItem, null)
+  component: () => /*#__PURE__*/React.createElement(DeleteColumnItem, {
+    api: api
+  })
 }];

package/dist/es2019/ui/TableMenu/column/items/AddColumnLeftItem.js

@@ -1,14 +1,50 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { addColumnBefore, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { TableColumnAddLeftIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export const AddColumnLeftItem = () => {
+import { insertColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+export const AddColumnLeftItem = ({
+  api
+}) => {
   var _tooltip;
+  const {
+    editorView
+  } = useEditorToolbar();
   const {
     formatMessage
   } = useIntl();
+  const {
+    isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    const tableState = states.tableState;
+    return {
+      isCommentEditor: tableState === null || tableState === void 0 ? void 0 : tableState.isCommentEditor,
+      isTableFixedColumnWidthsOptionEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableFixedColumnWidthsOptionEnabled,
+      isTableScalingEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableScalingEnabled
+    };
+  });
+  const handleClick = () => {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    const selectionRect = getSelectionRect(editorView.state.selection);
+    const index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left;
+    if (index === undefined) {
+      return;
+    }
+    const shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
+    insertColumnWithAnalytics(api, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnAddLeftIcon, {
       color: "currentColor",
       label: "",

package/dist/es2019/ui/TableMenu/column/items/AddColumnRightItem.js

@@ -1,14 +1,50 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { addColumnAfter, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { TableColumnAddRightIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export const AddColumnRightItem = () => {
+import { insertColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+export const AddColumnRightItem = ({
+  api
+}) => {
   var _tooltip;
+  const {
+    editorView
+  } = useEditorToolbar();
   const {
     formatMessage
   } = useIntl();
+  const {
+    isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    const tableState = states.tableState;
+    return {
+      isCommentEditor: tableState === null || tableState === void 0 ? void 0 : tableState.isCommentEditor,
+      isTableFixedColumnWidthsOptionEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableFixedColumnWidthsOptionEnabled,
+      isTableScalingEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableScalingEnabled
+    };
+  });
+  const handleClick = () => {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    const selectionRect = getSelectionRect(editorView.state.selection);
+    const index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
+    if (index === undefined) {
+      return;
+    }
+    const shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
+    insertColumnWithAnalytics(api, api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnAddRightIcon, {
       color: "currentColor",
       label: "",

package/dist/es2019/ui/TableMenu/column/items/ColumnBackgroundSection.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 import { shouldShowHeaderColumnToggle } from './HeaderColumnToggleItem';
@@ -10,10 +11,23 @@ import { shouldShowHeaderColumnToggle } from './HeaderColumnToggleItem';
  * the very top of the menu.
  */
 export const ColumnBackgroundSection = ({
+  api,
   children
 }) => {
   const tableMenuContext = useTableMenuContext();
-  const hasSeparator = shouldShowHeaderColumnToggle(tableMenuContext);
+  const {
+    isHeaderColumnAllowed
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    var _states$tableState, _states$tableState$pl;
+    return {
+      isHeaderColumnAllowed: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : (_states$tableState$pl = _states$tableState.pluginConfig) === null || _states$tableState$pl === void 0 ? void 0 : _states$tableState$pl.allowHeaderColumn
+    };
+  });
+  const hasSeparator = shouldShowHeaderColumnToggle({
+    isFirstColumn: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn,
+    isHeaderColumnAllowed,
+    selectedColumnCount: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount
+  });
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
     hasSeparator: hasSeparator
   }, children);

package/dist/es2019/ui/TableMenu/column/items/ColumnToggleSection.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
 import { shouldShowHeaderColumnToggle } from './HeaderColumnToggleItem';
@@ -9,10 +10,23 @@ import { shouldShowHeaderColumnToggle } from './HeaderColumnToggleItem';
  * empty wrapper (and so the section below can drop its leading separator).
  */
 export const ColumnToggleSection = ({
+  api,
   children
 }) => {
   const tableMenuContext = useTableMenuContext();
-  if (!shouldShowHeaderColumnToggle(tableMenuContext)) {
+  const {
+    isHeaderColumnAllowed
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    var _states$tableState, _states$tableState$pl;
+    return {
+      isHeaderColumnAllowed: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : (_states$tableState$pl = _states$tableState.pluginConfig) === null || _states$tableState$pl === void 0 ? void 0 : _states$tableState$pl.allowHeaderColumn
+    };
+  });
+  if (!shouldShowHeaderColumnToggle({
+    isFirstColumn: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn,
+    isHeaderColumnAllowed,
+    selectedColumnCount: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount
+  })) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, null, children);

package/dist/es2019/ui/TableMenu/column/items/DeleteColumnItem.js

@@ -1,14 +1,74 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { deleteColumn, tooltip } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { DeleteIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export const DeleteColumnItem = () => {
-  var _tooltip;
+import { clearHoverSelection, hoverColumns } from '../../../../pm-plugins/commands';
+import { deleteColumnsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+import { getSelectedColumnIndexes } from '../../../../pm-plugins/utils/selection';
+import { useTableMenuContext } from '../../shared/TableMenuContext';
+export const DeleteColumnItem = ({
+  api
+}) => {
+  var _tableMenuContext$sel, _tooltip;
+  const {
+    editorView
+  } = useEditorToolbar();
+  const tableMenuContext = useTableMenuContext();
+  const selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
   const {
     formatMessage
   } = useIntl();
+  const {
+    isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    const tableState = states.tableState;
+    return {
+      isCommentEditor: tableState === null || tableState === void 0 ? void 0 : tableState.isCommentEditor,
+      isTableFixedColumnWidthsOptionEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableFixedColumnWidthsOptionEnabled,
+      isTableScalingEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableScalingEnabled
+    };
+  });
+  const handleMouseEnter = () => {
+    if (!editorView) {
+      return;
+    }
+    const selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    hoverColumns(getSelectedColumnIndexes(selectionRect), true)(editorView.state, editorView.dispatch);
+  };
+  const handleMouseLeave = () => {
+    if (!editorView) {
+      return;
+    }
+    clearHoverSelection()(editorView.state, editorView.dispatch);
+  };
+  const handleClick = () => {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    const selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    const shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
+    deleteColumnsWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.TABLE_CONTEXT_MENU, selectionRect)(editorView.state, editorView.dispatch, editorView);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
+    onFocus: handleMouseEnter,
+    onMouseEnter: handleMouseEnter,
+    onBlur: handleMouseLeave,
+    onMouseLeave: handleMouseLeave,
     elemBefore: /*#__PURE__*/React.createElement(DeleteIcon, {
       color: "currentColor",
       label: "",
@@ -18,6 +78,6 @@ export const DeleteColumnItem = () => {
       shortcut: (_tooltip = tooltip(deleteColumn)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
   }, formatMessage(messages.removeColumns, {
-    0: 1
+    0: selectedColumnCount
   }));
 };

package/dist/es2019/ui/TableMenu/column/items/DistributeColumnsItem.js

@@ -1,23 +1,59 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { TableColumnsDistributeIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { distributeColumnsWidthsWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+import { getNewResizeStateFromSelectedColumns } from '../../../../pm-plugins/table-resizing/utils/resize-state';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
-
 /** Distribute columns is only visible when more than one column is selected. */
-const shouldShowDistributeColumns = tableMenuContext => {
-  var _tableMenuContext$sel;
-  return ((_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 0) > 1;
-};
-export const DistributeColumnsItem = () => {
+const shouldShowDistributeColumns = selectedColumnCount => (selectedColumnCount !== null && selectedColumnCount !== void 0 ? selectedColumnCount : 0) > 1;
+export const DistributeColumnsItem = ({
+  api
+}) => {
+  const {
+    editorView
+  } = useEditorToolbar();
   const tableMenuContext = useTableMenuContext();
   const {
     formatMessage
   } = useIntl();
-  if (!shouldShowDistributeColumns(tableMenuContext)) {
+  const {
+    isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled
+  } = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], states => {
+    const tableState = states.tableState;
+    return {
+      isCommentEditor: tableState === null || tableState === void 0 ? void 0 : tableState.isCommentEditor,
+      isTableFixedColumnWidthsOptionEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableFixedColumnWidthsOptionEnabled,
+      isTableScalingEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isTableScalingEnabled
+    };
+  });
+  const handleClick = () => {
+    var _api$width, _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    const selectionRect = getSelectionRect(editorView.state.selection);
+    const editorContainerWidth = api === null || api === void 0 ? void 0 : (_api$width = api.width) === null || _api$width === void 0 ? void 0 : _api$width.sharedState.currentState();
+    if (!selectionRect || !editorContainerWidth) {
+      return;
+    }
+    const newResizeState = getNewResizeStateFromSelectedColumns(selectionRect, editorView.state, editorView.domAtPos.bind(editorView), () => editorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
+    if (!newResizeState) {
+      return;
+    }
+    distributeColumnsWidthsWithAnalytics(api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api)(INPUT_METHOD.TABLE_CONTEXT_MENU, newResizeState)(editorView.state, editorView.dispatch);
+  };
+  if (!shouldShowDistributeColumns(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount)) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnsDistributeIcon, {
       color: "currentColor",
       label: "",