@atlaskit/editor-plugin-table 8.4.1 → 8.4.3

package/src/{utils → pm-plugins/utils}/decoration.ts

@@ -22,9 +22,9 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInRow, getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import type { Cell, CellColumnPositioning } from '../types';
-import { TableCssClassName as ClassName, TableDecorations } from '../types';
-import { ColumnResizeWidget } from '../ui/ColumnResizeWidget';
+import type { Cell, CellColumnPositioning } from '../../types';
+import { TableCssClassName as ClassName, TableDecorations } from '../../types';
+import { ColumnResizeWidget } from '../../ui/ColumnResizeWidget';
 
 const filterDecorationByKey = (key: TableDecorations, decorationSet: DecorationSet): Decoration[] =>
 	decorationSet.find(undefined, undefined, (spec) => spec.key.indexOf(key) > -1);

package/src/{utils → pm-plugins/utils}/dom.ts

@@ -1,6 +1,6 @@
 import { closestElement, containsClassName } from '@atlaskit/editor-common/utils';
 
-import { TableCssClassName as ClassName } from '../types';
+import { TableCssClassName as ClassName } from '../../types';
 
 export const isCell = (node: HTMLElement | null): boolean => {
 	return Boolean(

package/src/{utils → pm-plugins/utils}/drag-menu.ts

@@ -50,6 +50,9 @@ import HipchatChevronDoubleDownIcon from '@atlaskit/icon/glyph/hipchat/chevron-d
 import HipchatChevronDoubleUpIcon from '@atlaskit/icon/glyph/hipchat/chevron-double-up';
 import type { NewIconProps } from '@atlaskit/icon/types';
 
+import type { DraggableData, DraggableType, PluginInjectionAPI, TableDirection } from '../../types';
+import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../../ui/icons';
+import { getClosestSelectionRect } from '../../ui/toolbar';
 import {
 	deleteColumnsWithAnalytics,
 	deleteRowsWithAnalytics,
@@ -58,13 +61,10 @@ import {
 	insertColumnWithAnalytics,
 	insertRowWithAnalytics,
 	sortColumnWithAnalytics,
-} from '../commands-with-analytics';
-import { moveSourceWithAnalytics } from '../pm-plugins/drag-and-drop/commands-with-analytics';
-import { getPluginState as getTablePluginState } from '../pm-plugins/plugin-factory';
-import { getNewResizeStateFromSelectedColumns } from '../pm-plugins/table-resizing/utils/resize-state';
-import { getClosestSelectionRect } from '../toolbar';
-import type { DraggableData, DraggableType, PluginInjectionAPI, TableDirection } from '../types';
-import { AddColLeftIcon, AddColRightIcon, AddRowAboveIcon, AddRowBelowIcon } from '../ui/icons';
+} from '../commands/commands-with-analytics';
+import { moveSourceWithAnalytics } from '../drag-and-drop/commands-with-analytics';
+import { getPluginState as getTablePluginState } from '../plugin-factory';
+import { getNewResizeStateFromSelectedColumns } from '../table-resizing/utils/resize-state';
 
 import {
 	hasMergedCellsInSelection,

package/src/{utils → pm-plugins/utils}/get-allow-add-column-custom-step.ts

@@ -1,6 +1,6 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 
-import { getPluginState } from '../pm-plugins/plugin-factory';
+import { getPluginState } from '../plugin-factory';
 
 export function getAllowAddColumnCustomStep(state: EditorState): boolean {
 	const tablePluginState = getPluginState(state);

package/src/{utils → pm-plugins/utils}/paste.ts

@@ -4,7 +4,7 @@ import { Fragment, Slice } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { flatten } from '@atlaskit/editor-prosemirror/utils';
 
-import { getPluginState } from '../pm-plugins/plugin-factory';
+import { getPluginState } from '../plugin-factory';
 
 // lifts up the content of each cell, returning an array of nodes
 export const unwrapContentFromTable = (maybeTable: PMNode): PMNode | PMNode[] => {

package/src/{utils → pm-plugins/utils}/row-controls.ts

@@ -5,8 +5,8 @@ import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect, isRowSelected } from '@atlaskit/editor-tables/utils';
 
-import { TableCssClassName as ClassName } from '../types';
-import { tableDeleteButtonSize } from '../ui/consts';
+import { TableCssClassName as ClassName } from '../../types';
+import { tableDeleteButtonSize } from '../../ui/consts';
 
 export interface RowParams {
 	startIndex: number;

package/src/{utils → pm-plugins/utils}/update-plugin-state-decorations.ts

@@ -1,8 +1,8 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
-import { getDecorations } from '../pm-plugins/decorations/plugin';
-import type { TableDecorations } from '../types';
+import type { TableDecorations } from '../../types';
+import { getDecorations } from '../decorations/plugin';
 
 import { updateDecorations } from './decoration';
 

package/src/pm-plugins/view-mode-sort/index.ts

@@ -18,7 +18,7 @@ import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import type tablePlugin from '../../plugin';
+import type tablePlugin from '../../tablePlugin';
 import { SortingIconWrapper } from '../../ui/icons/SortingIconWrapper';
 import { getPluginState } from '../plugin-factory';
 

package/src/{plugin.tsx → tablePlugin.tsx}

@@ -8,7 +8,6 @@ import {
 	tableRow,
 	tableRowWithNestedTable,
 } from '@atlaskit/adf-schema';
-import type { AnalyticsEventPayload } from '@atlaskit/editor-common/analytics';
 import {
 	ACTION,
 	ACTION_SUBJECT,
@@ -28,25 +27,8 @@ import {
 } from '@atlaskit/editor-common/nesting';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-import type {
-	Command,
-	EditorCommand,
-	EditorPlugin,
-	GetEditorContainerWidth,
-	GetEditorFeatureFlags,
-	NextEditorPlugin,
-	OptionalPlugin,
-} from '@atlaskit/editor-common/types';
+import type { Command, EditorPlugin, GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
-import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibility-utils';
-import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
-import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
-import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
-import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
-import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
-import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
-import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
-import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { hasParentNodeOfType, safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -55,10 +37,11 @@ import { tableEditing } from '@atlaskit/editor-tables/pm-plugins';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
-import { insertTableWithNestingSupport, insertTableWithSize } from './commands/insert';
-import { pluginConfig } from './create-plugin-config';
+import { tableNodeSpecWithFixedToDOM } from './nodeviews/toDOM';
 import { createPlugin as createTableAnalyticsPlugin } from './pm-plugins/analytics/plugin';
 import { pluginKey as tableAnalyticsPluginKey } from './pm-plugins/analytics/plugin-key';
+import { insertTableWithNestingSupport, insertTableWithSize } from './pm-plugins/commands/insert';
+import { pluginConfig } from './pm-plugins/create-plugin-config';
 import { createPlugin as createDecorationsPlugin } from './pm-plugins/decorations/plugin';
 import {
 	createPlugin as createDragAndDropPlugin,
@@ -87,10 +70,10 @@ import {
 	pluginKey as tableWidthPluginKey,
 } from './pm-plugins/table-width';
 import { createPlugin as createTableWidthInCommentFixPlugin } from './pm-plugins/table-width-in-comment-fix';
+import { createTableWithWidth } from './pm-plugins/utils';
 import { createPlugin as createViewModeSortPlugin } from './pm-plugins/view-mode-sort';
-import { tableNodeSpecWithFixedToDOM } from './toDOM';
-import { getToolbarConfig } from './toolbar';
-import type { ColumnResizingPluginState, PluginConfig, TableSharedState } from './types';
+import type { TablePlugin, TablePluginOptions } from './tablePluginType';
+import type { ColumnResizingPluginState } from './types';
 import FloatingContextualButton from './ui/FloatingContextualButton';
 import FloatingContextualMenu from './ui/FloatingContextualMenu';
 import FloatingDeleteButton from './ui/FloatingDeleteButton';
@@ -99,70 +82,10 @@ import FloatingInsertButton from './ui/FloatingInsertButton';
 import { FloatingToolbarLabel } from './ui/FloatingToolbarLabel/FloatingToolbarLabel';
 import { GlobalStylesWrapper } from './ui/global-styles';
 import { FullWidthDisplay } from './ui/TableFullWidthLabel';
-import { createTableWithWidth } from './utils';
-
-export interface TablePluginOptions {
-	tableOptions: PluginConfig;
-	// this option will eventually be removed, and enabled by default
-	dragAndDropEnabled?: boolean;
-	// this option will eventually be removed, and enabled by default
-	isTableScalingEnabled?: boolean;
-	allowContextualMenu?: boolean;
-	// TODO these two need to be rethought
-	fullWidthEnabled?: boolean;
-	wasFullWidthEnabled?: boolean;
-	getEditorFeatureFlags?: GetEditorFeatureFlags;
-	isNewColumnResizingEnabled?: boolean;
-	isCommentEditor?: boolean;
-	isChromelessEditor?: boolean;
-}
-
-type InsertTableAction = (analyticsPayload: AnalyticsEventPayload) => Command;
+import { getToolbarConfig } from './ui/toolbar';
 
 const defaultGetEditorFeatureFlags = () => ({});
 
-// TODO: duplicating type instead of importing media plugin causing a circular dependency
-type MediaPlugin = NextEditorPlugin<
-	'media',
-	{
-		pluginConfiguration: any;
-		dependencies: any;
-		sharedState: any;
-		actions: any;
-		commands: any;
-	}
->;
-
-export type TablePlugin = NextEditorPlugin<
-	'table',
-	{
-		pluginConfiguration: TablePluginOptions | undefined;
-		actions: {
-			insertTable: InsertTableAction;
-		};
-		sharedState?: TableSharedState;
-		commands: {
-			insertTableWithSize: (
-				rowsCount: number,
-				colsCount: number,
-				inputMethod?: INPUT_METHOD.PICKER,
-			) => EditorCommand;
-		};
-		dependencies: [
-			AnalyticsPlugin,
-			ContentInsertionPlugin,
-			WidthPlugin,
-			GuidelinePlugin,
-			SelectionPlugin,
-			OptionalPlugin<BatchAttributeUpdatesPlugin>,
-			OptionalPlugin<AccessibilityUtilsPlugin>,
-			OptionalPlugin<MediaPlugin>,
-			OptionalPlugin<EditorViewModePlugin>,
-			OptionalPlugin<FeatureFlagsPlugin>,
-		];
-	}
->;
-
 /**
  * Table plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
@@ -786,15 +709,16 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 					action(insert, state) {
 						// see comment on tablesPlugin.getSharedState on usage
 						const tableState = api?.table?.sharedState.currentState();
-
-						const tableNode = createTableWithWidth({
+						const tableNodeProps = {
 							isTableScalingEnabled: options?.isTableScalingEnabled,
 							isTableAlignmentEnabled: options?.tableOptions.allowTableAlignment,
 							isFullWidthModeEnabled: tableState?.isFullWidthModeEnabled,
 							isCommentEditor: options?.isCommentEditor,
 							isChromelessEditor: options?.isChromelessEditor,
 							isTableResizingEnabled: options?.tableOptions.allowTableResizing,
-						})(state.schema);
+						};
+
+						let tableNode = createTableWithWidth(tableNodeProps)(state.schema);
 
 						let { tr } = state;
 						// If the cursor is inside a table
@@ -815,6 +739,10 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 								tr.scrollIntoView();
 							} else {
 								// Table can be nested in parent table
+								tableNode = createTableWithWidth({
+									...tableNodeProps,
+									isNestedTable: true,
+								})(state.schema);
 								tr = insert(tableNode);
 							}
 						} else {

package/src/tablePluginType.ts

@@ -0,0 +1,79 @@
+import type { AnalyticsEventPayload, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
+import type {
+	Command,
+	EditorCommand,
+	GetEditorFeatureFlags,
+	NextEditorPlugin,
+	OptionalPlugin,
+} from '@atlaskit/editor-common/types';
+import type { AccessibilityUtilsPlugin } from '@atlaskit/editor-plugin-accessibility-utils';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { BatchAttributeUpdatesPlugin } from '@atlaskit/editor-plugin-batch-attribute-updates';
+import type { ContentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
+import type { EditorViewModePlugin } from '@atlaskit/editor-plugin-editor-viewmode';
+import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { GuidelinePlugin } from '@atlaskit/editor-plugin-guideline';
+import type { SelectionPlugin } from '@atlaskit/editor-plugin-selection';
+import type { WidthPlugin } from '@atlaskit/editor-plugin-width';
+
+import type { PluginConfig, TableSharedState } from './types';
+
+export interface TablePluginOptions {
+	tableOptions: PluginConfig;
+	// this option will eventually be removed, and enabled by default
+	dragAndDropEnabled?: boolean;
+	// this option will eventually be removed, and enabled by default
+	isTableScalingEnabled?: boolean;
+	allowContextualMenu?: boolean;
+	// TODO these two need to be rethought
+	fullWidthEnabled?: boolean;
+	wasFullWidthEnabled?: boolean;
+	getEditorFeatureFlags?: GetEditorFeatureFlags;
+	isNewColumnResizingEnabled?: boolean;
+	isCommentEditor?: boolean;
+	isChromelessEditor?: boolean;
+}
+
+type InsertTableAction = (analyticsPayload: AnalyticsEventPayload) => Command;
+
+// TODO: duplicating type instead of importing media plugin causing a circular dependency
+type MediaPlugin = NextEditorPlugin<
+	'media',
+	{
+		pluginConfiguration: any;
+		dependencies: any;
+		sharedState: any;
+		actions: any;
+		commands: any;
+	}
+>;
+
+export type TablePlugin = NextEditorPlugin<
+	'table',
+	{
+		pluginConfiguration: TablePluginOptions | undefined;
+		actions: {
+			insertTable: InsertTableAction;
+		};
+		sharedState?: TableSharedState;
+		commands: {
+			insertTableWithSize: (
+				rowsCount: number,
+				colsCount: number,
+				inputMethod?: INPUT_METHOD.PICKER,
+			) => EditorCommand;
+		};
+		dependencies: [
+			AnalyticsPlugin,
+			ContentInsertionPlugin,
+			WidthPlugin,
+			GuidelinePlugin,
+			SelectionPlugin,
+			OptionalPlugin<BatchAttributeUpdatesPlugin>,
+			OptionalPlugin<AccessibilityUtilsPlugin>,
+			OptionalPlugin<MediaPlugin>,
+			OptionalPlugin<EditorViewModePlugin>,
+			OptionalPlugin<FeatureFlagsPlugin>,
+		];
+	}
+>;

package/src/{types.ts → types/index.ts}

@@ -12,7 +12,7 @@ import type { DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
 import type { Edge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge';
 
-import type { TablePlugin } from './plugin';
+import type { TablePlugin } from '../tablePluginType';
 
 export const RESIZE_HANDLE_AREA_DECORATION_GAP = 30;
 export type RowInsertPosition = 'TOP' | 'BOTTOM';

package/src/ui/DragHandle/index.tsx

@@ -18,9 +18,9 @@ import { token } from '@atlaskit/tokens';
 import { getPluginState as getDnDPluginState } from '../../pm-plugins/drag-and-drop/plugin-factory';
 import type { TriggerType } from '../../pm-plugins/drag-and-drop/types';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
+import { findDuplicatePosition, hasMergedCellsInSelection } from '../../pm-plugins/utils';
 import { TableCssClassName as ClassName } from '../../types';
 import type { CellHoverMeta, TableDirection } from '../../types';
-import { findDuplicatePosition, hasMergedCellsInSelection } from '../../utils';
 import { dragTableInsertColumnButtonSize } from '../consts';
 import { DragPreview } from '../DragPreview';
 

package/src/ui/FloatingContextualButton/index.tsx

@@ -22,7 +22,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorSmallZIndex } from '@atlaskit/editor-shared-styles';
 import ExpandIcon from '@atlaskit/icon/utility/migration/chevron-down';
 
-import { toggleContextualMenu } from '../../commands';
+import { toggleContextualMenu } from '../../pm-plugins/commands';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
 import { TableCssClassName as ClassName } from '../../types';
 

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -62,7 +62,7 @@ import {
 	hoverRows,
 	setFocusToCellMenu,
 	toggleContextualMenu,
-} from '../../commands';
+} from '../../pm-plugins/commands';
 import {
 	deleteColumnsWithAnalytics,
 	deleteRowsWithAnalytics,
@@ -74,18 +74,18 @@ import {
 	setColorWithAnalytics,
 	sortColumnWithAnalytics,
 	splitCellWithAnalytics,
-} from '../../commands-with-analytics';
+} from '../../pm-plugins/commands/commands-with-analytics';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { pluginKey as tablePluginKey } from '../../pm-plugins/plugin-key';
 import { getNewResizeStateFromSelectedColumns } from '../../pm-plugins/table-resizing/utils/resize-state';
-import { canMergeCells } from '../../transforms';
-import { TableCssClassName as ClassName } from '../../types';
-import type { PluginInjectionAPI } from '../../types';
+import { canMergeCells } from '../../pm-plugins/transforms';
 import {
 	getMergedCellsPositions,
 	getSelectedColumnIndexes,
 	getSelectedRowIndexes,
-} from '../../utils';
+} from '../../pm-plugins/utils';
+import { TableCssClassName as ClassName } from '../../types';
+import type { PluginInjectionAPI } from '../../types';
 import {
 	colorPalletteColumns,
 	contextualMenuDropdownWidth,

package/src/ui/FloatingDeleteButton/index.tsx

@@ -14,18 +14,21 @@ import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { getSelectionRect, isTableSelected } from '@atlaskit/editor-tables/utils';
 
-import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
-import { deleteColumnsWithAnalytics, deleteRowsWithAnalytics } from '../../commands-with-analytics';
+import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
+import {
+	deleteColumnsWithAnalytics,
+	deleteRowsWithAnalytics,
+} from '../../pm-plugins/commands/commands-with-analytics';
 import { getPluginState as getTablePluginState } from '../../pm-plugins/plugin-factory';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
-import type { PluginInjectionAPI, TableDirection } from '../../types';
-import { TableCssClassName as ClassName } from '../../types';
 import {
 	getColumnDeleteButtonParams,
 	getColumnsWidths,
 	getRowDeleteButtonParams,
 	getRowHeights,
-} from '../../utils';
+} from '../../pm-plugins/utils';
+import type { PluginInjectionAPI, TableDirection } from '../../types';
+import { TableCssClassName as ClassName } from '../../types';
 import { stickyRowZIndex } from '../consts';
 
 import DeleteButton from './DeleteButton';

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -47,27 +47,27 @@ import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Toggle from '@atlaskit/toggle';
 
-import { clearHoverSelection, hoverColumns, hoverRows } from '../../commands';
+import { clearHoverSelection, hoverColumns, hoverRows } from '../../pm-plugins/commands';
 import {
 	setColorWithAnalytics,
 	toggleHeaderColumnWithAnalytics,
 	toggleHeaderRowWithAnalytics,
 	toggleNumberColumnWithAnalytics,
-} from '../../commands-with-analytics';
+} from '../../pm-plugins/commands/commands-with-analytics';
 import { toggleDragMenu } from '../../pm-plugins/drag-and-drop/commands';
 import { getPluginState } from '../../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState as getTablePluginState } from '../../pm-plugins/plugin-factory';
-import type { PluginConfig, PluginInjectionAPI, TableDirection } from '../../types';
-import { TableCssClassName as ClassName } from '../../types';
 import {
 	checkIfHeaderColumnEnabled,
 	checkIfHeaderRowEnabled,
 	checkIfNumberColumnEnabled,
 	getSelectedColumnIndexes,
 	getSelectedRowIndexes,
-} from '../../utils';
-import type { DragMenuConfig, DragMenuOptionIdType } from '../../utils/drag-menu';
-import { getDragMenuConfig } from '../../utils/drag-menu';
+} from '../../pm-plugins/utils';
+import type { DragMenuConfig, DragMenuOptionIdType } from '../../pm-plugins/utils/drag-menu';
+import { getDragMenuConfig } from '../../pm-plugins/utils/drag-menu';
+import { TableCssClassName as ClassName } from '../../types';
+import type { PluginConfig, PluginInjectionAPI, TableDirection } from '../../types';
 import { colorPalletteColumns } from '../consts';
 
 import { DropdownMenu } from './DropdownMenu';

package/src/ui/FloatingInsertButton/index.tsx

@@ -26,10 +26,13 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
-import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';
+import {
+	insertColumnWithAnalytics,
+	insertRowWithAnalytics,
+} from '../../pm-plugins/commands/commands-with-analytics';
+import { checkIfNumberColumnEnabled } from '../../pm-plugins/utils';
 import { TableCssClassName as ClassName } from '../../types';
 import type { PluginInjectionAPI } from '../../types';
-import { checkIfNumberColumnEnabled } from '../../utils';
 
 import getPopupOptions from './getPopupOptions';
 import InsertButton, { DragAndDropInsertButton } from './InsertButton';

package/src/ui/TableFloatingColumnControls/ColumnControls/index.tsx

@@ -18,13 +18,13 @@ import {
 	hoverColumns,
 	selectColumn,
 	selectColumns,
-} from '../../../commands';
-import type { TablePlugin } from '../../../plugin';
+} from '../../../pm-plugins/commands';
 import { toggleDragMenu } from '../../../pm-plugins/drag-and-drop/commands';
 import type { TriggerType } from '../../../pm-plugins/drag-and-drop/types';
+import { getRowsParams, getSelectedColumnIndexes } from '../../../pm-plugins/utils';
+import type { TablePlugin } from '../../../tablePluginType';
 import type { CellHoverMeta, HandleTypes } from '../../../types';
 import { TableCssClassName as ClassName } from '../../../types';
-import { getRowsParams, getSelectedColumnIndexes } from '../../../utils';
 import type { DragHandleAppearance } from '../../DragHandle';
 import { DragHandle } from '../../DragHandle';
 

package/src/ui/TableFloatingColumnControls/index.tsx

@@ -10,9 +10,9 @@ import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/ad
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
+import { containsHeaderColumn, getColumnsWidths, getRowHeights } from '../../pm-plugins/utils';
 import type { CellHoverMeta, DraggableSourceData, PluginInjectionAPI } from '../../types';
 import { TableCssClassName as ClassName } from '../../types';
-import { containsHeaderColumn, getColumnsWidths, getRowHeights } from '../../utils';
 
 import { ColumnControls } from './ColumnControls';
 import { ColumnDropTargets } from './ColumnDropTargets';

package/src/ui/TableFloatingControls/CornerControls/ClassicCornerControls.tsx

@@ -9,7 +9,7 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, isTableSelected, selectTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import { clearHoverSelection, hoverTable } from '../../../commands';
+import { clearHoverSelection, hoverTable } from '../../../pm-plugins/commands';
 import { TableCssClassName as ClassName } from '../../../types';
 
 import type { CornerControlProps } from './types';

package/src/ui/TableFloatingControls/CornerControls/DragCornerControls.tsx

@@ -9,8 +9,8 @@ import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import { findTable, isTableSelected, selectTable } from '@atlaskit/editor-tables/utils';
 
-import { clearHoverSelection } from '../../../commands';
-import type { TablePlugin } from '../../../plugin';
+import { clearHoverSelection } from '../../../pm-plugins/commands';
+import type { TablePlugin } from '../../../tablePluginType';
 import { TableCssClassName as ClassName } from '../../../types';
 
 import type { CornerControlProps } from './types';

package/src/ui/TableFloatingControls/FloatingControlsWithSelection.tsx

@@ -4,7 +4,7 @@ import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
-import type { TablePlugin } from '../../plugin';
+import type { TablePlugin } from '../../tablePluginType';
 
 import { CornerControls } from './CornerControls';
 import { RowControls } from './RowControls';

package/src/ui/TableFloatingControls/NumberColumn/index.tsx

@@ -7,9 +7,9 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { isRowSelected } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import { clearHoverSelection } from '../../../commands';
+import { clearHoverSelection } from '../../../pm-plugins/commands';
+import { getRowHeights } from '../../../pm-plugins/utils';
 import { TableCssClassName as ClassName } from '../../../types';
-import { getRowHeights } from '../../../utils';
 import { tableBorderColor } from '../../consts';
 
 interface Props {

package/src/ui/TableFloatingControls/RowControls/ClassicControls.tsx

@@ -8,10 +8,10 @@ import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import { clearHoverSelection } from '../../../commands';
+import { clearHoverSelection } from '../../../pm-plugins/commands';
+import type { RowParams } from '../../../pm-plugins/utils';
+import { getRowClassNames, getRowHeights, getRowsParams } from '../../../pm-plugins/utils';
 import { TableCssClassName as ClassName } from '../../../types';
-import type { RowParams } from '../../../utils';
-import { getRowClassNames, getRowHeights, getRowsParams } from '../../../utils';
 import { tableControlsSpacing, tableToolbarSize } from '../../consts';
 
 export interface Props {

package/src/ui/TableFloatingControls/RowControls/DragControls.tsx

@@ -13,13 +13,13 @@ import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { token } from '@atlaskit/tokens';
 
-import { clearHoverSelection } from '../../../commands';
+import { clearHoverSelection } from '../../../pm-plugins/commands';
 import { toggleDragMenu } from '../../../pm-plugins/drag-and-drop/commands';
 import type { TriggerType } from '../../../pm-plugins/drag-and-drop/types';
 import { getPluginState as getTablePluginState } from '../../../pm-plugins/plugin-factory';
+import { getRowHeights, getRowsParams, getSelectedRowIndexes } from '../../../pm-plugins/utils';
 import { TableCssClassName as ClassName } from '../../../types';
 import type { CellHoverMeta, DraggableSourceData, HandleTypes } from '../../../types';
-import { getRowHeights, getRowsParams, getSelectedRowIndexes } from '../../../utils';
 import { dropTargetExtendedWidth } from '../../consts';
 import type { DragHandleAppearance } from '../../DragHandle';
 import { DragHandle } from '../../DragHandle';

package/src/ui/TableFloatingControls/index.tsx

@@ -10,12 +10,12 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { findTable } from '@atlaskit/editor-tables/utils';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
-import { hoverCell, hoverRows, selectRow, selectRows } from '../../commands';
-import type { TablePlugin } from '../../plugin';
+import { hoverCell, hoverRows, selectRow, selectRows } from '../../pm-plugins/commands';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
+import { isTableNested } from '../../pm-plugins/utils/nodes';
+import type { TablePlugin } from '../../tablePluginType';
 import { TableCssClassName as ClassName } from '../../types';
 import type { CellHoverMeta } from '../../types';
-import { isTableNested } from '../../utils/nodes';
 
 import {
 	CornerControls,