@atlaskit/editor-plugin-table 22.4.11 → 22.4.13

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

@@ -1,13 +1,70 @@
 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 var DeleteColumnItem = function 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 var DeleteColumnItem = function DeleteColumnItem(_ref) {
+  var _tableMenuContext$sel, _tooltip;
+  var api = _ref.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
+  var tableMenuContext = useTableMenuContext();
+  var selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var 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
+      };
+    }),
+    isCommentEditor = _useSharedPluginState.isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled = _useSharedPluginState.isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled = _useSharedPluginState.isTableScalingEnabled;
+  var handleMouseEnter = function handleMouseEnter() {
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    hoverColumns(getSelectedColumnIndexes(selectionRect), true)(editorView.state, editorView.dispatch);
+  };
+  var handleMouseLeave = function handleMouseLeave() {
+    if (!editorView) {
+      return;
+    }
+    clearHoverSelection()(editorView.state, editorView.dispatch);
+  };
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
+    deleteColumnsWithAnalytics(api === null || api === 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: "",
@@ -17,6 +74,6 @@ export var DeleteColumnItem = function DeleteColumnItem() {
       shortcut: (_tooltip = tooltip(deleteColumn)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
   }, formatMessage(messages.removeColumns, {
-    0: 1
+    0: selectedColumnCount
   }));
 };

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

@@ -1,22 +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. */
-var shouldShowDistributeColumns = function 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;
+var shouldShowDistributeColumns = function shouldShowDistributeColumns(selectedColumnCount) {
+  return (selectedColumnCount !== null && selectedColumnCount !== void 0 ? selectedColumnCount : 0) > 1;
 };
