@atlaskit/editor-plugin-table 7.21.3 → 7.21.5

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

@@ -3,9 +3,10 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { TableCssClassName as ClassName } from '../../../types';
 import { ALIGN_CENTER, ALIGN_START, shouldChangeAlignmentToCenterResized } from '../../../utils/alignment';
-import { getTableContainerElementWidth, getTableScalingPercent } from './misc';
+import { getTableScalingPercent } from './misc';
 import { growColumn, shrinkColumn, updateAffectedColumn } from './resize-logic';
 import { updateColgroup } from './resize-state';
 export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
@@ -21,68 +22,115 @@ export var resizeColumn = function resizeColumn(resizeState, colIndex, amount, t
   updateColgroup(newState, tableRef, tableNode, isTableScalingEnabled, shouldUseIncreasedScalingPercent);
   return newState;
 };
+export var resizeColumnAndTable = function resizeColumnAndTable(_ref) {
+  var resizeState = _ref.resizeState,
+    colIndex = _ref.colIndex,
+    amount = _ref.amount,
+    tableRef = _ref.tableRef,
+    tableNode = _ref.tableNode,
+    lineLength = _ref.lineLength,
+    editorWidth = _ref.width,
+    isTableAlignmentEnabled = _ref.isTableAlignmentEnabled;
+  var editorContainerWidth = getEditorContainerWidth(editorWidth);
+  var isTableLeftAligned = tableNode.attrs.layout === ALIGN_START;
+  var resizeAmount = isTableLeftAligned ? amount : amount * 2;
+  var willTableHitEditorEdge = resizeState.maxSize + resizeAmount > editorContainerWidth;
+  var willResizedTableStayInOverflow = resizeState.overflow && resizeState.tableWidth + resizeAmount / 2 > resizeState.maxSize;
 
-// try not scale table during resize
-export var resizeColumnAndTable = function resizeColumnAndTable(resizeState, colIndex, amount, tableRef, tableNode, selectedColumns) {
-  var _tableRef$closest;
-  var isTableScalingEnabled = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var originalTableWidth = arguments.length > 7 ? arguments[7] : undefined;
-  var shouldUseIncreasedScalingPercent = arguments.length > 8 && arguments[8] !== undefined ? arguments[8] : false;
-  var lineLength = arguments.length > 9 ? arguments[9] : undefined;
-  var isTableAlignmentEnabled = arguments.length > 10 && arguments[10] !== undefined ? arguments[10] : false;
-  // TODO: can we use document state, and apply scaling factor?
-  var tableWidth = tableRef.clientWidth;
-  var tableContainerWidth = (_tableRef$closest = tableRef.closest('.pm-table-container')) === null || _tableRef$closest === void 0 ? void 0 : _tableRef$closest.clientWidth;
-  var isOverflowed = !!(tableWidth && tableContainerWidth && tableWidth > tableContainerWidth);
-  var resizeAmount = tableNode.attrs.layout === ALIGN_START && !isOverflowed ? amount : amount * 2;
-
-  // todo: reimplement - use getTableScalingPercentFrozen to get scaled percent before table width changes dynamically
-  // let scalePercent = 1;
-  // if (isTableScalingEnabled) {
-  // import from ./misc
-  //   scalePercent = getStaticTableScalingPercent(
-  //     tableNode,
-  //     originalTableWidth || resizeState.maxSize,
-  //   );
-  //   resizeAmount = amount / scalePercent;
-  // }
-
-  // need to look at the resize amount and try to adjust the colgroups
-  if (isOverflowed) {
-    resizeAmount = amount < 0 ? amount : resizeAmount - (tableNode.attrs.width + resizeAmount - tableContainerWidth) / 2;
+  // 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) {
+    var diff = -(resizeState.tableWidth - resizeState.maxSize);
+    var rest = amount - diff;
+    var final = isTableLeftAligned ? diff + rest : diff + rest * 2;
+    resizeAmount = final;
   }
   var newState = updateAffectedColumn(resizeState, colIndex, resizeAmount);
 
-  // this function only updates the colgroup in DOM, it reverses the scalePercent
-  // todo: change isScalingEnabled to true when reimplementing scaling
-  updateColgroup(newState, tableRef, tableNode, false, shouldUseIncreasedScalingPercent);
-
-  // use the difference in width from affected column to update overall table width
+  // 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;
-  if (!isOverflowed) {
-    // If the table is aligned to the start and the table width is greater than the line length, we should change the alignment to center
-    var shouldChangeAlignment = shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, newState.tableWidth + delta);
-    shouldChangeAlignment ? updateTablePreview(delta, tableRef, tableNode, ALIGN_CENTER) : updateTablePreview(delta, tableRef, tableNode);
+  newState.maxSize = Math.round(resizeState.overflow ? 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 :
+  // 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 ?
+  // CASE 2: table will hit editor edge
+  editorContainerWidth :
+  // CASE 3: table is being resized from a non-overflow state
+  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));
   }
