@atlaskit/editor-plugin-table 7.6.13 → 7.7.0

package/dist/es2019/nodeviews/TableContainer.js

@@ -2,22 +2,11 @@ import React, { forwardRef, useCallback, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
-import { calcTableWidth } from '@atlaskit/editor-common/styles';
 import { akEditorDefaultLayoutWidth, akEditorGutterPadding, akEditorMediaResizeHandlerPaddingWide, akEditorMobileBreakoutPoint } from '@atlaskit/editor-shared-styles';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
 import { TableCssClassName as ClassName } from '../types';
 import { TableResizer } from './TableResizer';
-const getMarginLeft = (lineLength, tableWidth) => {
-  let marginLeft;
-  if (tableWidth !== 'inherit' && lineLength) {
-    const containerWidth = tableWidth;
-    if (containerWidth) {
-      marginLeft = (lineLength - containerWidth) / 2;
-    }
-  }
-  return marginLeft;
-};
 export const InnerContainer = /*#__PURE__*/forwardRef(({
   className,
   style,
@@ -162,11 +151,9 @@ export const TableContainer = ({
   node,
   className,
   containerWidth: {
-    lineLength,
     width: editorWidth
   },
   isTableResizingEnabled,
-  isBreakoutEnabled,
   editorView,
   getPos,
   tableRef,
@@ -192,15 +179,13 @@ export const TableContainer = ({
       isWholeTableInDanger: isWholeTableInDanger
     }, children);
   }
-  const tableWidth = isBreakoutEnabled ? calcTableWidth(node.attrs.layout, editorWidth) : 'inherit';
   return /*#__PURE__*/React.createElement(InnerContainer, {
     node: node,
     className: classNames(className, {
       'less-padding': editorWidth < akEditorMobileBreakoutPoint && !isNested
     }),
     style: {
-      width: tableWidth,
-      marginLeft: getMarginLeft(lineLength, tableWidth)
+      width: 'inherit'
     }
   }, children);
 };

package/dist/es2019/nodeviews/table.js

@@ -246,7 +246,6 @@ export default class TableView extends ReactNodeView {
 export const createTableView = (node, view, getPos, portalProviderAPI, eventDispatcher, getEditorContainerWidth, getEditorFeatureFlags, dispatchAnalyticsEvent, pluginInjectionApi) => {
   const {
     pluginConfig,
-    isBreakoutEnabled,
     isFullWidthModeEnabled,
     wasFullWidthModeEnabled,
     isTableResizingEnabled,
@@ -267,7 +266,6 @@ export const createTableView = (node, view, getPos, portalProviderAPI, eventDisp
     eventDispatcher,
     getPos: getPos,
     options: {
-      isBreakoutEnabled,
       isFullWidthModeEnabled,
       wasFullWidthModeEnabled,
       isTableResizingEnabled,

package/dist/es2019/plugin.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { table, tableCell, tableHeader, tableRow, tableWithCustomWidth } from '@atlaskit/adf-schema';
+import { table, tableCell, tableHeader, tableRow } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { ErrorBoundary } from '@atlaskit/editor-common/error-boundary';
 import { IconTable } from '@atlaskit/editor-common/icons';
@@ -33,8 +33,7 @@ import FloatingContextualMenu from './ui/FloatingContextualMenu';
 import FloatingDeleteButton from './ui/FloatingDeleteButton';
 import FloatingDragMenu from './ui/FloatingDragMenu';
 import FloatingInsertButton from './ui/FloatingInsertButton';
-import LayoutButton from './ui/LayoutButton';
-import { createTableWithWidth, isLayoutSupported } from './utils';
+import { createTableWithWidth } from './utils';
 const defaultGetEditorFeatureFlags = () => ({});
 
 // TODO: duplicating type instead of importing media plugin causing a circular dependency
@@ -107,10 +106,9 @@ const tablesPlugin = ({
       insertTableWithSize: insertTableWithSize(options === null || options === void 0 ? void 0 : options.fullWidthEnabled, options === null || options === void 0 ? void 0 : options.isTableScalingEnabled, api === null || api === void 0 ? void 0 : (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 ? void 0 : _api$analytics2.actions)
     },
     nodes() {
-      const tableNode = options !== null && options !== void 0 && options.tableResizingEnabled ? tableWithCustomWidth : table;
       return [{
         name: 'table',
-        node: tableNode
+        node: table
       }, {
         name: 'tableHeader',
         node: tableHeader
@@ -136,13 +134,12 @@ const tablesPlugin = ({
             fullWidthEnabled,
             wasFullWidthEnabled,
             tableResizingEnabled,
-            breakoutEnabled,
             tableOptions,
             getEditorFeatureFlags,
             dragAndDropEnabled,
             isTableScalingEnabled
           } = options || {};
-          return createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, breakoutEnabled, tableResizingEnabled, fullWidthEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api, isTableScalingEnabled);
+          return createPlugin(dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig(tableOptions), defaultGetEditorContainerWidth, getEditorFeatureFlags || defaultGetEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthEnabled, wasFullWidthEnabled, dragAndDropEnabled, editorAnalyticsAPI, api, isTableScalingEnabled);
         }
       }, {
         name: 'tablePMColResizing',
@@ -305,9 +302,6 @@ const tablesPlugin = ({
           tableWidthPluginState,
           dragAndDropState
         }) => {
-          const {
-            state
-          } = editorView;
           const isColumnResizing = resizingPluginState === null || resizingPluginState === void 0 ? void 0 : resizingPluginState.dragging;
           const isTableResizing = tableWidthPluginState === null || tableWidthPluginState === void 0 ? void 0 : tableWidthPluginState.resizing;
           const isResizing = isColumnResizing || isTableResizing;
@@ -316,7 +310,6 @@ const tablesPlugin = ({
             tablePos,
             targetCellPosition,
             isContextualMenuOpen,
-            layout,
             tableRef,
             pluginConfig,
             insertColumnButtonIndex,
@@ -330,17 +323,6 @@ const tablesPlugin = ({
             allowControls
           } = pluginConfig;
           const stickyHeader = stickyHeadersState ? findStickyHeaderForTable(stickyHeadersState, tablePos) : undefined;
-          const LayoutContent = options && !options.tableResizingEnabled && isLayoutSupported(state) && options.breakoutEnabled ? /*#__PURE__*/React.createElement(LayoutButton, {
-            editorView: editorView,
-            mountPoint: popupsMountPoint,
-            boundariesElement: popupsBoundariesElement,
-            scrollableElement: popupsScrollableElement,
-            targetRef: tableWrapperTarget,
-            layout: layout,
-            isResizing: !!resizingPluginState && !!resizingPluginState.dragging,
-            stickyHeader: stickyHeader,
-            editorAnalyticsAPI: editorAnalyticsAPI
-          }) : null;
           return /*#__PURE__*/React.createElement(React.Fragment, null, targetCellPosition && tableRef && !isResizing && options && options.allowContextualMenu && /*#__PURE__*/React.createElement(FloatingContextualButton, {
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorView: editorView,
@@ -350,7 +332,6 @@ const tablesPlugin = ({
             scrollableElement: popupsScrollableElement,
             dispatchAnalyticsEvent: dispatchAnalyticsEvent,
             isContextualMenuOpen: isContextualMenuOpen,
-            layout: layout,
             stickyHeader: stickyHeader,
             tableWrapper: tableWrapperTarget
           }), allowControls && /*#__PURE__*/React.createElement(FloatingInsertButton, {
@@ -403,7 +384,7 @@ const tablesPlugin = ({
             stickyHeaders: stickyHeader,
             isNumberColumnEnabled: tableNode && tableNode.attrs.isNumberColumnEnabled,
             editorAnalyticsAPI: editorAnalyticsAPI
-          }), LayoutContent);
+          }));
         }
       }));
     },

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

@@ -22,7 +22,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 const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, breakoutEnabled, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled) => {
+export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI, eventDispatcher, pluginConfig, getEditorContainerWidth, getEditorFeatureFlags, getIntl, tableResizingEnabled, fullWidthModeEnabled, previousFullWidthModeEnabled, dragAndDropEnabled, editorAnalyticsAPI, pluginInjectionApi, isTableScalingEnabled) => {
   var _accessibilityUtils;
   const state = createPluginState(dispatch, {
     pluginConfig,
@@ -30,7 +30,6 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
     insertColumnButtonIndex: undefined,
     insertRowButtonIndex: undefined,
     isFullWidthModeEnabled: fullWidthModeEnabled,
-    isBreakoutEnabled: breakoutEnabled,
     wasFullWidthModeEnabled: previousFullWidthModeEnabled,
     isTableResizingEnabled: tableResizingEnabled,
     isHeaderRowEnabled: !!pluginConfig.allowHeaderRow,

package/dist/es2019/pm-plugins/table-resizing/event-handlers.js

@@ -1,7 +1,5 @@
 import { ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD, TABLE_ACTION, TABLE_OVERFLOW_CHANGE_TRIGGER } from '@atlaskit/editor-common/analytics';
-import { getParentNodeWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
-import { akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { getSelectionRect } from '@atlaskit/editor-tables/utils';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
@@ -13,7 +11,7 @@ import { getPluginState as getTablePluginState } from '../plugin-factory';
 import { META_KEYS } from '../table-analytics';
 import { evenColumns, setDragging, stopResizing } from './commands';
 import { getPluginState } from './plugin-factory';
-import { currentColWidth, getLayoutSize, getResizeState, getTableMaxWidth, pointsAtCell, resizeColumn, updateControls } from './utils';
+import { currentColWidth, getResizeState, getTableMaxWidth, pointsAtCell, resizeColumn, updateControls } from './utils';
 export const handleMouseDown = (view, event, localResizeHandlePos, getEditorContainerWidth, getEditorFeatureFlags, editorAnalyticsAPI) => {
   const {
     state,
@@ -47,25 +45,13 @@ export const handleMouseDown = (view, event, localResizeHandlePos, getEditorCont
   if (dom && dom.nodeName !== 'TABLE') {
     dom = dom.closest('table');
   }
-  let maxSize;
-  if (!getBooleanFF('platform.editor.a11y-column-resizing_emcvz')) {
-    const containerWidth = getEditorContainerWidth();
-    const parentWidth = getParentNodeWidth(start, state, containerWidth);
-    maxSize = getBooleanFF('platform.editor.custom-table-width') ? parentWidth ||
-    // its safe to reference table width from node as this will not have changed
-    originalTable.attrs.width || getLayoutSize(dom.getAttribute('data-layout'), containerWidth.width, {}) : parentWidth || getLayoutSize(dom.getAttribute('data-layout'), containerWidth.width, {});
-    if (originalTable.attrs.isNumberColumnEnabled) {
-      maxSize -= akEditorTableNumberColumnWidth;
-    }
-  } else {
-    maxSize = getTableMaxWidth({
-      table: originalTable,
-      tableStart: start,
-      state,
-      layout: originalTable.attrs.layout,
-      getEditorContainerWidth
-    });
-  }
+  const maxSize = getTableMaxWidth({
+    table: originalTable,
+    tableStart: start,
+    state,
+    layout: originalTable.attrs.layout,
+    getEditorContainerWidth
+  });
   const shouldScale = tableDepth === 0 && isTableScalingEnabled;
   const resizeState = getResizeState({
     minWidth: tableCellMinWidth,

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

@@ -2,7 +2,6 @@ import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { getFragmentBackingArray } from '@atlaskit/editor-common/utils';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getTableScalingPercent } from './misc';
 /**
  * This ensures the combined width of the columns (and tbody) of table is always smaller or equal
@@ -13,62 +12,40 @@ import { getTableScalingPercent } from './misc';
 export const getColWidthFix = (colwidth, tableColumnCount) => colwidth - 1 / tableColumnCount;
 export const generateColgroup = (table, tableRef) => {
   const cols = [];
-  if (getBooleanFF('platform.editor.custom-table-width')) {
-    const map = TableMap.get(table);
-    table.content.firstChild.content.forEach(cell => {
-      const colspan = cell.attrs.colspan || 1;
-      if (Array.isArray(cell.attrs.colwidth)) {
-        // We slice here to guard against our colwidth array having more entries
-        // Than the we actually span. We'll patch the document at a later point.
-        if (tableRef) {
-          const scalePercent = getTableScalingPercent(table, tableRef);
-          cell.attrs.colwidth.slice(0, colspan).forEach(width => {
-            const fixedColWidth = getColWidthFix(width, map.width);
-            const scaledWidth = fixedColWidth * scalePercent;
-            const finalWidth = Math.max(scaledWidth, tableCellMinWidth);
-            cols.push(['col', {
-              style: `width: ${finalWidth}px;`
-            }]);
-          });
-        } else {
-          cell.attrs.colwidth.slice(0, colspan).forEach(width => {
-            cols.push(['col', {
-              style: `width: ${getColWidthFix(width ? Math.max(width, tableCellMinWidth) : tableCellMinWidth, map.width)}px;`
-            }]);
-          });
-        }
-      } else {
-        // When we have merged cells on the first row (firstChild),
-        // We want to ensure we're creating the appropriate amount of
-        // cols the table still has.
-        cols.push(...Array.from({
-          length: colspan
-        }, _ => ['col', {
-          style: `width: ${tableCellMinWidth}px;`
-        }]));
-      }
-    });
-  } else {
-    table.content.firstChild.content.forEach(cell => {
-      const colspan = cell.attrs.colspan || 1;
-      if (Array.isArray(cell.attrs.colwidth)) {
-        // We slice here to guard against our colwidth array having more entries
-        // Than the we actually span. We'll patch the document at a later point.
+  const map = TableMap.get(table);
+  table.content.firstChild.content.forEach(cell => {
+    const colspan = cell.attrs.colspan || 1;
+    if (Array.isArray(cell.attrs.colwidth)) {
+      // We slice here to guard against our colwidth array having more entries
+      // Than the we actually span. We'll patch the document at a later point.
+      if (tableRef) {
+        const scalePercent = getTableScalingPercent(table, tableRef);
         cell.attrs.colwidth.slice(0, colspan).forEach(width => {
-          cols.push(['col', width ? {
-            style: `width: ${width}px;`
-          } : {}]);
+          const fixedColWidth = getColWidthFix(width, map.width);
+          const scaledWidth = fixedColWidth * scalePercent;
+          const finalWidth = Math.max(scaledWidth, tableCellMinWidth);
+          cols.push(['col', {
+            style: `width: ${finalWidth}px;`
+          }]);
         });
       } else {
-        // When we have merged cells on the first row (firstChild),
-        // We want to ensure we're creating the appropriate amount of
-        // cols the table still has.
-        cols.push(...Array.from({
-          length: colspan
-        }, _ => ['col', {}]));
+        cell.attrs.colwidth.slice(0, colspan).forEach(width => {
+          cols.push(['col', {
+            style: `width: ${getColWidthFix(width ? Math.max(width, tableCellMinWidth) : tableCellMinWidth, map.width)}px;`
+          }]);
+        });
       }
-    });
-  }
+    } else {
+      // When we have merged cells on the first row (firstChild),
+      // We want to ensure we're creating the appropriate amount of
+      // cols the table still has.
+      cols.push(...Array.from({
+        length: colspan
+      }, _ => ['col', {
+        style: `width: ${tableCellMinWidth}px;`
+      }]));
+    }
+  });
   return cols;
 };
 export const insertColgroupFromNode = (tableRef, table, isTableScalingEnabled = false, shouldRemove = true) => {

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

@@ -3,7 +3,6 @@ import { calcTableWidth } from '@atlaskit/editor-common/styles';
 import { getBreakpoint, mapBreakpointToLayoutMaxWidth } from '@atlaskit/editor-common/ui';
 import { calcTableColumnWidths, containsClassName } from '@atlaskit/editor-common/utils';
 import { akEditorFullWidthLayoutWidth, akEditorGutterPadding, akEditorTableNumberColumnWidth } from '@atlaskit/editor-shared-styles';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { hasTableBeenResized } from './colgroup';
 import { MAX_SCALING_PERCENT } from './consts';
 
@@ -69,7 +68,7 @@ export const getTableMaxWidth = ({
 }) => {
   const containerWidth = getEditorContainerWidth();
   const parentWidth = getParentNodeWidth(tableStart, state, containerWidth);
-  let maxWidth = getBooleanFF('platform.editor.custom-table-width') ? parentWidth || table.attrs.width || getLayoutSize(layout, containerWidth.width, {}) : parentWidth || getLayoutSize(layout, containerWidth.width, {});
+  let maxWidth = parentWidth || table.attrs.width || getLayoutSize(layout, containerWidth.width, {});
   if (table.attrs.isNumberColumnEnabled) {
     maxWidth -= akEditorTableNumberColumnWidth;
   }

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

@@ -1,7 +1,6 @@
 import { getTableContainerWidth } from '@atlaskit/editor-common/node-width';
 import { tableCellMinWidth, tableNewColumnMinWidth } from '@atlaskit/editor-common/styles';
 import { calcTableColumnWidths } from '@atlaskit/editor-common/utils';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getSelectedTableInfo } from '../../../utils';
 import { getColWidthFix, hasTableBeenResized, insertColgroupFromNode } from './colgroup';
 import { getCellsRefsInColumn, getColumnStateFromDOM } from './column-state';
@@ -74,33 +73,24 @@ export const getResizeState = ({
 // updates Colgroup DOM node with new widths
 export const updateColgroup = (state, tableRef, tableNode, isTableScalingEnabled) => {
   const cols = tableRef.querySelectorAll('col');
-  if (getBooleanFF('platform.editor.custom-table-width')) {
-    const columnsCount = cols.length;
-    if (isTableScalingEnabled && tableNode) {
-      const scalePercent = getTableScalingPercent(tableNode, tableRef);
-      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);
-        const scaledWidth = fixedColWidth * scalePercent;
-        const finalWidth = Math.max(scaledWidth, tableCellMinWidth);
-        // we aren't handling the remaining pixels here when the 48px min width is reached
-        if (cols[i]) {
-          cols[i].style.width = `${finalWidth}px`;
-        }
-      });
-    } else {
-      state.cols.filter(column => column && !!column.width) // if width is 0, we dont want to apply that.
-      .forEach((column, i) => {
-        if (cols[i]) {
-          cols[i].style.width = `${getColWidthFix(column.width, columnsCount)}px`;
-        }
-      });
-    }
+  const columnsCount = cols.length;
+  if (isTableScalingEnabled && tableNode) {
+    const scalePercent = getTableScalingPercent(tableNode, tableRef);
+    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);
+      const scaledWidth = fixedColWidth * scalePercent;
+      const finalWidth = Math.max(scaledWidth, tableCellMinWidth);
+      // we aren't handling the remaining pixels here when the 48px min width is reached
+      if (cols[i]) {
+        cols[i].style.width = `${finalWidth}px`;
+      }
+    });
   } else {
     state.cols.filter(column => column && !!column.width) // if width is 0, we dont want to apply that.
     .forEach((column, i) => {
       if (cols[i]) {
-        cols[i].style.width = `${column.width}px`;
+        cols[i].style.width = `${getColWidthFix(column.width, columnsCount)}px`;
       }
     });
   }

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

@@ -11,28 +11,18 @@ 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, isTableScalingEnabled = false) => {
-  /**
-   * isBreakoutEnabled === true -> default center aligned
-   * isBreakoutEnabled === false -> full width mode
-   */
-
   const {
     node,
     containerWidth,
     previousContainerWidth,
     prevNode,
     start,
-    isBreakoutEnabled,
     layoutChanged,
     isTableResizingEnabled
   } = options;
-  const maxSize = isTableResizingEnabled ? getTableContainerWidth(node) : getLayoutSize(node.attrs.layout, containerWidth, {
-    isBreakoutEnabled
-  });
+  const maxSize = isTableResizingEnabled ? getTableContainerWidth(node) : getLayoutSize(node.attrs.layout, containerWidth, {});
   const prevTableWidth = getTableWidth(prevNode);
-  const previousMaxSize = isTableResizingEnabled ? getTableContainerWidth(node) : getLayoutSize(prevNode.attrs.layout, previousContainerWidth, {
-    isBreakoutEnabled
-  });
+  const previousMaxSize = isTableResizingEnabled ? getTableContainerWidth(node) : getLayoutSize(prevNode.attrs.layout, previousContainerWidth, {});
   let newWidth = maxSize;
 
   // adjust table width if layout is updated

package/dist/es2019/reducer.js

@@ -29,11 +29,6 @@ export default ((pluginState, action) => {
         ...action.data,
         isContextualMenuOpen: false
       };
-    case 'SET_TABLE_LAYOUT':
-      return {
-        ...pluginState,
-        ...action.data
-      };
     case 'TOGGLE_CONTEXTUAL_MENU':
       return {
         ...pluginState,

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

@@ -1,12 +1,10 @@
 import { tableCellMinWidth } from '@atlaskit/editor-common/styles';
 import { AttrStep } from '@atlaskit/editor-prosemirror/transform';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { getTableContainerElementWidth, getTableElementWidth, hasTableBeenResized } from '../pm-plugins/table-resizing/utils';
 import { isMinCellWidthTable } from '../pm-plugins/table-resizing/utils/colgroup';
 import { getResizeState } from '../pm-plugins/table-resizing/utils/resize-state';
 import { scaleTableTo } from '../pm-plugins/table-resizing/utils/scale-table';
-import { insertColumnButtonOffset } from '../ui/common-styles';
 
 /**
  * Given a new ResizeState object, create a transaction that replaces and updates the table node based on new state.
@@ -111,16 +109,16 @@ export const rescaleColumns = (isTableScalingEnabled = false) => (table, view) =
   if (shouldScale) {
     previousTableInfo = {
       width: getTableElementWidth(table.node),
-      possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? getTableContainerElementWidth(table.node) : getTableContainerElementWidth(table.node) - insertColumnButtonOffset,
+      possibleMaxWidth: getTableContainerElementWidth(table.node),
       isResized
     };
   } else {
-    var _tableRef$parentEleme, _tableRef$parentEleme2;
+    var _tableRef$parentEleme;
     previousTableInfo = {
       // when table is resized the tableRef client width will be 1px larger than colGroup, which is used in calculations
       width: isResized ? tableRef.clientWidth - 1 : tableRef.clientWidth,
       /** the is the width the table can reach before overflowing */
-      possibleMaxWidth: getBooleanFF('platform.editor.custom-table-width') ? (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0 : ((tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme2 = tableRef.parentElement) === null || _tableRef$parentEleme2 === void 0 ? void 0 : _tableRef$parentEleme2.clientWidth) || 0) - insertColumnButtonOffset,
+      possibleMaxWidth: (tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$parentEleme = tableRef.parentElement) === null || _tableRef$parentEleme === void 0 ? void 0 : _tableRef$parentEleme.clientWidth) || 0,
       isResized
     };
   }

package/dist/es2019/types.js

@@ -69,7 +69,6 @@ export const TableCssClassName = {
   CONTROLS_INSERT_BUTTON_WRAP: `${tablePrefixSelector}-controls__insert-button-wrap`,
   CONTROLS_INSERT_LINE: `${tablePrefixSelector}-controls__insert-line`,
   CONTROLS_BUTTON_OVERLAY: `${tablePrefixSelector}-controls__button-overlay`,
-  LAYOUT_BUTTON: `${tablePrefixSelector}-layout-button`,
   DRAG_CONTROLS_INSERT_BUTTON: `${tablePrefixSelector}-controls__drag-insert-button`,
   DRAG_CONTROLS_INSERT_BUTTON_INNER: `${tablePrefixSelector}-controls__drag-insert-button-inner`,
   DRAG_CONTROLS_INSERT_BUTTON_INNER_COLUMN: `${tablePrefixSelector}-controls__drag-insert-button-inner-column`,

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
+import { startColumnResizing, ToolTipContent } from '@atlaskit/editor-common/keymaps';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import Tooltip from '@atlaskit/tooltip';
 import { TableCssClassName } from '../../types';
@@ -21,7 +22,10 @@ export const ColumnResizeWidget = ({
     });
   }
   return jsx(Tooltip, {
-    content: formatMessage(messages.adjustColumns),
+    content: jsx(ToolTipContent, {
+      description: formatMessage(messages.adjustColumns),
+      keymap: startColumnResizing
+    }),
     hideTooltipOnClick: true,
     hideTooltipOnMouseDown: true,
     position: "mouse",

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

@@ -5,6 +5,7 @@ import { ArrowKeyNavigationProvider, ArrowKeyNavigationType, DropdownMenuItem }
 import { withReactEditorViewOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { akEditorFloatingPanelZIndex } from '@atlaskit/editor-shared-styles';
 import { MenuGroup, Section } from '@atlaskit/menu';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { dragMenuDropdownWidth } from '../consts';
 const DropListWithOutsideListeners = withReactEditorViewOuterListeners(DropList);
 export const DropdownMenu = ({
@@ -27,6 +28,10 @@ export const DropdownMenu = ({
   const handleRef = ref => {
     setTargetRefDiv(ref);
   };
+
+  // more offsets calculation as offsets depend on the direction and updated placement here
+  let offsetY = direction === 'row' ? popupPlacement[0] === 'bottom' ? -8 : -34 : 0;
+  let offsetX = direction === 'column' ? popupPlacement[1] === 'left' ? 0 : -7 : 0;
   const innerMenu = () => {
     return /*#__PURE__*/React.createElement(DropListWithOutsideListeners, {
       isOpen: true,
@@ -69,12 +74,31 @@ export const DropdownMenu = ({
     })))));
   };
   if (disableKeyboardHandling) {
-    return innerMenu();
+    if (getBooleanFF('platform.editor.table.background-color-flicker-in-drag-menu')) {
+      // This part need be refactor when clean up the ff, to reuse the wrapper
+      return /*#__PURE__*/React.createElement("div", {
+        className: "drag-dropdown-menu-wrapper"
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "drag-dropdown-menu-popup-ref",
+        ref: handleRef
+      }), /*#__PURE__*/React.createElement(Popup, {
+        target: targetRefDiv,
+        mountTo: mountPoint,
+        boundariesElement: boundariesElement,
+        scrollableElement: scrollableElement,
+        onPlacementChanged: placement => {
+          setPopupPlacement(placement);
+        },
+        fitHeight: fitHeight,
+        fitWidth: fitWidth,
+        zIndex: akEditorFloatingPanelZIndex,
+        offset: [offsetX, offsetY],
+        allowOutOfBounds: true // required as this popup is child of a parent popup, should be allowed to be out of bound of the parent popup, otherwise horizontal offset is not right
+      }, innerMenu()));
+    } else {
+      return innerMenu();
+    }
   }
-
-  // more offsets calculation as offsets depend on the direction and updated placement here
-  let offsetY = direction === 'row' ? popupPlacement[0] === 'bottom' ? -8 : -34 : 0;
-  let offsetX = direction === 'column' ? popupPlacement[1] === 'left' ? 0 : -7 : 0;
   return /*#__PURE__*/React.createElement("div", {
     className: "drag-dropdown-menu-wrapper"
   }, /*#__PURE__*/React.createElement("div", {
@@ -96,6 +120,7 @@ export const DropdownMenu = ({
   }, /*#__PURE__*/React.createElement(ArrowKeyNavigationProvider, {
     closeOnTab: true,
     type: ArrowKeyNavigationType.MENU,
+    handleClose: () => handleClose('handle'),
     onSelection: index => {
       const results = items.flatMap(item => 'items' in item ? item.items : item);