@atlaskit/editor-plugin-table 7.4.1 → 7.4.3

package/dist/esm/nodeviews/TableComponent.js

@@ -564,8 +564,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
       var isNested = isTableNested(view.state, tablePos);
       var topStickyShadowPosition = isDragAndDropEnabled ? this.state.stickyHeader && this.state.stickyHeader.top + this.state.stickyHeader.padding + 2 : this.state.stickyHeader && this.state.stickyHeader.top + this.state.stickyHeader.padding + shadowPadding + 2;
       var _getEditorFeatureFlag3 = getEditorFeatureFlags(),
-        stickyScrollbar = _getEditorFeatureFlag3.stickyScrollbar,
-        tableResizePerformance = _getEditorFeatureFlag3.tableResizePerformance;
+        stickyScrollbar = _getEditorFeatureFlag3.stickyScrollbar;
       return /*#__PURE__*/React.createElement(TableContainer, {
         className: classnames(ClassName.TABLE_CONTAINER, (_classnames = {}, _defineProperty(_classnames, ClassName.WITH_CONTROLS, allowControls && tableActive), _defineProperty(_classnames, ClassName.TABLE_STICKY, this.state.stickyHeader && hasHeaderRow), _defineProperty(_classnames, ClassName.HOVERED_DELETE_BUTTON, isInDanger), _defineProperty(_classnames, ClassName.TABLE_SELECTED, isTableSelected(view.state.selection)), _classnames)),
         editorView: view,
@@ -577,8 +576,7 @@ var TableComponent = /*#__PURE__*/function (_React$Component) {
         isNested: isNested,
         pluginInjectionApi: pluginInjectionApi,
         isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.isTableResizingEnabled,
-        isResizing: isResizing,
-        tableResizePerformance: tableResizePerformance
+        isResizing: isResizing
       }, /*#__PURE__*/React.createElement("div", {
         className: ClassName.TABLE_STICKY_SENTINEL_TOP,
         "data-testid": "sticky-sentinel-top"

package/dist/esm/nodeviews/TableContainer.js

@@ -43,8 +43,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref2) {
     getPos = _ref2.getPos,
     tableRef = _ref2.tableRef,
     isResizing = _ref2.isResizing,
-    pluginInjectionApi = _ref2.pluginInjectionApi,
-    tableResizePerformance = _ref2.tableResizePerformance;
+    pluginInjectionApi = _ref2.pluginInjectionApi;
   var containerRef = useRef(null);
   var tableWidthRef = useRef(akEditorDefaultLayoutWidth);
   var updateContainerHeight = useCallback(function (height) {
@@ -125,8 +124,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref2) {
     tableRef: tableRef,
     displayGuideline: displayGuideline,
     attachAnalyticsEvent: attachAnalyticsEvent,
-    displayGapCursor: displayGapCursor,
-    tableResizePerformance: tableResizePerformance
+    displayGapCursor: displayGapCursor
   };
   if (getBooleanFF('platform.editor.resizing-table-height-improvement')) {
     tableResizerProps = _objectSpread(_objectSpread({}, tableResizerProps), {}, {
@@ -138,8 +136,7 @@ export var ResizableTableContainer = /*#__PURE__*/React.memo(function (_ref2) {
     style: {
       display: 'flex',
       justifyContent: 'center'
-    },
-    contentEditable: tableResizePerformance && isResizing ? 'false' : undefined
+    }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       width: tableWidthRef.current
@@ -165,8 +162,7 @@ export var TableContainer = function TableContainer(_ref3) {
     tableRef = _ref3.tableRef,
     isNested = _ref3.isNested,
     isResizing = _ref3.isResizing,
-    pluginInjectionApi = _ref3.pluginInjectionApi,
-    tableResizePerformance = _ref3.tableResizePerformance;
+    pluginInjectionApi = _ref3.pluginInjectionApi;
   if (isTableResizingEnabled && !isNested) {
     return /*#__PURE__*/React.createElement(ResizableTableContainer, {
       className: className,
@@ -176,8 +172,7 @@ export var TableContainer = function TableContainer(_ref3) {
       getPos: getPos,
       tableRef: tableRef,
       isResizing: isResizing,
-      pluginInjectionApi: pluginInjectionApi,
-      tableResizePerformance: tableResizePerformance
+      pluginInjectionApi: pluginInjectionApi
     }, children);
   }
   var tableWidth = isBreakoutEnabled ? calcTableWidth(node.attrs.layout, editorWidth) : 'inherit';

package/dist/esm/nodeviews/TableResizer.js

@@ -87,8 +87,7 @@ export var TableResizer = function TableResizer(_ref) {
     tableRef = _ref.tableRef,
     displayGuideline = _ref.displayGuideline,
     attachAnalyticsEvent = _ref.attachAnalyticsEvent,
-    displayGapCursor = _ref.displayGapCursor,
-    tableResizePerformance = _ref.tableResizePerformance;
+    displayGapCursor = _ref.displayGapCursor;
   var currentGap = useRef(0);
   // track resizing state - use ref over state to avoid re-render
   var isResizing = useRef(false);
@@ -218,10 +217,7 @@ export var TableResizer = function TableResizer(_ref) {
       var resizeFrameRatePayloads = generateResizeFrameRatePayloads({
         docSize: state.doc.nodeSize,
         frameRateSamples: frameRateSamples,
-        originalNode: node,
-        experiments: {
-          tableResizePerformance: tableResizePerformance
-        }
+        originalNode: node
       });
       resizeFrameRatePayloads.forEach(function (payload) {
         var _attachAnalyticsEvent;
@@ -257,7 +253,7 @@ export var TableResizer = function TableResizer(_ref) {
       onResizeStop();
     }
     return newWidth;
-  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop, tableResizePerformance]);
+  }, [displayGapCursor, updateWidth, editorView, getPos, node, tableRef, scheduleResize, displayGuideline, attachAnalyticsEvent, endMeasure, onResizeStop]);
   var handleTableSizeChangeOnKeypress = useCallback(function (step) {
     var newWidth = width + step;
     if (newWidth > maxWidth || newWidth < resizerMinWidth) {

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

@@ -6,12 +6,14 @@ import ReactDOM from 'react-dom';
 import { injectIntl } from 'react-intl-next';
 import { tableMessages as messages } from '@atlaskit/editor-common/messages';
 import { browser } from '@atlaskit/editor-common/utils';
+import { TextSelection } from '@atlaskit/editor-prosemirror/state';
+import { findTable, TableMap } from '@atlaskit/editor-tables';
 import { draggable } from '@atlaskit/pragmatic-drag-and-drop/element/adapter';
 import { setCustomNativeDragPreview } from '@atlaskit/pragmatic-drag-and-drop/element/set-custom-native-drag-preview';
 import { getPluginState as getDnDPluginState } from '../../pm-plugins/drag-and-drop/plugin-factory';
 import { getPluginState } from '../../pm-plugins/plugin-factory';
 import { TableCssClassName as ClassName } from '../../types';
-import { hasMergedCellsInColumn, hasMergedCellsInRow } from '../../utils';
+import { findDuplicatePosition, hasMergedCellsInSelection } from '../../utils';
 import { dragTableInsertColumnButtonSize } from '../consts';
 import { DragPreview } from '../DragPreview';
 import { HandleIconComponent } from './HandleIconComponent';
@@ -30,6 +32,7 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
     onMouseOver = _ref.onMouseOver,
     onMouseOut = _ref.onMouseOut,
     toggleDragMenu = _ref.toggleDragMenu,
+    hoveredCell = _ref.hoveredCell,
     onClick = _ref.onClick,
     editorView = _ref.editorView,
     formatMessage = _ref.intl.formatMessage;
@@ -50,8 +53,37 @@ var DragHandleComponent = function DragHandleComponent(_ref) {
   var isRowHandleHovered = isRow && hoveredRows.length > 0;
   var isColumnHandleHovered = isColumn && hoveredColumns.length > 0;
   var hasMergedCells = useMemo(function () {
-    return isRow ? hasMergedCellsInRow(indexes[0])(selection) : hasMergedCellsInColumn(indexes[0])(selection);
-  }, [indexes, isRow, selection]);
+    var table = findTable(selection);
+    if (!table) {
+      return false;
+    }
+    var map = TableMap.get(table === null || table === void 0 ? void 0 : table.node);
+    if (!map.hasMergedCells() || indexes.length < 1) {
+      return false;
+    }
+    var mapByColumn = map.mapByColumn,
+      mapByRow = map.mapByRow;
+
+    // this handle when hover to first column or row which has merged cells.
+    if (hoveredCell && hoveredCell.rowIndex !== undefined && hoveredCell.colIndex !== undefined && selection instanceof TextSelection) {
+      var rowIndex = hoveredCell.rowIndex,
+        colIndex = hoveredCell.colIndex;
+      var mergedPositionInRow = findDuplicatePosition(mapByRow[rowIndex]);
+      var mergedPositionInCol = findDuplicatePosition(mapByColumn[colIndex]);
+      var hasMergedCellsInFirstRowOrColumn = direction === 'column' ? mergedPositionInRow.includes(mapByRow[0][colIndex]) : mergedPositionInCol.includes(mapByColumn[0][rowIndex]);
+      var isHoveredOnFirstRowOrColumn = direction === 'column' ? hoveredCell.rowIndex === 0 && hasMergedCellsInFirstRowOrColumn : hoveredCell.colIndex === 0 && hasMergedCellsInFirstRowOrColumn;
+      if (isHoveredOnFirstRowOrColumn) {
+        var mergedSizes = direction === 'column' ? mapByRow[0].filter(function (el) {
+          return el === mapByRow[0][colIndex];
+        }).length : mapByColumn[0].filter(function (el) {
+          return el === mapByColumn[0][rowIndex];
+        }).length;
+        var mergedSelection = hasMergedCellsInSelection(direction === 'column' ? [colIndex, colIndex + mergedSizes - 1] : [rowIndex, rowIndex + mergedSizes - 1], direction)(selection);
+        return mergedSelection;
+      }
+    }
+    return hasMergedCellsInSelection(indexes, direction)(selection);
+  }, [indexes, selection, direction, hoveredCell]);
   var handleIconProps = {
     forceDefaultHandle: forceDefaultHandle,
     isHandleHovered: isColumnHandleHovered || isRowHandleHovered,

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

@@ -139,6 +139,7 @@ export var ColumnControls = function ColumnControls(_ref) {
       direction: "column",
       tableLocalId: localId || '',
       indexes: indexes,
+      hoveredCell: hoveredCell,
       previewWidth: previewWidth,
       forceDefaultHandle: !isHover,
       previewHeight: previewHeight,

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

@@ -141,6 +141,7 @@ var DragControlsComponent = function DragControlsComponent(_ref) {
       previewWidth: tableWidth,
       previewHeight: previewHeight,
       appearance: appearance,
+      hoveredCell: hoveredCell,
       onClick: handleClick,
       onMouseOver: handleMouseOver,
       onMouseOut: handleMouseOut,

package/dist/esm/utils/analytics.js

@@ -107,8 +107,7 @@ export var generateResizeFrameRatePayloads = function generateResizeFrameRatePay
         frameRate: frameRateSample,
         nodeSize: props.originalNode.nodeSize,
         docSize: props.docSize,
-        isInitialSample: index === 0,
-        experiments: props.experiments
+        isInitialSample: index === 0
       }
     };
   });

package/dist/esm/utils/index.js

@@ -8,4 +8,4 @@ export { getRowHeights, isRowDeleteButtonVisible, getRowDeleteButtonParams, getR
 export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions } from './table';
 export { updatePluginStateDecorations } from './update-plugin-state-decorations';
-export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween } from './merged-cells';
+export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween, hasMergedCellsInSelection, findDuplicatePosition, checkEdgeHasMergedCells } from './merged-cells';

package/dist/esm/utils/merged-cells.js

@@ -195,4 +195,98 @@ export var hasMergedCellsWithRowNextToRowIndex = function hasMergedCellsWithRowN
     }
   }
   return false;
+};
+export var hasMergedCellsInSelection = function hasMergedCellsInSelection(indexes, type) {
+  return function (selection) {
+    var table = findTable(selection);
+    if (!table) {
+      return false;
+    }
+    var map = TableMap.get(table.node);
+    if (!map.hasMergedCells()) {
+      return false;
+    }
+    return checkEdgeHasMergedCells(indexes, map, type);
+  };
+};
+
+/**
+ * handle table map by preprocess table's map row or column.
+ *
+ * @param map TableMap
+ * @returns object including mapByRow and mapByColumn
+ */
+export var getTableMapByRowOrColumn = function getTableMapByRowOrColumn(map) {
+  var mapByRow = Array(map.height);
+  var mapByColumn = Array(map.width);
+  var mapCopy = _toConsumableArray(map.map);
+  for (var i = 0; i < mapCopy.length; i++) {
+    var _mapByColumn$columnIn, _mapByRow$rowIndex;
+    var columnIndex = i % map.width;
+    mapByColumn[columnIndex] = [].concat(_toConsumableArray((_mapByColumn$columnIn = mapByColumn[columnIndex]) !== null && _mapByColumn$columnIn !== void 0 ? _mapByColumn$columnIn : []), [mapCopy[i]]);
+    var rowIndex = Math.trunc(i / map.width);
+    mapByRow[rowIndex] = [].concat(_toConsumableArray((_mapByRow$rowIndex = mapByRow[rowIndex]) !== null && _mapByRow$rowIndex !== void 0 ? _mapByRow$rowIndex : []), [mapCopy[i]]);
+  }
+  return {
+    mapByRow: mapByRow,
+    mapByColumn: mapByColumn
+  };
+};
+
+/**
+ * this check the selection has merged cells with previous/next col or row.
+ *
+ * @param indexes - this get the indexes of the selection,e.g. [0,1] for selecting first two rows or columns.
+ * @param tableMap  - this return a TableMap object.
+ * @param direction - check selection is selected by row or column
+ * @returns boolean
+ */
+export var checkEdgeHasMergedCells = function checkEdgeHasMergedCells(indexes, tableMap, direction) {
+  var _getTableMapByRowOrCo = getTableMapByRowOrColumn(tableMap),
+    mapByRow = _getTableMapByRowOrCo.mapByRow,
+    mapByColumn = _getTableMapByRowOrCo.mapByColumn;
+  var map = 'row' === direction ? mapByRow : mapByColumn;
+  var lengthLimiter = direction === 'row' ? tableMap.width : tableMap.height;
+  var minIndex = Math.min.apply(Math, _toConsumableArray(indexes));
+  var maxIndex = Math.max.apply(Math, _toConsumableArray(indexes));
+  var isTopSideHaveMergedCells = false;
+  var isBottomSideHaveMergedCells = false;
+  var isOldMinIndex = !map[minIndex - 1] && !map[minIndex];
+  var isOldMaxIndex = !map[maxIndex + 1] && !map[maxIndex];
+  if (minIndex > 0 && !isOldMinIndex) {
+    var prevSelectionSet = map[minIndex - 1];
+    var minSelectionSet = map[minIndex];
+    for (var i = 0; i < lengthLimiter; i++) {
+      if (prevSelectionSet[i] === minSelectionSet[i]) {
+        isTopSideHaveMergedCells = true;
+        break;
+      }
+    }
+  }
+  if (maxIndex < map.length - 1 && !isOldMaxIndex) {
+    var afterSelectionSet = map[maxIndex + 1];
+    var maxSelectionSet = map[maxIndex];
+    for (var _i = 0; _i < lengthLimiter; _i++) {
+      if (afterSelectionSet[_i] === maxSelectionSet[_i]) {
+        isBottomSideHaveMergedCells = true;
+        break;
+      }
+    }
+  }
+  return isTopSideHaveMergedCells || isBottomSideHaveMergedCells;
+};
+
+/**
+ * this function will find the duplicate position in the array(table map position array).
+ *
+ * @param array this usually be the array including positions of the table map.
+ * @returns []
+ */
+export var findDuplicatePosition = function findDuplicatePosition(array) {
+  if (!array) {
+    return [];
+  }
+  return array.filter(function (item, index) {
+    return array.indexOf(item) !== index;
+  });
 };

package/dist/types/nodeviews/TableContainer.d.ts

@@ -24,9 +24,8 @@ type ResizableTableContainerProps = {
     tableRef: HTMLTableElement;
     isResizing?: boolean;
     pluginInjectionApi?: PluginInjectionAPI;
-    tableResizePerformance?: boolean;
 };
-export declare const ResizableTableContainer: React.MemoExoticComponent<({ children, className, node, containerWidth, editorView, getPos, tableRef, isResizing, pluginInjectionApi, tableResizePerformance, }: PropsWithChildren<ResizableTableContainerProps>) => JSX.Element>;
+export declare const ResizableTableContainer: React.MemoExoticComponent<({ children, className, node, containerWidth, editorView, getPos, tableRef, isResizing, pluginInjectionApi, }: PropsWithChildren<ResizableTableContainerProps>) => JSX.Element>;
 type TableContainerProps = {
     node: PMNode;
     className: string;
@@ -39,7 +38,6 @@ type TableContainerProps = {
     isNested: boolean;
     isResizing?: boolean;
     pluginInjectionApi?: PluginInjectionAPI;
-    tableResizePerformance?: boolean;
 };
-export declare const TableContainer: ({ children, node, className, containerWidth: { lineLength, width: editorWidth }, isTableResizingEnabled, isBreakoutEnabled, editorView, getPos, tableRef, isNested, isResizing, pluginInjectionApi, tableResizePerformance, }: PropsWithChildren<TableContainerProps>) => JSX.Element;
+export declare const TableContainer: ({ children, node, className, containerWidth: { lineLength, width: editorWidth }, isTableResizingEnabled, isBreakoutEnabled, editorView, getPos, tableRef, isNested, isResizing, pluginInjectionApi, }: PropsWithChildren<TableContainerProps>) => JSX.Element;
 export {};

package/dist/types/nodeviews/TableResizer.d.ts

@@ -16,11 +16,10 @@ interface TableResizerProps {
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
     displayGapCursor: (toggle: boolean) => boolean;
-    tableResizePerformance?: boolean;
 }
 export interface TableResizerImprovementProps extends TableResizerProps {
     onResizeStop?: () => void;
     onResizeStart?: () => void;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, tableResizePerformance, }: PropsWithChildren<TableResizerImprovementProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, }: PropsWithChildren<TableResizerImprovementProps>) => JSX.Element;
 export {};

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

@@ -3,7 +3,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TriggerType } from '../../pm-plugins/drag-and-drop/types';
-import type { TableDirection } from '../../types';
+import type { CellHoverMeta, TableDirection } from '../../types';
 export type DragHandleAppearance = 'default' | 'selected' | 'disabled' | 'danger' | 'placeholder';
 type DragHandleProps = {
     tableLocalId: string;
@@ -11,6 +11,7 @@ type DragHandleProps = {
     forceDefaultHandle?: boolean;
     previewWidth?: number;
     previewHeight?: number;
+    hoveredCell?: CellHoverMeta;
     direction?: TableDirection;
     appearance?: DragHandleAppearance;
     onClick?: MouseEventHandler;

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

@@ -33,7 +33,6 @@ export declare const generateResizeFrameRatePayloads: (props: {
     docSize: number;
     frameRateSamples: number[];
     originalNode: PMNode;
-    experiments?: Record<string, boolean | undefined>;
 }) => TableEventPayload[];
 /**
  * Measures the framerate of a component over a given time period.

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

@@ -9,4 +9,4 @@ export type { RowParams } from './row-controls';
 export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions } from './table';
 export { updatePluginStateDecorations } from './update-plugin-state-decorations';
-export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween, } from './merged-cells';
+export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween, hasMergedCellsInSelection, findDuplicatePosition, checkEdgeHasMergedCells, } from './merged-cells';

package/dist/types/utils/merged-cells.d.ts

@@ -1,8 +1,36 @@
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import { TableMap } from '@atlaskit/editor-tables';
 type MergeType = 'row' | 'column';
 export declare const hasMergedCellsInColumn: (columnIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInRow: (rowIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInBetween: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
 export declare const hasMergedCellsWithColumnNextToColumnIndex: (colIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsWithRowNextToRowIndex: (rowIndex: number, selection: Selection) => boolean;
+export declare const hasMergedCellsInSelection: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
+/**
+ * handle table map by preprocess table's map row or column.
+ *
+ * @param map TableMap
+ * @returns object including mapByRow and mapByColumn
+ */
+export declare const getTableMapByRowOrColumn: (map: TableMap) => {
+    mapByRow: any[];
+    mapByColumn: any[];
+};
+/**
+ * this check the selection has merged cells with previous/next col or row.
+ *
+ * @param indexes - this get the indexes of the selection,e.g. [0,1] for selecting first two rows or columns.
+ * @param tableMap  - this return a TableMap object.
+ * @param direction - check selection is selected by row or column
+ * @returns boolean
+ */
+export declare const checkEdgeHasMergedCells: (indexes: number[], tableMap: TableMap, direction: 'row' | 'column') => boolean;
+/**
+ * this function will find the duplicate position in the array(table map position array).
+ *
+ * @param array this usually be the array including positions of the table map.
+ * @returns []
+ */
+export declare const findDuplicatePosition: (array: number[]) => number[];
 export {};

package/dist/types-ts4.5/nodeviews/TableContainer.d.ts

@@ -24,9 +24,8 @@ type ResizableTableContainerProps = {
     tableRef: HTMLTableElement;
     isResizing?: boolean;
     pluginInjectionApi?: PluginInjectionAPI;
-    tableResizePerformance?: boolean;
 };
-export declare const ResizableTableContainer: React.MemoExoticComponent<({ children, className, node, containerWidth, editorView, getPos, tableRef, isResizing, pluginInjectionApi, tableResizePerformance, }: PropsWithChildren<ResizableTableContainerProps>) => JSX.Element>;
+export declare const ResizableTableContainer: React.MemoExoticComponent<({ children, className, node, containerWidth, editorView, getPos, tableRef, isResizing, pluginInjectionApi, }: PropsWithChildren<ResizableTableContainerProps>) => JSX.Element>;
 type TableContainerProps = {
     node: PMNode;
     className: string;
@@ -39,7 +38,6 @@ type TableContainerProps = {
     isNested: boolean;
     isResizing?: boolean;
     pluginInjectionApi?: PluginInjectionAPI;
-    tableResizePerformance?: boolean;
 };
-export declare const TableContainer: ({ children, node, className, containerWidth: { lineLength, width: editorWidth }, isTableResizingEnabled, isBreakoutEnabled, editorView, getPos, tableRef, isNested, isResizing, pluginInjectionApi, tableResizePerformance, }: PropsWithChildren<TableContainerProps>) => JSX.Element;
+export declare const TableContainer: ({ children, node, className, containerWidth: { lineLength, width: editorWidth }, isTableResizingEnabled, isBreakoutEnabled, editorView, getPos, tableRef, isNested, isResizing, pluginInjectionApi, }: PropsWithChildren<TableContainerProps>) => JSX.Element;
 export {};

package/dist/types-ts4.5/nodeviews/TableResizer.d.ts

@@ -16,11 +16,10 @@ interface TableResizerProps {
     displayGuideline: (guideline: GuidelineConfig[]) => boolean;
     attachAnalyticsEvent: (payload: TableEventPayload) => ((tr: Transaction) => boolean) | undefined;
     displayGapCursor: (toggle: boolean) => boolean;
-    tableResizePerformance?: boolean;
 }
 export interface TableResizerImprovementProps extends TableResizerProps {
     onResizeStop?: () => void;
     onResizeStart?: () => void;
 }
-export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, tableResizePerformance, }: PropsWithChildren<TableResizerImprovementProps>) => JSX.Element;
+export declare const TableResizer: ({ children, width, maxWidth, containerWidth, updateWidth, onResizeStop, onResizeStart, editorView, getPos, node, tableRef, displayGuideline, attachAnalyticsEvent, displayGapCursor, }: PropsWithChildren<TableResizerImprovementProps>) => JSX.Element;
 export {};

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

@@ -3,7 +3,7 @@ import React from 'react';
 import type { WrappedComponentProps } from 'react-intl-next';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { TriggerType } from '../../pm-plugins/drag-and-drop/types';
-import type { TableDirection } from '../../types';
+import type { CellHoverMeta, TableDirection } from '../../types';
 export type DragHandleAppearance = 'default' | 'selected' | 'disabled' | 'danger' | 'placeholder';
 type DragHandleProps = {
     tableLocalId: string;
@@ -11,6 +11,7 @@ type DragHandleProps = {
     forceDefaultHandle?: boolean;
     previewWidth?: number;
     previewHeight?: number;
+    hoveredCell?: CellHoverMeta;
     direction?: TableDirection;
     appearance?: DragHandleAppearance;
     onClick?: MouseEventHandler;

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

@@ -33,7 +33,6 @@ export declare const generateResizeFrameRatePayloads: (props: {
     docSize: number;
     frameRateSamples: number[];
     originalNode: PMNode;
-    experiments?: Record<string, boolean | undefined>;
 }) => TableEventPayload[];
 /**
  * Measures the framerate of a component over a given time period.

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

@@ -9,4 +9,4 @@ export type { RowParams } from './row-controls';
 export { getSelectedTableInfo, getSelectedCellInfo } from './analytics';
 export { getMergedCellsPositions } from './table';
 export { updatePluginStateDecorations } from './update-plugin-state-decorations';
-export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween, } from './merged-cells';
+export { hasMergedCellsInColumn, hasMergedCellsInRow, hasMergedCellsInBetween, hasMergedCellsInSelection, findDuplicatePosition, checkEdgeHasMergedCells, } from './merged-cells';

package/dist/types-ts4.5/utils/merged-cells.d.ts

@@ -1,8 +1,36 @@
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
+import { TableMap } from '@atlaskit/editor-tables';
 type MergeType = 'row' | 'column';
 export declare const hasMergedCellsInColumn: (columnIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInRow: (rowIndexes: number | number[]) => (selection: Selection) => boolean;
 export declare const hasMergedCellsInBetween: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
 export declare const hasMergedCellsWithColumnNextToColumnIndex: (colIndex: number, selection: Selection) => boolean;
 export declare const hasMergedCellsWithRowNextToRowIndex: (rowIndex: number, selection: Selection) => boolean;
+export declare const hasMergedCellsInSelection: (indexes: number[], type: MergeType) => (selection: Selection) => boolean;
+/**
+ * handle table map by preprocess table's map row or column.
+ *
+ * @param map TableMap
+ * @returns object including mapByRow and mapByColumn
+ */
+export declare const getTableMapByRowOrColumn: (map: TableMap) => {
+    mapByRow: any[];
+    mapByColumn: any[];
+};
+/**
+ * this check the selection has merged cells with previous/next col or row.
+ *
+ * @param indexes - this get the indexes of the selection,e.g. [0,1] for selecting first two rows or columns.
+ * @param tableMap  - this return a TableMap object.
+ * @param direction - check selection is selected by row or column
+ * @returns boolean
+ */
+export declare const checkEdgeHasMergedCells: (indexes: number[], tableMap: TableMap, direction: 'row' | 'column') => boolean;
+/**
+ * this function will find the duplicate position in the array(table map position array).
+ *
+ * @param array this usually be the array including positions of the table map.
+ * @returns []
+ */
+export declare const findDuplicatePosition: (array: number[]) => number[];
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-table",
-  "version": "7.4.1",
+  "version": "7.4.3",
   "description": "Table plugin for the @atlaskit/editor",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.7.0",
+    "@atlaskit/editor-common": "^78.8.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-content-insertion": "^1.0.0",
@@ -46,7 +46,7 @@
     "@atlaskit/pragmatic-drag-and-drop": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
-    "@atlaskit/primitives": "^3.0.0",
+    "@atlaskit/primitives": "^3.1.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/toggle": "^13.0.0",
     "@atlaskit/tokens": "^1.38.0",

package/src/nodeviews/TableComponent.tsx

@@ -535,7 +535,7 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
           shadowPadding +
           2;
 
-    const { stickyScrollbar, tableResizePerformance } = getEditorFeatureFlags();
+    const { stickyScrollbar } = getEditorFeatureFlags();
 
     return (
       <TableContainer
@@ -555,7 +555,6 @@ class TableComponent extends React.Component<ComponentProps, TableState> {
         pluginInjectionApi={pluginInjectionApi}
         isTableResizingEnabled={options?.isTableResizingEnabled}
         isResizing={isResizing}
-        tableResizePerformance={tableResizePerformance}
       >
         <div
           className={ClassName.TABLE_STICKY_SENTINEL_TOP}

package/src/nodeviews/TableContainer.tsx

@@ -75,7 +75,6 @@ type ResizableTableContainerProps = {
   tableRef: HTMLTableElement;
   isResizing?: boolean;
   pluginInjectionApi?: PluginInjectionAPI;
-  tableResizePerformance?: boolean;
 };
 
 export const ResizableTableContainer = React.memo(
@@ -89,7 +88,6 @@ export const ResizableTableContainer = React.memo(
     tableRef,
     isResizing,
     pluginInjectionApi,
-    tableResizePerformance,
   }: PropsWithChildren<ResizableTableContainerProps>) => {
     const containerRef = useRef<HTMLDivElement | null>(null);
     const tableWidthRef = useRef<number>(akEditorDefaultLayoutWidth);
@@ -209,7 +207,6 @@ export const ResizableTableContainer = React.memo(
       displayGuideline,
       attachAnalyticsEvent,
       displayGapCursor,
-      tableResizePerformance,
     };
 
     if (getBooleanFF('platform.editor.resizing-table-height-improvement')) {
@@ -226,9 +223,6 @@ export const ResizableTableContainer = React.memo(
           display: 'flex',
           justifyContent: 'center',
         }}
-        contentEditable={
-          tableResizePerformance && isResizing ? 'false' : undefined
-        }
       >
         <div
           style={{
@@ -260,7 +254,6 @@ type TableContainerProps = {
   isNested: boolean;
   isResizing?: boolean;
   pluginInjectionApi?: PluginInjectionAPI;
-  tableResizePerformance?: boolean;
 };
 
 export const TableContainer = ({
@@ -276,7 +269,6 @@ export const TableContainer = ({
   isNested,
   isResizing,
   pluginInjectionApi,
-  tableResizePerformance,
 }: PropsWithChildren<TableContainerProps>) => {
   if (isTableResizingEnabled && !isNested) {
     return (
@@ -289,7 +281,6 @@ export const TableContainer = ({
         tableRef={tableRef}
         isResizing={isResizing}
         pluginInjectionApi={pluginInjectionApi}
-        tableResizePerformance={tableResizePerformance}
       >
         {children}
       </ResizableTableContainer>

package/src/nodeviews/TableResizer.tsx

@@ -68,7 +68,6 @@ interface TableResizerProps {
     payload: TableEventPayload,
   ) => ((tr: Transaction) => boolean) | undefined;
   displayGapCursor: (toggle: boolean) => boolean;
-  tableResizePerformance?: boolean;
 }
 
 export interface TableResizerImprovementProps extends TableResizerProps {
@@ -163,7 +162,6 @@ export const TableResizer = ({
   displayGuideline,
   attachAnalyticsEvent,
   displayGapCursor,
-  tableResizePerformance,
 }: PropsWithChildren<TableResizerImprovementProps>) => {
   const currentGap = useRef(0);
   // track resizing state - use ref over state to avoid re-render
@@ -356,9 +354,6 @@ export const TableResizer = ({
           docSize: state.doc.nodeSize,
           frameRateSamples,
           originalNode: node,
-          experiments: {
-            tableResizePerformance,
-          },
         });
         resizeFrameRatePayloads.forEach((payload) => {
           attachAnalyticsEvent(payload)?.(tr);
@@ -421,7 +416,6 @@ export const TableResizer = ({
       attachAnalyticsEvent,
       endMeasure,
       onResizeStop,
-      tableResizePerformance,
     ],
   );