@atlaskit/editor-plugin-table 38.0.4 → 38.0.6

package/dist/cjs/ui/FloatingToolbarLabel/FloatingToolbarLabel.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FloatingToolbarLabel = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _ui = require("@atlaskit/editor-common/ui");
+var _Popup = _interopRequireDefault(require("@atlaskit/editor-common/Popup"));
 var FloatingToolbarLabel = exports.FloatingToolbarLabel = /*#__PURE__*/_react.default.memo(function (props) {
   var target = props.target,
     content = props.content,
@@ -16,7 +16,7 @@ var FloatingToolbarLabel = exports.FloatingToolbarLabel = /*#__PURE__*/_react.de
     forcePlacement = props.forcePlacement,
     stick = props.stick,
     offset = props.offset;
-  return /*#__PURE__*/_react.default.createElement(_ui.Popup, {
+  return /*#__PURE__*/_react.default.createElement(_Popup.default, {
     target: target,
     alignX: alignX,
     alignY: alignY,

package/dist/cjs/ui/SizeSelector/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SizeSelector = void 0;
 var _react = require("react");
 var _react2 = require("@emotion/react");
-var _ui = require("@atlaskit/editor-common/ui");
+var _TableSelector = require("@atlaskit/editor-common/TableSelector");
 var _tableSizeSelector = require("../../pm-plugins/table-size-selector");
 /**
  * @jsxRuntime classic
@@ -47,7 +47,7 @@ var SizeSelector = exports.SizeSelector = function SizeSelector(_ref) {
   var onUnmount = function onUnmount() {
     api === null || api === void 0 || api.core.actions.focus();
   };
-  return (0, _react2.jsx)(_ui.TableSelectorPopup
+  return (0, _react2.jsx)(_TableSelector.TableSelectorPopup
   // eslint-disable-next-line @atlassian/perf-linting/no-unstable-inline-props -- Ignored via go/ees017 (to be fixed)
   , {
     defaultSize: {

package/dist/cjs/ui/TableFloatingColumnControls/ColumnControls/index.js

@@ -6,12 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ColumnControls = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _styles = require("@atlaskit/editor-common/styles");
-var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _editorTables = require("@atlaskit/editor-tables");
-var _utils = require("@atlaskit/editor-tables/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _tableEvents = require("@atlaskit/editor-common/analytics/types/table-events");
+var _table = require("@atlaskit/editor-common/styles/table");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _constants = require("@atlaskit/editor-shared-styles/constants");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _getSelectionRect = require("@atlaskit/editor-tables/utils/get-selection-rect");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../pm-plugins/drag-and-drop/commands-with-analytics");
@@ -24,7 +25,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 
 var getSelectedColumns = function getSelectedColumns(selection) {
-  if (!(selection instanceof _editorTables.CellSelection)) {
+  if (!(selection instanceof _cellSelection.CellSelection)) {
     return [];
   }
   if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
@@ -32,13 +33,13 @@ var getSelectedColumns = function getSelectedColumns(selection) {
     if (!isColumnSelection) {
       return [];
     }
-    var rect = (0, _utils.getSelectionRect)(selection);
+    var rect = (0, _getSelectionRect.getSelectionRect)(selection);
     return rect ? (0, _selection.getSelectedColumnIndexes)(rect) : [];
   }
 
   // Old behaviour: only standard column selections are recognised.
   if (selection.isColSelection()) {
-    var _rect = (0, _utils.getSelectionRect)(selection);
+    var _rect = (0, _getSelectionRect.getSelectionRect)(selection);
     if (!_rect) {
       return [];
     }
@@ -64,7 +65,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     getScrollOffset = _ref.getScrollOffset,
     api = _ref.api;
   var columnControlsRef = (0, _react.useRef)(null);
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection', 'table'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['selection', 'table'], function (states) {
       var _states$tableState, _states$selectionStat;
       return {
         activeTableMenu: (_states$tableState = states.tableState) === null || _states$tableState === void 0 ? void 0 : _states$tableState.activeTableMenu,
@@ -161,12 +162,12 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
           if (!isSameActiveMenu) {
             var _api$analytics;
             (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
-              action: _analytics.TABLE_ACTION.DRAG_MENU_OPENED,
-              actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+              action: _tableEvents.TABLE_ACTION.DRAG_MENU_OPENED,
+              actionSubject: _enums.ACTION_SUBJECT.TABLE,
               actionSubjectId: null,
-              eventType: _analytics.EVENT_TYPE.TRACK,
+              eventType: _enums.EVENT_TYPE.TRACK,
               attributes: {
-                inputMethod: trigger === 'keyboard' ? _analytics.INPUT_METHOD.KEYBOARD : _analytics.INPUT_METHOD.MOUSE,
+                inputMethod: trigger === 'keyboard' ? _enums.INPUT_METHOD.KEYBOARD : _enums.INPUT_METHOD.MOUSE,
                 direction: 'column'
               }
             })(tr);
@@ -202,8 +203,8 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
       return sum + cur;
     }, 0)) !== null && _rowHeights$reduce !== void 0 ? _rowHeights$reduce : 0;
     var previewWidth = (_colWidths$reduce = colWidths === null || colWidths === void 0 ? void 0 : colWidths.reduce(function (sum, v, i) {
-      return sum + (v !== null && v !== void 0 ? v : _styles.tableCellMinWidth) * (indexes.includes(i) ? 1 : 0);
-    }, 0)) !== null && _colWidths$reduce !== void 0 ? _colWidths$reduce : _styles.tableCellMinWidth;
+      return sum + (v !== null && v !== void 0 ? v : _table.tableCellMinWidth) * (indexes.includes(i) ? 1 : 0);
+    }, 0)) !== null && _colWidths$reduce !== void 0 ? _colWidths$reduce : _table.tableCellMinWidth;
     return /*#__PURE__*/_react.default.createElement("div", {
       contentEditable: false,
       key: type,
@@ -272,7 +273,7 @@ var ColumnControls = exports.ColumnControls = function ColumnControls(_ref) {
     }
     return handles;
   };
-  var containerWidth = isNumberColumnEnabled && tableContainerWidth ? tableContainerWidth - _editorSharedStyles.akEditorTableNumberColumnWidth : tableContainerWidth;
+  var containerWidth = isNumberColumnEnabled && tableContainerWidth ? tableContainerWidth - _constants.akEditorTableNumberColumnWidth : tableContainerWidth;
   return /*#__PURE__*/_react.default.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     className: _types.TableCssClassName.DRAG_COLUMN_CONTROLS,

package/dist/cjs/ui/TableFloatingControls/NumberColumn/index.js

@@ -14,7 +14,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames2 = _interopRequireDefault(require("classnames"));
-var _coreUtils = require("@atlaskit/editor-common/core-utils");
+var _isSsr = require("@atlaskit/editor-common/is-ssr");
 var _utils = require("@atlaskit/editor-tables/utils");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
@@ -83,7 +83,7 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
         // with platform_editor_table_q4_loveability enabled, table controls have margin-top of 1px applied. Offset this here.
         return rowHeights[0] + 1;
       };
-      if ((0, _coreUtils.isSSR)()) {
+      if ((0, _isSsr.isSSR)()) {
         return /*#__PURE__*/_react.default.createElement("div", {
           // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
           className: _types.TableCssClassName.NUMBERED_COLUMN,

package/dist/cjs/ui/TableFloatingControls/RowControls/DragControls.js

@@ -8,10 +8,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.DragControlsWithSelection = exports.DragControls = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
-var _editorTables = require("@atlaskit/editor-tables");
-var _utils = require("@atlaskit/editor-tables/utils");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _tableEvents = require("@atlaskit/editor-common/analytics/types/table-events");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _getSelectionRect = require("@atlaskit/editor-tables/utils/get-selection-rect");
 var _elementAdapter = require("@atlaskit/pragmatic-drag-and-drop/adapter/element-adapter");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../../../pm-plugins/commands");
@@ -27,7 +28,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
 
 var getSelectedRows = function getSelectedRows(selection) {
-  if (!(selection instanceof _editorTables.CellSelection)) {
+  if (!(selection instanceof _cellSelection.CellSelection)) {
     return [];
   }
   if ((0, _expValEquals.expValEquals)('platform_editor_table_menu_updates', 'isEnabled', true)) {
@@ -36,13 +37,13 @@ var getSelectedRows = function getSelectedRows(selection) {
     if (!selection.isRowSelection() && !(0, _selection.isRowSelectionWithMergedFirstColumn)(selection)) {
       return [];
     }
-    var rect = (0, _utils.getSelectionRect)(selection);
+    var rect = (0, _getSelectionRect.getSelectionRect)(selection);
     return rect ? (0, _selection.getSelectedRowIndexes)(rect) : [];
   }
 
   // Old behaviour: only standard row selections are recognised.
   if (selection.isRowSelection()) {
-    var _rect = (0, _utils.getSelectionRect)(selection);
+    var _rect = (0, _getSelectionRect.getSelectionRect)(selection);
     if (!_rect) {
       return [];
     }
@@ -121,12 +122,12 @@ var DragControls = exports.DragControls = function DragControls(_ref) {
           if (!isSameActiveMenu) {
             var _api$analytics;
             (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || _api$analytics.attachAnalyticsEvent({
-              action: _analytics.TABLE_ACTION.DRAG_MENU_OPENED,
-              actionSubject: _analytics.ACTION_SUBJECT.TABLE,
+              action: _tableEvents.TABLE_ACTION.DRAG_MENU_OPENED,
+              actionSubject: _enums.ACTION_SUBJECT.TABLE,
               actionSubjectId: null,
-              eventType: _analytics.EVENT_TYPE.TRACK,
+              eventType: _enums.EVENT_TYPE.TRACK,
               attributes: {
-                inputMethod: trigger === 'keyboard' ? _analytics.INPUT_METHOD.KEYBOARD : _analytics.INPUT_METHOD.MOUSE,
+                inputMethod: trigger === 'keyboard' ? _enums.INPUT_METHOD.KEYBOARD : _enums.INPUT_METHOD.MOUSE,
                 direction: 'row'
               }
             })(tr);
@@ -350,7 +351,7 @@ var DragControlsWithSelection = exports.DragControlsWithSelection = function Dra
     selectRows = _ref6.selectRows,
     updateCellHoverLocation = _ref6.updateCellHoverLocation,
     api = _ref6.api;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.useSharedPluginStateWithSelector)(api, ['selection'], function (states) {
       var _states$selectionStat;
       return {
         selection: (_states$selectionStat = states.selectionState) === null || _states$selectionStat === void 0 ? void 0 : _states$selectionStat.selection

package/dist/cjs/ui/TableFullWidthLabel/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.FullWidthDisplay = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
+var _table = require("@atlaskit/editor-common/messages/table");
 var _primitives = require("@atlaskit/primitives");
 // eslint-disable-next-line @atlaskit/design-system/no-emotion-primitives -- to be migrated to @atlaskit/primitives/compiled – go/akcss
 
@@ -37,5 +37,5 @@ var FullWidthDisplay = exports.FullWidthDisplay = function FullWidthDisplay() {
     xcss: tableFullWidthLabelWrapperStyles
   }, /*#__PURE__*/_react.default.createElement(_primitives.Inline, {
     xcss: tableFullWidthLabelStyles
-  }, formatMessage(_messages.tableMessages.fullWidthLabel)));
+  }, formatMessage(_table.messages.fullWidthLabel)));
 };

package/dist/cjs/ui/TableMenu/cell/getCellMenuComponents.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCellMenuComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _table = require("@atlaskit/editor-common/messages/table");
+var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var _alignPositionBottom = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-bottom"));
 var _alignPositionCenterVertical = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-center-vertical"));
 var _alignPositionTop = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-top"));
@@ -39,7 +39,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.CELL_MENU_RANK[_keys.CELL_ACTION_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, props.children);
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, null, props.children);
     }
   }, {
     type: _keys.VERTICAL_ALIGN_MENU.type,
@@ -61,7 +61,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.VERTICAL_ALIGN_MENU_RANK[_keys.VERTICAL_ALIGN_MENU_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, props.children);
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, null, props.children);
     }
   }, {
     type: _keys.VERTICAL_ALIGN_TOP_ITEM.type,
@@ -75,7 +75,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionTop.default,
-        label: _messages.tableMessages.cellAlignmentTop,
+        label: _table.messages.cellAlignmentTop,
         value: "top"
       });
     }
@@ -91,7 +91,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionCenterVertical.default,
-        label: _messages.tableMessages.cellAlignmentMiddle,
+        label: _table.messages.cellAlignmentMiddle,
         value: "middle"
       });
     }
@@ -107,7 +107,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionBottom.default,
-        label: _messages.tableMessages.cellAlignmentBottom,
+        label: _table.messages.cellAlignmentBottom,
         value: "bottom"
       });
     }
@@ -123,7 +123,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.CELL_MENU_RANK[_keys.CELL_ADD_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -164,7 +164,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.CELL_MENU_RANK[_keys.CELL_DANGER_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -186,7 +186,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.CELL_MENU_RANK[_keys.CELL_ACTION_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, props.children);
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, null, props.children);
     }
   }, {
     type: _keys.VERTICAL_ALIGN_MENU.type,
@@ -208,7 +208,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.VERTICAL_ALIGN_MENU_RANK[_keys.VERTICAL_ALIGN_MENU_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, null, props.children);
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, null, props.children);
     }
   }, {
     type: _keys.VERTICAL_ALIGN_TOP_ITEM.type,
@@ -222,7 +222,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionTop.default,
-        label: _messages.tableMessages.cellAlignmentTop,
+        label: _table.messages.cellAlignmentTop,
         value: "top"
       });
     }