-  return _objectSpread(_objectSpread({}, newState), {}, {
-    // resizeState.tableWidth sometimes is off by ~3px on load on resized table when !isOverflowed, using resizeState.maxSize instead
-    tableWidth: isOverflowed ? tableContainerWidth : resizeState.maxSize + delta
-  });
+  return newState;
 };
-var updateTablePreview = function updateTablePreview(resizeAmount, tableRef, tableNode, tableAligment) {
-  var currentWidth = getTableContainerElementWidth(tableNode);
-  var resizingContainer = tableRef === null || tableRef === void 0 ? void 0 : tableRef.closest(".".concat(ClassName.TABLE_RESIZER_CONTAINER));
+var updateTablePreview = function updateTablePreview(tableRef, newTableWidth, shouldChangeAlignment) {
+  var resizingContainer = tableRef.closest(".".concat(ClassName.TABLE_RESIZER_CONTAINER));
   var resizingItem = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.querySelector('.resizer-item');
   var alignmentContainer = resizingContainer === null || resizingContainer === void 0 ? void 0 : resizingContainer.parentElement;
   if (resizingItem) {
-    var newWidth = "".concat(currentWidth + resizeAmount, "px");
-    if (tableRef) {
-      tableRef.style.width = newWidth;
-    }
+    var newWidth = "".concat(newTableWidth, "px");
     resizingContainer.style.width = newWidth;
     resizingItem.style.width = newWidth;
-    if (tableAligment && alignmentContainer) {
-      alignmentContainer.style.justifyContent = tableAligment;
+    if (shouldChangeAlignment && alignmentContainer) {
+      alignmentContainer.style.justifyContent = ALIGN_CENTER;
     }
   }
+};
+var getEditorContainerWidth = function getEditorContainerWidth(editorWidth) {
+  return Math.min(editorWidth - akEditorGutterPaddingDynamic() * 2, akEditorFullWidthLayoutWidth);
+};
+
+/**
+ * Apply a scaling factor to resize state
+ */
+export var scaleResizeState = function scaleResizeState(_ref2) {
+  var resizeState = _ref2.resizeState,
+    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)) {
+    return resizeState;
+  }
+  var scalePercent = getTableScalingPercent(tableNode, tableRef);
+  var cols = resizeState.cols.map(function (col) {
+    return _objectSpread(_objectSpread({}, col), {}, {
+      width: Math.round(Math.max(col.width * scalePercent, col.minWidth))
+    });
+  });
+  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
+  if (calculatedTableWidth > scaledTableWidth) {
+    var diff = calculatedTableWidth - scaledTableWidth;
+    cols = cols.map(function (col) {
+      return col.width - diff >= col.minWidth ? _objectSpread(_objectSpread({}, col), {}, {
+        width: col.width - diff
+      }) : col;
+    });
+  }
+  return _objectSpread(_objectSpread({}, resizeState), {}, {
+    widths: cols.map(function (col) {
+      return col.width;
+    }),
+    tableWidth: scaledTableWidth,
+    maxSize: Math.round(resizeState.maxSize * scalePercent),
+    cols: cols
+  });
 };

package/dist/esm/toolbar.js

