@atlaskit/editor-plugin-table 8.4.14 → 9.0.1

package/dist/esm/pm-plugins/table-resizing/utils/resize-column.js

@@ -1,13 +1,6 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 // Resize a given column by an amount from the current state
-import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { TableCssClassName as ClassName } from '../../../types';
-import { ALIGN_CENTER, ALIGN_START, shouldChangeAlignmentToCenterResized } from '../../utils/alignment';
-import { getTableScalingPercent } from './misc';
-import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
+
+import { growColumn, shrinkColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
   var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
@@ -19,138 +12,4 @@ export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, t
   var newState = resizeAmount > 0 ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, scalePercent);
   return newState;
-};
-export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
-  var resizeState = _ref.resizeState,
-    colIndex = _ref.colIndex,
-    amount = _ref.amount,
-    tableRef = _ref.tableRef,
-    tableNode = _ref.tableNode,
-    lineLength = _ref.lineLength,
-    editorWidth = _ref.width,
-    isTableAlignmentEnabled = _ref.isTableAlignmentEnabled;
-  var editorContainerWidth = getEditorContainerWidth(editorWidth);
-  var isTableLeftAligned = tableNode.attrs.layout === ALIGN_START;
-  var isNumberColumnEnabled = tableNode.attrs.isNumberColumnEnabled;
-  var isOverflow = resizeState.tableWidth > resizeState.maxSize;
-  var resizeAmount = isTableLeftAligned ? amount : amount * 2;
-  var willTableHitEditorEdge = resizeState.maxSize + resizeAmount > editorContainerWidth;
-  var willResizedTableStayInOverflow = isOverflow && resizeState.tableWidth + resizeAmount / 2 > resizeState.maxSize;
-
-  // STEP 1: Update col width
-  if (willTableHitEditorEdge || willResizedTableStayInOverflow) {
-    var _tableRef$closest;
-    var tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
-    resizeAmount = amount < 0 ? amount :
-    // Ignored via go/ees005
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    resizeAmount - (resizeState.maxSize + resizeAmount - tableContainerWidth) / 2;
-  } else {
-    var diff = -(resizeState.tableWidth - resizeState.maxSize);
-    var rest = amount - diff;
-    var final = isTableLeftAligned ? diff + rest : diff + rest * 2;
-    resizeAmount = final;
-  }
-  var newState = updateAffectedColumn(resizeState, colIndex, resizeAmount);
-
-  // STEP 2: Update table container width
-  // columns have a min width, so delta !== resizeAmount when this is reached, use this for calculations
-  var delta = newState.cols[colIndex].width - resizeState.cols[colIndex].width;
-  newState.maxSize = Math.round(isOverflow ? willResizedTableStayInOverflow ?
-  // CASE 1A: table will stay in overflow
-  // do not grow the table because resize is happening in the overflow region
-  // and the overall table container needs to be retained
-  isNumberColumnEnabled ? resizeState.maxSize + akEditorTableNumberColumnWidth : resizeState.maxSize :
-  // CASE 1B: table will no longer be in overflow, so adjust container width
-  // ensure the table is resized without any 'big jumps' by working out
-  // the difference between the new table width and the max size and adding the resize
-  isNumberColumnEnabled ? resizeState.maxSize + akEditorTableNumberColumnWidth + (resizeState.tableWidth - resizeState.maxSize + akEditorTableNumberColumnWidth + delta) : resizeState.maxSize + (resizeState.tableWidth - resizeState.maxSize + delta) : willTableHitEditorEdge ?
-  // CASE 2: table will hit editor edge
-  editorContainerWidth :
-  // CASE 3: table is being resized from a non-overflow state
-  isNumberColumnEnabled ? resizeState.maxSize + akEditorTableNumberColumnWidth + delta : resizeState.maxSize + delta);
-
-  // do not apply scaling logic because resize state is already scaled
-  updateColgroup(newState, tableRef, tableNode, false, 1);
-  updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
-  return newState;
-};
-var updateTablePreview = function updateTablePreview(tableRef, newTableWidth, shouldChangeAlignment) {
-  var resizingContainer = tableRef.closest(".".concat(ClassName.TABLE_RESIZER_CONTAINER));
-  var resizingItem = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.querySelector('.resizer-item');
-  var alignmentContainer = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.parentElement;
-  if (resizingItem) {
-    var newWidth = "".concat(newTableWidth, "px");
-    // Ignored via go/ees005
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    resizingContainer.style.width = newWidth;
-    // Ignored via go/ees005
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    resizingItem.style.width = newWidth;
-    if (shouldChangeAlignment && alignmentContainer) {
-      alignmentContainer.style.justifyContent = ALIGN_CENTER;
-    }
-  }
-};
-var getEditorContainerWidth = function getEditorContainerWidth(editorWidth) {
-  return Math.min(editorWidth - akEditorGutterPaddingDynamic() * 2, akEditorFullWidthLayoutWidth);
-};
-
-/**
- * Apply a scaling factor to resize state
- */
-export var scaleResizeState = function scaleResizeState(_ref2) {
-  var resizeState = _ref2.resizeState,
-    tableRef = _ref2.tableRef,
-    tableNode = _ref2.tableNode,
-    editorWidth = _ref2.editorWidth,
-    shouldUseIncreasedScalingPercent = _ref2.shouldUseIncreasedScalingPercent;
-  var isNumberColumnEnabled = tableNode.attrs.isNumberColumnEnabled;
-  var isTableScaled = isNumberColumnEnabled || resizeState.maxSize > getEditorContainerWidth(editorWidth);
-
-  // Tables with number column can cause the table to be in two different states:
-  // 1. The table sum of col widths will be smaller than the max size, which is incorrect. For this
-  // avoid scaling and take the document width
-  // 2. The table sum of col widths will be the same size as max width, which happens when the table
-  // is scaled using preserve table width logic, for this apply a scaled width
-  // return early if table isn't scaled
-  if (!isTableScaled || isNumberColumnEnabled && resizeState.maxSize > resizeState.tableWidth) {
-    return resizeState;
-  }
-  var scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
-  var scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
-  var cols = resizeState.cols.map(function (col) {
-    return _objectSpread(_objectSpread({}, col), {}, {
-      minWidth: tableCellMinWidth,
-      width: Math.max(Math.round(col.width * scalePercent), tableCellMinWidth)
-    });
-  });
-  var calculatedTableWidth = cols.reduce(function (prev, curr) {
-    return prev + curr.width;
-  }, 0);
-
-  // using Math.round can cause the sum of col widths to be larger than the table width
-  // distribute the difference to the first column
-  if (calculatedTableWidth > scaledTableWidth) {
-    var diff = calculatedTableWidth - scaledTableWidth;
-    var hasDiffBeenDistributed = false;
-    cols = cols.map(function (col) {
-      if (!hasDiffBeenDistributed && col.width - diff >= col.minWidth) {
-        hasDiffBeenDistributed = true;
-        return _objectSpread(_objectSpread({}, col), {}, {
-          width: col.width - diff
-        });
-      }
-      return col;
-    });
-  }
-  var maxSize = isNumberColumnEnabled ? Math.round((resizeState.maxSize + akEditorTableNumberColumnWidth) * scalePercent) : Math.round(resizeState.maxSize * scalePercent);
-  return _objectSpread(_objectSpread({}, resizeState), {}, {
-    widths: cols.map(function (col) {
-      return col.width;
-    }),
-    tableWidth: scaledTableWidth,
-    maxSize: maxSize,
-    cols: cols
-  });
 };