@@ -238,7 +238,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionCenterVertical.default,
-        label: _messages.tableMessages.cellAlignmentMiddle,
+        label: _table.messages.cellAlignmentMiddle,
         value: "middle"
       });
     }
@@ -254,7 +254,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       return /*#__PURE__*/_react.default.createElement(_VerticalAlignDropdownItem.VerticalAlignDropdownItem, {
         api: api,
         icon: _alignPositionBottom.default,
-        label: _messages.tableMessages.cellAlignmentBottom,
+        label: _table.messages.cellAlignmentBottom,
         value: "bottom"
       });
     }
@@ -295,7 +295,7 @@ var getCellMenuComponents = exports.getCellMenuComponents = function getCellMenu
       rank: _keys.CELL_MENU_RANK[_keys.CELL_DANGER_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }

package/dist/cjs/ui/TableMenu/cell/items/MergeCellsItem.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.MergeCellsItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _table = require("@atlaskit/editor-common/messages/table");
+var _cellMergeIcon = require("@atlaskit/editor-toolbar/cell-merge-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _TableMenuContext = require("../../shared/TableMenuContext");
@@ -32,18 +33,18 @@ var MergeCellsItem = exports.MergeCellsItem = function MergeCellsItem(_ref) {
     if (!editorView) {
       return;
     }
-    (0, _commandsWithAnalytics.mergeCellsWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_analytics.INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
+    (0, _commandsWithAnalytics.mergeCellsWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_enums.INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
     api === null || api === void 0 || api.core.actions.execute((0, _commands.closeActiveTableMenu)(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!shouldShowMergeCells(tableMenuContext)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableCellMergeIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_cellMergeIcon.TableCellMergeIcon, {
       label: "",
       size: "small"
     })
-  }, formatMessage(_messages.tableMessages.mergeCells));
+  }, formatMessage(_table.messages.mergeCells));
 };

