@atlaskit/editor-plugin-table 7.23.0 → 7.24.1

package/dist/es2019/ui/FloatingInsertButton/index.js

@@ -10,7 +10,7 @@ import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-s
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';
 import { TableCssClassName as ClassName } from '../../types';
 import { checkIfNumberColumnEnabled } from '../../utils';
@@ -34,7 +34,8 @@ export class FloatingInsertButton extends React.Component {
       isHeaderColumnEnabled,
       isHeaderRowEnabled,
       isDragAndDropEnabled,
-      dispatchAnalyticsEvent
+      dispatchAnalyticsEvent,
+      isChromelessEditor
     } = this.props;
 
     // TODO: temporarily disable insert button for first column and row https://atlassian.slack.com/archives/C05U8HRQM50/p1698363744682219?thread_ts=1698209039.104909&cid=C05U8HRQM50
@@ -124,7 +125,8 @@ export class FloatingInsertButton extends React.Component {
       type: type,
       tableRef: tableRef,
       onMouseDown: type === 'column' ? this.insertColumn : this.insertRow,
-      hasStickyHeaders: this.props.hasStickyHeaders || false
+      hasStickyHeaders: this.props.hasStickyHeaders || false,
+      isChromelessEditor: isChromelessEditor
     }) : /*#__PURE__*/React.createElement(InsertButton, {
       type: type,
       tableRef: tableRef,
@@ -186,7 +188,7 @@ export class FloatingInsertButton extends React.Component {
         tableDuplicateCellColouring = false,
         tableWithFixedColumnWidthsOption = false
       } = getEditorFeatureFlags ? getEditorFeatureFlags() : {};
-      const shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+      const shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent');
       const {
         state,
         dispatch

package/dist/es2019/ui/TableFloatingColumnControls/index.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { TableCssClassName as ClassName } from '../../types';
 import { containsHeaderColumn, getColumnsWidths, getRowHeights } from '../../utils';
@@ -21,7 +21,8 @@ export const TableFloatingColumnControls = ({
   isNumberColumnEnabled,
   getScrollOffset,
   tableWrapperHeight,
-  api
+  api,
+  isChromelessEditor
 }) => {
   const [isDragging, setIsDragging] = useState(false);
   const containerRef = useRef(null);
@@ -73,7 +74,7 @@ export const TableFloatingColumnControls = ({
     ref: containerRef
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,
-    className: ClassName.DRAG_COLUMN_CONTROLS_WRAPPER,
+    className: ClassName.DRAG_COLUMN_CONTROLS_WRAPPER + (isChromelessEditor ? ' ' + ClassName.DRAG_CONTROLS_CHROMELESS : ''),
     "data-testid": "table-floating-column-controls-wrapper"
   }, /*#__PURE__*/React.createElement(ColumnControls, {
     editorView: editorView,
@@ -91,7 +92,7 @@ export const TableFloatingColumnControls = ({
     isNumberColumnEnabled: isNumberColumnEnabled,
     isDragging: isDragging,
     getScrollOffset: getScrollOffset,
-    api: getBooleanFF('platform.editor.table.use-shared-state-hook') ? api : undefined
+    api: fg('platform.editor.table.use-shared-state-hook') ? api : undefined
   }), isDragging && /*#__PURE__*/React.createElement(ColumnDropTargets, {
     tableRef: tableRef,
     isHeaderSticky: (stickyHeader === null || stickyHeader === void 0 ? void 0 : stickyHeader.sticky) && hasHeaderRow,

package/dist/es2019/ui/TableFloatingControls/index.js

@@ -27,7 +27,8 @@ export const TableFloatingControls = ({
   hoveredCell,
   isTableHovered,
   tableWrapperWidth,
-  api
+  api,
+  isChromelessEditor
 }) => {
   var _findTable;
   const _selectRow = useCallback((row, expand) => {
@@ -81,7 +82,7 @@ export const TableFloatingControls = ({
     return null;
   }
   const stickyTop = stickyHeader && stickyHeader.sticky && hasHeaderRow ? stickyHeader.top : undefined;
-  const wrapperClassName = isDragAndDropEnabled ? ClassName.DRAG_ROW_CONTROLS_WRAPPER : ClassName.ROW_CONTROLS_WRAPPER;
+  const wrapperClassName = isDragAndDropEnabled ? isChromelessEditor ? ClassName.DRAG_ROW_CONTROLS_WRAPPER + ' ' + ClassName.DRAG_CONTROLS_CHROMELESS : ClassName.DRAG_ROW_CONTROLS_WRAPPER : ClassName.ROW_CONTROLS_WRAPPER;
   const tablePos = (_findTable = findTable(editorView.state.selection)) === null || _findTable === void 0 ? void 0 : _findTable.pos;
   const isNested = tablePos !== undefined && isTableNested(editorView.state, tablePos);
   const shouldShowCornerControls = fg('platform_editor_element_drag_and_drop_ed_24041') ? !(featureFlagsState !== null && featureFlagsState !== void 0 && featureFlagsState.elementDragAndDrop) || isNested : !(featureFlagsState !== null && featureFlagsState !== void 0 && featureFlagsState.elementDragAndDrop);

package/dist/es2019/ui/common-styles.js

@@ -439,10 +439,18 @@ export const baseTableStyles = props => {
 			}
 		}
 
+		.${ClassName.DRAG_ROW_CONTROLS_WRAPPER}.${ClassName.DRAG_CONTROLS_CHROMELESS} {
+			left: -4px;
+		}
+
 		.${ClassName.DRAG_COLUMN_CONTROLS_WRAPPER} {
 			padding: 0 ${tablePadding}px;
 		}
 
+		.${ClassName.DRAG_COLUMN_CONTROLS_WRAPPER}.${ClassName.DRAG_CONTROLS_CHROMELESS} {
+			left: -8px;
+		}
+
 		&.${ClassName.TABLE_CONTAINER}[data-number-column='true'] {
 			padding-left: ${akEditorTableNumberColumnWidth + tablePadding - 1}px;
 		}

package/dist/es2019/ui/ui-styles.js

@@ -150,6 +150,10 @@ export const dragInsertButtonWrapper = () => css`
 		left: -3px;
 		bottom: -2px;
 	}
+	.${ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW_CHROMELESS} {
+		left: 6px;
+		bottom: -2px;
+	}
 
 	.${ClassName.DRAG_CONTROLS_INSERT_BUTTON} {
 		${Button(`

package/dist/esm/nodeviews/TableComponent.js

@@ -729,7 +729,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         headerRowHeight: headerRow ? headerRow.offsetHeight : undefined,
         stickyHeader: this.state.stickyHeader,
         tableWrapperWidth: this.state.tableWrapperWidth,
-        api: pluginInjectionApi
+        api: pluginInjectionApi,
+        isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor
       });
       var tableContainerWidth = getTableContainerWidth(node);
       var colControls = isDragAndDropEnabled ? /*#__PURE__*/React.createElement(TableFloatingColumnControls, {
@@ -757,7 +758,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
           return ((_this4$wrapper = _this4.wrapper) === null || _this4$wrapper === void 0 ? void 0 : _this4$wrapper.scrollLeft) || 0;
         },
         tableWrapperHeight: this.state.tableWrapperHeight,
-        api: pluginInjectionApi
+        api: pluginInjectionApi,
+        isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor
       }) : null;
       var shadowPadding = allowControls && tableActive ? -tableToolbarSize : tableMarginSides;
       var shadowStyle = memoizeOne(function (visible) {
@@ -803,7 +805,8 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         isWholeTableInDanger: isWholeTableInDanger,
         isTableAlignmentEnabled: isTableAlignmentEnabled,
         shouldUseIncreasedScalingPercent: shouldUseIncreasedScalingPercent,
-        isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor
+        isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor,
+        isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor
       }, /*#__PURE__*/React.createElement("div", {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         className: ClassName.TABLE_STICKY_SENTINEL_TOP,

package/dist/esm/nodeviews/TableContainer.js

@@ -287,7 +287,8 @@ export var TableContainer = function TableContainer(_ref6) {
     isTableWithFixedColumnWidthsOptionEnabled = _ref6.isTableWithFixedColumnWidthsOptionEnabled,
     isTableAlignmentEnabled = _ref6.isTableAlignmentEnabled,
     shouldUseIncreasedScalingPercent = _ref6.shouldUseIncreasedScalingPercent,
-    isCommentEditor = _ref6.isCommentEditor;
+    isCommentEditor = _ref6.isCommentEditor,
+    isChromelessEditor = _ref6.isChromelessEditor;
   if (isTableResizingEnabled && !isNested) {
     return /*#__PURE__*/React.createElement(ResizableTableContainer
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -319,7 +320,8 @@ export var TableContainer = function TableContainer(_ref6) {
     }),
     style: {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-      width: 'inherit'
+      width: 'inherit',
+      marginLeft: isChromelessEditor ? 18 : undefined
     }
   }, children);
 };

package/dist/esm/nodeviews/lazy-node-views.js

@@ -7,7 +7,7 @@ import TableRow from './TableRow';
 export var lazyTableView = function lazyTableView(options) {
   if (!fg('platform_editor_lazy-node-views')) {
     return function (node, view, getPos) {
-      return createTableView(node, view, getPos, options.portalProviderAPI, options.eventDispatcher, options.getEditorContainerWidth, options.getEditorFeatureFlags, options.dispatchAnalyticsEvent, options.pluginInjectionApi, options.isTableAlignmentEnabled, options.isCommentEditor);
+      return createTableView(node, view, getPos, options.portalProviderAPI, options.eventDispatcher, options.getEditorContainerWidth, options.getEditorFeatureFlags, options.dispatchAnalyticsEvent, options.pluginInjectionApi, options.isTableAlignmentEnabled, options.isCommentEditor, options.isChromelessEditor);
     };
   }
   var loader = function loader() {
@@ -23,8 +23,9 @@ export var lazyTableView = function lazyTableView(options) {
           dispatchAnalyticsEvent = _getNodeViewOptions.dispatchAnalyticsEvent,
           pluginInjectionApi = _getNodeViewOptions.pluginInjectionApi,
           isTableAlignmentEnabled = _getNodeViewOptions.isTableAlignmentEnabled,
-          isCommentEditor = _getNodeViewOptions.isCommentEditor;
-        return createTableView(node, view, getPos, portalProviderAPI, eventDispatcher, getEditorContainerWidth, getEditorFeatureFlags, dispatchAnalyticsEvent, pluginInjectionApi, isTableAlignmentEnabled, isCommentEditor);
+          isCommentEditor = _getNodeViewOptions.isCommentEditor,
+          isChromelessEditor = _getNodeViewOptions.isChromelessEditor;
+        return createTableView(node, view, getPos, portalProviderAPI, eventDispatcher, getEditorContainerWidth, getEditorFeatureFlags, dispatchAnalyticsEvent, pluginInjectionApi, isTableAlignmentEnabled, isCommentEditor, isChromelessEditor);
       };
     });
     return result;

package/dist/esm/nodeviews/table.js

@@ -284,7 +284,7 @@ var TableView = /*#__PURE__*/function (_ReactNodeView) {
   return TableView;
 }(ReactNodeView);
 export { TableView as default };
-export var createTableView = function createTableView(node, view, getPos, portalProviderAPI, eventDispatcher, getEditorContainerWidth, getEditorFeatureFlags, dispatchAnalyticsEvent, pluginInjectionApi, isTableAlignmentEnabled, isCommentEditor) {
+export var createTableView = function createTableView(node, view, getPos, portalProviderAPI, eventDispatcher, getEditorContainerWidth, getEditorFeatureFlags, dispatchAnalyticsEvent, pluginInjectionApi, isTableAlignmentEnabled, isCommentEditor, isChromelessEditor) {
   var _getPluginState2 = getPluginState(view.state),
     pluginConfig = _getPluginState2.pluginConfig,
     isFullWidthModeEnabled = _getPluginState2.isFullWidthModeEnabled,
@@ -311,7 +311,8 @@ export var createTableView = function createTableView(node, view, getPos, portal
       isTableScalingEnabled: isTableScalingEnabled,
       // same as options.isTableScalingEnabled
       isTableAlignmentEnabled: isTableAlignmentEnabled,
-      isCommentEditor: isCommentEditor
+      isCommentEditor: isCommentEditor,
+      isChromelessEditor: isChromelessEditor
     },
     getEditorContainerWidth: getEditorContainerWidth,
     getEditorFeatureFlags: getEditorFeatureFlags,

package/dist/esm/plugin.js

@@ -197,8 +197,9 @@ var tablesPlugin = function tablesPlugin(_ref) {
             dragAndDropEnabled = _ref3.dragAndDropEnabled,
             isTableScalingEnabled = _ref3.isTableScalingEnabled,
             isTableAlignmentEnabled = _ref3.isTableAlignmentEnabled,
-            isCommentEditor = _ref3.isCommentEditor;
-          return createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api, isTableScalingEnabled, isTableAlignmentEnabled, shouldUseIncreasedScalingPercent, isCommentEditor);
+            isCommentEditor = _ref3.isCommentEditor,
+            isChromelessEditor = _ref3.isChromelessEditor;
+          return createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api, isTableScalingEnabled, isTableAlignmentEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor);
         }
       }, {
         name: 'tablePMColResizing',
@@ -426,7 +427,8 @@ var tablesPlugin = function tablesPlugin(_ref) {
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             editorAnalyticsAPI: editorAnalyticsAPI,
             getEditorContainerWidth: defaultGetEditorContainerWidth,
-            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags
+            getEditorFeatureFlags: (options === null || options === void 0 ? void 0 : options.getEditorFeatureFlags) || defaultGetEditorFeatureFlags,
+            isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor
           }), (options === null || options === void 0 ? void 0 : options.allowContextualMenu) && /*#__PURE__*/React.createElement(FloatingContextualMenu, {
             editorView: editorView,
             mountPoint: popupsMountPoint,

package/dist/esm/pm-plugins/main.js

@@ -23,7 +23,7 @@ import { isHeaderRowRequired } from '../utils/paste';
 import { defaultHoveredCell, defaultTableSelection } from './default-table-selection';
 import { createPluginState, getPluginState } from './plugin-factory';
 import { pluginKey } from './plugin-key';
-export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled, isTableAlignmentEnabled, shouldUseIncreasedScalingPercent, isCommentEditor) {
+export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled, isTableAlignmentEnabled, shouldUseIncreasedScalingPercent, isCommentEditor, isChromelessEditor) {
   var _accessibilityUtils;
   var state = createPluginState(dispatch, _objectSpread(_objectSpread(_objectSpread({
     pluginConfig: pluginConfig,
@@ -195,11 +195,7 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
         if (!pluginConfig.allowBackgroundColor) {
           slice = transformSliceRemoveCellBackgroundColor(slice, schema);
         }
-
-        //  If a partial paste of nested expand, paste only nested-expand's content */
-        if (fg('platform.editor.transform-slice-for-nested-expand')) {
-          slice = transformSliceToRemoveOpenNestedExpand(slice, schema);
-        }
+        slice = transformSliceToRemoveOpenNestedExpand(slice, schema);
         return slice;
       },
       handleClick: function handleClick(_ref2, _pos, event) {
@@ -257,7 +253,8 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
           dispatchAnalyticsEvent: dispatchAnalyticsEvent,
           pluginInjectionApi: pluginInjectionApi,
           isTableAlignmentEnabled: isTableAlignmentEnabled,
-          isCommentEditor: isCommentEditor
+          isCommentEditor: isCommentEditor,
+          isChromelessEditor: isChromelessEditor
         }),
         tableRow: lazyTableRowView({
           eventDispatcher: eventDispatcher

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

@@ -2,8 +2,8 @@ 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 { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic } from '@atlaskit/editor-shared-styles';
+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';
@@ -33,17 +33,18 @@ export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
     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 = resizeState.overflow && resizeState.tableWidth + resizeAmount / 2 > resizeState.maxSize;
+  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 : resizeAmount - (resizeState.maxSize + resizeAmount - tableContainerWidth) / 2;
-  }
-  if (!willResizedTableStayInOverflow && !willTableHitEditorEdge) {
+  } else {
     var diff = -(resizeState.tableWidth - resizeState.maxSize);
     var rest = amount - diff;
     var final = isTableLeftAligned ? diff + rest : diff + rest * 2;
@@ -54,25 +55,23 @@ export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
   // 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(resizeState.overflow ? willResizedTableStayInOverflow ?
+  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
-  resizeState.maxSize :
+  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
-  resizeState.maxSize + (resizeState.tableWidth - resizeState.maxSize + delta) : willTableHitEditorEdge ?
+  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
-  resizeState.maxSize + delta);
+  isNumberColumnEnabled ? resizeState.maxSize + akEditorTableNumberColumnWidth + delta : resizeState.maxSize + delta);
 
   // do not apply scaling logic because resize state is already scaled
   updateColgroup(newState, tableRef, tableNode, false, false);
-  if (!willTableHitEditorEdge && !willResizedTableStayInOverflow) {
-    updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
-  }
+  updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
   return newState;
 };
 var updateTablePreview = function updateTablePreview(tableRef, newTableWidth, shouldChangeAlignment) {
@@ -100,37 +99,52 @@ export var scaleResizeState = function scaleResizeState(_ref2) {
     tableRef = _ref2.tableRef,
     tableNode = _ref2.tableNode,
     editorWidth = _ref2.editorWidth;
-  // check if table is scaled, if not then avoid applying scaling values down
-  if (resizeState.maxSize < getEditorContainerWidth(editorWidth)) {
+  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);
+  var scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
   var cols = resizeState.cols.map(function (col) {
     return _objectSpread(_objectSpread({}, col), {}, {
-      width: Math.round(Math.max(col.width * scalePercent, col.minWidth))
+      minWidth: tableCellMinWidth,
+      width: Math.max(Math.round(col.width * scalePercent), tableCellMinWidth)
     });
   });
-  var scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
   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 smallest column
+  // distribute the difference to the first column
   if (calculatedTableWidth > scaledTableWidth) {
     var diff = calculatedTableWidth - scaledTableWidth;
+    var hasDiffBeenDistributed = false;
     cols = cols.map(function (col) {
-      return col.width - diff >= col.minWidth ? _objectSpread(_objectSpread({}, col), {}, {
-        width: col.width - diff
-      }) : 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: Math.round(resizeState.maxSize * scalePercent),
+    maxSize: maxSize,
     cols: cols
   });
 };

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

@@ -231,6 +231,9 @@ export function updateAffectedColumn(resizeState, colIndex, resizeAmount) {
     return col;
   });
   return _objectSpread(_objectSpread({}, resizeState), {}, {
+    tableWidth: updatedCols.reduce(function (acc, col) {
+      return acc + col.width;
+    }, 0),
     cols: updatedCols
   });
 }

package/dist/esm/toolbar.js

@@ -209,19 +209,22 @@ export var getToolbarCellOptionsConfig = function getToolbarCellOptionsConfig(ed
     onMouseLeave: clearHoverSelection(),
     selected: false,
     disabled: false
-  }, {
-    id: 'editor.table.mergeCells',
-    title: formatMessage(messages.mergeCells),
-    onClick: mergeCellsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB),
-    selected: false,
-    disabled: !canMergeCells(editorState.tr)
-  }, {
-    id: 'editor.table.splitCell',
-    title: formatMessage(messages.splitCell),
-    onClick: splitCellWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB),
-    selected: false,
-    disabled: !splitCell(editorState)
   }];
+  if (pluginState.pluginConfig.allowMergeCells) {
+    options.push({
+      id: 'editor.table.mergeCells',
+      title: formatMessage(messages.mergeCells),
+      onClick: mergeCellsWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB),
+      selected: false,
+      disabled: !canMergeCells(editorState.tr)
+    }, {
+      id: 'editor.table.splitCell',
+      title: formatMessage(messages.splitCell),
+      onClick: splitCellWithAnalytics(editorAnalyticsAPI)(INPUT_METHOD.FLOATING_TB),
+      selected: false,
+      disabled: !splitCell(editorState)
+    });
+  }
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo = pluginState.pluginConfig) !== null && _pluginState$pluginCo !== void 0 && _pluginState$pluginCo.allowDistributeColumns) {
     var _newResizeStateWithAn;
     var newResizeStateWithAnalytics = editorView ? getNewResizeStateFromSelectedColumns(initialSelectionRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled) : undefined;

package/dist/esm/types.js

@@ -75,6 +75,7 @@ export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssCla
   DRAG_CONTROLS_INSERT_BUTTON_INNER: "".concat(tablePrefixSelector, "-controls__drag-insert-button-inner"),
   DRAG_CONTROLS_INSERT_BUTTON_INNER_COLUMN: "".concat(tablePrefixSelector, "-controls__drag-insert-button-inner-column"),
   DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW: "".concat(tablePrefixSelector, "-controls__drag-insert-button-inner-row"),
+  DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW_CHROMELESS: "".concat(tablePrefixSelector, "-controls__drag-insert-button-inner-row-chromeless"),
   DRAG_CONTROLS_INSERT_BUTTON_WRAP: "".concat(tablePrefixSelector, "-controls__drag-insert-button-wrap"),
   CONTROLS_INSERT_MARKER: "".concat(tablePrefixSelector, "-controls__insert-marker"),
   CONTROLS_INSERT_COLUMN: "".concat(tablePrefixSelector, "-controls__insert-column"),
@@ -90,6 +91,7 @@ export var TableCssClassName = _objectSpread(_objectSpread({}, TableSharedCssCla
   /** drag and drop controls */
   DRAG_ROW_CONTROLS_WRAPPER: "".concat(tablePrefixSelector, "-drag-row-controls-wrapper"),
   DRAG_ROW_CONTROLS: "".concat(tablePrefixSelector, "-drag-row-controls"),
+  DRAG_CONTROLS_CHROMELESS: "drag-controls-chromeless",
   DRAG_ROW_FLOATING_INSERT_DOT_WRAPPER: "".concat(tablePrefixSelector, "-drag-row-floating-insert-dot-wrapper"),
   DRAG_ROW_FLOATING_INSERT_DOT: "".concat(tablePrefixSelector, "-drag-row-floating-insert-dot"),
   DRAG_COLUMN_CONTROLS: "".concat(tablePrefixSelector, "-drag-column-controls"),

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

@@ -208,8 +208,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         editorView = _this$props3.editorView;
       var _getPluginState3 = getPluginState(editorView.state),
         isDragAndDropEnabled = _getPluginState3.isDragAndDropEnabled;
+      var content = formatMessage(isDragAndDropEnabled ? messages.addColumnRight : messages.insertColumn);
       return {
-        content: formatMessage(isDragAndDropEnabled ? messages.addColumnRight : messages.insertColumn),
+        content: content,
         value: {
           name: 'insert_column'
         },
@@ -221,7 +222,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         jsx("span", {
           css: elementBeforeIconStyles
-        }, jsx(AddColRightIcon, null)) : undefined
+        }, jsx(AddColRightIcon, null)) : undefined,
+        'aria-label': fg('platform_editor_announce_cell_options_hotkeys') ? tooltip(addColumnAfter, String(content)) : undefined
       };
     });
     _defineProperty(_assertThisInitialized(_this), "createInsertRowItem", function () {
@@ -230,8 +232,9 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         editorView = _this$props4.editorView;
       var _getPluginState4 = getPluginState(editorView.state),
         isDragAndDropEnabled = _getPluginState4.isDragAndDropEnabled;
+      var content = formatMessage(isDragAndDropEnabled ? messages.addRowBelow : messages.insertRow);
       return {
-        content: formatMessage(isDragAndDropEnabled ? messages.addRowBelow : messages.insertRow),
+        content: content,
         value: {
           name: 'insert_row'
         },
@@ -243,7 +246,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/design-system/consistent-css-prop-usage -- Ignored via go/DSP-18766
         jsx("span", {
           css: elementBeforeIconStyles
-        }, jsx(AddRowBelowIcon, null)) : undefined
+        }, jsx(AddRowBelowIcon, null)) : undefined,
+        'aria-label': fg('platform_editor_announce_cell_options_hotkeys') ? tooltip(addRowAfter, String(content)) : undefined
       };
     });
     _defineProperty(_assertThisInitialized(_this), "createClearCellsItem", function () {
@@ -259,10 +263,11 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
         left = selectionRect.left;
       var noOfColumns = right - left;
       var noOfRows = bottom - top;
+      var content = formatMessage(messages.clearCells, {
+        0: Math.max(noOfColumns, noOfRows)
+      });
       return {
-        content: formatMessage(messages.clearCells, {
-          0: Math.max(noOfColumns, noOfRows)
-        }),
+        content: content,
         value: {
           name: 'clear'
         },
@@ -278,7 +283,8 @@ export var ContextualMenu = /*#__PURE__*/function (_Component) {
           label: formatMessage(messages.clearCells, {
             0: Math.max(noOfColumns, noOfRows)
           })
-        })) : undefined
+        })) : undefined,
+        'aria-label': fg('platform_editor_announce_cell_options_hotkeys') ? tooltip(backspace, String(content)) : undefined
       };
     });
     _defineProperty(_assertThisInitialized(_this), "createDeleteColumnItem", function () {

package/dist/esm/ui/FloatingInsertButton/InsertButton.js

@@ -34,12 +34,12 @@ var getNumberColumnWidth = function getNumberColumnWidth(tableRef, isDragAndDrop
   }
   return 0;
 };
-var getInsertLineWidth = function getInsertLineWidth(tableRef, isDragAndDropEnabled) {
+var getInsertLineWidth = function getInsertLineWidth(tableRef, isDragAndDropEnabled, isChromelessEditor) {
   // The line gets width 100% from the table,
   // but since we have an overflow on the left,
   // we should add an offset to make up for it.
   var LINE_OFFSET = 4;
-  var DRAG_LINE_OFFSET = 6;
+  var DRAG_LINE_OFFSET = isChromelessEditor ? 14 : 6;
   var parentElement = tableRef.parentElement,
     offsetWidth = tableRef.offsetWidth;
   var parentOffsetWidth = parentElement.offsetWidth;
@@ -59,7 +59,8 @@ export var InsertButtonForDragAndDrop = function InsertButtonForDragAndDrop(_ref
     tableRef = _ref2.tableRef,
     type = _ref2.type,
     formatMessage = _ref2.intl.formatMessage,
-    hasStickyHeaders = _ref2.hasStickyHeaders;
+    hasStickyHeaders = _ref2.hasStickyHeaders,
+    isChromelessEditor = _ref2.isChromelessEditor;
   var isRow = type === 'row';
   var content = /*#__PURE__*/React.createElement(Tooltip, {
     content: /*#__PURE__*/React.createElement(ToolTipContent, {
@@ -69,7 +70,7 @@ export var InsertButtonForDragAndDrop = function InsertButtonForDragAndDrop(_ref
     position: "top"
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: classnames(ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER, (_classnames = {}, _defineProperty(_classnames, ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW, isRow), _defineProperty(_classnames, ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_COLUMN, !isRow), _classnames))
+    className: classnames(ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER, (_classnames = {}, _defineProperty(_classnames, ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW, isRow && !isChromelessEditor), _defineProperty(_classnames, ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_COLUMN, !isRow), _defineProperty(_classnames, ClassName.DRAG_CONTROLS_INSERT_BUTTON_INNER_ROW_CHROMELESS, isRow && isChromelessEditor), _classnames))
   }, /*#__PURE__*/React.createElement("button", {
     type: "button"
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -93,7 +94,7 @@ export var InsertButtonForDragAndDrop = function InsertButtonForDragAndDrop(_ref
     // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
     ,
     style: type === 'row' ? {
-      width: getInsertLineWidth(tableRef, true),
+      width: getInsertLineWidth(tableRef, true, isChromelessEditor),
       left: "var(--ds-space-150, 12px)"
     } : {
       height: getInsertLineHeight(tableRef, hasStickyHeaders, true) - 8,

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

@@ -18,7 +18,7 @@ import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-s
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { insertColumnWithAnalytics, insertRowWithAnalytics } from '../../commands-with-analytics';
 import { TableCssClassName as ClassName } from '../../types';
 import { checkIfNumberColumnEnabled } from '../../utils';
@@ -49,7 +49,8 @@ export var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
         isHeaderColumnEnabled = _this$props.isHeaderColumnEnabled,
         isHeaderRowEnabled = _this$props.isHeaderRowEnabled,
         isDragAndDropEnabled = _this$props.isDragAndDropEnabled,
-        dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent;
+        dispatchAnalyticsEvent = _this$props.dispatchAnalyticsEvent,
+        isChromelessEditor = _this$props.isChromelessEditor;
 
       // TODO: temporarily disable insert button for first column and row https://atlassian.slack.com/archives/C05U8HRQM50/p1698363744682219?thread_ts=1698209039.104909&cid=C05U8HRQM50
       if (isDragAndDropEnabled && (insertColumnButtonIndex === 0 || insertRowButtonIndex === 0)) {
@@ -134,7 +135,8 @@ export var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
         type: type,
         tableRef: tableRef,
         onMouseDown: type === 'column' ? this.insertColumn : this.insertRow,
-        hasStickyHeaders: this.props.hasStickyHeaders || false
+        hasStickyHeaders: this.props.hasStickyHeaders || false,
+        isChromelessEditor: isChromelessEditor
       }) : /*#__PURE__*/React.createElement(InsertButton, {
         type: type,
         tableRef: tableRef,
@@ -198,7 +200,7 @@ export var FloatingInsertButton = /*#__PURE__*/function (_React$Component) {
           tableDuplicateCellColouring = _ref$tableDuplicateCe === void 0 ? false : _ref$tableDuplicateCe,
           _ref$tableWithFixedCo = _ref.tableWithFixedColumnWidthsOption,
           tableWithFixedColumnWidthsOption = _ref$tableWithFixedCo === void 0 ? false : _ref$tableWithFixedCo;
-        var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && getBooleanFF('platform.editor.table.use-increased-scaling-percent');
+        var shouldUseIncreasedScalingPercent = isTableScalingEnabled && tableWithFixedColumnWidthsOption && fg('platform.editor.table.use-increased-scaling-percent');
         var state = editorView.state,
           dispatch = editorView.dispatch;
         insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);