package/dist/esm/pm-plugins/table-resizing/utils/resize-state.js

@@ -332,7 +332,6 @@ export var getNewResizeStateFromSelectedColumns = function getNewResizeStateFrom
     layout: layout,
     getEditorContainerWidth: getEditorContainerWidth
   });
-  var resizeState;
   var isTableScalingEnabledOnCurrentTable = isTableScalingEnabled;
   var isTableScalingWithFixedColumnWidthsOptionEnabled = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled;
   if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
@@ -343,7 +342,7 @@ export var getNewResizeStateFromSelectedColumns = function getNewResizeStateFrom
     isTableScalingEnabledOnCurrentTable = true;
     shouldUseIncreasedScalingPercent = true;
   }
-  resizeState = getResizeState({
+  var resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize: maxSize,
     table: table.node,

package/dist/esm/pm-plugins/view-mode-sort/utils.js

@@ -67,6 +67,9 @@ export var toggleSort = function toggleSort(view, event, pluginState) {
   if (!tableId || !tableNode || (tableNode === null || tableNode === void 0 || (_tableNode$type = tableNode.type) === null || _tableNode$type === void 0 ? void 0 : _tableNode$type.name) !== 'table') {
     return;
   }
+
+  // Ignored via go/ees005
+  // eslint-disable-next-line prefer-const
   var _ref = (pluginState === null || pluginState === void 0 ? void 0 : pluginState[tableId]) || {},
     index = _ref.index,
     direction = _ref.direction,

package/dist/esm/tablePlugin.js

@@ -247,14 +247,12 @@ var tablesPlugin = function tablesPlugin(_ref) {
             fullWidthEnabled = _ref5.fullWidthEnabled,
             tableOptions = _ref5.tableOptions,
             getEditorFeatureFlags = _ref5.getEditorFeatureFlags,
-            isTableScalingEnabled = _ref5.isTableScalingEnabled,
-            isNewColumnResizingEnabled = _ref5.isNewColumnResizingEnabled;
+            isTableScalingEnabled = _ref5.isTableScalingEnabled;
           var _pluginConfig2 = pluginConfig(tableOptions),
-            allowColumnResizing = _pluginConfig2.allowColumnResizing,
-            allowTableAlignment = _pluginConfig2.allowTableAlignment;
+            allowColumnResizing = _pluginConfig2.allowColumnResizing;
           return allowColumnResizing ? createFlexiResizingPlugin(dispatch, {
             lastColumnResizable: !fullWidthEnabled
-          }, defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, isTableScalingEnabled || false, isNewColumnResizingEnabled, allowTableAlignment, !!(options !== null && options !== void 0 && options.isCommentEditor)) : undefined;
+          }, defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, api, nodeViewPortalProviderAPI, editorAnalyticsAPI, isTableScalingEnabled || false, !!(options !== null && options !== void 0 && options.isCommentEditor)) : undefined;
         }
       }, {
         name: 'tableEditing',

package/dist/esm/ui/DragPreview/index.js

@@ -29,6 +29,7 @@ export var DragPreview = function DragPreview(_ref) {
       marginLeft: "".concat(marginLeft, "px"),
       // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
       marginTop: "".concat(marginTop, "px"),
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
       transform: transform
     }
   }));