@@ -3,7 +3,10 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 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; }
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { TableSortOrder as SortOrder } from '@atlaskit/custom-steps';

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

@@ -1,5 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';

package/dist/esm/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.js

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { ButtonGroup } from '@atlaskit/button';

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766

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

@@ -11,7 +11,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { Component } from 'react';
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';

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

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { Popup } from '@atlaskit/editor-common/ui';

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

@@ -1,7 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 /* eslint-disable @atlaskit/design-system/prefer-primitives */
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 /** @jsxFrag */
 import React, { useEffect, useState } from 'react';
 

package/dist/esm/utils/alignment.js

@@ -14,5 +14,5 @@ export var normaliseAlignment = function normaliseAlignment(layout) {
  * We don't want to switch alignment in Full-width editor
  */
 export var shouldChangeAlignmentToCenterResized = function shouldChangeAlignmentToCenterResized(isTableAlignmentEnabled, tableNode, lineLength, updatedTableWidth) {
-  return isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH;
+  return Boolean(isTableAlignmentEnabled && tableNode && tableNode.attrs.layout === ALIGN_START && lineLength && updatedTableWidth > lineLength && lineLength < FULL_WIDTH_EDITOR_CONTENT_WIDTH);
 };

package/dist/types/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,4 +1,26 @@
+import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => ResizeState;
-export declare const resizeColumnAndTable: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, originalTableWidth?: number, shouldUseIncreasedScalingPercent?: boolean, lineLength?: number, isTableAlignmentEnabled?: boolean) => ResizeState;
+type ResizeInformation = {
+    resizeState: ResizeState;
+    colIndex: number;
+    amount: number;
+};
+type TableReferences = {
+    tableRef: HTMLElement;
+    tableNode: PmNode;
+};
+type TableResizingPluginOptions = {
+    isTableAlignmentEnabled?: boolean;
+};
+type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
+export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
+/**
+ * Apply a scaling factor to resize state
+ */
+export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, }: TableReferences & {
+    resizeState: ResizeState;
+    editorWidth: number;
+}) => ResizeState;
+export {};