package/dist/cjs/ui/TableMenu/cell/items/SplitCellItem.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.SplitCellItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _table = require("@atlaskit/editor-common/messages/table");
+var _cellSplitIcon = require("@atlaskit/editor-toolbar/cell-split-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _TableMenuContext = require("../../shared/TableMenuContext");
@@ -32,18 +33,18 @@ var SplitCellItem = exports.SplitCellItem = function SplitCellItem(_ref) {
     if (!editorView) {
       return;
     }
-    (0, _commandsWithAnalytics.splitCellWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_analytics.INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
+    (0, _commandsWithAnalytics.splitCellWithAnalytics)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_enums.INPUT_METHOD.CONTEXT_MENU)(editorView.state, editorView.dispatch);
     api === null || api === void 0 || api.core.actions.execute((0, _commands.closeActiveTableMenu)(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
   if (!shouldShowSplitCell(tableMenuContext)) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableCellSplitIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_cellSplitIcon.TableCellSplitIcon, {
       label: "",
       size: "small"
     })
-  }, formatMessage(_messages.tableMessages.splitCell));
+  }, formatMessage(_table.messages.splitCell));
 };

package/dist/cjs/ui/TableMenu/cell/items/VerticalAlignDropdownItem.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.VerticalAlignDropdownItem = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _pluginFactory = require("../../../../pm-plugins/plugin-factory");
@@ -37,7 +37,7 @@ var VerticalAlignDropdownItem = exports.VerticalAlignDropdownItem = function Ver
     api.core.actions.execute(function (_ref3) {
       var _api$analytics;
       var tr = _ref3.tr;
-      (0, _commandsWithAnalytics.setCellVerticalAlignmentWithAnalytics)((_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, value, targetCellPosition)({
+      (0, _commandsWithAnalytics.setCellVerticalAlignmentWithAnalytics)((_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)(_enums.INPUT_METHOD.TABLE_CONTEXT_MENU, value, targetCellPosition)({
         tr: tr
       });
       (0, _commands.closeActiveTableMenu)(api)({
@@ -50,7 +50,7 @@ var VerticalAlignDropdownItem = exports.VerticalAlignDropdownItem = function Ver
   if (!editorView) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     elemBefore: /*#__PURE__*/_react.default.createElement(Icon, {
       color: "currentColor",
       label: "",

package/dist/cjs/ui/TableMenu/cell/items/VerticalAlignNestedMenu.js

@@ -8,8 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.VerticalAlignNestedMenu = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
-var _messages = require("@atlaskit/editor-common/messages");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _table = require("@atlaskit/editor-common/messages/table");
+var _nestedDropdownRightIcon = require("@atlaskit/editor-toolbar/nested-dropdown-right-icon");
+var _toolbarNestedDropdownMenu = require("@atlaskit/editor-toolbar/toolbar-nested-dropdown-menu");
 var _alignPositionBottom = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-bottom"));
 var _alignPositionCenterVertical = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-center-vertical"));
 var _alignPositionTop = _interopRequireDefault(require("@atlaskit/icon-lab/core/align-position-top"));
@@ -41,16 +42,16 @@ var VerticalAlignNestedMenu = exports.VerticalAlignNestedMenu = function Vertica
   if (!editorView) {
     return null;
   }
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarNestedDropdownMenu, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarNestedDropdownMenu.ToolbarNestedDropdownMenu, {
     elemBefore: /*#__PURE__*/_react.default.createElement(TriggerIcon, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.NestedDropdownRightIcon, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_nestedDropdownRightIcon.NestedDropdownRightIcon, {
       label: "",
       size: "small"
     }),
-    text: formatMessage(_messages.tableMessages.cellAlignment)
+    text: formatMessage(_table.messages.cellAlignment)
   }, children);
 };

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getColumnMenuComponents = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _toolbarDropdownItemSection = require("@atlaskit/editor-toolbar/toolbar-dropdown-item-section");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _AddColumnLeftItem = require("./items/AddColumnLeftItem");
 var _AddColumnRightItem = require("./items/AddColumnRightItem");
@@ -85,7 +85,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_SORT_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -126,7 +126,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_ADD_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -180,7 +180,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_DANGER_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -245,7 +245,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_SORT_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -286,7 +286,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_ADD_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }
@@ -366,7 +366,7 @@ var getColumnMenuComponents = exports.getColumnMenuComponents = function getColu
       rank: _keys.COLUMN_SECTION_RANK[_keys.COLUMN_DANGER_SECTION.key]
     }],
     component: function component(props) {
-      return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
+      return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItemSection.ToolbarDropdownItemSection, {
         hasSeparator: true
       }, props.children);
     }

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

@@ -7,12 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.AddColumnLeftItem = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntl = require("react-intl");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _hooks = require("@atlaskit/editor-common/hooks");
+var _enums = require("@atlaskit/editor-common/analytics/types/enums");
 var _keymaps = require("@atlaskit/editor-common/keymaps");
-var _messages = require("@atlaskit/editor-common/messages");
-var _utils = require("@atlaskit/editor-tables/utils");
-var _editorToolbar = require("@atlaskit/editor-toolbar");
+var _table = require("@atlaskit/editor-common/messages/table");
+var _useSharedPluginStateWithSelector = require("@atlaskit/editor-common/useSharedPluginStateWithSelector");
+var _getSelectionRect = require("@atlaskit/editor-tables/utils/get-selection-rect");
+var _columnAddLeftIcon = require("@atlaskit/editor-toolbar/column-add-left-icon");
+var _toolbarDropdownItem = require("@atlaskit/editor-toolbar/toolbar-dropdown-item");
+var _toolbarKeyboardShortcutHint = require("@atlaskit/editor-toolbar/toolbar-keyboard-shortcut-hint");
 var _commands = require("../../../../pm-plugins/commands");
 var _commandsWithAnalytics = require("../../../../pm-plugins/commands/commands-with-analytics");
 var _TableMenuContext = require("../../shared/TableMenuContext");
@@ -23,7 +25,7 @@ var AddColumnLeftItem = exports.AddColumnLeftItem = function AddColumnLeftItem(_
     editorView = _ref2.editorView;
   var _useIntl = (0, _reactIntl.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var _useSharedPluginState = (0, _hooks.useSharedPluginStateWithSelector)(api !== null && api !== void 0 ? api : undefined, ['table'], function (states) {
+  var _useSharedPluginState = (0, _useSharedPluginStateWithSelector.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,
@@ -39,25 +41,25 @@ var AddColumnLeftItem = exports.AddColumnLeftItem = function AddColumnLeftItem(_
     if (!editorView) {
       return;
     }
-    var selectionRect = (0, _utils.getSelectionRect)(editorView.state.selection);
+    var selectionRect = (0, _getSelectionRect.getSelectionRect)(editorView.state.selection);
     var index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.left;
     if (index === undefined) {
       return;
     }
     var shouldUseIncreasedScalingPercent = isTableScalingEnabled && (isTableFixedColumnWidthsOptionEnabled || isCommentEditor);
-    (0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(_analytics.INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
+    (0, _commandsWithAnalytics.insertColumnWithAnalytics)(api, api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(_enums.INPUT_METHOD.TABLE_CONTEXT_MENU, index)(editorView.state, editorView.dispatch, editorView);
     api === null || api === void 0 || api.core.actions.execute((0, _commands.closeActiveTableMenu)(api));
     api === null || api === void 0 || api.core.actions.focus();
   };
-  return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItem, {
+  return /*#__PURE__*/_react.default.createElement(_toolbarDropdownItem.ToolbarDropdownItem, {
     onClick: handleClick,
-    elemBefore: /*#__PURE__*/_react.default.createElement(_editorToolbar.TableColumnAddLeftIcon, {
+    elemBefore: /*#__PURE__*/_react.default.createElement(_columnAddLeftIcon.TableColumnAddLeftIcon, {
       color: "currentColor",
       label: "",
       size: "small"
     }),
-    elemAfter: /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarKeyboardShortcutHint, {
+    elemAfter: /*#__PURE__*/_react.default.createElement(_toolbarKeyboardShortcutHint.ToolbarKeyboardShortcutHint, {
       shortcut: (_tooltip = (0, _keymaps.tooltip)(_keymaps.addColumnBefore)) !== null && _tooltip !== void 0 ? _tooltip : ''
     })
-  }, formatMessage(_messages.tableMessages.addColumnLeft));
+  }, formatMessage(_table.messages.addColumnLeft));
 };