@atlaskit/editor-plugin-table 8.4.2 → 8.4.4

package/src/nodeviews/TableComponent.tsx

@@ -29,13 +29,7 @@ import type { CleanupFn } from '@atlaskit/pragmatic-drag-and-drop/types';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { token } from '@atlaskit/tokens';
 
-import { autoSizeTable, clearHoverSelection } from '../commands';
-import {
-	handleMouseOut,
-	handleMouseOver,
-	isTableInFocus,
-	withCellTracking,
-} from '../event-handlers';
+import { autoSizeTable, clearHoverSelection } from '../pm-plugins/commands';
 import { autoScrollerFactory } from '../pm-plugins/drag-and-drop/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import type { RowStickyState, StickyPluginState } from '../pm-plugins/sticky-headers';
@@ -62,10 +56,6 @@ import {
 	getScalingPercentForTableWithoutWidth,
 	getTableScalingPercent,
 } from '../pm-plugins/table-resizing/utils/misc';
-import type { CellHoverMeta, PluginInjectionAPI } from '../types';
-import { TableCssClassName as ClassName, ShadowEvent } from '../types';
-import TableFloatingColumnControls from '../ui/TableFloatingColumnControls';
-import TableFloatingControls from '../ui/TableFloatingControls';
 import {
 	containsHeaderRow,
 	getAssistiveMessage,
@@ -74,7 +64,17 @@ import {
 	tablesHaveDifferentColumnWidths,
 	tablesHaveDifferentNoOfColumns,
 	tablesHaveDifferentNoOfRows,
-} from '../utils';
+} from '../pm-plugins/utils';
+import type { CellHoverMeta, PluginInjectionAPI } from '../types';
+import { TableCssClassName as ClassName, ShadowEvent } from '../types';
+import {
+	handleMouseOut,
+	handleMouseOver,
+	isTableInFocus,
+	withCellTracking,
+} from '../ui/event-handlers';
+import TableFloatingColumnControls from '../ui/TableFloatingColumnControls';
+import TableFloatingControls from '../ui/TableFloatingControls';
 
 import { ExternalDropTargets } from './ExternalDropTargets';
 import { OverflowShadowsObserver } from './OverflowShadowsObserver';

package/src/nodeviews/TableContainer.tsx

@@ -20,15 +20,15 @@ import {
 	akEditorMobileBreakoutPoint,
 } from '@atlaskit/editor-shared-styles';
 
-import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../commands-with-analytics';
+import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import {
 	TABLE_MAX_WIDTH,
 	TABLE_OFFSET_IN_COMMENT_EDITOR,
 } from '../pm-plugins/table-resizing/utils';
+import { ALIGN_CENTER, ALIGN_START } from '../pm-plugins/utils/alignment';
 import type { PluginInjectionAPI, TableSharedState } from '../types';
 import { TableCssClassName as ClassName } from '../types';
-import { ALIGN_CENTER, ALIGN_START } from '../utils/alignment';
 
 import { getAlignmentStyle } from './table-container-styles';
 import { TableResizer } from './TableResizer';

package/src/nodeviews/TableResizer.tsx

@@ -28,8 +28,8 @@ import { findTable } from '@atlaskit/editor-tables/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { token } from '@atlaskit/tokens';
 
