@atlaskit/editor-plugin-table 31.0.5 → 31.0.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 31.0.7
+
+### Patch Changes
+
+- [`6bbecbd2ad0eb`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6bbecbd2ad0eb) -
+  EDITOR-9120 Fix numbered table columns in `platform_editor_ai_show_diff_patch_2` so replacement
+  widgets share an existing row number, added and removed rows remain independently numbered, and
+  anchor widgets do not create phantom entries.
+- Updated dependencies
+
+## 31.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 31.0.5
 
 ### Patch Changes

package/dist/cjs/pm-plugins/utils/row-controls.js

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRowsParams = exports.getRowIndexByMousePosition = exports.getRowHeights = exports.getRowDeleteButtonParams = exports.getRowClassNames = exports.copyPreviousRow = void 0;
+exports.getRowsParams = exports.getRowIndexByMousePosition = exports.getRowHeights = exports.getRowDeleteButtonParams = exports.getRowClassNames = exports.getRenderedRowNumberLabels = exports.copyPreviousRow = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
 var _utils3 = require("@atlaskit/editor-tables/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _types = require("../../types");
 var _consts = require("../../ui/consts");
 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; }
@@ -18,8 +19,12 @@ var getRowHeights = exports.getRowHeights = function getRowHeights(tableRef) {
   var heights = [];
   var tableBody = tableRef.querySelector('tbody');
   if (tableBody) {
-    var rows = tableBody.childNodes;
+    // filter out widget children (e.g. anchor widgets) of table body
+    var rows = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? Array.from(tableBody.childNodes).filter(function (node) {
+      return node instanceof HTMLTableRowElement;
+    }) : tableBody.childNodes;
     for (var i = 0, count = rows.length; i < count; i++) {
+      // remove as cast when cleaning up platform_editor_ai_show_diff_patch_2
       var row = rows[i];
       heights[i] = row.getBoundingClientRect().height + 1;
 
@@ -33,6 +38,38 @@ var getRowHeights = exports.getRowHeights = function getRowHeights(tableRef) {
   }
   return heights;
 };
+var getRowNumberLabel = function getRowNumberLabel(rowIndex, hasHeaderRow) {
+  if (!hasHeaderRow) {
+    return rowIndex + 1;
+  }
+  return rowIndex > 0 ? rowIndex : null;
+};
+
+/**
+ * Replacement diff widgets are inserted immediately before their document-row counterpart. Give
+ * the widget the next row number without consuming it, so the counterpart receives the same
+ * label. Other rows consume a number normally.
+ */
+var getRenderedRowNumberLabels = exports.getRenderedRowNumberLabels = function getRenderedRowNumberLabels(tableRef, hasHeaderRow) {
+  var rowNumberLabels = [];
+  var tableBody = tableRef.querySelector('tbody');
+  if (tableBody) {
+    var nextRowIndex = 0;
+    var rows = Array.from(tableBody.childNodes).filter(function (node) {
+      return node instanceof HTMLTableRowElement;
+    });
+    for (var i = 0, count = rows.length; i < count; i++) {
+      var row = rows[i];
+      if (row.hasAttribute('data-show-diff-table-row-replacement')) {
+        rowNumberLabels.push(getRowNumberLabel(nextRowIndex, hasHeaderRow));
+        continue;
+      }
+      var rowIndex = nextRowIndex++;
+      rowNumberLabels.push(getRowNumberLabel(rowIndex, hasHeaderRow));
+    }
+  }
+  return rowNumberLabels;
+};
 var getRowDeleteButtonParams = exports.getRowDeleteButtonParams = function getRowDeleteButtonParams(rowsHeights, selection) {
   var offsetTop = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var rect = (0, _utils3.getSelectionRect)(selection);

package/dist/cjs/ui/TableFloatingControls/NumberColumn/index.js

@@ -16,6 +16,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _coreUtils = require("@atlaskit/editor-common/core-utils");
 var _utils = require("@atlaskit/editor-tables/utils");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _rowControls = require("../../../pm-plugins/utils/row-controls");
 var _types = require("../../../types");
@@ -73,6 +74,7 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
         tableActive = _this$props3.tableActive,
         updateCellHoverLocation = _this$props3.updateCellHoverLocation;
       var rowHeights = (0, _rowControls.getRowHeights)(tableRef);
+      var renderedRowNumberLabels = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? (0, _rowControls.getRenderedRowNumberLabels)(tableRef, hasHeaderRow) : undefined;
       var getMarginTop = function getMarginTop() {
         if (!hasHeaderRow || _this2.props.stickyTop === undefined) {
           return undefined;
@@ -109,6 +111,7 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
         },
         contentEditable: false
       }, rowHeights.map(function (rowHeight, index) {
+        var rowNumberLabel = (0, _fg.fg)('platform_editor_ai_show_diff_patch_2') ? renderedRowNumberLabels === null || renderedRowNumberLabels === void 0 ? void 0 : renderedRowNumberLabels[index] : hasHeaderRow ? index > 0 ? index : null : index + 1;
         return /*#__PURE__*/_react.default.createElement("div", {
           // Ignored via go/ees005
           // eslint-disable-next-line react/no-array-index-key
@@ -126,7 +129,7 @@ var NumberColumn = exports.default = /*#__PURE__*/function (_Component) {
           onMouseOver: function onMouseOver() {
             return updateCellHoverLocation(index);
           }
-        }, hasHeaderRow ? index > 0 ? index : null : index + 1);
+        }, rowNumberLabel);
       }));
     }
   }]);