package/dist/types/ui/ColumnResizeWidget/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 type Props = {
     startIndex: number;

package/dist/types/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 type Props = {

package/dist/types/ui/FloatingContextualMenu/ContextualMenu.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { Component } from 'react';
 import { jsx } from '@emotion/react';
 import type { WrappedComponentProps } from 'react-intl-next';

package/dist/types/ui/FloatingContextualMenu/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';

package/dist/types/ui/FloatingDragMenu/DragMenu.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 /** @jsxFrag */
 import React from 'react';
 import { jsx } from '@emotion/react';

package/dist/types/utils/alignment.d.ts

@@ -11,4 +11,4 @@ export declare const normaliseAlignment: (layout: TableLayout) => AlignmentOptio
 /**
  * We don't want to switch alignment in Full-width editor
  */
-export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean | 0 | undefined;
+export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean;

package/dist/types-ts4.5/pm-plugins/table-resizing/utils/resize-column.d.ts

@@ -1,4 +1,26 @@
+import { type EditorContainerWidth } from '@atlaskit/editor-common/types';
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { ResizeState } from './types';
 export declare const resizeColumn: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement | null, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, shouldUseIncreasedScalingPercent?: boolean) => ResizeState;
-export declare const resizeColumnAndTable: (resizeState: ResizeState, colIndex: number, amount: number, tableRef: HTMLElement, tableNode: PmNode, selectedColumns?: number[], isTableScalingEnabled?: boolean, originalTableWidth?: number, shouldUseIncreasedScalingPercent?: boolean, lineLength?: number, isTableAlignmentEnabled?: boolean) => ResizeState;
+type ResizeInformation = {
+    resizeState: ResizeState;
+    colIndex: number;
+    amount: number;
+};
+type TableReferences = {
+    tableRef: HTMLElement;
+    tableNode: PmNode;
+};
+type TableResizingPluginOptions = {
+    isTableAlignmentEnabled?: boolean;
+};
+type ResizeColumnAndTable = ResizeInformation & TableResizingPluginOptions & TableReferences & EditorContainerWidth;
+export declare const resizeColumnAndTable: ({ resizeState, colIndex, amount, tableRef, tableNode, lineLength, width: editorWidth, isTableAlignmentEnabled, }: ResizeColumnAndTable) => ResizeState;
+/**
+ * Apply a scaling factor to resize state
+ */
+export declare const scaleResizeState: ({ resizeState, tableRef, tableNode, editorWidth, }: TableReferences & {
+    resizeState: ResizeState;
+    editorWidth: number;
+}) => ResizeState;
+export {};

package/dist/types-ts4.5/ui/ColumnResizeWidget/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 type Props = {
     startIndex: number;

package/dist/types-ts4.5/ui/FloatingAlignmentButtons/FloatingAlignmentButtons.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 import type { Command, FloatingToolbarItem } from '@atlaskit/editor-common/types';
 type Props = {

package/dist/types-ts4.5/ui/FloatingContextualMenu/ContextualMenu.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import React, { Component } from 'react';
 import { jsx } from '@emotion/react';
 import type { WrappedComponentProps } from 'react-intl-next';

package/dist/types-ts4.5/ui/FloatingContextualMenu/index.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 import { jsx } from '@emotion/react';
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
 import type { GetEditorContainerWidth, GetEditorFeatureFlags } from '@atlaskit/editor-common/types';

package/dist/types-ts4.5/ui/FloatingDragMenu/DragMenu.d.ts

@@ -1,4 +1,7 @@
-/** @jsx jsx */
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
 /** @jsxFrag */
 import React from 'react';
 import { jsx } from '@emotion/react';

package/dist/types-ts4.5/utils/alignment.d.ts

@@ -11,4 +11,4 @@ export declare const normaliseAlignment: (layout: TableLayout) => AlignmentOptio
 /**
  * We don't want to switch alignment in Full-width editor
  */
-export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean | 0 | undefined;
+export declare const shouldChangeAlignmentToCenterResized: (isTableAlignmentEnabled: boolean | undefined, tableNode: PmNode, lineLength: number | undefined, updatedTableWidth: number) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "7.21.3",
+	"version": "7.21.5",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
 		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/button": "^19.0.0",
 		"@atlaskit/custom-steps": "^0.4.0",
-		"@atlaskit/editor-common": "^86.2.0",
+		"@atlaskit/editor-common": "^86.5.0",
 		"@atlaskit/editor-palette": "1.6.0",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.1.0",
 		"@atlaskit/editor-plugin-analytics": "^1.4.0",
@@ -43,7 +43,7 @@
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.7.0",
-		"@atlaskit/icon": "^22.6.0",
+		"@atlaskit/icon": "^22.7.0",
 		"@atlaskit/menu": "^2.8.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.2.0",
@@ -105,9 +105,6 @@
 		"platform_editor_lazy-node-views": {
 			"type": "boolean"
 		},
-		"platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg": {
-			"type": "boolean"
-		},
 		"platform.editor.transform-slice-for-nested-expand": {
 			"type": "boolean"
 		},
@@ -128,6 +125,9 @@
 		},
 		"platform_editor_element_drag_and_drop_ed_24041": {
 			"type": "boolean"
+		},
+		"editor_react_18_fix_table_delete_col_decorations": {
+			"type": "boolean"
 		}
 	}
 }

package/src/nodeviews/TableComponent.tsx

@@ -26,6 +26,7 @@ import type { CleanupFn } from '@atlaskit/pragmatic-drag-and-drop/types';
 import { token } from '@atlaskit/tokens';
 
 import { autoSizeTable, clearHoverSelection } from '../commands';
+import { handleMouseOut, isTableInFocus } from '../event-handlers';
 import { autoScrollerFactory } from '../pm-plugins/drag-and-drop/utils';
 import { getPluginState } from '../pm-plugins/plugin-factory';
 import type { RowStickyState, StickyPluginState } from '../pm-plugins/sticky-headers';
@@ -186,6 +187,13 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		}
 	}
 