-export var DistributeColumnsItem = function DistributeColumnsItem() {
+export var DistributeColumnsItem = function DistributeColumnsItem(_ref) {
+  var api = _ref.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var tableMenuContext = useTableMenuContext();
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  if (!shouldShowDistributeColumns(tableMenuContext)) {
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var 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
+      };
+    }),
+    isCommentEditor = _useSharedPluginState.isCommentEditor,
+    isTableFixedColumnWidthsOptionEnabled = _useSharedPluginState.isTableFixedColumnWidthsOptionEnabled,
+    isTableScalingEnabled = _useSharedPluginState.isTableScalingEnabled;
+  var handleClick = function handleClick() {
+    var _api$width, _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    var editorContainerWidth = api === null || api === void 0 || (_api$width = api.width) === null || _api$width === void 0 ? void 0 : _api$width.sharedState.currentState();
+    if (!selectionRect || !editorContainerWidth) {
+      return;
+    }
+    var newResizeState = getNewResizeStateFromSelectedColumns(selectionRect, editorView.state, editorView.domAtPos.bind(editorView), function () {
+      return editorContainerWidth;
+    }, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
+    if (!newResizeState) {
+      return;
+    }
+    distributeColumnsWidthsWithAnalytics(api === null || api === 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: "",

package/dist/esm/ui/TableMenu/column/items/HeaderColumnToggleItem.js

@@ -1,10 +1,12 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
 import { ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
 import Toggle from '@atlaskit/toggle';
+import { toggleHeaderColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
-
 /**
  * Header column toggle is only visible when the first column is the entire
  * selection.
@@ -13,21 +15,49 @@ import { useTableMenuContext } from '../../shared/TableMenuContext';
  * `ColumnBackgroundSection` (which drops its leading separator alongside)
  * can stay in lockstep with this rule without redefining it.
  */
-export var shouldShowHeaderColumnToggle = function shouldShowHeaderColumnToggle(tableMenuContext) {
-  return (tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn) === true && tableMenuContext.selectedColumnCount === 1;
+export var shouldShowHeaderColumnToggle = function shouldShowHeaderColumnToggle(_ref) {
+  var isFirstColumn = _ref.isFirstColumn,
+    isHeaderColumnAllowed = _ref.isHeaderColumnAllowed,
+    selectedColumnCount = _ref.selectedColumnCount;
+  return isHeaderColumnAllowed === true && isFirstColumn === true && selectedColumnCount === 1;
 };
-export var HeaderColumnToggleItem = function HeaderColumnToggleItem() {
+export var HeaderColumnToggleItem = function HeaderColumnToggleItem(props) {
+  var api = props.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var tableMenuContext = useTableMenuContext();
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var _states$tableState, _states$tableState2;
+      return {
+        isHeaderColumnAllowed: (_states$tableState = states.tableState) === null || _states$tableState === void 0 || (_states$tableState = _states$tableState.pluginConfig) === null || _states$tableState === void 0 ? void 0 : _states$tableState.allowHeaderColumn,
+        isHeaderColumnEnabled: (_states$tableState2 = states.tableState) === null || _states$tableState2 === void 0 ? void 0 : _states$tableState2.isHeaderColumnEnabled
+      };
+    }),
+    isHeaderColumnAllowed = _useSharedPluginState.isHeaderColumnAllowed,
+    isHeaderColumnEnabled = _useSharedPluginState.isHeaderColumnEnabled;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var label = formatMessage(messages.headerColumn);
-  if (!shouldShowHeaderColumnToggle(tableMenuContext)) {
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    toggleHeaderColumnWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(editorView.state, editorView.dispatch);
+  };
+  if (!shouldShowHeaderColumnToggle({
+    isFirstColumn: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn,
+    isHeaderColumnAllowed: isHeaderColumnAllowed,
+    selectedColumnCount: tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount
+  })) {
     return null;
   }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemAfter: /*#__PURE__*/React.createElement(Toggle, {
       label: label,
-      isChecked: false
+      isChecked: !!isHeaderColumnEnabled,
+      onChange: handleClick
     })
   }, label);
 };

package/dist/esm/ui/TableMenu/column/items/MoveColumnLeftItem.js

@@ -0,0 +1,62 @@
+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 { moveColumnLeft, 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 { ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
+import TableColumnMoveLeftIcon from '@atlaskit/icon/core/table-column-move-left';
+import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
+import { getPluginState } from '../../../../pm-plugins/plugin-factory';
+import { getSelectedColumnIndexes } from '../../../../pm-plugins/utils/selection';
+import { TABLE_COLUMN } from '../../shared/consts';
+import { useTableMenuContext } from '../../shared/TableMenuContext';
+var shouldShowMoveColumnLeft = function shouldShowMoveColumnLeft(isFirstColumn) {
+  return !isFirstColumn;
+};
+export var MoveColumnLeftItem = function MoveColumnLeftItem(props) {
+  var _tableMenuContext$sel, _tooltip;
+  var api = props.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
+  var tableMenuContext = useTableMenuContext();
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var _states$tableState;
+      return {
+        tableNode: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.tableNode
+      };
+    }),
+    tableNode = _useSharedPluginState.tableNode;
+  var selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics, _api$accessibilityUti;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify, getPluginState(editorView.state).getIntl)(INPUT_METHOD.TABLE_CONTEXT_MENU, TABLE_COLUMN, getSelectedColumnIndexes(selectionRect), selectionRect.left - 1)(editorView.state, editorView.dispatch);
+  };
+  if (!tableNode || !shouldShowMoveColumnLeft(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isFirstColumn)) {
+    return null;
+  }
+  return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
+    elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveLeftIcon, {
+      color: "currentColor",
+      label: "",
+      size: "small"
+    }),
+    elemAfter: /*#__PURE__*/React.createElement(ToolbarKeyboardShortcutHint, {
+      shortcut: (_tooltip = tooltip(moveColumnLeft)) !== null && _tooltip !== void 0 ? _tooltip : ''
+    })
+  }, formatMessage(messages.moveColumnLeft, {
+    0: selectedColumnCount
+  }));
+};

package/dist/esm/ui/TableMenu/column/items/MoveColumnRightItem.js