-import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../commands-with-analytics';
-import { updateWidthToWidest } from '../commands/misc';
+import { setTableAlignmentWithTableContentWithPosWithAnalytics } from '../pm-plugins/commands/commands-with-analytics';
+import { updateWidthToWidest } from '../pm-plugins/commands/misc';
 import { META_KEYS } from '../pm-plugins/table-analytics';
 import {
 	COLUMN_MIN_WIDTH,
@@ -40,35 +40,35 @@ import {
 	TABLE_OFFSET_IN_COMMENT_EDITOR,
 } from '../pm-plugins/table-resizing/utils';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
-import type { PluginInjectionAPI, TableSharedStateInternal } from '../types';
-import {
-	TABLE_GUIDELINE_VISIBLE_ADJUSTMENT,
-	TABLE_HIGHLIGHT_GAP,
-	TABLE_HIGHLIGHT_TOLERANCE,
-	TABLE_SNAP_GAP,
-} from '../ui/consts';
 import {
 	ALIGN_CENTER,
 	ALIGN_START,
 	normaliseAlignment,
 	shouldChangeAlignmentToCenterResized,
-} from '../utils/alignment';
+} from '../pm-plugins/utils/alignment';
 import {
 	generateResizedPayload,
 	generateResizeFrameRatePayloads,
 	useMeasureFramerate,
-} from '../utils/analytics';
+} from '../pm-plugins/utils/analytics';
 import {
 	defaultGuidelines,
 	defaultGuidelinesForPreserveTable,
 	PRESERVE_TABLE_GUIDELINES_LENGTH_OFFSET,
-} from '../utils/guidelines';
+} from '../pm-plugins/utils/guidelines';
 import {
 	defaultSnappingWidths,
 	defaultTablePreserveSnappingWidths,
 	findClosestSnap,
 	PRESERVE_TABLE_SNAPPING_LENGTH_OFFSET,
-} from '../utils/snapping';
+} from '../pm-plugins/utils/snapping';
+import type { PluginInjectionAPI, TableSharedStateInternal } from '../types';
+import {
+	TABLE_GUIDELINE_VISIBLE_ADJUSTMENT,
+	TABLE_HIGHLIGHT_GAP,
+	TABLE_HIGHLIGHT_TOLERANCE,
+	TABLE_SNAP_GAP,
+} from '../ui/consts';
 
 interface TableResizerProps {
 	width: number;

package/src/nodeviews/TableRow.ts

@@ -14,6 +14,9 @@ import {
 	syncStickyRowToTable,
 	updateStickyMargins as updateTableMargin,
 } from '../pm-plugins/table-resizing/utils/dom';
+import type { TableDOMElements } from '../pm-plugins/utils/dom';
+import { getTop, getTree } from '../pm-plugins/utils/dom';
+import { supportedHeaderRow } from '../pm-plugins/utils/nodes';
 import type { TablePluginState } from '../types';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import {
@@ -22,9 +25,6 @@ import {
 	tableControlsSpacing,
 	tableScrollbarOffset,
 } from '../ui/consts';
-import type { TableDOMElements } from '../utils/dom';
-import { getTop, getTree } from '../utils/dom';
-import { supportedHeaderRow } from '../utils/nodes';
 
 import TableNodeView from './TableNodeViewBase';
 

package/src/nodeviews/table-container-styles.ts

@@ -1,5 +1,5 @@
+import { ALIGN_START } from '../pm-plugins/utils/alignment';
 import type { AlignmentOptions } from '../types';
-import { ALIGN_START } from '../utils/alignment';
 
 const centerAlignStyle = { display: 'flex', justifyContent: 'center' };
 

package/src/nodeviews/table.tsx

@@ -21,15 +21,15 @@ import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
-import { pluginConfig as getPluginConfig } from '../create-plugin-config';
+import { pluginConfig as getPluginConfig } from '../pm-plugins/create-plugin-config';
 import { pluginKey as tableDragAndDropPluginKey } from '../pm-plugins/drag-and-drop';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import { pluginKey } from '../pm-plugins/plugin-key';
 import { pluginKey as tableResizingPluginKey } from '../pm-plugins/table-resizing';
 import { generateColgroup } from '../pm-plugins/table-resizing/utils';
 import { pluginKey as tableWidthPluginKey } from '../pm-plugins/table-width';
+import { isTableNested } from '../pm-plugins/utils';
 import type { PluginInjectionAPI } from '../types';
-import { isTableNested } from '../utils';
 
 import TableComponent from './TableComponent';
 import { TableComponentWithSharedState } from './TableComponentWithSharedState';

package/src/{toDOM.ts → nodeviews/toDOM.ts}

@@ -8,9 +8,10 @@ import { akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
-import { getAlignmentStyle } from './nodeviews/table-container-styles';
-import { generateColgroup, getResizerMinWidth } from './pm-plugins/table-resizing/utils/colgroup';
-import { TABLE_MAX_WIDTH } from './pm-plugins/table-resizing/utils/consts';
+import { generateColgroup, getResizerMinWidth } from '../pm-plugins/table-resizing/utils/colgroup';
+import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils/consts';
+
+import { getAlignmentStyle } from './table-container-styles';
 
 type Config = {
 	allowColumnResizing: boolean;

package/src/pm-plugins/analytics/plugin.ts

@@ -8,7 +8,7 @@ import {
 	getTableElementMoveTypeBySlice,
 	getTableSelectionType,
 	isInsideFirstCellOfRowOrColumn,
-} from '../../commands/misc';
+} from '../commands/misc';
 
 import { resetRowOrColumnMovedTransform, updateRowOrColumnMoved } from './commands';
 import { createPluginState } from './plugin-factory';

package/src/{commands → pm-plugins/commands}/column-resize.ts

@@ -17,31 +17,31 @@ import {
 	nextCell,
 } from '@atlaskit/editor-tables/utils';
 
-import { getDecorations } from '../pm-plugins/decorations/plugin';
+import { TableDecorations } from '../../types';
+import type { PluginInjectionAPI, TablePluginAction } from '../../types';
+import { getDecorations } from '../decorations/plugin';
 import {
 	buildColumnResizingDecorations,
 	clearColumnResizingDecorations,
-} from '../pm-plugins/decorations/utils';
-import { createCommand, getPluginState } from '../pm-plugins/plugin-factory';
+} from '../decorations/utils';
+import { createCommand, getPluginState } from '../plugin-factory';
 import {
 	getPluginState as getTableResizingPluginState,
 	createCommand as tableResizingPluginCreateCommand,
-} from '../pm-plugins/table-resizing/plugin-factory';
-import { pluginKey as tableResizingPK } from '../pm-plugins/table-resizing/plugin-key';
+} from '../table-resizing/plugin-factory';
+import { pluginKey as tableResizingPK } from '../table-resizing/plugin-key';
 import {
 	currentColWidth,
 	getResizeState,
 	getTableMaxWidth,
 	resizeColumn,
 	updateControls,
-} from '../pm-plugins/table-resizing/utils';
+} from '../table-resizing/utils';
 import {
 	getScalingPercentForTableWithoutWidth,
 	getTableScalingPercent,
-} from '../pm-plugins/table-resizing/utils/misc';
+} from '../table-resizing/utils/misc';
 import { updateColumnWidths } from '../transforms';