package/dist/es2019/pm-plugins/utils/row-controls.js

@@ -2,14 +2,17 @@ import { parsePx } from '@atlaskit/editor-common/utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect, isRowSelected } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { TableCssClassName as ClassName } from '../../types';
 import { tableDeleteButtonSize } from '../../ui/consts';
 export const getRowHeights = tableRef => {
   const heights = [];
   const tableBody = tableRef.querySelector('tbody');
   if (tableBody) {
-    const rows = tableBody.childNodes;
+    // filter out widget children (e.g. anchor widgets) of table body
+    const rows = fg('platform_editor_ai_show_diff_patch_2') ? Array.from(tableBody.childNodes).filter(node => node instanceof HTMLTableRowElement) : tableBody.childNodes;
     for (let i = 0, count = rows.length; i < count; i++) {
+      // remove as cast when cleaning up platform_editor_ai_show_diff_patch_2
       const row = rows[i];
       heights[i] = row.getBoundingClientRect().height + 1;
 
@@ -23,6 +26,36 @@ export const getRowHeights = tableRef => {
   }
   return heights;
 };
+const getRowNumberLabel = (rowIndex, hasHeaderRow) => {
+  if (!hasHeaderRow) {
+    return rowIndex + 1;
+  }
+  return rowIndex > 0 ? rowIndex : null;
+};
+
+/**
+ * Replacement diff widgets are inserted immediately before their document-row counterpart. Give
+ * the widget the next row number without consuming it, so the counterpart receives the same
+ * label. Other rows consume a number normally.
+ */
+export const getRenderedRowNumberLabels = (tableRef, hasHeaderRow) => {
+  const rowNumberLabels = [];
+  const tableBody = tableRef.querySelector('tbody');
+  if (tableBody) {
+    let nextRowIndex = 0;
+    const rows = Array.from(tableBody.childNodes).filter(node => node instanceof HTMLTableRowElement);
+    for (let i = 0, count = rows.length; i < count; i++) {
+      const row = rows[i];
+      if (row.hasAttribute('data-show-diff-table-row-replacement')) {
+        rowNumberLabels.push(getRowNumberLabel(nextRowIndex, hasHeaderRow));
+        continue;
+      }
+      const rowIndex = nextRowIndex++;
+      rowNumberLabels.push(getRowNumberLabel(rowIndex, hasHeaderRow));
+    }
+  }
+  return rowNumberLabels;
+};
 export const getRowDeleteButtonParams = (rowsHeights, selection, offsetTop = 0) => {
   const rect = getSelectionRect(selection);
   if (!rect) {

package/dist/es2019/ui/TableFloatingControls/NumberColumn/index.js

@@ -3,8 +3,9 @@ import React, { Component } from 'react';
 import classnames from 'classnames';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { isRowSelected } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { getRowHeights } from '../../../pm-plugins/utils/row-controls';
+import { getRenderedRowNumberLabels, getRowHeights } from '../../../pm-plugins/utils/row-controls';
 import { TableCssClassName as ClassName } from '../../../types';
 import { tableBorderColor } from '../../consts';
 // Ignored via go/ees005
@@ -53,6 +54,7 @@ export default class NumberColumn extends Component {
       updateCellHoverLocation
     } = this.props;
     const rowHeights = getRowHeights(tableRef);
+    const renderedRowNumberLabels = fg('platform_editor_ai_show_diff_patch_2') ? getRenderedRowNumberLabels(tableRef, hasHeaderRow) : undefined;
     const getMarginTop = () => {
       if (!hasHeaderRow || this.props.stickyTop === undefined) {
         return undefined;
@@ -90,19 +92,22 @@ export default class NumberColumn extends Component {
         visibility: 'visible'
       },
       contentEditable: false
-    }, rowHeights.map((rowHeight, index) => /*#__PURE__*/React.createElement("div", {
-      // Ignored via go/ees005
-      // eslint-disable-next-line react/no-array-index-key
-      key: `wrapper-${index}`
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-      ,
-      className: this.getClassNames(index, true),
-      "data-index": index
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
-      ,
-      style: this.getCellStyles(index, rowHeight),
-      onFocus: () => updateCellHoverLocation(index),
-      onMouseOver: () => updateCellHoverLocation(index)
-    }, hasHeaderRow ? index > 0 ? index : null : index + 1)));
+    }, rowHeights.map((rowHeight, index) => {
+      const rowNumberLabel = fg('platform_editor_ai_show_diff_patch_2') ? renderedRowNumberLabels === null || renderedRowNumberLabels === void 0 ? void 0 : renderedRowNumberLabels[index] : hasHeaderRow ? index > 0 ? index : null : index + 1;
+      return /*#__PURE__*/React.createElement("div", {
+        // Ignored via go/ees005
+        // eslint-disable-next-line react/no-array-index-key
+        key: `wrapper-${index}`
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+        ,
+        className: this.getClassNames(index, true),
+        "data-index": index
+        // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+        ,
+        style: this.getCellStyles(index, rowHeight),
+        onFocus: () => updateCellHoverLocation(index),
+        onMouseOver: () => updateCellHoverLocation(index)
+      }, rowNumberLabel);
+    }));
   }
 }