+	private handleMouseOut = (event: Event) => {
+		if (!isTableInFocus(this.props.view)) {
+			return false;
+		}
+		return handleMouseOut(this.props.view, event);
+	};
+
 	componentDidMount() {
 		const {
 			allowColumnResizing,
@@ -204,6 +212,9 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 				this?.table?.addEventListener('mouseenter', this.handleMouseEnter);
 			}
 		}
+		if (fg('editor_react_18_fix_table_delete_col_decorations')) {
+			this?.table?.addEventListener('mouseout', this.handleMouseOut);
+		}
 
 		const { tableWithFixedColumnWidthsOption = false, stickyScrollbar } = getEditorFeatureFlags();
 
@@ -308,6 +319,9 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
 		if (fg('platform.editor.table.live-pages-sorting_4malx')) {
 			this?.table?.removeEventListener('mouseenter', this.handleMouseEnter);
 		}
+		if (fg('editor_react_18_fix_table_delete_col_decorations')) {
+			this?.table?.removeEventListener('mouseout', this.handleMouseOut);
+		}
 
 		if (this.overflowShadowsObserver) {
 			this.overflowShadowsObserver.dispose();

package/src/pm-plugins/keymap.ts

@@ -143,41 +143,39 @@ export function keymapPlugin(
 		list,
 	);
 
-	if (fg('platform.editor.a11y-help-dialog-shortcut-keys-position_aghfg')) {
-		bindKeymapWithCommand(
-			addRowBeforeVO.common!,
-			addRowAroundSelection(editorAnalyticsAPI)('TOP'),
-			list,
-		);
+	bindKeymapWithCommand(
+		addRowBeforeVO.common!,
+		addRowAroundSelection(editorAnalyticsAPI)('TOP'),
+		list,
+	);
 
-		bindKeymapWithCommand(
-			addRowAfterVO.common!,
-			addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'),
-			list,
-		);
+	bindKeymapWithCommand(
+		addRowAfterVO.common!,
+		addRowAroundSelection(editorAnalyticsAPI)('BOTTOM'),
+		list,
+	);
 
-		bindKeymapWithCommand(
-			addColumnBeforeVO.common!,
-			addColumnBeforeCommand(
-				isTableScalingEnabled,
-				isCellBackgroundDuplicated,
-				isTableFixedColumnWidthsOptionEnabled,
-				shouldUseIncreasedScalingPercent,
-			),
-			list,
-		);
+	bindKeymapWithCommand(
+		addColumnBeforeVO.common!,
+		addColumnBeforeCommand(
+			isTableScalingEnabled,
+			isCellBackgroundDuplicated,
+			isTableFixedColumnWidthsOptionEnabled,
+			shouldUseIncreasedScalingPercent,
+		),
+		list,
+	);
 
-		bindKeymapWithCommand(
-			addColumnAfterVO.common!,
-			addColumnAfterCommand(
-				isTableScalingEnabled,
-				isCellBackgroundDuplicated,
-				isTableFixedColumnWidthsOptionEnabled,
-				shouldUseIncreasedScalingPercent,
-			),
-			list,
-		);
-	}
+	bindKeymapWithCommand(
+		addColumnAfterVO.common!,
+		addColumnAfterCommand(
+			isTableScalingEnabled,
+			isCellBackgroundDuplicated,
+			isTableFixedColumnWidthsOptionEnabled,
+			shouldUseIncreasedScalingPercent,
+		),
+		list,
+	);
 
 	if (dragAndDropEnabled) {
 		// Move row/column shortcuts

package/src/pm-plugins/main.ts

@@ -374,7 +374,9 @@ export const createPlugin = (
 				mousedown: withCellTracking(handleMouseDown),
 				mouseover: withCellTracking(whenTableInFocus(handleMouseOver)),
 				mouseleave: handleMouseLeave,
-				mouseout: whenTableInFocus(handleMouseOut),
+				mouseout: fg('editor_react_18_fix_table_delete_col_decorations')
+					? undefined
+					: whenTableInFocus(handleMouseOut),
 				mousemove: whenTableInFocus(handleMouseMove),
 				mouseenter: handleMouseEnter,
 				mouseup: whenTableInFocus(handleMouseUp),