@@ -1,13 +1,52 @@
 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 { moveColumnRight, 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 { TableColumnMoveRightIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export var MoveColumnRightItem = function MoveColumnRightItem() {
-  var _tooltip;
+import { moveSourceWithAnalytics } from '../../../../pm-plugins/drag-and-drop/commands-with-analytics';
+import { getPluginState } from '../../../../pm-plugins/plugin-factory';
+import { getSelectedColumnIndexes } from '../../../../pm-plugins/utils/selection';
+import { TABLE_COLUMN } from '../../shared/consts';
+import { useTableMenuContext } from '../../shared/TableMenuContext';
+var shouldShowMoveColumnRight = function shouldShowMoveColumnRight(isLastColumn) {
+  return !isLastColumn;
+};
+export var MoveColumnRightItem = function MoveColumnRightItem(props) {
+  var _tableMenuContext$sel, _tooltip;
+  var api = props.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
+  var tableMenuContext = useTableMenuContext();
+  var _useSharedPluginState = useSharedPluginStateWithSelector(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+      var _states$tableState;
+      return {
+        tableNode: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.tableNode
+      };
+    }),
+    tableNode = _useSharedPluginState.tableNode;
+  var selectedColumnCount = (_tableMenuContext$sel = tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.selectedColumnCount) !== null && _tableMenuContext$sel !== void 0 ? _tableMenuContext$sel : 1;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics, _api$accessibilityUti;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    if (!selectionRect) {
+      return;
+    }
+    moveSourceWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, api === null || api === void 0 || (_api$accessibilityUti = api.accessibilityUtils) === null || _api$accessibilityUti === void 0 ? void 0 : _api$accessibilityUti.actions.ariaNotify, getPluginState(editorView.state).getIntl)(INPUT_METHOD.TABLE_CONTEXT_MENU, TABLE_COLUMN, getSelectedColumnIndexes(selectionRect), selectionRect.right)(editorView.state, editorView.dispatch);
+  };
+  if (!tableNode || !shouldShowMoveColumnRight(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.isLastColumn)) {
+    return null;
+  }
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableColumnMoveRightIcon, {
       color: "currentColor",
       label: "",
@@ -17,6 +56,6 @@ export var MoveColumnRightItem = function MoveColumnRightItem() {
       shortcut: (_tooltip = tooltip(moveColumnRight)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
   }, formatMessage(messages.moveColumnRight, {
-    0: 1
+    0: selectedColumnCount
   }));
 };

package/dist/esm/ui/TableMenu/column/items/SortDecreasingItem.js

@@ -1,13 +1,34 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { ArrowDownIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
-export var SortDecreasingItem = function SortDecreasingItem() {
+export var SortDecreasingItem = function SortDecreasingItem(_ref) {
+  var api = _ref.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var tableMenuContext = useTableMenuContext();
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    var columnIndex = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left;
+    if (columnIndex === undefined) {
+      return;
+    }
+    sortColumnWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, columnIndex, SortOrder.DESC)(editorView.state, editorView.dispatch);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     isDisabled: Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.hasMergedCellsInTable),
     elemBefore: /*#__PURE__*/React.createElement(ArrowDownIcon, {
       color: "currentColor",

package/dist/esm/ui/TableMenu/column/items/SortIncreasingItem.js

@@ -1,13 +1,34 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
+import { useEditorToolbar } from '@atlaskit/editor-common/toolbar';
+import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { ArrowUpIcon, ToolbarDropdownItem } from '@atlaskit/editor-toolbar';
+import { sortColumnWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
 import { useTableMenuContext } from '../../shared/TableMenuContext';
-export var SortIncreasingItem = function SortIncreasingItem() {
+export var SortIncreasingItem = function SortIncreasingItem(_ref) {
+  var api = _ref.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var tableMenuContext = useTableMenuContext();
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    var columnIndex = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left;
+    if (columnIndex === undefined) {
+      return;
+    }
+    sortColumnWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, columnIndex, SortOrder.ASC)(editorView.state, editorView.dispatch);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     isDisabled: Boolean(tableMenuContext === null || tableMenuContext === void 0 ? void 0 : tableMenuContext.hasMergedCellsInTable),
     elemBefore: /*#__PURE__*/React.createElement(ArrowUpIcon, {
       color: "currentColor",

package/dist/esm/ui/TableMenu/column/keys.js

@@ -51,6 +51,10 @@ export var ADD_COLUMN_RIGHT_ITEM = {
   type: 'menu-item',
   key: 'add-column-right'
 };
+export var MOVE_COLUMN_LEFT_ITEM = {
+  type: 'menu-item',
+  key: 'move-column-left'
+};
 export var MOVE_COLUMN_RIGHT_ITEM = {
   type: 'menu-item',
   key: 'move-column-right'
@@ -69,5 +73,5 @@ export var DELETE_COLUMN_ITEM = {
 export var COLUMN_TOGGLE_SECTION_RANK = _defineProperty({}, HEADER_COLUMN_TOGGLE_ITEM.key, 100);
 export var COLUMN_BACKGROUND_SECTION_RANK = _defineProperty({}, BACKGROUND_COLOR_ITEM.key, 100);
 export var COLUMN_SORT_SECTION_RANK = _defineProperty(_defineProperty({}, SORT_INCREASING_ITEM.key, 100), SORT_DECREASING_ITEM.key, 200);
-export var COLUMN_ADD_SECTION_RANK = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ADD_COLUMN_LEFT_ITEM.key, 100), ADD_COLUMN_RIGHT_ITEM.key, 200), MOVE_COLUMN_RIGHT_ITEM.key, 300), DISTRIBUTE_COLUMNS_ITEM.key, 400);
+export var COLUMN_ADD_SECTION_RANK = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, ADD_COLUMN_LEFT_ITEM.key, 100), ADD_COLUMN_RIGHT_ITEM.key, 200), MOVE_COLUMN_LEFT_ITEM.key, 300), MOVE_COLUMN_RIGHT_ITEM.key, 400), DISTRIBUTE_COLUMNS_ITEM.key, 500);
 export var COLUMN_DANGER_SECTION_RANK = _defineProperty(_defineProperty({}, CLEAR_CELLS_ITEM.key, 100), DELETE_COLUMN_ITEM.key, 200);

package/dist/esm/ui/TableMenu/row/getRowMenuComponents.js

@@ -8,7 +8,8 @@ import { MoveRowDownItem } from './items/MoveRowDownItem';
 import { MoveRowUpItem } from './items/MoveRowUpItem';
 import { NumberedRowsToggleItem } from './items/NumberedRowsToggleItem';
 import { ROW_MENU, ROW_TOGGLE_SECTION, ROW_BACKGROUND_SECTION, ROW_ADD_SECTION, ROW_DANGER_SECTION, ROW_MENU_SECTION_RANK, HEADER_ROW_TOGGLE_ITEM, NUMBERED_ROWS_TOGGLE_ITEM, ADD_ROW_ABOVE_ITEM, ADD_ROW_BELOW_ITEM, MOVE_ROW_UP_ITEM, MOVE_ROW_DOWN_ITEM, DELETE_ROW_ITEM, ROW_TOGGLE_SECTION_RANK, ROW_ADD_SECTION_RANK, ROW_DANGER_SECTION_RANK } from './keys';
-export var getRowMenuComponents = function getRowMenuComponents() {
+export var getRowMenuComponents = function getRowMenuComponents(_ref) {
+  var api = _ref.api;
   return [
   // --- Menu surface ---
   {
@@ -36,7 +37,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_TOGGLE_SECTION_RANK[HEADER_ROW_TOGGLE_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(HeaderRowToggleItem, null);
+      return /*#__PURE__*/React.createElement(HeaderRowToggleItem, {
+        api: api
+      });
     }
   }, {
     type: NUMBERED_ROWS_TOGGLE_ITEM.type,
@@ -47,7 +50,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_TOGGLE_SECTION_RANK[NUMBERED_ROWS_TOGGLE_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(NumberedRowsToggleItem, null);
+      return /*#__PURE__*/React.createElement(NumberedRowsToggleItem, {
+        api: api
+      });
     }
   },
   // --- Background color section ---
@@ -88,7 +93,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_ADD_SECTION_RANK[ADD_ROW_ABOVE_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(AddRowAboveItem, null);
+      return /*#__PURE__*/React.createElement(AddRowAboveItem, {
+        api: api
+      });
     }
   }, {
     type: ADD_ROW_BELOW_ITEM.type,
@@ -99,7 +106,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_ADD_SECTION_RANK[ADD_ROW_BELOW_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(AddRowBelowItem, null);
+      return /*#__PURE__*/React.createElement(AddRowBelowItem, {
+        api: api
+      });
     }
   }, {
     type: MOVE_ROW_UP_ITEM.type,
@@ -110,7 +119,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_ADD_SECTION_RANK[MOVE_ROW_UP_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(MoveRowUpItem, null);
+      return /*#__PURE__*/React.createElement(MoveRowUpItem, {
+        api: api
+      });
     }
   }, {
     type: MOVE_ROW_DOWN_ITEM.type,
@@ -121,7 +132,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_ADD_SECTION_RANK[MOVE_ROW_DOWN_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(MoveRowDownItem, null);
+      return /*#__PURE__*/React.createElement(MoveRowDownItem, {
+        api: api
+      });
     }
   },
   // --- Danger section (Clear cells, Delete row) ---
@@ -147,7 +160,9 @@ export var getRowMenuComponents = function getRowMenuComponents() {
       rank: ROW_DANGER_SECTION_RANK[DELETE_ROW_ITEM.key]
     }],
     component: function component() {
-      return /*#__PURE__*/React.createElement(DeleteRowItem, null);
+      return /*#__PURE__*/React.createElement(DeleteRowItem, {
+        api: api
+      });
     }
   }];
 };

