@atlaskit/editor-plugin-table 8.4.2 → 8.4.4

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

@@ -1,9 +1,8 @@
 import { pluginFactory } from '@atlaskit/editor-common/utils';
 
-import { handleDocOrSelectionChanged } from '../handlers';
-import reducer from '../reducer';
-
+import { handleDocOrSelectionChanged } from './handlers';
 import { pluginKey } from './plugin-key';
+import reducer from './reducer';
 
 export const { createPluginState, createCommand, getPluginState } = pluginFactory(
 	pluginKey,

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

@@ -1,5 +1,6 @@
-import { defaultTableSelection } from './pm-plugins/default-table-selection';
-import type { TablePluginAction, TablePluginState } from './types';
+import type { TablePluginAction, TablePluginState } from '../types';
+
+import { defaultTableSelection } from './default-table-selection';
 
 export default (pluginState: TablePluginState, action: TablePluginAction): TablePluginState => {
 	switch (action.type) {

package/src/pm-plugins/table-resizing/commands.ts

@@ -5,9 +5,9 @@ import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { ContentNodeWithPos } from '@atlaskit/editor-prosemirror/utils';
 import { isTableSelected } from '@atlaskit/editor-tables/utils';
 
-import { updateColumnWidths } from '../../transforms';
 import type { PluginInjectionAPI } from '../../types';
 import { META_KEYS } from '../table-analytics';
+import { updateColumnWidths } from '../transforms';
 
 import { createCommand, getPluginState } from './plugin-factory';
 import type { ResizeState } from './utils';

package/src/pm-plugins/table-resizing/event-handlers.ts

@@ -15,18 +15,18 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 
-import { stopKeyboardColumnResizing } from '../../commands/column-resize';
-import { updateResizeHandleDecorations } from '../../commands/misc';
-import { updateColumnWidths } from '../../transforms';
 import type { PluginInjectionAPI } from '../../types';
-import { getSelectedColumnIndexes, isTableNested } from '../../utils';
+import { stopKeyboardColumnResizing } from '../commands/column-resize';
+import { updateResizeHandleDecorations } from '../commands/misc';
+import { getPluginState as getTablePluginState } from '../plugin-factory';
+import { META_KEYS } from '../table-analytics';
+import { updateColumnWidths } from '../transforms';
+import { getSelectedColumnIndexes, isTableNested } from '../utils';
 import {
 	ALIGN_CENTER,
 	ALIGN_START,
 	shouldChangeAlignmentToCenterResized,
-} from '../../utils/alignment';
-import { getPluginState as getTablePluginState } from '../plugin-factory';
-import { META_KEYS } from '../table-analytics';
+} from '../utils/alignment';
 
 import { evenColumns, setDragging, stopResizing } from './commands';
 import { getPluginState } from './plugin-factory';

package/src/pm-plugins/table-resizing/utils/dom.ts

@@ -4,9 +4,9 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 
 import { TableCssClassName as ClassName } from '../../../types';
-import { colWidthsForRow } from '../../../utils/column-controls';
-import { getRowHeights } from '../../../utils/row-controls';
 import { getPluginState as getMainPluginState } from '../../plugin-factory';
+import { colWidthsForRow } from '../../utils/column-controls';
+import { getRowHeights } from '../../utils/row-controls';
 
 export const updateControls = () => (state: EditorState) => {
 	const { tableRef } = getMainPluginState(state);

package/src/pm-plugins/table-resizing/utils/resize-column.ts

@@ -13,7 +13,7 @@ import {
 	ALIGN_CENTER,
 	ALIGN_START,
 	shouldChangeAlignmentToCenterResized,
-} from '../../../utils/alignment';
+} from '../../utils/alignment';
 
 import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';

package/src/pm-plugins/table-resizing/utils/resize-state.ts

@@ -6,7 +6,7 @@ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
 
-import { getSelectedTableInfo } from '../../../utils';
+import { getSelectedTableInfo } from '../../utils';
 
 import { getColWidthFix, hasTableBeenResized, insertColgroupFromNode } from './colgroup';
 import type { ColumnState } from './column-state';

package/src/pm-plugins/table-resizing/utils/scale-table.ts

@@ -5,9 +5,9 @@ import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { DomAtPos } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 
-import { updateColumnWidths } from '../../../transforms';
 import type { PluginInjectionAPI } from '../../../types';
-import { getTableWidth } from '../../../utils';
+import { updateColumnWidths } from '../../transforms';
+import { getTableWidth } from '../../utils';
 import { getLayoutSize } from '../utils/misc';
 import { reduceSpace } from '../utils/resize-logic';
 import {

package/src/pm-plugins/table-selection-keymap.ts

@@ -13,6 +13,8 @@ import {
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 
+import { type PluginInjectionAPI } from '../types';
+
 import {
 	arrowLeftFromTable,
 	arrowRightFromTable,
@@ -20,8 +22,7 @@ import {
 	selectColumns,
 	selectRows,
 	shiftArrowUpFromTable,
-} from '../commands/selection';
-import { type PluginInjectionAPI } from '../types';
+} from './commands/selection';
 
 export function tableSelectionKeymapPlugin(
 	pluginInjectionApi?: PluginInjectionAPI,

package/src/pm-plugins/table-width-in-comment-fix.ts

@@ -19,7 +19,7 @@ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
 import { akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
 
-import { ALIGN_START } from '../utils/alignment';
+import { ALIGN_START } from './utils/alignment';
 
 type TableWidthInCommentFixPluginState = {
 	documentHasLoadedOnce: boolean;

package/src/pm-plugins/table-width.ts

@@ -16,9 +16,8 @@ import {
 	akEditorWideLayoutWidth,
 } from '@atlaskit/editor-shared-styles';
 
-import { ALIGN_START } from '../utils/alignment';
-
 import { TABLE_MAX_WIDTH } from './table-resizing/utils';
+import { ALIGN_START } from './utils/alignment';
 
 type __ReplaceStep = ReplaceStep & {
 	// Properties `to` and `from` are private attributes of ReplaceStep.

package/src/{transforms → pm-plugins/transforms}/column-width.ts

@@ -8,16 +8,16 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { fg } from '@atlaskit/platform-feature-flags';
 
-import type { ResizeState } from '../pm-plugins/table-resizing/utils';
+import type { PluginInjectionAPI } from '../../types';
+import type { ResizeState } from '../table-resizing/utils';
 import {
 	getTableContainerElementWidth,
 	getTableElementWidth,
 	hasTableBeenResized,
-} from '../pm-plugins/table-resizing/utils';
-import { isMinCellWidthTable } from '../pm-plugins/table-resizing/utils/colgroup';
-import { getResizeState } from '../pm-plugins/table-resizing/utils/resize-state';
-import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
-import type { PluginInjectionAPI } from '../types';
+} from '../table-resizing/utils';
+import { isMinCellWidthTable } from '../table-resizing/utils/colgroup';
+import { getResizeState } from '../table-resizing/utils/resize-state';
+import { scaleTableTo } from '../table-resizing/utils/scale-table';
 
 /**
  * Given a new ResizeState object, create a transaction that replaces and updates the table node based on new state.
@@ -90,7 +90,15 @@ export const updateColumnWidths =
 				const cell = table.nodeAt(pos);
 				if (!seen[pos] && cell) {
 					if (updatedCellsAttrs[pos]) {
-						steps.push(new AttrStep(pos + start, 'colwidth', updatedCellsAttrs[pos].colwidth));
+						steps.push(
+							new AttrStep(
+								pos + start,
+								'colwidth',
+								updatedCellsAttrs[pos].colwidth === undefined && fg('platform_editor_ed_25642')
+									? null
+									: updatedCellsAttrs[pos].colwidth,
+							),
+						);
 					}
 					seen[pos] = true;
 				}

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

@@ -9,8 +9,8 @@ import type { Rect } from '@atlaskit/editor-tables/table-map';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
 
-import { META_KEYS } from '../pm-plugins/table-analytics';
-import type { PluginInjectionAPI } from '../types';
+import type { PluginInjectionAPI } from '../../types';
+import { META_KEYS } from '../table-analytics';
 
 import { rescaleColumns } from './column-width';
 import { splitCellsInColumns } from './split';

package/src/{transforms → pm-plugins/transforms}/fix-tables.ts

@@ -7,13 +7,13 @@ import {
 	akEditorWideLayoutWidth,
 } from '@atlaskit/editor-shared-styles';
 
+import type { ReportInvalidNodeAttrs } from '../../types';
 import {
 	calculateColumnWidth,
 	contentWidth,
 	getCellsRefsInColumn,
 	getLayoutSize,
-} from '../pm-plugins/table-resizing/utils';
-import type { ReportInvalidNodeAttrs } from '../types';
+} from '../table-resizing/utils';
 
 const validateTableCellNodeAttrs = (
 	{ colspan, rowspan, tableLocalId }: { colspan?: number; rowspan?: number; tableLocalId: string },

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

@@ -1,8 +1,8 @@
 import type { TableLayout } from '@atlaskit/adf-schema';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 
-import { FULL_WIDTH_EDITOR_CONTENT_WIDTH } from '../pm-plugins/table-resizing/utils/consts';
-import type { AlignmentOptions } from '../types';
+import type { AlignmentOptions } from '../../types';
+import { FULL_WIDTH_EDITOR_CONTENT_WIDTH } from '../table-resizing/utils/consts';
 
 export const ALIGN_START = 'align-start';
 export const ALIGN_CENTER = 'center';

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

@@ -13,8 +13,9 @@ import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect } from '@atlaskit/editor-tables/utils';
 
-import { hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
-import { getTableWidth } from '../utils';
+import { hasTableBeenResized } from '../table-resizing/utils';
+
+import { getTableWidth } from './index';
 
 export function getSelectedTableInfo(selection: Selection): {
 	table: ReturnType<typeof findTable> | undefined;

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

@@ -5,7 +5,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect } from '@atlaskit/editor-tables/utils';
 
-import { tableDeleteButtonSize } from '../ui/consts';
+import { tableDeleteButtonSize } from '../../ui/consts';
 
 interface CellWidthInfo {
 	width: number;

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

@@ -2,7 +2,7 @@ import type { TableAttributes } from '@atlaskit/adf-schema';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { createTable } from '@atlaskit/editor-tables/utils';
 
-import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
+import { TABLE_MAX_WIDTH } from '../table-resizing/utils';
 const NESTED_TABLE_DEFAULT_ROWS = 2;
 const NESTED_TABLE_DEFAULT_COLS = 2;
 

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`.

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';