package/dist/esm/pm-plugins/utils/row-controls.js

@@ -5,14 +5,19 @@ import { parsePx } from '@atlaskit/editor-common/utils';
 import { safeInsert } from '@atlaskit/editor-prosemirror/utils';
 import { TableMap } from '@atlaskit/editor-tables/table-map';
 import { findTable, getSelectionRect, isRowSelected } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { TableCssClassName as ClassName } from '../../types';
 import { tableDeleteButtonSize } from '../../ui/consts';
 export var getRowHeights = function getRowHeights(tableRef) {
   var heights = [];
   var tableBody = tableRef.querySelector('tbody');
   if (tableBody) {
-    var rows = tableBody.childNodes;
+    // filter out widget children (e.g. anchor widgets) of table body
+    var rows = fg('platform_editor_ai_show_diff_patch_2') ? Array.from(tableBody.childNodes).filter(function (node) {
+      return node instanceof HTMLTableRowElement;
+    }) : tableBody.childNodes;
     for (var i = 0, count = rows.length; i < count; i++) {
+      // remove as cast when cleaning up platform_editor_ai_show_diff_patch_2
       var row = rows[i];
       heights[i] = row.getBoundingClientRect().height + 1;
 
@@ -26,6 +31,38 @@ export var getRowHeights = function getRowHeights(tableRef) {
   }
   return heights;
 };
+var getRowNumberLabel = function getRowNumberLabel(rowIndex, hasHeaderRow) {
+  if (!hasHeaderRow) {
+    return rowIndex + 1;
+  }
+  return rowIndex > 0 ? rowIndex : null;
+};
+
+/**
+ * Replacement diff widgets are inserted immediately before their document-row counterpart. Give
+ * the widget the next row number without consuming it, so the counterpart receives the same
+ * label. Other rows consume a number normally.
+ */
+export var getRenderedRowNumberLabels = function getRenderedRowNumberLabels(tableRef, hasHeaderRow) {
+  var rowNumberLabels = [];
+  var tableBody = tableRef.querySelector('tbody');
+  if (tableBody) {
+    var nextRowIndex = 0;
+    var rows = Array.from(tableBody.childNodes).filter(function (node) {
+      return node instanceof HTMLTableRowElement;
+    });
+    for (var i = 0, count = rows.length; i < count; i++) {
+      var row = rows[i];
+      if (row.hasAttribute('data-show-diff-table-row-replacement')) {
+        rowNumberLabels.push(getRowNumberLabel(nextRowIndex, hasHeaderRow));
+        continue;
+      }
+      var rowIndex = nextRowIndex++;
+      rowNumberLabels.push(getRowNumberLabel(rowIndex, hasHeaderRow));
+    }
+  }
+  return rowNumberLabels;
+};
 export var getRowDeleteButtonParams = function getRowDeleteButtonParams(rowsHeights, selection) {
   var offsetTop = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var rect = getSelectionRect(selection);

package/dist/esm/ui/TableFloatingControls/NumberColumn/index.js

@@ -10,8 +10,9 @@ import React, { Component } from 'react';
 import classnames from 'classnames';
 import { isSSR } from '@atlaskit/editor-common/core-utils';
 import { isRowSelected } from '@atlaskit/editor-tables/utils';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { getRowHeights } from '../../../pm-plugins/utils/row-controls';
+import { getRenderedRowNumberLabels, getRowHeights } from '../../../pm-plugins/utils/row-controls';
 import { TableCssClassName as ClassName } from '../../../types';
 import { tableBorderColor } from '../../consts';
 // Ignored via go/ees005
@@ -64,6 +65,7 @@ var NumberColumn = /*#__PURE__*/function (_Component) {
         tableActive = _this$props3.tableActive,
         updateCellHoverLocation = _this$props3.updateCellHoverLocation;
       var rowHeights = getRowHeights(tableRef);
+      var renderedRowNumberLabels = fg('platform_editor_ai_show_diff_patch_2') ? getRenderedRowNumberLabels(tableRef, hasHeaderRow) : undefined;
       var getMarginTop = function getMarginTop() {
         if (!hasHeaderRow || _this2.props.stickyTop === undefined) {
           return undefined;
@@ -100,6 +102,7 @@ var NumberColumn = /*#__PURE__*/function (_Component) {
         },
         contentEditable: false
       }, rowHeights.map(function (rowHeight, index) {
+        var rowNumberLabel = fg('platform_editor_ai_show_diff_patch_2') ? renderedRowNumberLabels === null || renderedRowNumberLabels === void 0 ? void 0 : renderedRowNumberLabels[index] : hasHeaderRow ? index > 0 ? index : null : index + 1;
         return /*#__PURE__*/React.createElement("div", {
           // Ignored via go/ees005
           // eslint-disable-next-line react/no-array-index-key
@@ -117,7 +120,7 @@ var NumberColumn = /*#__PURE__*/function (_Component) {
           onMouseOver: function onMouseOver() {
             return updateCellHoverLocation(index);
           }
-        }, hasHeaderRow ? index > 0 ? index : null : index + 1);
+        }, rowNumberLabel);
       }));
     }
   }]);

