@atlaskit/editor-plugin-table 8.4.1 → 8.4.3

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';
 
@@ -378,18 +378,10 @@ export const insertTableWithNestingSupport: InsertTableWithNestingSupportCommand
 	) =>
 	({ tr }) => {
 		const { schema } = tr.doc.type;
-		const node = createTableWithWidth({
-			isTableScalingEnabled,
-			isTableAlignmentEnabled,
-			isFullWidthModeEnabled,
-			isCommentEditor,
-			isChromelessEditor,
-			isTableResizingEnabled,
-			createTableProps,
-		})(schema);
 
 		// If the cursor is inside a table
 		let insertAt: Selection | undefined;
+		let isNestedTable = false;
 		if (
 			hasParentNodeOfType(schema.nodes.table)(tr.selection) &&
 			fg('platform_editor_use_nested_table_pm_nodes')
@@ -406,9 +398,23 @@ export const insertTableWithNestingSupport: InsertTableWithNestingSupportCommand
 					return tr;
 				}
 				insertAt = TextSelection.create(tr.doc, positionAfterTopTable);
+			} else {
+				// Table can be nested in parent table
+				isNestedTable = true;
 			}
 		}
 
+		const node = createTableWithWidth({
+			isTableScalingEnabled,
+			isTableAlignmentEnabled,
+			isFullWidthModeEnabled,
+			isCommentEditor,
+			isChromelessEditor,
+			isTableResizingEnabled,
+			isNestedTable,
+			createTableProps,
+		})(schema);
+
 		api?.contentInsertion?.commands?.insert({
 			node,
 			options: {

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,

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.

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,11 +2,15 @@ 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;
 
 type CreateTableOverrides = {
 	tableWidth?: TableAttributes['width'] | 'inherit';
 	layout?: TableAttributes['layout'];
+	rowsCount?: number;
+	colsCount?: number;
 };
 
 export const createTableWithWidth =
@@ -17,6 +21,7 @@ export const createTableWithWidth =
 		isCommentEditor,
 		isChromelessEditor,
 		isTableResizingEnabled,
+		isNestedTable,
 		createTableProps,
 	}: {
 		isTableScalingEnabled?: boolean;
@@ -25,6 +30,7 @@ export const createTableWithWidth =
 		isCommentEditor?: boolean;
 		isChromelessEditor?: boolean;
 		isTableResizingEnabled?: boolean;
+		isNestedTable?: boolean;
 		createTableProps?: {
 			rowsCount?: number;
 			colsCount?: number;
@@ -32,6 +38,14 @@ export const createTableWithWidth =
 	}) =>
 	(schema: Schema) => {
 		const attrsOverrides: CreateTableOverrides = {};
+		if (isNestedTable) {
+			attrsOverrides.rowsCount = createTableProps?.rowsCount
+				? createTableProps?.rowsCount
+				: NESTED_TABLE_DEFAULT_ROWS;
+			attrsOverrides.colsCount = createTableProps?.colsCount
+				? createTableProps?.colsCount
+				: NESTED_TABLE_DEFAULT_COLS;
+		}
 		if (isTableScalingEnabled && isFullWidthModeEnabled && !isCommentEditor) {
 			attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
 		}