@atlaskit/editor-plugin-table 7.25.9 → 7.25.11

package/dist/es2019/pm-plugins/table-resizing/utils/misc.js

@@ -1,9 +1,8 @@
 import { getParentNodeWidth, getTableContainerWidth, layoutToWidth } from '@atlaskit/editor-common/node-width';
 import { calcTableWidth } from '@atlaskit/editor-common/styles';
-import { getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common/ui';
-import { calcTableColumnWidths, containsClassName } from '@atlaskit/editor-common/utils';
+import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
 import { akEditorFullWidthLayoutWidth, akEditorGutterPaddingDynamic, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { hasTableBeenResized } from './colgroup';
+import { hasTableBeenResized, hasTableColumnBeenResized } from './colgroup';
 import { MAX_SCALING_PERCENT, MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION } from './consts';
 
 // Translates named layouts in number values.
@@ -20,9 +19,6 @@ export function getLayoutSize(tableLayout, containerWidth = 0, options) {
   }
   return layoutToWidth[tableLayout] || containerWidth;
 }
-export function getDefaultLayoutMaxWidth(containerWidth) {
-  return mapBreakpointToLayoutMaxWidth(getBreakpoint(containerWidth));
-}
 
 // Does the current position point at a cell.
 export function pointsAtCell($pos) {
@@ -51,14 +47,6 @@ export function currentColWidth(view, cellPos, {
   }
   return domWidth / parts;
 }
-
-// Attempts to find a parent TD/TH depending on target element.
-export function domCellAround(target) {
-  while (target && target.nodeName !== 'TD' && target.nodeName !== 'TH') {
-    target = containsClassName(target, 'ProseMirror') ? null : target.parentNode;
-  }
-  return target;
-}
 export const getTableMaxWidth = ({
   table,
   tableStart,
@@ -100,6 +88,26 @@ export const getTableScalingPercent = (table, tableRef, shouldUseIncreasedScalin
   scalePercent = Math.max(scalePercent, 1 - maxScalingPercent);
   return Math.min(scalePercent, 1);
 };
+
+// This function is used to default and full-width tables in Comment/Chromeless editors
+// These tables don't have node.attrs.width set. Their pm-table-wrapper width depend on the editor container width.
+// actual table node width can be calculated as sum of colwidth values if table's columns were resized.
+// If colwidth are not set, table columns are not resized, they all are equal widths.
+export const getScalingPercentForTableWithoutWidth = (table, tableRef) => {
+  // are table columns resized
+  if (hasTableColumnBeenResized(table)) {
+    var _tableRef$parentEleme2;
+    const tableWidth = calcTableColumnWidths(table).reduce((sum, width) => sum + width, 0);
+    let renderWidth = (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || tableWidth;
+
+    // minus 1 here to avoid any 1px scroll in Firefox
+    return (renderWidth - 1) / tableWidth;
+  }
+
+  // When table cols are not resized and table width is not set,
+  // tableWidth is equal to renderWidth
+  return 1;
+};
 export const getStaticTableScalingPercent = (table, tableRenderWidth, shouldUseIncreasedScalingPercent) => {
   const maxScalingPercent = shouldUseIncreasedScalingPercent ? MAX_SCALING_PERCENT_TABLES_WITH_FIXED_COLUMN_WIDTHS_OPTION : MAX_SCALING_PERCENT;
   const tableWidth = getTableContainerElementWidth(table);

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

@@ -6,15 +6,13 @@ import { ALIGN_CENTER, ALIGN_START, shouldChangeAlignmentToCenterResized } from
 import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
-export const resizeColumn = (resizeState, colIndex, amount, tableRef, tableNode, selectedColumns, isTableScalingEnabled = false, shouldUseIncreasedScalingPercent = false) => {
-  let scalePercent = 1;
+export const resizeColumn = (resizeState, colIndex, amount, tableRef, tableNode, selectedColumns, isTableScalingEnabled = false, scalePercent = 1) => {
   let resizeAmount = amount;
   if (isTableScalingEnabled) {
-    scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
     resizeAmount = amount / scalePercent;
   }
   const newState = resizeAmount > 0 ? growColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeAmount < 0 ? shrinkColumn(resizeState, colIndex, resizeAmount, selectedColumns) : resizeState;
-  updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
+  updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, scalePercent);
   return newState;
 };
 export const resizeColumnAndTable = ({
@@ -66,7 +64,7 @@ export const resizeColumnAndTable = ({
   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);
+  updateColgroup(newState, tableRef, tableNode, false, 1);
   updateTablePreview(tableRef, newState.maxSize, shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.maxSize));
   return newState;
 };
@@ -92,7 +90,8 @@ export const scaleResizeState = ({
   resizeState,
   tableRef,
   tableNode,
-  editorWidth
+  editorWidth,
+  shouldUseIncreasedScalingPercent
 }) => {
   const isNumberColumnEnabled = tableNode.attrs.isNumberColumnEnabled;
   const isTableScaled = isNumberColumnEnabled || resizeState.maxSize > getEditorContainerWidth(editorWidth);
@@ -106,7 +105,7 @@ export const scaleResizeState = ({
   if (!isTableScaled || isNumberColumnEnabled && resizeState.maxSize > resizeState.tableWidth) {
     return resizeState;
   }
-  const scalePercent = getTableScalingPercent(tableNode, tableRef);
+  const scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
   const scaledTableWidth = Math.round(resizeState.tableWidth * scalePercent);
   let cols = resizeState.cols.map(col => {
     return {

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

@@ -15,14 +15,16 @@ export const getResizeState = ({
   start,
   domAtPos,
   isTableScalingEnabled = false,
-  shouldUseIncreasedScalingPercent = false
+  shouldUseIncreasedScalingPercent = false,
+  isCommentEditor = false
 }) => {
-  if (isTableScalingEnabled) {
+  var _table$attrs;
+  if (isTableScalingEnabled && !isCommentEditor || isTableScalingEnabled && isCommentEditor && (_table$attrs = table.attrs) !== null && _table$attrs !== void 0 && _table$attrs.width) {
     const scalePercent = getTableScalingPercent(table, tableRef, shouldUseIncreasedScalingPercent);
     minWidth = Math.ceil(minWidth / scalePercent);
   }
-  // If the table has been resized, we can use the column widths from the table node
   if (hasTableBeenResized(table)) {
+    // If the table has been resized, we can use the column widths from the table node
     const cols = calcTableColumnWidths(table).map((width, index) => ({
       width: width === 0 ? tableNewColumnMinWidth : width,
       minWidth: width === 0 ? tableNewColumnMinWidth : minWidth,
@@ -45,12 +47,15 @@ export const getResizeState = ({
   // Getting the resize state from DOM
   const colgroupChildren = insertColgroupFromNode(tableRef, table, isTableScalingEnabled, shouldReinsertColgroup,
   // don't reinsert colgroup when preserving table width - this causes widths to jump
-  shouldUseIncreasedScalingPercent);
+  shouldUseIncreasedScalingPercent, isCommentEditor);
   const cols = Array.from(colgroupChildren).map((_, index) => {
     // If the table hasn't been resized and we have a table width attribute, we can use it
     // to calculate the widths of the columns
     if (isTableScalingEnabled) {
-      const tableNodeWidth = getTableContainerWidth(table);
+      var _table$attrs2;
+      // isCommentEditor when table cols were not resized,
+      // we want to use tableRef.parentElement.clientWidth, which is the same as maxSize
+      const tableNodeWidth = isCommentEditor && !((_table$attrs2 = table.attrs) !== null && _table$attrs2 !== void 0 && _table$attrs2.width) ? maxSize : getTableContainerWidth(table);
       return {
         index,
         width: tableNodeWidth / colgroupChildren.length,
@@ -74,7 +79,7 @@ export const getResizeState = ({
 };
 
 // updates Colgroup DOM node with new widths
-export const updateColgroup = (state, tableRef, tableNode, isTableScalingEnabled, shouldUseIncreasedScalingPercent) => {
+export const updateColgroup = (state, tableRef, tableNode, isTableScalingEnabled, scalePercent) => {
   const cols = tableRef === null || tableRef === void 0 ? void 0 : tableRef.querySelectorAll('col');
   const columnsCount = cols === null || cols === void 0 ? void 0 : cols.length;
   /**
@@ -83,11 +88,10 @@ export const updateColgroup = (state, tableRef, tableNode, isTableScalingEnabled
       We need to remove !isColumnResizing if we handled auto scale table when mouseUp event.
       * */
   if (isTableScalingEnabled && tableNode) {
-    const scalePercent = getTableScalingPercent(tableNode, tableRef, shouldUseIncreasedScalingPercent);
     state.cols.filter(column => column && !!column.width) // if width is 0, we dont want to apply that.
     .forEach((column, i) => {
       const fixedColWidth = getColWidthFix(column.width, columnsCount !== null && columnsCount !== void 0 ? columnsCount : 0);
-      const scaledWidth = fixedColWidth * scalePercent;
+      const scaledWidth = fixedColWidth * (scalePercent || 1);
       const finalWidth = Math.max(scaledWidth, tableCellMinWidth);
       // we aren't handling the remaining pixels here when the 48px min width is reached
       if (cols !== null && cols !== void 0 && cols[i]) {
@@ -148,7 +152,7 @@ export const evenAllColumnsWidths = resizeState => {
   }, maxSize);
 };
 const getSpace = (columns, start, end) => columns.slice(start, end).map(col => col.width).reduce((sum, width) => sum + width, 0);
-export const evenSelectedColumnsWidths = (resizeState, rect) => {
+const evenSelectedColumnsWidths = (resizeState, rect) => {
   const cols = resizeState.cols;
   const selectedSpace = getSpace(cols, rect.left, rect.right);
   const allSpace = getSpace(cols, 0, cols.length);
@@ -257,13 +261,9 @@ export const bulkColumnsResize = (resizeState, columnsIndexes, sourceColumnIndex
   // fix total table widths by adding missing pixels to columns widths here and there
   return adjustColumnsWidths(newState, resizeState.maxSize);
 };
-export const areColumnsEven = resizeState => {
-  const newResizeState = evenAllColumnsWidths(resizeState);
-  return newResizeState.cols.every((col, i) => col.width === resizeState.cols[i].width);
-};
 
 // Get the layout
-export const normaliseTableLayout = input => {
+const normaliseTableLayout = input => {
   switch (input) {
     case 'wide':
       return input;
@@ -312,6 +312,11 @@ export const getNewResizeStateFromSelectedColumns = (rect, state, domAtPos, getE
   if (isTableScalingWithFixedColumnWidthsOptionEnabled) {
     isTableScalingEnabledOnCurrentTable = table.node.attrs.displayMode !== 'fixed';
   }
+  let shouldUseIncreasedScalingPercent = isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent');
+  if (isTableScalingEnabled && isCommentEditor) {
+    isTableScalingEnabledOnCurrentTable = true;
+    shouldUseIncreasedScalingPercent = true;
+  }
   resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize,
@@ -320,7 +325,8 @@ export const getNewResizeStateFromSelectedColumns = (rect, state, domAtPos, getE
     start: table.start,
     domAtPos,
     isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
-    shouldUseIncreasedScalingPercent: isTableScalingWithFixedColumnWidthsOptionEnabled && fg('platform.editor.table.use-increased-scaling-percent') || isTableScalingEnabled && isCommentEditor
+    shouldUseIncreasedScalingPercent,
+    isCommentEditor
   });
   const newResizeState = evenSelectedColumnsWidths(resizeState, rect);
   const widthsBefore = resizeState.widths;

package/dist/es2019/pm-plugins/table-resizing/utils/scale-table.js

@@ -11,7 +11,7 @@ import { hasTableBeenResized, insertColgroupFromNode } from './colgroup';
 import { syncStickyRowToTable } from './dom';
 // Base function to trigger the actual scale on a table node.
 // Will only resize/scale if a table has been previously resized.
-export const scale = (tableRef, options, domAtPos, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false) => {
+const scale = (tableRef, options, domAtPos, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = false) => {
   const {
     node,
     containerWidth,
@@ -50,11 +50,12 @@ export const scale = (tableRef, options, domAtPos, isTableScalingEnabledOnCurren
     start,
     domAtPos,
     isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
-    shouldUseIncreasedScalingPercent
+    shouldUseIncreasedScalingPercent,
+    isCommentEditor
   });
   return scaleTableTo(resizeState, newWidth);
 };
-export const scaleWithParent = (tableRef, parentWidth, table, start, domAtPos, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false) => {
+const scaleWithParent = (tableRef, parentWidth, table, start, domAtPos, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = false) => {
   const resizeState = getResizeState({
     minWidth: tableCellMinWidth,
     maxSize: parentWidth,
@@ -63,7 +64,8 @@ export const scaleWithParent = (tableRef, parentWidth, table, start, domAtPos, i
     start,
     domAtPos,
     isTableScalingEnabled: isTableScalingEnabledOnCurrentTable,
-    shouldUseIncreasedScalingPercent
+    shouldUseIncreasedScalingPercent,
+    isCommentEditor
   });
   if (table.attrs.isNumberColumnEnabled) {
     parentWidth -= akEditorTableNumberColumnWidth;
@@ -130,12 +132,12 @@ export const previewScaleTable = (tableRef, options, domAtPos, isTableScalingEna
   // Here isTableScalingEnabled = false
   shouldUseIncreasedScalingPercent) : scale(tableRef, options, domAtPos, false, shouldUseIncreasedScalingPercent);
   if (resizeState) {
-    updateColgroup(resizeState, tableRef, node, false, shouldUseIncreasedScalingPercent);
+    updateColgroup(resizeState, tableRef, node, false, 1);
   }
 };
 
 // Scale the table to meet new requirements (col, layout change etc)
-export const scaleTable = (tableRef, options, domAtPos, api, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false) => tr => {
+export const scaleTable = (tableRef, options, domAtPos, api, isTableScalingEnabledOnCurrentTable = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = false) => tr => {
   if (!tableRef) {
     return tr;
   }
@@ -150,7 +152,8 @@ export const scaleTable = (tableRef, options, domAtPos, api, isTableScalingEnabl
     // If its not a re-sized table, we still want to re-create cols
     // To force reflow of columns upon delete.
     if (!isTableScalingEnabledOnCurrentTable) {
-      insertColgroupFromNode(tableRef, node, false, undefined, shouldUseIncreasedScalingPercent);
+      const isTableScalingEnabled = false;
+      insertColgroupFromNode(tableRef, node, isTableScalingEnabled, undefined, shouldUseIncreasedScalingPercent, isCommentEditor);
     }
     tr.setMeta('scrollIntoView', false);
     return tr;

package/dist/es2019/pm-plugins/table-selection-keymap.js

@@ -13,5 +13,4 @@ export function tableSelectionKeymapPlugin(pluginInjectionApi, getIntl) {
   bindKeymapWithCommand(shiftArrowUp.common, shiftArrowUpFromTable(editorSelectionAPI)(), list);
   bindKeymapWithCommand(selectTable.common, modASelectTable(editorSelectionAPI)(), list);
   return keymap(list);
-}
-export default tableSelectionKeymapPlugin;
+}

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

@@ -9,7 +9,7 @@ export const unsort = (oldOrder, tableElement) => {
     tbody === null || tbody === void 0 ? void 0 : tbody.appendChild(rows[item.index + 1]);
   });
 };
-export const getSortOrderFromTable = (tableNode, sortIndex, direction) => {
+const getSortOrderFromTable = (tableNode, sortIndex, direction) => {
   const tableArray = convertProsemirrorTableNodeToArrayOfRows(tableNode);
   tableArray.shift(); // remove header row
 

package/dist/es2019/toolbar.js

@@ -133,7 +133,7 @@ export const getToolbarCellOptionsConfig = (editorState, editorView, initialSele
       const selectionRect = getClosestSelectionRect(state);
       const index = selectionRect === null || selectionRect === void 0 ? void 0 : selectionRect.right;
       if (index) {
-        insertColumnWithAnalytics(api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
+        insertColumnWithAnalytics(api, editorAnalyticsAPI, isTableScalingEnabled, isCellBackgroundDuplicated, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.FLOATING_TB, index)(state, dispatch, view);
       }
       return true;
     },
@@ -171,7 +171,7 @@ export const getToolbarCellOptionsConfig = (editorState, editorView, initialSele
     onClick: (state, dispatch, view) => {
       const selectionRect = getClosestSelectionRect(state);
       if (selectionRect) {
-        deleteColumnsWithAnalytics(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent)(INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
+        deleteColumnsWithAnalytics(editorAnalyticsAPI, api, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.FLOATING_TB, selectionRect)(state, dispatch, view);
       }
       return true;
     },
@@ -316,7 +316,7 @@ export const getClosestSelectionRect = state => {
   const selection = state.selection;
   return isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
 };
-export const getClosestSelectionOrTableRect = state => {
+const getClosestSelectionOrTableRect = state => {
   const selection = state.selection;
   const tableObject = findTable(state.selection);
   if (!tableObject) {
@@ -450,7 +450,7 @@ const getCellItems = (state, view, {
   }
   return [];
 };
-export const getDistributeConfig = (getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, isCommentEditor = false) => (state, dispatch, editorView) => {
+const getDistributeConfig = (getEditorContainerWidth, api, editorAnalyticsAPI, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, isCommentEditor = false) => (state, dispatch, editorView) => {
   const selectionOrTableRect = getClosestSelectionOrTableRect(state);
   if (!editorView || !selectionOrTableRect) {
     return false;
@@ -474,7 +474,7 @@ const getColumnSettingItems = (editorState, editorView, {
   if (!selectionOrTableRect || !editorView) {
     return [];
   }
-  const newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled);
+  const newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionOrTableRect, editorState, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, isCommentEditor);
   const wouldChange = (_newResizeStateWithAn2 = newResizeStateWithAnalytics === null || newResizeStateWithAnalytics === void 0 ? void 0 : newResizeStateWithAnalytics.changed) !== null && _newResizeStateWithAn2 !== void 0 ? _newResizeStateWithAn2 : false;
   const items = [];
   if (pluginState !== null && pluginState !== void 0 && (_pluginState$pluginCo3 = pluginState.pluginConfig) !== null && _pluginState$pluginCo3 !== void 0 && _pluginState$pluginCo3.allowDistributeColumns && pluginState.isDragAndDropEnabled) {
@@ -551,7 +551,7 @@ const highlightColumnsHandler = (state, dispatch) => {
   }
   return false;
 };
-export const getAlignmentOptionsConfig = (editorState, {
+const getAlignmentOptionsConfig = (editorState, {
   formatMessage
 }, editorAnalyticsAPI, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor, isCommentEditor) => {
   const tableObject = findTable(editorState.selection);
@@ -612,11 +612,11 @@ export const getAlignmentOptionsConfig = (editorState, {
   }];
   return alignmentToolbarItem;
 };
-export const getSelectedAlignmentIcon = (alignmentIcons, selectedNode) => {
+const getSelectedAlignmentIcon = (alignmentIcons, selectedNode) => {
   const selectedAlignment = selectedNode.attrs.layout;
   return alignmentIcons.find(icon => icon.value === normaliseAlignment(selectedAlignment));
 };
-export const isLayoutOptionDisabled = (selectedNode, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor) => {
+const isLayoutOptionDisabled = (selectedNode, getEditorContainerWidth, getDomRef, editorView, shouldUseIncreasedScalingPercent, isFullWidthEditor) => {
   const {
     lineLength
   } = getEditorContainerWidth();

package/dist/es2019/transforms/column-width.js

@@ -86,7 +86,7 @@ export const updateColumnWidths = (resizeState, table, start, _api) => tr => {
  * @param view
  * @returns Updated transaction with rescaled columns for a given table
  */
-export const rescaleColumns = (isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, api) => (table, view) => tr => {
+export const rescaleColumns = (isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, api, isCommentEditor = false) => (table, view) => tr => {
   if (!view) {
     return tr;
   }
@@ -169,7 +169,8 @@ export const rescaleColumns = (isTableScalingEnabled = false, isTableFixedColumn
     domAtPos,
     maxSize: previousTableInfo.possibleMaxWidth,
     isTableScalingEnabled: shouldScale,
-    shouldUseIncreasedScalingPercent
+    shouldUseIncreasedScalingPercent,
+    isCommentEditor
   });
   // Two scenarios that require scaling:
   //   1. If the new table width will result in the table going into overflow

package/dist/es2019/transforms/delete-columns.js

@@ -192,7 +192,7 @@ function fixRowSpans(table) {
   }
   return table.type.createChecked(table.attrs, rows, table.marks);
 }
-export const deleteColumns = (rect, allowCustomStep, api, view, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false) => tr => {
+export const deleteColumns = (rect, allowCustomStep, api, view, isTableScalingEnabled = false, isTableFixedColumnWidthsOptionEnabled = false, shouldUseIncreasedScalingPercent = false, isCommentEditor = false) => tr => {
   let updatedTr = tr;
   updatedTr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
     name: TABLE_OVERFLOW_CHANGE_TRIGGER.DELETED_COLUMN
@@ -204,7 +204,7 @@ export const deleteColumns = (rect, allowCustomStep, api, view, isTableScalingEn
   }
   const table = findTable(updatedTr.selection);
   if (table) {
-    updatedTr = rescaleColumns(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api)(table, view)(updatedTr);
+    updatedTr = rescaleColumns(isTableScalingEnabled, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, api, isCommentEditor)(table, view)(updatedTr);
   }
   return updatedTr;
 };

package/dist/es2019/transforms/index.js

@@ -1,5 +1,5 @@
 export { fixTables, fixAutoSizedTable } from './fix-tables';
-export { mergeCells, canMergeCells, mergeEmptyColumns } from './merge';
+export { mergeCells, canMergeCells } from './merge';
 export { deleteColumns } from './delete-columns';
 export { deleteRows } from './delete-rows';
 export { updateColumnWidths } from './column-width';

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

@@ -168,7 +168,9 @@ const DragHandleComponent = ({
       left: isRow ? `${"var(--ds-space-050, 4px)"}` : undefined,
       bottom: isColumn ? `${"var(--ds-space-0, 0px)"}` : undefined,
       alignSelf: isColumn ? 'none' : 'center',
-      zIndex: isColumn ? '-1' : 'auto'
+      zIndex: isColumn ? '-1' : 'auto',
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+      pointerEvents: 'auto'
     },
     onMouseUp: e => {
       // should toggle menu if current drag menu open.

package/dist/es2019/ui/FloatingContextualButton/FixedButton.js

@@ -4,7 +4,7 @@ import { createPortal } from 'react-dom';
 import { akEditorTableCellOnStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
 import { TableCssClassName as ClassName } from '../../types';
 import { insertColumnButtonOffset } from '../common-styles';
-export const BUTTON_WIDTH = 20;
+const BUTTON_WIDTH = 20;
 export const calcLeftPos = ({
   buttonWidth,
   cellRectLeft,

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

@@ -544,7 +544,7 @@ export class ContextualMenu extends Component {
           this.toggleOpen();
           break;
         case 'distribute_columns':
-          const newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, tableWithFixedColumnWidthsOption);
+          const newResizeStateWithAnalytics = getNewResizeStateFromSelectedColumns(selectionRect, state, editorView.domAtPos.bind(editorView), getEditorContainerWidth, isTableScalingEnabled, tableWithFixedColumnWidthsOption, isCommentEditor);
           if (newResizeStateWithAnalytics) {
             distributeColumnsWidthsWithAnalytics(editorAnalyticsAPI, this.props.api)(INPUT_METHOD.CONTEXT_MENU, newResizeStateWithAnalytics)(state, dispatch);
             this.toggleOpen();
@@ -555,7 +555,7 @@ export class ContextualMenu extends Component {
           this.toggleOpen();
           break;
         case 'insert_column':
-          insertColumnWithAnalytics(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
+          insertColumnWithAnalytics(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(state, dispatch, editorView);
           this.toggleOpen();
           break;
         case 'insert_row':
@@ -566,7 +566,7 @@ export class ContextualMenu extends Component {
           this.toggleOpen();
           break;
         case 'delete_column':
-          deleteColumnsWithAnalytics(editorAnalyticsAPI, this.props.api, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
+          deleteColumnsWithAnalytics(editorAnalyticsAPI, this.props.api, isTableScalingEnabled, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.CONTEXT_MENU, selectionRect)(state, dispatch, editorView);
           this.toggleOpen();
           break;
         case 'delete_row':

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

@@ -17,7 +17,7 @@ import { getColumnDeleteButtonParams, getColumnsWidths, getRowDeleteButtonParams
 import { stickyRowZIndex } from '../consts';
 import DeleteButton from './DeleteButton';
 import getPopupOptions from './getPopUpOptions';
-export function getSelectionType(selection) {
+function getSelectionType(selection) {
   if (!isTableSelected(selection) && selection instanceof CellSelection) {
     if (selection.isRowSelection()) {
       return 'row';

package/dist/es2019/ui/FloatingDragMenu/DragMenu.js

@@ -170,7 +170,7 @@ const convertToDropdownItems = (dragMenuConfig, formatMessage, tableSortColumnRe
   };
 };
 const ColorPaletteWithListeners = withOuterListeners(ColorPalette);
-export const DragMenu = /*#__PURE__*/React.memo(({
+const DragMenu = /*#__PURE__*/React.memo(({
   direction = 'row',
   index,
   target,
@@ -195,7 +195,8 @@ export const DragMenu = /*#__PURE__*/React.memo(({
   shouldUseIncreasedScalingPercent,
   isTableFixedColumnWidthsOptionEnabled,
   tableSortColumnReorder,
-  ariaNotifyPlugin
+  ariaNotifyPlugin,
+  isCommentEditor
 }) => {
   var _tableMap$hasMergedCe, _pluginConfig$allowBa;
   const {
@@ -213,7 +214,7 @@ export const DragMenu = /*#__PURE__*/React.memo(({
   const selectionRect = isSelectionType(selection, 'cell') ? getSelectionRect(selection) : findCellRectClosestToPos(selection.$from);
   const hasMergedCellsInTable = (_tableMap$hasMergedCe = tableMap === null || tableMap === void 0 ? void 0 : tableMap.hasMergedCells()) !== null && _tableMap$hasMergedCe !== void 0 ? _tableMap$hasMergedCe : false;
   const allowBackgroundColor = (_pluginConfig$allowBa = pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.allowBackgroundColor) !== null && _pluginConfig$allowBa !== void 0 ? _pluginConfig$allowBa : false;
-  const dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin);
+  const dragMenuConfig = getDragMenuConfig(direction, getEditorContainerWidth, hasMergedCellsInTable, editorView, api, tableMap, index, targetCellPosition, selectionRect, editorAnalyticsAPI, pluginConfig === null || pluginConfig === void 0 ? void 0 : pluginConfig.isHeaderRowRequired, isTableScalingEnabled, tableDuplicateCellColouring, isTableFixedColumnWidthsOptionEnabled, shouldUseIncreasedScalingPercent, tableSortColumnReorder, ariaNotifyPlugin, isCommentEditor);
   const {
     menuItems,
     menuCallback

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

@@ -22,7 +22,8 @@ const FloatingDragMenu = ({
   isTableScalingEnabled,
   getEditorFeatureFlags,
   ariaNotifyPlugin,
-  api
+  api,
+  isCommentEditor
 }) => {
   if (!isOpen || !targetCellPosition || editorView.state.doc.nodeSize <= targetCellPosition) {
     return null;
@@ -78,7 +79,8 @@ const FloatingDragMenu = ({
     isTableFixedColumnWidthsOptionEnabled: tableWithFixedColumnWidthsOption,
     tableSortColumnReorder: tableSortColumnReorder,
     ariaNotifyPlugin: ariaNotifyPlugin,
-    api: api
+    api: api,
+    isCommentEditor: isCommentEditor || false
   }));
 };
 FloatingDragMenu.displayName = 'FloatingDragMenu';

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

@@ -55,7 +55,7 @@ const getInsertLineWidth = (tableRef, isDragAndDropEnabled, isChromelessEditor)
 const tooltipMessageByType = type => {
   return type === 'row' ? messages.insertRow : messages.insertColumn;
 };
-export const InsertButtonForDragAndDrop = ({
+const InsertButtonForDragAndDrop = ({
   onMouseDown,
   tableRef,
   type,

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

@@ -180,7 +180,8 @@ export class FloatingInsertButton extends React.Component {
       insertColumnButtonIndex,
       editorAnalyticsAPI,
       getEditorFeatureFlags,
-      isTableScalingEnabled
+      isTableScalingEnabled,
+      isCommentEditor
     } = this.props;
     if (typeof insertColumnButtonIndex !== 'undefined') {
       event.preventDefault();
@@ -193,7 +194,7 @@ export class FloatingInsertButton extends React.Component {
         state,
         dispatch
       } = editorView;
-      insertColumnWithAnalytics(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
+      insertColumnWithAnalytics(this.props.api, editorAnalyticsAPI, isTableScalingEnabled, tableDuplicateCellColouring, tableWithFixedColumnWidthsOption, shouldUseIncreasedScalingPercent, isCommentEditor)(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(state, dispatch, editorView);
     }
   }
 }

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

@@ -234,5 +234,4 @@ export const ColumnControls = ({
       right: '0'
     } : {}
   }))), columnHandles()));
-};
-export default ColumnControls;
+};

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

@@ -5,7 +5,7 @@ import { TableCssClassName as ClassName } from '../../types';
 import { containsHeaderColumn, getColumnsWidths, getRowHeights } from '../../utils';
 import { ColumnControls } from './ColumnControls';
 import { ColumnDropTargets } from './ColumnDropTargets';
-export const TableFloatingColumnControls = ({
+const TableFloatingColumnControls = ({
   editorView,
   tableRef,
   getNode,

package/dist/es2019/ui/TableFloatingControls/RowControls/DragControls.js

@@ -134,7 +134,9 @@ const DragControlsComponent = ({
         // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
         position: 'relative',
         // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview, @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-        right: '-0.5px'
+        right: '-0.5px',
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop
+        pointerEvents: 'none'
       },
       "data-testid": `table-floating-row-${isHover ? rowIndex : selectedRowIndexes[0]}-drag-handle`
     }, /*#__PURE__*/React.createElement(DragHandle, {

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

@@ -1,5 +1,4 @@
 export { DragHandleIcon } from './DragHandleIcon';
-export { DragInMotionIcon } from './DragInMotionIcon';
 export { DragHandleDisabledIcon } from './DragHandleDisabledIcon';
 export { MinimisedHandleIcon } from './MinimisedHandle';
 export { MergeCellsIcon } from './MergeCellsIcon';

package/dist/es2019/utils/column-controls.js

@@ -1,9 +1,7 @@
 import { maphElem } from '@atlaskit/editor-common/utils';
 import { findDomRefAtPos } from '@atlaskit/editor-prosemirror/utils';
-import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { findTable, getSelectionRect, isColumnSelected, isTableSelected } from '@atlaskit/editor-tables/utils';
-import { TableCssClassName as ClassName } from '../types';
+import { findTable, getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { tableDeleteButtonSize } from '../ui/consts';
 export const getColumnsWidths = view => {
   const {
@@ -32,12 +30,6 @@ export const getColumnsWidths = view => {
   }
   return widths;
 };
-export const isColumnDeleteButtonVisible = selection => {
-  if (!isTableSelected(selection) && selection instanceof CellSelection && selection.isColSelection()) {
-    return true;
-  }
-  return false;
-};
 export const getColumnDeleteButtonParams = (columnsWidths, selection) => {
   const rect = getSelectionRect(selection);
   if (!rect) {
@@ -67,16 +59,6 @@ export const getColumnDeleteButtonParams = (columnsWidths, selection) => {
     indexes
   };
 };
-export const getColumnClassNames = (index, selection, hoveredColumns = [], isInDanger, isResizing) => {
-  const classNames = [];
-  if (isColumnSelected(index)(selection) || hoveredColumns.indexOf(index) > -1 && !isResizing) {
-    classNames.push(ClassName.HOVERED_CELL_ACTIVE);
-    if (isInDanger) {
-      classNames.push(ClassName.HOVERED_CELL_IN_DANGER);
-    }
-  }
-  return classNames.join(' ');
-};
 
 // give a row colspan and a colwidths
 // and map to a row's colwidths

package/dist/es2019/utils/dom.js

@@ -13,7 +13,6 @@ export const isTableControlsButton = node => containsClassName(node, ClassName.C
 export const isTableContainerOrWrapper = node => containsClassName(node, ClassName.TABLE_CONTAINER) || containsClassName(node, ClassName.TABLE_NODE_WRAPPER);
 
 /** drag-and-drop classes */
-export const isDragRowControlsButton = node => containsClassName(node, ClassName.DRAG_ROW_CONTROLS) || closestElement(node, `.${ClassName.DRAG_ROW_CONTROLS}`);
 export const isDragRowFloatingInsertDot = node => containsClassName(node, ClassName.DRAG_ROW_FLOATING_INSERT_DOT_WRAPPER);
 export const isDragColumnFloatingInsertDot = node => containsClassName(node, ClassName.DRAG_COLUMN_FLOATING_INSERT_DOT_WRAPPER);
 export const isDragCornerButton = node => containsClassName(node, ClassName.DRAG_CORNER_BUTTON) || containsClassName(node, ClassName.DRAG_CORNER_BUTTON_INNER);