package/dist/types/pm-plugins/utils/row-controls.d.ts

@@ -6,6 +6,12 @@ export interface RowParams {
     startIndex: number;
 }
 export declare const getRowHeights: (tableRef: HTMLTableElement) => number[];
+/**
+ * Replacement diff widgets are inserted immediately before their document-row counterpart. Give
+ * the widget the next row number without consuming it, so the counterpart receives the same
+ * label. Other rows consume a number normally.
+ */
+export declare const getRenderedRowNumberLabels: (tableRef: HTMLTableElement, hasHeaderRow?: boolean) => Array<number | null>;
 export declare const getRowDeleteButtonParams: (rowsHeights: Array<number | undefined>, selection: Selection, offsetTop?: number) => {
     indexes: number[];
     top: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "31.0.5",
+	"version": "31.0.7",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,9 +29,9 @@
 		"@atlaskit/editor-plugin-batch-attribute-updates": "^19.0.0",
 		"@atlaskit/editor-plugin-content-insertion": "^19.0.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^21.0.0",
-		"@atlaskit/editor-plugin-extension": "22.0.5",
+		"@atlaskit/editor-plugin-extension": "22.0.7",
 		"@atlaskit/editor-plugin-guideline": "^19.0.0",
-		"@atlaskit/editor-plugin-interaction": "^32.0.0",
+		"@atlaskit/editor-plugin-interaction": "^33.0.0",
 		"@atlaskit/editor-plugin-limited-mode": "^16.0.0",
 		"@atlaskit/editor-plugin-selection": "^19.0.0",
 		"@atlaskit/editor-plugin-toolbar": "^16.0.0",
@@ -53,9 +53,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.2.0",
 		"@atlaskit/primitives": "^22.5.0",
-		"@atlaskit/tmp-editor-statsig": "^202.0.0",
+		"@atlaskit/tmp-editor-statsig": "^203.0.0",
 		"@atlaskit/toggle": "^17.3.0",
-		"@atlaskit/tokens": "^18.2.0",
+		"@atlaskit/tokens": "^19.0.0",
 		"@atlaskit/tooltip": "^24.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.2",
@@ -68,7 +68,7 @@
 		"uuid": "^11.1.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^123.5.0",
+		"@atlaskit/editor-common": "^123.8.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -99,6 +99,9 @@
 		"platform_editor_ai_table_ai_streaming_pos_fix": {
 			"type": "boolean"
 		},
+		"platform_editor_ai_show_diff_patch_2": {
+			"type": "boolean"
+		},
 		"platform_editor_table_menu_updates_patch_1": {
 			"type": "boolean"
 		},