package/dist/esm/ui/FloatingContextualButton/index.js

@@ -48,8 +48,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     }
   };
   var domAtPos = editorView.domAtPos.bind(editorView);
-  var targetCellRef;
-  targetCellRef = findDomRefAtPos(targetCellPosition, domAtPos);
+  var targetCellRef = findDomRefAtPos(targetCellPosition, domAtPos);
   useEffect(function () {
     if (isCellMenuOpenByKeyboard && !isContextualMenuOpen) {
       var state = editorView.state,

package/dist/esm/ui/FloatingContextualMenu/ContextualMenu.js

@@ -105,14 +105,12 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         var _node$attrs, _node$attrs2;
         var node = isOpen && targetCellPosition ? state.doc.nodeAt(targetCellPosition) : null;
         var background = hexToEditorBackgroundPaletteColor((node === null || node === void 0 || (_node$attrs = node.attrs) === null || _node$attrs === void 0 ? void 0 : _node$attrs.background) || '#ffffff');
-        var selectedRowIndex;
-        var selectedColumnIndex;
         var selectedRowAndColumnFromPalette = getSelectedRowAndColumnFromPalette(cellBackgroundColorPalette,
         // Ignored via go/ees005
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         background, colorPalletteColumns);
-        selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
-        selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
+        var selectedRowIndex = selectedRowAndColumnFromPalette.selectedRowIndex;
+        var selectedColumnIndex = selectedRowAndColumnFromPalette.selectedColumnIndex;
         return {
           content: isDragAndDropEnabled ? formatMessage(messages.backgroundColor) : formatMessage(messages.cellBackground),
           value: {

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

@@ -8,6 +8,7 @@ var tableFullWidthLabelWrapperStyles = xcss({
   backgroundColor: 'elevation.surface.overlay',
   borderRadius: 'border.radius',
   boxShadow: 'elevation.shadow.overlay',
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 1,
   boxSizing: 'border-box',
   alignItems: 'center'

package/dist/esm/ui/event-handlers.js

@@ -1,8 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import rafSchedule from 'raf-schd';
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
+import { getParentOfTypeCount } from '@atlaskit/editor-common/nesting';
 import { browser, closestElement, isElementInTableCell, isLastItemMediaGroup, setNodeSelection } from '@atlaskit/editor-common/utils';
 import { Selection, TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findParentNodeOfTypeClosestToPos } from '@atlaskit/editor-prosemirror/utils';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { cellAround, findCellRectClosestToPos, findTable, getSelectionRect, removeTable } from '@atlaskit/editor-tables/utils';
@@ -140,7 +142,16 @@ export var handleMouseOver = function handleMouseOver(view, mouseEvent) {
       _dispatch2 = view.dispatch;
     return hoverColumns([_startIndex], false)(_state, _dispatch2);
   }
-  if ((isCell(target) || isCornerButton(target)) && (typeof insertColumnButtonIndex === 'number' || typeof insertRowButtonIndex === 'number')) {
+  var isNestedTable = getParentOfTypeCount(state.schema.nodes.table)(state.selection.$from) > 1;
+  if (isNestedTable) {
+    // if the table is nested inside a table, we only call hideInsertColumnOrRowButton if the table nearest to the mouse target is NOT the parent table
+    var nearestTable = closestElement(target, 'table');
+    var nestedTable = findParentNodeOfTypeClosestToPos(state.doc.resolve(state.selection.from), [state.schema.nodes.table]);
+    var parentTable = findParentNodeOfTypeClosestToPos(state.doc.resolve((nestedTable === null || nestedTable === void 0 ? void 0 : nestedTable.pos) || 0), [state.schema.nodes.table]);
+    if ((nearestTable === null || nearestTable === void 0 ? void 0 : nearestTable.dataset.tableLocalId) !== (parentTable === null || parentTable === void 0 ? void 0 : parentTable.node.attrs.localId)) {
+      return hideInsertColumnOrRowButton()(state, dispatch);
+    }
+  } else if ((isCell(target) || isCornerButton(target)) && (typeof insertColumnButtonIndex === 'number' || typeof insertRowButtonIndex === 'number')) {
     return hideInsertColumnOrRowButton()(state, dispatch);
   }
   if (isResizeHandleDecoration(target)) {

package/dist/esm/ui/toolbar.js

@@ -365,10 +365,7 @@ export var getToolbarConfig = function getToolbarConfig(getEditorContainerWidth,
 
       // We don't want to show floating toolbar while resizing the table
       var isWidthResizing = tableWidthState === null || tableWidthState === void 0 ? void 0 : tableWidthState.resizing;
-
-      // Hide floating toolbar when resizing column and internal column width is on
-      var shouldHideToolbarForInternalColumnWidth = Boolean((options === null || options === void 0 ? void 0 : options.isNewColumnResizingEnabled) && resizeState && resizeState.dragging);
-      if (tableObject && pluginState.editorHasFocus && !isWidthResizing && !shouldHideToolbarForInternalColumnWidth) {
+      if (tableObject && pluginState.editorHasFocus && !isWidthResizing) {
         var nodeType = state.schema.nodes.table;
         var isNested = pluginState.tablePos && isTableNested(state, pluginState.tablePos);
         var isTableScalingWithFixedColumnWidthsOptionShown = isTableScalingEnabled && isTableFixedColumnWidthsOptionEnabled && !isNested;

package/dist/types/pm-plugins/table-resizing/event-handlers.d.ts

@@ -3,4 +3,4 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PluginInjectionAPI } from '../../types';
-export declare const handleMouseDown: (view: EditorView, event: MouseEvent, localResizeHandlePos: number, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, isTableScalingEnabled: boolean, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isNewColumnResizingEnabled?: boolean, isTableAlignmentEnabled?: boolean, isCommentEditor?: boolean) => boolean;
+export declare const handleMouseDown: (view: EditorView, event: MouseEvent, localResizeHandlePos: number, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, isTableScalingEnabled: boolean, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isCommentEditor?: boolean) => boolean;

package/dist/types/pm-plugins/table-resizing/plugin.d.ts

@@ -4,4 +4,4 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { ColumnResizingPluginState, PluginInjectionAPI } from '../../types';
-export declare function createPlugin(dispatch: Dispatch<ColumnResizingPluginState>, { lastColumnResizable }: ColumnResizingPluginState, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isTableScalingEnabled?: boolean, isNewColumnResizingEnabled?: boolean, isTableAlignmentEnabled?: boolean, isCommentEditor?: boolean): SafePlugin<ColumnResizingPluginState>;
+export declare function createPlugin(dispatch: Dispatch<ColumnResizingPluginState>, { lastColumnResizable }: ColumnResizingPluginState, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isTableScalingEnabled?: boolean, isCommentEditor?: boolean): SafePlugin<ColumnResizingPluginState>;

package/dist/types/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,27 +1,3 @@
-import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, scalePercent?: number) => ResizeState;
-type ResizeInformation = {
-    resizeState: ResizeState;
-    colIndex: number;
-    amount: number;
-};
-type TableReferences = {
-    tableRef: HTMLElement;
-    tableNode: PmNode;
-};
-type TableResizingPluginOptions = {
-    isTableAlignmentEnabled?: boolean;
-};
-type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
-export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
-/**
- * Apply a scaling factor to resize state
- */
-export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, shouldUseIncreasedScalingPercent, }: TableReferences & {
-    resizeState: ResizeState;
-    editorWidth: number;
-    shouldUseIncreasedScalingPercent: boolean;
-}) => ResizeState;
-export {};

package/dist/types/tablePluginType.d.ts

@@ -18,7 +18,6 @@ export interface TablePluginOptions {
     fullWidthEnabled?: boolean;
     wasFullWidthEnabled?: boolean;
     getEditorFeatureFlags?: GetEditorFeatureFlags;
-    isNewColumnResizingEnabled?: boolean;
     isCommentEditor?: boolean;
     isChromelessEditor?: boolean;
 }

package/dist/types-ts4.5/pm-plugins/table-resizing/event-handlers.d.ts

@@ -3,4 +3,4 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { PluginInjectionAPI } from '../../types';
-export declare const handleMouseDown: (view: EditorView, event: MouseEvent, localResizeHandlePos: number, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, isTableScalingEnabled: boolean, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isNewColumnResizingEnabled?: boolean, isTableAlignmentEnabled?: boolean, isCommentEditor?: boolean) => boolean;
+export declare const handleMouseDown: (view: EditorView, event: MouseEvent, localResizeHandlePos: number, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, isTableScalingEnabled: boolean, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isCommentEditor?: boolean) => boolean;

package/dist/types-ts4.5/pm-plugins/table-resizing/plugin.d.ts

@@ -4,4 +4,4 @@ import { type PortalProviderAPI } from '@atlaskit/editor-common/portal';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { ColumnResizingPluginState, PluginInjectionAPI } from '../../types';
-export declare function createPlugin(dispatch: Dispatch<ColumnResizingPluginState>, { lastColumnResizable }: ColumnResizingPluginState, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isTableScalingEnabled?: boolean, isNewColumnResizingEnabled?: boolean, isTableAlignmentEnabled?: boolean, isCommentEditor?: boolean): SafePlugin<ColumnResizingPluginState>;
+export declare function createPlugin(dispatch: Dispatch<ColumnResizingPluginState>, { lastColumnResizable }: ColumnResizingPluginState, getEditorContainerWidth: GetEditorContainerWidth, getEditorFeatureFlags: GetEditorFeatureFlags, api: PluginInjectionAPI | undefined | null, nodeViewPortalProviderAPI: PortalProviderAPI, editorAnalyticsAPI?: EditorAnalyticsAPI, isTableScalingEnabled?: boolean, isCommentEditor?: boolean): SafePlugin<ColumnResizingPluginState>;

package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,27 +1,3 @@
-import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, scalePercent?: number) => ResizeState;
-type ResizeInformation = {
-    resizeState: ResizeState;
-    colIndex: number;
-    amount: number;
-};
-type TableReferences = {
-    tableRef: HTMLElement;
-    tableNode: PmNode;
-};
-type TableResizingPluginOptions = {
-    isTableAlignmentEnabled?: boolean;
-};
-type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
-export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
-/**
- * Apply a scaling factor to resize state
- */
-export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, shouldUseIncreasedScalingPercent, }: TableReferences & {
-    resizeState: ResizeState;
-    editorWidth: number;
-    shouldUseIncreasedScalingPercent: boolean;
-}) => ResizeState;
-export {};

package/dist/types-ts4.5/tablePluginType.d.ts

@@ -18,7 +18,6 @@ export interface TablePluginOptions {
     fullWidthEnabled?: boolean;
     wasFullWidthEnabled?: boolean;
     getEditorFeatureFlags?: GetEditorFeatureFlags;
-    isNewColumnResizingEnabled?: boolean;
     isCommentEditor?: boolean;
     isChromelessEditor?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "8.4.14",
+	"version": "9.0.1",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,11 +30,11 @@
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^97.2.0",
+		"@atlaskit/editor-common": "^98.2.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-batch-attribute-updates": "1.1.9",
+		"@atlaskit/editor-plugin-batch-attribute-updates": "1.1.10",
 		"@atlaskit/editor-plugin-content-insertion": "^1.11.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.1.0",
+		"@atlaskit/icon": "^23.2.0",
 		"@atlaskit/menu": "^2.13.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.4.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.30.0",
+		"@atlaskit/tmp-editor-statsig": "^2.32.0",
 		"@atlaskit/toggle": "^14.0.0",
 		"@atlaskit/tokens": "^2.5.0",
 		"@atlaskit/tooltip": "^19.0.0",

package/src/nodeviews/TableComponent.tsx

@@ -908,7 +908,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		const topShadowPadding = isDragAndDropEnabled ? 0 : shadowPadding;
 		const topOffset = fg('platform_editor_breakout_use_css')
 			? 0
-			: (this.state.stickyHeader?.top ?? 0);
+			: this.state.stickyHeader?.top ?? 0;
 
 		const topStickyShadowPosition =
 			this.state.stickyHeader && topOffset + this.state.stickyHeader.padding + topShadowPadding + 2;

package/src/nodeviews/TableContainer.tsx

@@ -303,7 +303,7 @@ export const ResizableTableContainer = React.memo(
 				? containerWidth - akEditorGutterPaddingDynamic() * 2
 				: containerWidth - akEditorGutterPaddingDynamic() * 2 - resizeHandleSpacing;
 		}
-		let width =
+		const width =
 			!node.attrs.width && isCommentEditor
 				? responsiveContainerWidth
 				: Math.min(tableWidth, responsiveContainerWidth);

package/src/nodeviews/TableRow.ts

@@ -493,24 +493,44 @@ export default class TableRow extends TableNodeView<HTMLTableRowElement> impleme
 		const tableContainer = wrapper.parentElement;
 		const tableContentWrapper = tableContainer?.parentElement;
 
-		const layoutContainer = tableContentWrapper && tableContentWrapper.parentElement;
+		const parentContainer = tableContentWrapper && tableContentWrapper.parentElement;
 
-		if (isCurrentTableSelected) {
-			this.colControlsOffset = tableControlsSpacing;
+		const isTableInsideLayout =
+			parentContainer && parentContainer.getAttribute('data-layout-content');
+
+		const isNestedTable =
+			parentContainer &&
+			(parentContainer.className === 'pm-table-header-content-wrap' ||
+				parentContainer.className === 'pm-table-cell-content-wrap');
+
+		const isNestedDataTable =
+			parentContainer &&
+			parentContainer.getAttribute('data-mark-type') === 'fragment' &&
+			(parentContainer.parentElement?.className === 'pm-table-header-content-wrap' ||
+				parentContainer.parentElement?.className === 'pm-table-cell-content-wrap');
+
+		const isTableInsideTable = isNestedTable || isNestedDataTable;
+
+		if (tableContentWrapper) {
+			if (isCurrentTableSelected) {
+				this.colControlsOffset = tableControlsSpacing;
 
-			if (layoutContainer && layoutContainer.getAttribute('data-layout-content')) {
 				// move table a little out of the way
 				// to provide spacing for table controls
-				// Ignored via go/ees005
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				tableContentWrapper!.style.paddingLeft = '11px';
-			}
-		} else {
-			this.colControlsOffset = 0;
-			if (layoutContainer && layoutContainer.getAttribute('data-layout-content')) {
-				// Ignored via go/ees005
-				// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-				tableContentWrapper!.style.removeProperty('padding-left');
+				if (isTableInsideLayout) {
+					tableContentWrapper.style.paddingLeft = '11px';
+				} else if (isTableInsideTable) {
+					tableContentWrapper.style.paddingLeft = '15px';
+					tableContentWrapper.style.paddingRight = '4px';
+				}
+			} else {
+				this.colControlsOffset = 0;
+				if (isTableInsideLayout) {
+					tableContentWrapper.style.removeProperty('padding-left');
+				} else if (isTableInsideTable) {
+					tableContentWrapper.style.removeProperty('padding-left');
+					tableContentWrapper.style.removeProperty('padding-right');
+				}
 			}
 		}
 

package/src/pm-plugins/commands/column-resize.ts

@@ -382,7 +382,7 @@ export const changeColumnWidthByStep =
 			isTableScalingEnabled && isCommentEditor && !originalTable.attrs?.width
 				? getScalingPercentForTableWithoutWidth(originalTable, dom)
 				: getTableScalingPercent(originalTable, dom, shouldUseIncreasedScalingPercent);
-		let newResizeState = resizeColumn(
+		const newResizeState = resizeColumn(
 			initialResizeState,
 			colIndex,
 			stepSize,

package/src/pm-plugins/commands/hover.ts

@@ -221,8 +221,8 @@ export const hoverCell = (rowIndex?: number, colIndex?: number) =>
 			// If no arguments have been passed then the intention it to reset the hover cell data
 			const clear = rowIndex === undefined && colIndex === undefined;
 
-			const nextRowIndex = clear ? undefined : (rowIndex ?? prevHoveredCell.rowIndex);
-			const nextColIndex = clear ? undefined : (colIndex ?? prevHoveredCell.colIndex);
+			const nextRowIndex = clear ? undefined : rowIndex ?? prevHoveredCell.rowIndex;
+			const nextColIndex = clear ? undefined : colIndex ?? prevHoveredCell.colIndex;
 
 			if (nextRowIndex === prevHoveredCell.rowIndex && nextColIndex === prevHoveredCell.colIndex) {
 				return false;

package/src/pm-plugins/commands/insert.ts

@@ -134,7 +134,7 @@ export const addColumnBefore =
 			return false;
 		}
 		if (dispatch) {
-			let rect = selectedRect(state);
+			const rect = selectedRect(state);
 			dispatch(
 				addColumnAt(
 					api,
@@ -171,7 +171,7 @@ export const addColumnAfter =
 		}
 
 		if (dispatch) {
-			let rect = selectedRect(state);
+			const rect = selectedRect(state);
 			dispatch(
 				addColumnAt(
 					api,
@@ -201,7 +201,7 @@ export const insertColumn =
 	) =>
 	(column: number): Command =>
 	(state, dispatch, view) => {
-		let tr = addColumnAt(
+		const tr = addColumnAt(
 			api,
 			isTableScalingEnabled,
 			isTableFixedColumnWidthsOptionEnabled,

package/src/pm-plugins/commands/misc.ts

@@ -737,7 +737,7 @@ export const addBoldInEmptyHeaderCells =
 
 export const updateWidthToWidest = (widthToWidest: WidthToWidest) =>
 	createCommand((state) => {
-		let { widthToWidest: prevWidthToWidest } = getPluginState(state);
+		const { widthToWidest: prevWidthToWidest } = getPluginState(state);
 
 		if (isEqual(widthToWidest, prevWidthToWidest)) {
 			return false;

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

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

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

@@ -5,7 +5,11 @@ 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/decoration';
+import {
+	createColumnInsertLine,
+	createRowInsertLine,
+	updateDecorations,
+} from '../utils/decoration';
 
 import { DragAndDropActionType } from './actions';
 import { DropTargetType } from './consts';
@@ -122,7 +126,7 @@ export const toggleDragMenu = (
 ) =>
 	createCommand(
 		(state) => {
-			let {
+			const {
 				isDragMenuOpen: previousOpenState,
 				dragMenuDirection: previousDragMenuDirection,
 				dragMenuIndex: previousDragMenuIndex,

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

@@ -55,7 +55,7 @@ const createPlugin = (
 		appendTransaction: (transactions, oldState, newState) => {
 			const newPluginState = pluginKey.getState(newState);
 			let hasAnalyticsBeenDispatched = false;
-			let lastTriggerName =
+			const lastTriggerName =
 				newPluginState?.lastTrigger?.name ||
 				// NOTE: We assume that we know and can correctly differentiate
 				// between all triggers of table overflow state change.