@atlaskit/editor-plugin-table 4.1.0 → 4.2.0

package/src/plugins/table/transforms/delete-columns.ts

@@ -4,12 +4,15 @@ import { TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { Transaction } from '@atlaskit/editor-prosemirror/state';
 import { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { Rect } from '@atlaskit/editor-tables/table-map';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable } from '@atlaskit/editor-tables/utils';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
 import { META_KEYS } from '../pm-plugins/table-analytics';
 
+import { rescaleColumns } from './column-width';
 import { splitCellsInColumns } from './split';
 
 const deleteColumnsCustomStep =
@@ -247,13 +250,27 @@ function fixRowSpans(table: PMNode): PMNode | null {
 }
 
 export const deleteColumns =
-  (rect: Rect, allowAddColumnCustomStep = false) =>
-  (tr: Transaction): Transaction => {
-    tr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
+  (rect: Rect, allowCustomStep: boolean, view?: EditorView) =>
+  (tr: Transaction) => {
+    let updatedTr = tr;
+    updatedTr.setMeta(META_KEYS.OVERFLOW_TRIGGER, {
       name: TABLE_OVERFLOW_CHANGE_TRIGGER.DELETED_COLUMN,
     });
-    if (allowAddColumnCustomStep) {
-      return deleteColumnsCustomStep(rect)(tr);
+
+    if (allowCustomStep) {
+      updatedTr = deleteColumnsCustomStep(rect)(updatedTr);
+    } else {
+      updatedTr = deleteColumnsLegacy(rect)(updatedTr);
+    }
+    const table = findTable(updatedTr.selection);
+    if (
+      getBooleanFF(
+        'platform.editor.table-update-colwidths-after-column-is-deleted',
+      )
+    ) {
+      if (table) {
+        updatedTr = rescaleColumns()(table, view)(updatedTr);
+      }
     }
-    return deleteColumnsLegacy(rect)(tr);
+    return updatedTr;
   };

package/src/plugins/table/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -434,7 +434,7 @@ export class ContextualMenu extends Component<
         deleteColumnsWithAnalytics(editorAnalyticsAPI)(
           INPUT_METHOD.CONTEXT_MENU,
           selectionRect,
-        )(state, dispatch);
+        )(state, dispatch, editorView);
         this.toggleOpen();
         break;
       case 'delete_row':

package/src/plugins/table/ui/FloatingDeleteButton/index.tsx

@@ -1,4 +1,5 @@
-import React, { Component, SyntheticEvent } from 'react';
+import type { SyntheticEvent } from 'react';
+import React, { Component } from 'react';
 
 import { createPortal } from 'react-dom';
 
@@ -6,8 +7,8 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
-import { Selection } from '@atlaskit/editor-prosemirror/state';
-import { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import {
@@ -21,7 +22,7 @@ import {
   deleteRowsWithAnalytics,
 } from '../../commands-with-analytics';
 import { getPluginState as getTablePluginState } from '../../pm-plugins/plugin-factory';
-import { RowStickyState } from '../../pm-plugins/sticky-headers';
+import type { RowStickyState } from '../../pm-plugins/sticky-headers';
 import { TableCssClassName as ClassName } from '../../types';
 import {
   getColumnDeleteButtonParams,
@@ -34,7 +35,7 @@ import tableMessages from '../messages';
 
 import DeleteButton from './DeleteButton';
 import getPopupOptions from './getPopUpOptions';
-import { CellSelectionType } from './types';
+import type { CellSelectionType } from './types';
 
 export interface Props {
   editorView: EditorView;
@@ -278,7 +279,7 @@ class FloatingDeleteButton extends Component<Props, State> {
           deleteColumnsWithAnalytics(editorAnalyticsAPI)(
             INPUT_METHOD.BUTTON,
             rect,
-          )(state, dispatch);
+          )(state, dispatch, this.props.editorView);
           return;
         }
         case 'row': {

package/src/plugins/table/ui/common-styles.ts

@@ -249,7 +249,6 @@ const tableWrapperStyles = () => {
         position: relative;
 
         > table[data-number-column='true'] {
-          margin-left: 1px;
           width: calc(100% - 1px);
         }
       }