@atlaskit/editor-plugin-table 24.4.23 → 24.4.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-table
 
+## 24.4.24
+
+### Patch Changes
+
+- [`b91c14d4dbad7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/b91c14d4dbad7) -
+  Editor; Ensure only the first table row can become a sticky header when the rounded table patch is
+  enabled
+
+  Renderer; Patch table body elements to have rounded corners when overridden by consumers
+
+- Updated dependencies
+
 ## 24.4.23
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableRow.js

@@ -111,13 +111,16 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
         var $pos = view.state.doc.resolve(pos);
         _this.isInNestedTable = (0, _nesting.getParentOfTypeCount)(view.state.schema.nodes.table)($pos) > 1;
         // Resolve rowIndex only when the flag is on — otherwise it's unused
-        if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true) && !(0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
           rowIndex = $pos.index();
         }
       }
     } catch (_unused) {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      rowIndex = (0, _nodes.getTableRowIndex)(view, getPos);
+    }
     _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
     if (_this.isHeaderRow) {
       _this.dom.setAttribute('data-vc-nvs', 'true');
@@ -175,6 +178,9 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
           // Intentionally swallowed — getPos can return stale positions during AI streaming
         }
       }
+      if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+        rowIndex = (0, _nodes.getTableRowIndex)(this.view, this.getPos);
+      }
       var newNodeIsHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         return false; // re-create nodeview

package/dist/cjs/nodeviews/TableRowNativeStickyWithFallback.js

@@ -109,7 +109,12 @@ var TableRowNativeStickyWithFallback = exports.default = /*#__PURE__*/function (
         _this.disableNativeSticky = false;
       }
     });
-    _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node);
+    if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      var rowIndex = (0, _nodes.getTableRowIndex)(view, getPos);
+      _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
+    } else {
+      _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node);
+    }
     if (_this.isHeaderRow && (0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_4', 'isEnabled', true)) {
       _this.isSingleRowTable = _this.checkIsSingleRowTable();
     }
@@ -203,7 +208,9 @@ var TableRowNativeStickyWithFallback = exports.default = /*#__PURE__*/function (
       // see if we're changing into a header row or
       // changing away from one
       var rowIndex = 0;
-      if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+      if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+        rowIndex = (0, _nodes.getTableRowIndex)(this.view, this.getPos);
+      } else if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
         try {
           var pos = this.getPos();
           if (pos) {

package/dist/cjs/pm-plugins/utils/nodes.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tablesHaveDifferentNoOfRows = exports.tablesHaveDifferentNoOfColumns = exports.tablesHaveDifferentColumnWidths = exports.supportedHeaderRow = exports.isTableNestedUnderBodiedSyncBlock = exports.isTableNestedInMoreThanOneNode = exports.isTableNested = exports.isIsolating = exports.getTableWidth = exports.containsHeaderRow = exports.containsHeaderColumn = exports.checkIfNumberColumnEnabled = exports.checkIfHeaderRowEnabled = exports.checkIfHeaderColumnEnabled = void 0;
+exports.tablesHaveDifferentNoOfRows = exports.tablesHaveDifferentNoOfColumns = exports.tablesHaveDifferentColumnWidths = exports.supportedHeaderRow = exports.isTableNestedUnderBodiedSyncBlock = exports.isTableNestedInMoreThanOneNode = exports.isTableNested = exports.isIsolating = exports.getTableWidth = exports.getTableRowIndex = exports.containsHeaderRow = exports.containsHeaderColumn = exports.checkIfNumberColumnEnabled = exports.checkIfHeaderRowEnabled = exports.checkIfHeaderColumnEnabled = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("@atlaskit/editor-common/utils");
 var _tableMap = require("@atlaskit/editor-tables/table-map");
@@ -142,9 +142,18 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
     return colspan > 1;
   });
 };
+var getTableRowIndex = exports.getTableRowIndex = function getTableRowIndex(view, getPos) {
+  try {
+    var pos = getPos();
+    return pos === undefined ? 0 : view.state.doc.resolve(pos).index();
+  } catch (_unused2) {
+    return 0;
+  }
+};
 
 /**
  * Check if a given node is a header row with this definition:
+ *  - the row is the first row when platform_editor_table_q4_patch_5 is enabled
  *  - all children are tableHeader cells
  *  - no table cells have been merged with other table row cells (rowspan > 1)
  *  - no table cells have been merged with other table column cells (colspan > 1),
@@ -158,6 +167,9 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
  */
 var supportedHeaderRow = exports.supportedHeaderRow = function supportedHeaderRow(node) {
   var rowIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if ((0, _expValEquals.expValEquals)('platform_editor_table_q4_patch_5', 'isEnabled', true) && rowIndex !== 0) {
+    return false;
+  }
   var allHeaders = (0, _utils.mapChildren)(node, function (child) {
     return child.type.name === 'tableHeader';
   }).every(Boolean);

package/dist/es2019/nodeviews/TableRow.js

@@ -12,7 +12,7 @@ import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { clearStickyCornerMaskPositions, syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { getTop, getTree } from '../pm-plugins/utils/dom';
-import { supportedHeaderRow } from '../pm-plugins/utils/nodes';
+import { getTableRowIndex, supportedHeaderRow } from '../pm-plugins/utils/nodes';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import TableNodeView from './TableNodeViewBase';
@@ -96,13 +96,16 @@ export default class TableRow extends TableNodeView {
         const $pos = view.state.doc.resolve(pos);
         this.isInNestedTable = getParentOfTypeCount(view.state.schema.nodes.table)($pos) > 1;
         // Resolve rowIndex only when the flag is on — otherwise it's unused
-        if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true) && !expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
           rowIndex = $pos.index();
         }
       }
     } catch {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      rowIndex = getTableRowIndex(view, getPos);
+    }
     this.isHeaderRow = supportedHeaderRow(node, rowIndex);
     if (this.isHeaderRow) {
       this.dom.setAttribute('data-vc-nvs', 'true');
@@ -155,6 +158,9 @@ export default class TableRow extends TableNodeView {
         // Intentionally swallowed — getPos can return stale positions during AI streaming
       }
     }
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      rowIndex = getTableRowIndex(this.view, this.getPos);
+    }
     const newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
     if (this.isHeaderRow !== newNodeIsHeaderRow) {
       return false; // re-create nodeview

package/dist/es2019/nodeviews/TableRowNativeStickyWithFallback.js

@@ -15,7 +15,7 @@ import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { clearStickyCornerMaskPositions, syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { areAllRectsZero, getTop, getTree } from '../pm-plugins/utils/dom';
-import { supportedHeaderRow } from '../pm-plugins/utils/nodes';
+import { getTableRowIndex, supportedHeaderRow } from '../pm-plugins/utils/nodes';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import TableNodeView from './TableNodeViewBase';
@@ -93,7 +93,12 @@ export default class TableRowNativeStickyWithFallback extends TableNodeView {
         this.disableNativeSticky = false;
       }
     });
-    this.isHeaderRow = supportedHeaderRow(node);
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      const rowIndex = getTableRowIndex(view, getPos);
+      this.isHeaderRow = supportedHeaderRow(node, rowIndex);
+    } else {
+      this.isHeaderRow = supportedHeaderRow(node);
+    }
     if (this.isHeaderRow && expValEquals('platform_editor_table_q4_patch_4', 'isEnabled', true)) {
       this.isSingleRowTable = this.checkIsSingleRowTable();
     }
@@ -184,7 +189,9 @@ export default class TableRowNativeStickyWithFallback extends TableNodeView {
     // see if we're changing into a header row or
     // changing away from one
     let rowIndex = 0;
-    if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      rowIndex = getTableRowIndex(this.view, this.getPos);
+    } else if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
       try {
         const pos = this.getPos();
         if (pos) {

package/dist/es2019/pm-plugins/utils/nodes.js

@@ -110,9 +110,18 @@ export const isTableNestedUnderBodiedSyncBlock = (state, tablePos) => {
 };
 const anyChildCellMergedAcrossRow = node => mapChildren(node, child => child.attrs.rowspan || 0).some(rowspan => rowspan > 1);
 const anyChildCellMergedAcrossColumn = node => mapChildren(node, child => child.attrs.colspan || 0).some(colspan => colspan > 1);
+export const getTableRowIndex = (view, getPos) => {
+  try {
+    const pos = getPos();
+    return pos === undefined ? 0 : view.state.doc.resolve(pos).index();
+  } catch {
+    return 0;
+  }
+};
 
 /**
  * Check if a given node is a header row with this definition:
+ *  - the row is the first row when platform_editor_table_q4_patch_5 is enabled
  *  - all children are tableHeader cells
  *  - no table cells have been merged with other table row cells (rowspan > 1)
  *  - no table cells have been merged with other table column cells (colspan > 1),
@@ -125,6 +134,9 @@ const anyChildCellMergedAcrossColumn = node => mapChildren(node, child => child.
  * @returns boolean if it meets definition
  */
 export const supportedHeaderRow = (node, rowIndex = 0) => {
+  if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true) && rowIndex !== 0) {
+    return false;
+  }
   const allHeaders = mapChildren(node, child => child.type.name === 'tableHeader').every(Boolean);
   if (expValEquals('platform_editor_fix_sticky_header_malfunction', 'isEnabled', true)) {
     const someMergedAcrossRow = anyChildCellMergedAcrossRow(node);

package/dist/esm/nodeviews/TableRow.js

@@ -19,7 +19,7 @@ import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { clearStickyCornerMaskPositions, syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { getTop, getTree } from '../pm-plugins/utils/dom';
-import { supportedHeaderRow } from '../pm-plugins/utils/nodes';
+import { getTableRowIndex, supportedHeaderRow } from '../pm-plugins/utils/nodes';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import TableNodeView from './TableNodeViewBase';
@@ -104,13 +104,16 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         var $pos = view.state.doc.resolve(pos);
         _this.isInNestedTable = getParentOfTypeCount(view.state.schema.nodes.table)($pos) > 1;
         // Resolve rowIndex only when the flag is on — otherwise it's unused
-        if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true) && !expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
           rowIndex = $pos.index();
         }
       }
     } catch (_unused) {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      rowIndex = getTableRowIndex(view, getPos);
+    }
     _this.isHeaderRow = supportedHeaderRow(node, rowIndex);
     if (_this.isHeaderRow) {
       _this.dom.setAttribute('data-vc-nvs', 'true');
@@ -168,6 +171,9 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
           // Intentionally swallowed — getPos can return stale positions during AI streaming
         }
       }
+      if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+        rowIndex = getTableRowIndex(this.view, this.getPos);
+      }
       var newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         return false; // re-create nodeview

package/dist/esm/nodeviews/TableRowNativeStickyWithFallback.js

@@ -22,7 +22,7 @@ import { pluginKey as tablePluginKey } from '../pm-plugins/plugin-key';
 import { updateStickyState } from '../pm-plugins/sticky-headers/commands';
 import { clearStickyCornerMaskPositions, syncStickyRowToTable, updateStickyMargins as updateTableMargin } from '../pm-plugins/table-resizing/utils/dom';
 import { areAllRectsZero, getTop, getTree } from '../pm-plugins/utils/dom';
-import { supportedHeaderRow } from '../pm-plugins/utils/nodes';
+import { getTableRowIndex, supportedHeaderRow } from '../pm-plugins/utils/nodes';
 import { TableCssClassName as ClassName, TableCssClassName } from '../types';
 import { stickyHeaderBorderBottomWidth, stickyRowOffsetTop, tableControlsSpacing, tableScrollbarOffset } from '../ui/consts';
 import TableNodeView from './TableNodeViewBase';
@@ -102,7 +102,12 @@ var TableRowNativeStickyWithFallback = /*#__PURE__*/function (_TableNodeView) {
         _this.disableNativeSticky = false;
       }
     });
-    _this.isHeaderRow = supportedHeaderRow(node);
+    if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+      var rowIndex = getTableRowIndex(view, getPos);
+      _this.isHeaderRow = supportedHeaderRow(node, rowIndex);
+    } else {
+      _this.isHeaderRow = supportedHeaderRow(node);
+    }
     if (_this.isHeaderRow && expValEquals('platform_editor_table_q4_patch_4', 'isEnabled', true)) {
       _this.isSingleRowTable = _this.checkIsSingleRowTable();
     }
@@ -196,7 +201,9 @@ var TableRowNativeStickyWithFallback = /*#__PURE__*/function (_TableNodeView) {
       // see if we're changing into a header row or
       // changing away from one
       var rowIndex = 0;
-      if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+      if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true)) {
+        rowIndex = getTableRowIndex(this.view, this.getPos);
+      } else if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
         try {
           var pos = this.getPos();
           if (pos) {

package/dist/esm/pm-plugins/utils/nodes.js

@@ -135,9 +135,18 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
     return colspan > 1;
   });
 };
+export var getTableRowIndex = function getTableRowIndex(view, getPos) {
+  try {
+    var pos = getPos();
+    return pos === undefined ? 0 : view.state.doc.resolve(pos).index();
+  } catch (_unused2) {
+    return 0;
+  }
+};
 
 /**
  * Check if a given node is a header row with this definition:
+ *  - the row is the first row when platform_editor_table_q4_patch_5 is enabled
  *  - all children are tableHeader cells
  *  - no table cells have been merged with other table row cells (rowspan > 1)
  *  - no table cells have been merged with other table column cells (colspan > 1),
@@ -151,6 +160,9 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
  */
 export var supportedHeaderRow = function supportedHeaderRow(node) {
   var rowIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+  if (expValEquals('platform_editor_table_q4_patch_5', 'isEnabled', true) && rowIndex !== 0) {
+    return false;
+  }
   var allHeaders = mapChildren(node, function (child) {
     return child.type.name === 'tableHeader';
   }).every(Boolean);

package/dist/types/pm-plugins/utils/nodes.d.ts

@@ -1,5 +1,6 @@
 import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
 import type { EditorState, Selection } from '@atlaskit/editor-prosemirror/state';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 export declare const isIsolating: (node: PmNode) => boolean;
 export declare const containsHeaderColumn: (table: PmNode) => boolean;
 export declare const containsHeaderRow: (table: PmNode) => boolean;
@@ -17,8 +18,10 @@ export declare const isTableNestedInMoreThanOneNode: (state: EditorState, tableP
  * Used to prefer DOM-measured wrapper width over getParentNodeWidth() for stable scaling.
  */
 export declare const isTableNestedUnderBodiedSyncBlock: (state: EditorState, tablePos: number) => boolean;
+export declare const getTableRowIndex: (view: EditorView, getPos: () => number | undefined) => number;
 /**
  * Check if a given node is a header row with this definition:
+ *  - the row is the first row when platform_editor_table_q4_patch_5 is enabled
  *  - all children are tableHeader cells
  *  - no table cells have been merged with other table row cells (rowspan > 1)
  *  - no table cells have been merged with other table column cells (colspan > 1),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "24.4.23",
+	"version": "24.4.24",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -52,7 +52,7 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.0.0",
 		"@atlaskit/primitives": "^22.2.0",
-		"@atlaskit/tmp-editor-statsig": "^135.0.0",
+		"@atlaskit/tmp-editor-statsig": "^135.2.0",
 		"@atlaskit/toggle": "^17.1.0",
 		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/tooltip": "^23.2.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.41.0",
+		"@atlaskit/editor-common": "^116.42.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"