-import { TableDecorations } from '../types';
-import type { PluginInjectionAPI, TablePluginAction } from '../types';
 import { createColumnLineResize, getSelectedColumnIndexes, updateDecorations } from '../utils';
 
 const getTablePluginCommand = (

package/src/{commands-with-analytics.ts → pm-plugins/commands/commands-with-analytics.ts}

@@ -28,12 +28,26 @@ import {
 	getSelectionRect,
 } from '@atlaskit/editor-tables/utils';
 
-import { clearMultipleCells } from './commands/clear';
-import { wrapTableInExpand } from './commands/collapse';
-import { changeColumnWidthByStep } from './commands/column-resize';
-import { deleteColumnsCommand } from './commands/delete';
-import { setTableDisplayMode } from './commands/display-mode';
-import { insertColumn, insertRow } from './commands/insert';
+import type {
+	AlignmentOptions,
+	InsertRowMethods,
+	InsertRowOptions,
+	PluginInjectionAPI,
+	RowInsertPosition,
+} from '../../types';
+import { getPluginState } from '../plugin-factory';
+import { distributeColumnsWidths } from '../table-resizing/commands';
+import type { ResizeStateWithAnalytics } from '../table-resizing/utils';
+import { deleteRows, mergeCells } from '../transforms';
+import { checkIfNumberColumnEnabled, getSelectedCellInfo, getSelectedTableInfo } from '../utils';
+import { withEditorAnalyticsAPI } from '../utils/analytics';
+
+import { clearMultipleCells } from './clear';
+import { wrapTableInExpand } from './collapse';
+import { changeColumnWidthByStep } from './column-resize';
+import { deleteColumnsCommand } from './delete';
+import { setTableDisplayMode } from './display-mode';
+import { insertColumn, insertRow } from './insert';
 import {
 	deleteTable,
 	deleteTableIfSelected,
@@ -41,23 +55,10 @@ import {
 	setMultipleCellAttrs,
 	setTableAlignment,
 	setTableAlignmentWithTableContentWithPos,
-} from './commands/misc';
-import { sortByColumn } from './commands/sort';
-import { splitCell } from './commands/split-cell';
-import { toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn } from './commands/toggle';
-import { getPluginState } from './pm-plugins/plugin-factory';
-import { distributeColumnsWidths } from './pm-plugins/table-resizing/commands';
-import type { ResizeStateWithAnalytics } from './pm-plugins/table-resizing/utils';
-import { deleteRows, mergeCells } from './transforms';
-import type {
-	AlignmentOptions,
-	InsertRowMethods,
-	InsertRowOptions,
-	PluginInjectionAPI,
-	RowInsertPosition,
-} from './types';
-import { checkIfNumberColumnEnabled, getSelectedCellInfo, getSelectedTableInfo } from './utils';
-import { withEditorAnalyticsAPI } from './utils/analytics';
+} from './misc';
+import { sortByColumn } from './sort';
+import { splitCell } from './split-cell';
+import { toggleHeaderColumn, toggleHeaderRow, toggleNumberColumn } from './toggle';
 
 // #region Analytics wrappers
 export const emptyMultipleCellsWithAnalytics =

package/src/{commands → pm-plugins/commands}/delete.ts

@@ -1,8 +1,8 @@
 import type { Command } from '@atlaskit/editor-common/types';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
 
+import type { PluginInjectionAPI } from '../../types';
 import { deleteColumns } from '../transforms/delete-columns';
-import type { PluginInjectionAPI } from '../types';
 import { getAllowAddColumnCustomStep } from '../utils/get-allow-add-column-custom-step';
 
 export const deleteColumnsCommand =

package/src/{commands → pm-plugins/commands}/go-to-next-cell.ts

@@ -9,10 +9,10 @@ import { TableMap } from '@atlaskit/editor-tables/table-map';
 import type { Direction } from '@atlaskit/editor-tables/types';
 import { goToNextCell as baseGotoNextCell, findTable } from '@atlaskit/editor-tables/utils';
 
-import { insertRowWithAnalytics } from '../commands-with-analytics';
-import { getPluginState } from '../pm-plugins/plugin-factory';
+import { getPluginState } from '../plugin-factory';
 
 import { stopKeyboardColumnResizing } from './column-resize';
+import { insertRowWithAnalytics } from './commands-with-analytics';
 
 const TAB_FORWARD_DIRECTION = 1;
 const TAB_BACKWARD_DIRECTION = -1;

package/src/{commands → pm-plugins/commands}/hover.ts

@@ -2,9 +2,9 @@
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getCellsInColumn, getCellsInRow } from '@atlaskit/editor-tables/utils';
 
