@atlaskit/editor-plugin-table 7.5.4 → 7.5.5

package/src/ui/FloatingContextualMenu/ContextualMenu.tsx

@@ -468,14 +468,15 @@ export class ContextualMenu extends Component<
       (!isDragAndDropEnabled ||
         !getBooleanFF('platform.editor.table.new-cell-context-menu-styling'))
     ) {
-      const { tablePreserveWidth = false } =
-        this.props.getEditorFeatureFlags?.() || {};
+      const { isTableScalingEnabled = false } = getPluginState(
+        editorView.state,
+      );
       const newResizeState = getNewResizeStateFromSelectedColumns(
         selectionRect,
         editorView.state,
         editorView.domAtPos.bind(editorView),
         getEditorContainerWidth,
-        tablePreserveWidth,
+        isTableScalingEnabled,
       );
 
       const wouldChange = newResizeState?.changed ?? false;
@@ -590,12 +591,11 @@ export class ContextualMenu extends Component<
       selectionRect,
       editorAnalyticsAPI,
       getEditorContainerWidth,
-      getEditorFeatureFlags,
     } = this.props;
     // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
     const { state, dispatch } = editorView;
-    const { targetCellPosition } = getPluginState(state);
-    const { tablePreserveWidth = false } = getEditorFeatureFlags?.() || {};
+    const { targetCellPosition, isTableScalingEnabled = false } =
+      getPluginState(state);
 
     switch (item.value.name) {
       case 'sort_column_desc':
@@ -635,7 +635,7 @@ export class ContextualMenu extends Component<
             state,
             editorView.domAtPos.bind(editorView),
             getEditorContainerWidth,
-            tablePreserveWidth,
+            isTableScalingEnabled,
           );
 
         if (newResizeStateWithAnalytics) {
@@ -654,15 +654,10 @@ export class ContextualMenu extends Component<
         this.toggleOpen();
         break;
       case 'insert_column':
-        insertColumnWithAnalytics(
-          getEditorContainerWidth,
-          editorAnalyticsAPI,
-          tablePreserveWidth,
-        )(INPUT_METHOD.CONTEXT_MENU, selectionRect.right)(
-          state,
-          dispatch,
-          editorView,
-        );
+        insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(
+          INPUT_METHOD.CONTEXT_MENU,
+          selectionRect.right,
+        )(state, dispatch, editorView);
         this.toggleOpen();
         break;
       case 'insert_row':

package/src/ui/FloatingContextualMenu/index.tsx

@@ -53,7 +53,6 @@ const FloatingContextualMenu = ({
   pluginConfig,
   editorAnalyticsAPI,
   getEditorContainerWidth,
-  getEditorFeatureFlags,
 }: Props) => {
   // TargetCellPosition could be outdated: https://product-fabric.atlassian.net/browse/ED-8129
   const { targetCellPosition, isDragAndDropEnabled } = getPluginState(
@@ -123,7 +122,6 @@ const FloatingContextualMenu = ({
           boundariesElement={boundariesElement}
           editorAnalyticsAPI={editorAnalyticsAPI}
           getEditorContainerWidth={getEditorContainerWidth}
-          getEditorFeatureFlags={getEditorFeatureFlags}
         />
       </div>
     </Popup>

package/src/ui/FloatingDragMenu/DragMenu.tsx

@@ -101,7 +101,7 @@ type DragMenuProps = {
   mountPoint?: HTMLElement;
   boundariesElement?: HTMLElement;
   scrollableElement?: HTMLElement;
-  tablePreserveWidth?: boolean;
+  isTableScalingEnabled?: boolean;
 };
 
 type PluralOptionType = 'noOfCols' | 'noOfRows' | 'noOfCells' | null;
@@ -280,7 +280,7 @@ export const DragMenu = React.memo(
     mountPoint,
     scrollableElement,
     boundariesElement,
-    tablePreserveWidth,
+    isTableScalingEnabled,
   }: DragMenuProps & WrappedComponentProps) => {
     const { state, dispatch } = editorView;
     const { selection } = state;
@@ -313,7 +313,7 @@ export const DragMenu = React.memo(
       selectionRect,
       editorAnalyticsAPI,
       pluginConfig?.isHeaderRowRequired,
-      tablePreserveWidth,
+      isTableScalingEnabled,
     );
 
     const { menuItems, menuCallback } = convertToDropdownItems(

package/src/ui/FloatingDragMenu/index.tsx

@@ -1,10 +1,7 @@
 import React from 'react';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type {
-  GetEditorContainerWidth,
-  GetEditorFeatureFlags,
-} from '@atlaskit/editor-common/types';
+import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { Popup } from '@atlaskit/editor-common/ui';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
@@ -14,6 +11,7 @@ import {
 } from '@atlaskit/editor-shared-styles';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 
+import { getPluginState } from '../../pm-plugins/plugin-factory';
 import type { RowStickyState } from '../../pm-plugins/sticky-headers';
 import type { PluginConfig, TableDirection } from '../../types';
 import { dragMenuDropdownWidth, tablePopupMenuFitHeight } from '../consts';
@@ -35,7 +33,6 @@ export interface Props {
   editorAnalyticsAPI?: EditorAnalyticsAPI;
   stickyHeaders?: RowStickyState;
   pluginConfig?: PluginConfig;
-  getEditorFeatureFlags: GetEditorFeatureFlags;
 }
 
 const FloatingDragMenu = ({
@@ -52,7 +49,6 @@ const FloatingDragMenu = ({
   editorAnalyticsAPI,
   stickyHeaders,
   pluginConfig,
-  getEditorFeatureFlags,
 }: Props) => {
   if (
     !isOpen ||
@@ -77,7 +73,7 @@ const FloatingDragMenu = ({
     return null;
   }
 
-  const { tablePreserveWidth = false } = getEditorFeatureFlags();
+  const { isTableScalingEnabled = false } = getPluginState(editorView.state);
 
   return (
     <Popup
@@ -117,7 +113,7 @@ const FloatingDragMenu = ({
         mountPoint={mountPoint}
         boundariesElement={boundariesElement}
         scrollableElement={scrollableElement}
-        tablePreserveWidth={tablePreserveWidth}
+        isTableScalingEnabled={isTableScalingEnabled}
       />
     </Popup>
   );

package/src/ui/FloatingInsertButton/index.tsx

@@ -15,10 +15,7 @@ import {
   EVENT_TYPE,
   INPUT_METHOD,
 } from '@atlaskit/editor-common/analytics';
-import type {
-  GetEditorContainerWidth,
-  GetEditorFeatureFlags,
-} from '@atlaskit/editor-common/types';
+import type { GetEditorContainerWidth } from '@atlaskit/editor-common/types';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { closestElement } from '@atlaskit/editor-common/utils';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
@@ -33,6 +30,7 @@ import {
   insertColumnWithAnalytics,
   insertRowWithAnalytics,
 } from '../../commands-with-analytics';
+import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
 import { checkIfNumberColumnEnabled } from '../../utils';
 
@@ -55,7 +53,6 @@ export interface Props {
   hasStickyHeaders?: boolean;
   dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
   editorAnalyticsAPI?: EditorAnalyticsAPI;
-  getEditorFeatureFlags?: GetEditorFeatureFlags;
 }
 
 export class FloatingInsertButton extends React.Component<
@@ -278,29 +275,21 @@ export class FloatingInsertButton extends React.Component<
   }
 
   private insertColumn(event: React.SyntheticEvent) {
-    const {
-      editorView,
-      insertColumnButtonIndex,
-      editorAnalyticsAPI,
-      getEditorContainerWidth,
-    } = this.props;
+    const { editorView, insertColumnButtonIndex, editorAnalyticsAPI } =
+      this.props;
 
     if (typeof insertColumnButtonIndex !== 'undefined') {
       event.preventDefault();
 
-      const { tablePreserveWidth = false } =
-        this.props.getEditorFeatureFlags?.() || {};
+      const { isTableScalingEnabled = false } = getPluginState(
+        editorView.state,
+      );
 
       const { state, dispatch } = editorView;
-      insertColumnWithAnalytics(
-        getEditorContainerWidth,
-        editorAnalyticsAPI,
-        tablePreserveWidth,
-      )(INPUT_METHOD.BUTTON, insertColumnButtonIndex)(
-        state,
-        dispatch,
-        editorView,
-      );
+      insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(
+        INPUT_METHOD.BUTTON,
+        insertColumnButtonIndex,
+      )(state, dispatch, editorView);
     }
   }
 }

package/src/utils/create.ts

@@ -1,4 +1,3 @@
-import type { GetEditorFeatureFlags } from '@atlaskit/editor-common/types';
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { createTable } from '@atlaskit/editor-tables/utils';
 
@@ -6,17 +5,15 @@ import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
 
 export const createTableWithWidth =
   (
+    isTableScalingEnabled?: boolean,
     isFullWidthModeEnabled?: boolean,
-    getEditorFeatureFlags?: GetEditorFeatureFlags,
     createTableProps?: {
       rowsCount?: number;
       colsCount?: number;
     },
   ) =>
   (schema: Schema) => {
-    const { tablePreserveWidth = false } = getEditorFeatureFlags?.() || {};
-
-    if (tablePreserveWidth && isFullWidthModeEnabled) {
+    if (isTableScalingEnabled && isFullWidthModeEnabled) {
       return createTable({
         schema,
         tableWidth: TABLE_MAX_WIDTH,

package/src/utils/drag-menu.ts

@@ -159,7 +159,7 @@ export const getDragMenuConfig = (
   selectionRect?: Rect,
   editorAnalyticsAPI?: EditorAnalyticsAPI,
   isHeaderRowRequired?: boolean,
-  tablePreserveWidth = false,
+  isTableScalingEnabled = false,
 ): DragMenuConfig[] => {
   const addOptions =
     direction === 'row'
@@ -294,15 +294,10 @@ export const getDragMenuConfig = (
             },
           )(state, dispatch);
         } else {
-          insertColumnWithAnalytics(
-            getEditorContainerWidth,
-            editorAnalyticsAPI,
-            tablePreserveWidth,
-          )(INPUT_METHOD.TABLE_CONTEXT_MENU, (index ?? 0) + offset)(
-            state,
-            dispatch,
-            editorView,
-          );
+          insertColumnWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(
+            INPUT_METHOD.TABLE_CONTEXT_MENU,
+            (index ?? 0) + offset,
+          )(state, dispatch, editorView);
         }
         return true;
       },
@@ -321,7 +316,7 @@ export const getDragMenuConfig = (
                 state,
                 editorView.domAtPos.bind(editorView),
                 getEditorContainerWidth,
-                tablePreserveWidth,
+                isTableScalingEnabled,
               );
 
               if (newResizeState) {
@@ -362,7 +357,7 @@ export const getDragMenuConfig = (
             !!isHeaderRowRequired,
           )(state, dispatch);
         } else {
-          deleteColumnsWithAnalytics(editorAnalyticsAPI, tablePreserveWidth)(
+          deleteColumnsWithAnalytics(editorAnalyticsAPI, isTableScalingEnabled)(
             INPUT_METHOD.TABLE_CONTEXT_MENU,
             selectionRect ?? defaultSelectionRect,
           )(state, dispatch, editorView);