package/dist/esm/ui/TableMenu/row/items/AddRowAboveItem.js

@@ -1,13 +1,36 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addRowBefore, 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 { TableRowAddAboveIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export var AddRowAboveItem = function AddRowAboveItem() {
+import { insertRowWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+export var AddRowAboveItem = function AddRowAboveItem(props) {
   var _tooltip;
+  var api = props.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.top;
+    if (index === undefined) {
+      return;
+    }
+    insertRowWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, {
+      index: index,
+      moveCursorToInsertedRow: true
+    })(editorView.state, editorView.dispatch);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowAddAboveIcon, {
       color: "currentColor",
       label: "",

package/dist/esm/ui/TableMenu/row/items/AddRowBelowItem.js

@@ -1,13 +1,36 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { addRowAfter, 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 { TableRowAddBelowIcon, ToolbarDropdownItem, ToolbarKeyboardShortcutHint } from '@atlaskit/editor-toolbar';
-export var AddRowBelowItem = function AddRowBelowItem() {
+import { insertRowWithAnalytics } from '../../../../pm-plugins/commands/commands-with-analytics';
+export var AddRowBelowItem = function AddRowBelowItem(props) {
   var _tooltip;
+  var api = props.api;
+  var _useEditorToolbar = useEditorToolbar(),
+    editorView = _useEditorToolbar.editorView;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
+  var handleClick = function handleClick() {
+    var _api$analytics;
+    if (!editorView) {
+      return;
+    }
+    var selectionRect = getSelectionRect(editorView.state.selection);
+    var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.bottom;
+    if (index === undefined) {
+      return;
+    }
+    insertRowWithAnalytics(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(INPUT_METHOD.TABLE_CONTEXT_MENU, {
+      index: index,
+      moveCursorToInsertedRow: true
+    })(editorView.state, editorView.dispatch);
+  };
   return /*#__PURE__*/React.createElement(ToolbarDropdownItem, {
+    onClick: handleClick,
     elemBefore: /*#__PURE__*/React.createElement(TableRowAddBelowIcon, {
       color: "currentColor",
       label: "",