-import { createCommand, getPluginState } from '../pm-plugins/plugin-factory';
-import type { Cell, CellColumnPositioning } from '../types';
-import { TableDecorations } from '../types';
+import type { Cell, CellColumnPositioning } from '../../types';
+import { TableDecorations } from '../../types';
+import { createCommand, getPluginState } from '../plugin-factory';
 import {
 	createCellHoverDecoration,
 	createColumnLineResize,

package/src/{commands → pm-plugins/commands}/insert.ts

@@ -28,10 +28,10 @@ import {
 import { fg } from '@atlaskit/platform-feature-flags';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
-import { updateRowOrColumnMovedTransform } from '../pm-plugins/analytics/commands';
-import { META_KEYS } from '../pm-plugins/table-analytics';
+import type { PluginInjectionAPI } from '../../types';
+import { updateRowOrColumnMovedTransform } from '../analytics/commands';
+import { META_KEYS } from '../table-analytics';
 import { rescaleColumns } from '../transforms/column-width';
-import type { PluginInjectionAPI } from '../types';
 import { checkIfHeaderRowEnabled, copyPreviousRow, createTableWithWidth } from '../utils';
 import { getAllowAddColumnCustomStep } from '../utils/get-allow-add-column-custom-step';
 

package/src/{commands → pm-plugins/commands}/misc.ts

@@ -34,15 +34,15 @@ import {
 	setCellAttrs,
 } from '@atlaskit/editor-tables/utils';
 
-import { getDecorations } from '../pm-plugins/decorations/plugin';
+import type { WidthToWidest } from '../../types';
+import { TableCssClassName as ClassName, TableDecorations } from '../../types';
+import { getDecorations } from '../decorations/plugin';
 import {
 	buildColumnResizingDecorations,
 	clearColumnResizingDecorations,
-} from '../pm-plugins/decorations/utils';
-import { createCommand, getPluginState } from '../pm-plugins/plugin-factory';
+} from '../decorations/utils';
+import { createCommand, getPluginState } from '../plugin-factory';
 import { fixAutoSizedTable } from '../transforms';
-import type { WidthToWidest } from '../types';
-import { TableCssClassName as ClassName, TableDecorations } from '../types';
 import {
 	createColumnControlsDecoration,
 	createColumnSelectedDecoration,

package/src/{commands → pm-plugins/commands}/referentiality.ts

@@ -1,7 +1,7 @@
 import { removeConnectedNodes } from '@atlaskit/editor-common/utils';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 
-import { createCommand } from '../pm-plugins/plugin-factory';
+import { createCommand } from '../plugin-factory';
 
 export const removeDescendantNodes = (sourceNode: PMNode) =>
 	createCommand(

package/src/{commands → pm-plugins/commands}/selection.ts

@@ -23,10 +23,11 @@ import {
 	selectedRect,
 } from '@atlaskit/editor-tables/utils';
 
-import { selectColumn, selectRow } from '../commands/misc';
-import type tablePlugin from '../plugin';
-import { getPluginState } from '../pm-plugins/plugin-factory';
-import { getClosestSelectionRect } from '../toolbar';
+import type tablePlugin from '../../tablePlugin';
+import { getClosestSelectionRect } from '../../ui/toolbar';
+import { getPluginState } from '../plugin-factory';
+
+import { selectColumn, selectRow } from './misc';
 
 enum TableSelectionDirection {
 	TopToBottom = 'TopToBottom',

package/src/{commands → pm-plugins/commands}/sort.ts

@@ -15,8 +15,8 @@ import {
 	isSelectionType,
 } from '@atlaskit/editor-tables/utils';
 
-import { createCommand, getPluginState } from '../pm-plugins/plugin-factory';
-import type { TablePluginState } from '../types';
+import type { TablePluginState } from '../../types';
+import { createCommand, getPluginState } from '../plugin-factory';
 
 const createGetInlineCardTextFromStore = (attrs: CardAttributes): string | null => {
 	const { data } = attrs as DataType;

package/src/{commands → pm-plugins/commands}/split-cell.ts

@@ -1,8 +1,8 @@
 import type { Command } from '@atlaskit/editor-common/types';
 import { splitCellWithType } from '@atlaskit/editor-tables/utils';
 
-import { getPluginState } from '../pm-plugins/plugin-factory';
-import type { TablePluginState } from '../types';
+import type { TablePluginState } from '../../types';
+import { getPluginState } from '../plugin-factory';
 
 /**
  * We need to split cell keeping the right type of cell given current table configuration.

package/src/{commands → pm-plugins/commands}/toggle.ts

@@ -6,8 +6,8 @@ import type { Command } from '@atlaskit/editor-common/types';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { findTable, toggleHeader } from '@atlaskit/editor-tables/utils';
 
-import { createCommand } from '../pm-plugins/plugin-factory';
-import { META_KEYS } from '../pm-plugins/table-analytics';
+import { createCommand } from '../plugin-factory';
+import { META_KEYS } from '../table-analytics';
 //#endregion
 
 // #region Utils

package/src/{create-plugin-config.ts → pm-plugins/create-plugin-config.ts}

@@ -1,4 +1,4 @@
-import type { PermittedLayoutsDescriptor, PluginConfig } from './types';
+import type { PermittedLayoutsDescriptor, PluginConfig } from '../types';
 
 export const pluginConfig = (config: PluginConfig = {}) => {
 	return config.advanced

package/src/pm-plugins/decorations/utils/column-controls.ts

@@ -11,7 +11,7 @@ import {
 	findColumnControlSelectedDecoration,
 	findControlsHoverDecoration,
 	updateDecorations,
-} from '../../../utils/decoration';
+} from '../../utils/decoration';
 
 import { composeDecorations } from './compose-decorations';
 import type { BuildDecorationTransformerParams, DecorationTransformer } from './types';

package/src/pm-plugins/decorations/utils/column-resizing.ts

@@ -4,7 +4,7 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import type { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 
 import { TableDecorations } from '../../../types';
-import { createResizeHandleDecoration, updateDecorations } from '../../../utils/decoration';
+import { createResizeHandleDecoration, updateDecorations } from '../../utils/decoration';
 
 import { composeDecorations } from './compose-decorations';
 import type { DecorationTransformer } from './types';

package/src/pm-plugins/drag-and-drop/commands-with-analytics.ts

@@ -16,9 +16,9 @@ import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { findCellRectClosestToPos, getSelectionRect } from '@atlaskit/editor-tables/utils';
 
 import type { DraggableData, DraggableType } from '../../types';
-import { getSelectedColumnIndexes, getSelectedRowIndexes, getSelectedTableInfo } from '../../utils';
-import { withEditorAnalyticsAPI } from '../../utils/analytics';
-import { canMove, getTargetIndex } from '../../utils/drag-menu';
+import { getSelectedColumnIndexes, getSelectedRowIndexes, getSelectedTableInfo } from '../utils';
+import { withEditorAnalyticsAPI } from '../utils/analytics';
+import { canMove, getTargetIndex } from '../utils/drag-menu';
 
 import { clearDropTarget, cloneSource, moveSource } from './commands';
 

package/src/pm-plugins/drag-and-drop/commands.ts

@@ -5,7 +5,7 @@ import { cloneColumn, cloneRow, moveColumn, moveRow } from '@atlaskit/editor-tab
 
 import type { DraggableType, TableDirection } from '../../types';
 import { TableDecorations } from '../../types';
-import { createColumnInsertLine, createRowInsertLine, updateDecorations } from '../../utils';
+import { createColumnInsertLine, createRowInsertLine, updateDecorations } from '../utils';
 
 import { DragAndDropActionType } from './actions';
 import { DropTargetType } from './consts';

package/src/pm-plugins/drag-and-drop/plugin.ts

@@ -11,10 +11,10 @@ import { combine } from '@atlaskit/pragmatic-drag-and-drop/combine';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 
 import type { DraggableSourceData } from '../../types';
-import { findNearestCellIndexToPoint, hasMergedCellsInBetween } from '../../utils';
 import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { pluginKey as tablePluginKey } from '../plugin-key';
 import { insertColgroupFromNode } from '../table-resizing/utils';
+import { findNearestCellIndexToPoint, hasMergedCellsInBetween } from '../utils';
 
 import { DragAndDropActionType } from './actions';
 import { clearDropTarget, setDropTarget, toggleDragMenu } from './commands';

package/src/{handlers.ts → pm-plugins/handlers.ts}

@@ -9,9 +9,10 @@ import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
-import { defaultTableSelection } from './pm-plugins/default-table-selection';
-import { pluginKey as tableResizingPluginKey } from './pm-plugins/table-resizing';
-import type { TablePluginState } from './types';
+import type { TablePluginState } from '../types';
+
+import { defaultTableSelection } from './default-table-selection';
+import { pluginKey as tableResizingPluginKey } from './table-resizing';
 import { isTableCollapsible } from './utils/collapse';
 import {
 	checkIfHeaderColumnEnabled,

package/src/pm-plugins/keymap.ts

@@ -44,27 +44,28 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from '../commands';
+import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
+import type { PluginInjectionAPI, PluginInjectionAPIWithA11y } from '../types';
+
+import { goToNextCell, moveCursorBackward, setFocusToCellMenu } from './commands';
+import {
+	activateNextResizeArea,
+	initiateKeyboardColumnResizing,
+	stopKeyboardColumnResizing,
+} from './commands/column-resize';
 import {
 	addRowAroundSelection,
 	changeColumnWidthByStepWithAnalytics,
 	deleteSelectedRowsOrColumnsWithAnalyticsViaShortcut,
 	deleteTableIfSelectedWithAnalytics,
 	emptyMultipleCellsWithAnalytics,
-} from '../commands-with-analytics';
-import {
-	activateNextResizeArea,
-	initiateKeyboardColumnResizing,
-	stopKeyboardColumnResizing,
-} from '../commands/column-resize';
+} from './commands/commands-with-analytics';
 import {
 	addColumnAfter as addColumnAfterCommand,
 	addColumnBefore as addColumnBeforeCommand,
 	createTable,
 	insertTableWithNestingSupport,
-} from '../commands/insert';
-import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
-import type { PluginInjectionAPI, PluginInjectionAPIWithA11y } from '../types';
+} from './commands/insert';
 
 export function keymapPlugin(
 	getEditorContainerWidth: GetEditorContainerWidth,

package/src/pm-plugins/main.ts

@@ -26,14 +26,20 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
-import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from '../commands';
-import { stopKeyboardColumnResizing } from '../commands/column-resize';
 import {
-	removeResizeHandleDecorations,
-	transformSliceRemoveCellBackgroundColor,
-	transformSliceToAddTableHeaders,
-	transformSliceToRemoveColumnsWidths,
-} from '../commands/misc';
+	lazyTableCellView,
+	lazyTableHeaderView,
+	lazyTableRowView,
+	lazyTableView,
+} from '../nodeviews/lazy-node-views';
+import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
+import type {
+	InvalidNodeAttr,
+	PluginConfig,
+	PluginInjectionAPI,
+	PluginInjectionAPIWithA11y,
+} from '../types';
+import { TableCssClassName as ClassName } from '../types';
 import {
 	handleBlur,
 	handleClick,
@@ -47,33 +53,27 @@ import {
 	handleTripleClick,
 	whenTableInFocus,
 	withCellTracking,
-} from '../event-handlers';
+} from '../ui/event-handlers';
+
+import { addBoldInEmptyHeaderCells, clearHoverSelection, setTableRef } from './commands';
+import { stopKeyboardColumnResizing } from './commands/column-resize';
 import {
-	lazyTableCellView,
-	lazyTableHeaderView,
-	lazyTableRowView,
-	lazyTableView,
-} from '../nodeviews/lazy-node-views';
-import { pluginKey as decorationsPluginKey } from '../pm-plugins/decorations/plugin';
-import { fixTables, replaceSelectedTable } from '../transforms';
-import type {
-	InvalidNodeAttr,
-	PluginConfig,
-	PluginInjectionAPI,
-	PluginInjectionAPIWithA11y,
-} from '../types';
-import { TableCssClassName as ClassName } from '../types';
+	removeResizeHandleDecorations,
+	transformSliceRemoveCellBackgroundColor,
+	transformSliceToAddTableHeaders,
+	transformSliceToRemoveColumnsWidths,
+} from './commands/misc';
+import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
+import { createPluginState, getPluginState } from './plugin-factory';
+import { pluginKey } from './plugin-key';
+import { fixTables, replaceSelectedTable } from './transforms';
 import {
 	findControlsHoverDecoration,
 	transformSliceToCorrectEmptyTableCells,
 	transformSliceToFixHardBreakProblemOnCopyFromCell,
 	transformSliceToRemoveOpenTable,
-} from '../utils';
-import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from '../utils/paste';
-
-import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
-import { createPluginState, getPluginState } from './plugin-factory';
-import { pluginKey } from './plugin-key';
+} from './utils';
+import { isHeaderRowRequired, transformSliceTableLayoutDefaultToCenter } from './utils/paste';
 
 export const createPlugin = (
 	dispatchAnalyticsEvent: DispatchAnalyticsEvent,