@atlaskit/editor-plugin-table 24.4.18 → 24.4.20

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-table
 
+## 24.4.20
+
+### Patch Changes
+
+- [`6f1a6a07b4be1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6f1a6a07b4be1) -
+  Fixes malfunctioning sticky header row when header columns are merged
+- Updated dependencies
+
+## 24.4.19
+
+### Patch Changes
+
+- [`f596f4ca80078`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f596f4ca80078) -
+  Clean up feature gate `platform_editor_table_auto_convert_fix`
+- Updated dependencies
+
 ## 24.4.18
 
 ### Patch Changes

package/dist/cjs/nodeviews/TableRow.js

@@ -90,7 +90,6 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
         _this.headerRowMouseScrollEnd();
       }
     }, HEADER_ROW_SCROLL_THROTTLE_TIMEOUT));
-    _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node);
     _this.isSticky = false;
     var _getPluginState = (0, _pluginFactory.getPluginState)(view.state),
       pluginConfig = _getPluginState.pluginConfig;
@@ -102,17 +101,24 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
     }
     var pos = _this.getPos();
     _this.isInNestedTable = false;
+    var rowIndex = 0;
     try {
       // We cannot trust that the value from getPos will be defined
       // https://discuss.prosemirror.net/t/getpos-is-undefined-in-nodeview-constructor/1246/4
       // There are also scenarios where the value it brings back does not tally with the current doc
       // E.g. when AI streaming brings in new content, this position brings back incorrect values that cannot be resolved
       if (pos) {
-        _this.isInNestedTable = (0, _nesting.getParentOfTypeCount)(view.state.schema.nodes.table)(view.state.doc.resolve(pos)) > 1;
+        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)) {
+          rowIndex = $pos.index();
+        }
       }
     } catch (_unused) {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    _this.isHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
     if (_this.isHeaderRow) {
       _this.dom.setAttribute('data-vc-nvs', 'true');
       var _nodeVisibilityManage = (0, _nodeVisibility.nodeVisibilityManager)(view.dom),
@@ -158,7 +164,18 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
 
       // see if we're changing into a header row or
       // changing away from one
-      var newNodeIsHeaderRow = (0, _nodes.supportedHeaderRow)(node);
+      var rowIndex = 0;
+      if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        try {
+          var pos = this.getPos();
+          if (pos) {
+            rowIndex = this.view.state.doc.resolve(pos).index();
+          }
+        } catch (_unused2) {
+          // Intentionally swallowed — getPos can return stale positions during AI streaming
+        }
+      }
+      var newNodeIsHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         return false; // re-create nodeview
       }
@@ -493,7 +510,7 @@ var TableRow = exports.default = /*#__PURE__*/function (_TableNodeView) {
                   return false;
                 }
               }
-            } catch (_unused2) {
+            } catch (_unused3) {
               // getPos can return stale positions during AI streaming — fall back to non-sticky
               return false;
             }

package/dist/cjs/nodeviews/TableRowNativeStickyWithFallback.js

@@ -202,7 +202,18 @@ var TableRowNativeStickyWithFallback = exports.default = /*#__PURE__*/function (
 
       // see if we're changing into a header row or
       // changing away from one
-      var newNodeIsHeaderRow = (0, _nodes.supportedHeaderRow)(node);
+      var rowIndex = 0;
+      if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        try {
+          var pos = this.getPos();
+          if (pos) {
+            rowIndex = this.view.state.doc.resolve(pos).index();
+          }
+        } catch (_unused2) {
+          // Intentionally swallowed — getPos can return stale positions during AI streaming
+        }
+      }
+      var newNodeIsHeaderRow = (0, _nodes.supportedHeaderRow)(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         if (!newNodeIsHeaderRow && this.isHeaderRow) {
           var _this$dom$closest;
@@ -738,7 +749,7 @@ var TableRowNativeStickyWithFallback = exports.default = /*#__PURE__*/function (
                   return false;
                 }
               }
-            } catch (_unused2) {
+            } catch (_unused3) {
               // getPos can return stale positions during AI streaming — fall back to non-sticky
               return false;
             }
@@ -918,7 +929,7 @@ var TableRowNativeStickyWithFallback = exports.default = /*#__PURE__*/function (
           return node.type === _this1.view.state.schema.nodes.table;
         })) === null || _findParentNodeCloses3 === void 0 ? void 0 : _findParentNodeCloses3.node;
         return (tableNode === null || tableNode === void 0 ? void 0 : tableNode.childCount) === 1;
-      } catch (_unused3) {
+      } catch (_unused4) {
         // getPos can return stale positions during AI streaming. Preserve the original sticky
         // header behaviour when the containing table cannot be determined.
         return false;

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

@@ -146,7 +146,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatchAnalytic
       var contentModeSizeTableId = null;
       var hasMeasuredContentModeTables = false;
       var focusListenerBinding = null;
-      if ((!(0, _platformFeatureFlags.fg)('platform_editor_table_auto_convert_fix') || !__livePage) && (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) !== 'view' && (0, _isContentModeSupported.isContentModeSupported)({
+      if (!__livePage && (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) !== 'view' && (0, _isContentModeSupported.isContentModeSupported)({
         allowColumnResizing: !!pluginConfig.allowColumnResizing,
         allowTableResizing: !!pluginConfig.allowTableResizing,
         isFullPageEditor: !isChromelessEditor && !isCommentEditor

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

@@ -148,18 +148,24 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
  *  - 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),
- *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction)
+ *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction,
+ *     and only applied to non-first rows — the first/sticky header row is allowed
+ *     to have merged columns within itself, gated behind platform_editor_fix_sticky_header_row)
  *
  * @param node ProseMirror node
+ * @param rowIndex index of this row within its parent (default 0 = first/sticky row)
  * @returns boolean if it meets definition
  */
 var supportedHeaderRow = exports.supportedHeaderRow = function supportedHeaderRow(node) {
+  var rowIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var allHeaders = (0, _utils.mapChildren)(node, function (child) {
     return child.type.name === 'tableHeader';
   }).every(Boolean);
   if ((0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_malfunction', 'isEnabled', true)) {
     var someMergedAcrossRow = anyChildCellMergedAcrossRow(node);
-    var someMergedAcrossColumn = anyChildCellMergedAcrossColumn(node);
+    // Only apply the colspan check to non-first rows (rowIndex > 0) when the fix is enabled.
+    var isFirstStickyRowExempt = (0, _expValEquals.expValEquals)('platform_editor_fix_sticky_header_row', 'isEnabled', true) && rowIndex === 0;
+    var someMergedAcrossColumn = isFirstStickyRowExempt ? false : anyChildCellMergedAcrossColumn(node);
     return allHeaders && !someMergedAcrossRow && !someMergedAcrossColumn;
   }
   var someMerged = anyChildCellMergedAcrossRow(node);

package/dist/cjs/pm-plugins/utils/tableMode/apply-measured-width-to-all-tables.js

@@ -7,7 +7,6 @@ exports.applyMeasuredWidthToAllTables = void 0;
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _styles = require("@atlaskit/editor-common/styles");
 var _table = require("@atlaskit/editor-common/table");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _contentMode = require("../../transforms/content-mode");
 /**
  * Iterates all top-level tables in the document, and for those in content mode,
@@ -25,18 +24,12 @@ var applyMeasuredWidthToAllTables = exports.applyMeasuredWidthToAllTables = func
 
   // modify only top-level tables
   doc.forEach(function (node, offset) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_table_auto_convert_fix')) {
-      if (node.type !== table || !(0, _table.isTableInContentMode)({
-        tableNode: node,
-        isSupported: true,
-        isTableNested: false
-      })) {
-        return;
-      }
-    } else {
-      if (node.type !== table || (0, _table.hasTableBeenResized)(node) && node.attrs.layout !== 'align-start') {
-        return;
-      }
+    if (node.type !== table || !(0, _table.isTableInContentMode)({
+      tableNode: node,
+      isSupported: true,
+      isTableNested: false
+    })) {
+      return;
     }
     var domNode = view.domAtPos(offset + 1).node;
     var tableWrapper = domNode instanceof HTMLElement ? domNode.closest(".".concat(_styles.TableSharedCssClassName.TABLE_VIEW_CONTENT_WRAP)) : null;

package/dist/es2019/nodeviews/TableRow.js

@@ -74,7 +74,6 @@ export default class TableRow extends TableNodeView {
         this.headerRowMouseScrollEnd();
       }
     }, HEADER_ROW_SCROLL_THROTTLE_TIMEOUT));
-    this.isHeaderRow = supportedHeaderRow(node);
     this.isSticky = false;
     const {
       pluginConfig
@@ -87,17 +86,24 @@ export default class TableRow extends TableNodeView {
     }
     const pos = this.getPos();
     this.isInNestedTable = false;
+    let rowIndex = 0;
     try {
       // We cannot trust that the value from getPos will be defined
       // https://discuss.prosemirror.net/t/getpos-is-undefined-in-nodeview-constructor/1246/4
       // There are also scenarios where the value it brings back does not tally with the current doc
       // E.g. when AI streaming brings in new content, this position brings back incorrect values that cannot be resolved
       if (pos) {
-        this.isInNestedTable = getParentOfTypeCount(view.state.schema.nodes.table)(view.state.doc.resolve(pos)) > 1;
+        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)) {
+          rowIndex = $pos.index();
+        }
       }
     } catch {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    this.isHeaderRow = supportedHeaderRow(node, rowIndex);
     if (this.isHeaderRow) {
       this.dom.setAttribute('data-vc-nvs', 'true');
       const {
@@ -138,7 +144,18 @@ export default class TableRow extends TableNodeView {
 
     // see if we're changing into a header row or
     // changing away from one
-    const newNodeIsHeaderRow = supportedHeaderRow(node);
+    let rowIndex = 0;
+    if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+      try {
+        const pos = this.getPos();
+        if (pos) {
+          rowIndex = this.view.state.doc.resolve(pos).index();
+        }
+      } catch {
+        // Intentionally swallowed — getPos can return stale positions during AI streaming
+      }
+    }
+    const newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
     if (this.isHeaderRow !== newNodeIsHeaderRow) {
       return false; // re-create nodeview
     }

package/dist/es2019/nodeviews/TableRowNativeStickyWithFallback.js

@@ -183,7 +183,18 @@ export default class TableRowNativeStickyWithFallback extends TableNodeView {
 
     // see if we're changing into a header row or
     // changing away from one
-    const newNodeIsHeaderRow = supportedHeaderRow(node);
+    let rowIndex = 0;
+    if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+      try {
+        const pos = this.getPos();
+        if (pos) {
+          rowIndex = this.view.state.doc.resolve(pos).index();
+        }
+      } catch {
+        // Intentionally swallowed — getPos can return stale positions during AI streaming
+      }
+    }
+    const newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
     if (this.isHeaderRow !== newNodeIsHeaderRow) {
       if (!newNodeIsHeaderRow && this.isHeaderRow) {
         var _this$dom$closest;

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

@@ -131,7 +131,7 @@ export const createPlugin = (dispatchAnalyticsEvent, dispatch, portalProviderAPI
       let contentModeSizeTableId = null;
       let hasMeasuredContentModeTables = false;
       let focusListenerBinding = null;
-      if ((!fg('platform_editor_table_auto_convert_fix') || !__livePage) && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) !== 'view' && isContentModeSupported({
+      if (!__livePage && (pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.mode) !== 'view' && isContentModeSupported({
         allowColumnResizing: !!pluginConfig.allowColumnResizing,
         allowTableResizing: !!pluginConfig.allowTableResizing,
         isFullPageEditor: !isChromelessEditor && !isCommentEditor

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

@@ -116,16 +116,21 @@ const anyChildCellMergedAcrossColumn = node => mapChildren(node, child => child.
  *  - 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),
- *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction)
+ *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction,
+ *     and only applied to non-first rows — the first/sticky header row is allowed
+ *     to have merged columns within itself, gated behind platform_editor_fix_sticky_header_row)
  *
  * @param node ProseMirror node
+ * @param rowIndex index of this row within its parent (default 0 = first/sticky row)
  * @returns boolean if it meets definition
  */
-export const supportedHeaderRow = node => {
+export const supportedHeaderRow = (node, rowIndex = 0) => {
   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);
-    const someMergedAcrossColumn = anyChildCellMergedAcrossColumn(node);
+    // Only apply the colspan check to non-first rows (rowIndex > 0) when the fix is enabled.
+    const isFirstStickyRowExempt = expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true) && rowIndex === 0;
+    const someMergedAcrossColumn = isFirstStickyRowExempt ? false : anyChildCellMergedAcrossColumn(node);
     return allHeaders && !someMergedAcrossRow && !someMergedAcrossColumn;
   }
   const someMerged = anyChildCellMergedAcrossRow(node);

package/dist/es2019/pm-plugins/utils/tableMode/apply-measured-width-to-all-tables.js

@@ -1,7 +1,6 @@
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
-import { hasTableBeenResized, isTableInContentMode } from '@atlaskit/editor-common/table';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { isTableInContentMode } from '@atlaskit/editor-common/table';
 import { applyTableMeasurement, getTableMeasurement } from '../../transforms/content-mode';
 
 /**
@@ -25,18 +24,12 @@ export const applyMeasuredWidthToAllTables = (view, pluginInjectionApi) => {
 
   // modify only top-level tables
   doc.forEach((node, offset) => {
-    if (fg('platform_editor_table_auto_convert_fix')) {
-      if (node.type !== table || !isTableInContentMode({
-        tableNode: node,
-        isSupported: true,
-        isTableNested: false
-      })) {
-        return;
-      }
-    } else {
-      if (node.type !== table || hasTableBeenResized(node) && node.attrs.layout !== 'align-start') {
-        return;
-      }
+    if (node.type !== table || !isTableInContentMode({
+      tableNode: node,
+      isSupported: true,
+      isTableNested: false
+    })) {
+      return;
     }
     const domNode = view.domAtPos(offset + 1).node;
     const tableWrapper = domNode instanceof HTMLElement ? domNode.closest(`.${TableSharedCssClassName.TABLE_VIEW_CONTENT_WRAP}`) : null;

package/dist/esm/nodeviews/TableRow.js

@@ -83,7 +83,6 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
         _this.headerRowMouseScrollEnd();
       }
     }, HEADER_ROW_SCROLL_THROTTLE_TIMEOUT));
-    _this.isHeaderRow = supportedHeaderRow(node);
     _this.isSticky = false;
     var _getPluginState = getPluginState(view.state),
       pluginConfig = _getPluginState.pluginConfig;
@@ -95,17 +94,24 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
     }
     var pos = _this.getPos();
     _this.isInNestedTable = false;
+    var rowIndex = 0;
     try {
       // We cannot trust that the value from getPos will be defined
       // https://discuss.prosemirror.net/t/getpos-is-undefined-in-nodeview-constructor/1246/4
       // There are also scenarios where the value it brings back does not tally with the current doc
       // E.g. when AI streaming brings in new content, this position brings back incorrect values that cannot be resolved
       if (pos) {
-        _this.isInNestedTable = getParentOfTypeCount(view.state.schema.nodes.table)(view.state.doc.resolve(pos)) > 1;
+        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)) {
+          rowIndex = $pos.index();
+        }
       }
     } catch (_unused) {
       // Intentionally swallowed — getPos can return stale positions during AI streaming
     }
+    _this.isHeaderRow = supportedHeaderRow(node, rowIndex);
     if (_this.isHeaderRow) {
       _this.dom.setAttribute('data-vc-nvs', 'true');
       var _nodeVisibilityManage = nodeVisibilityManager(view.dom),
@@ -151,7 +157,18 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
 
       // see if we're changing into a header row or
       // changing away from one
-      var newNodeIsHeaderRow = supportedHeaderRow(node);
+      var rowIndex = 0;
+      if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        try {
+          var pos = this.getPos();
+          if (pos) {
+            rowIndex = this.view.state.doc.resolve(pos).index();
+          }
+        } catch (_unused2) {
+          // Intentionally swallowed — getPos can return stale positions during AI streaming
+        }
+      }
+      var newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         return false; // re-create nodeview
       }
@@ -486,7 +503,7 @@ var TableRow = /*#__PURE__*/function (_TableNodeView) {
                   return false;
                 }
               }
-            } catch (_unused2) {
+            } catch (_unused3) {
               // getPos can return stale positions during AI streaming — fall back to non-sticky
               return false;
             }

package/dist/esm/nodeviews/TableRowNativeStickyWithFallback.js

@@ -195,7 +195,18 @@ var TableRowNativeStickyWithFallback = /*#__PURE__*/function (_TableNodeView) {
 
       // see if we're changing into a header row or
       // changing away from one
-      var newNodeIsHeaderRow = supportedHeaderRow(node);
+      var rowIndex = 0;
+      if (expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true)) {
+        try {
+          var pos = this.getPos();
+          if (pos) {
+            rowIndex = this.view.state.doc.resolve(pos).index();
+          }
+        } catch (_unused2) {
+          // Intentionally swallowed — getPos can return stale positions during AI streaming
+        }
+      }
+      var newNodeIsHeaderRow = supportedHeaderRow(node, rowIndex);
       if (this.isHeaderRow !== newNodeIsHeaderRow) {
         if (!newNodeIsHeaderRow && this.isHeaderRow) {
           var _this$dom$closest;
@@ -731,7 +742,7 @@ var TableRowNativeStickyWithFallback = /*#__PURE__*/function (_TableNodeView) {
                   return false;
                 }
               }
-            } catch (_unused2) {
+            } catch (_unused3) {
               // getPos can return stale positions during AI streaming — fall back to non-sticky
               return false;
             }
@@ -911,7 +922,7 @@ var TableRowNativeStickyWithFallback = /*#__PURE__*/function (_TableNodeView) {
           return node.type === _this1.view.state.schema.nodes.table;
         })) === null || _findParentNodeCloses3 === void 0 ? void 0 : _findParentNodeCloses3.node;
         return (tableNode === null || tableNode === void 0 ? void 0 : tableNode.childCount) === 1;
-      } catch (_unused3) {
+      } catch (_unused4) {
         // getPos can return stale positions during AI streaming. Preserve the original sticky
         // header behaviour when the containing table cannot be determined.
         return false;

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

@@ -139,7 +139,7 @@ export var createPlugin = function createPlugin(dispatchAnalyticsEvent, dispatch
       var contentModeSizeTableId = null;
       var hasMeasuredContentModeTables = false;
       var focusListenerBinding = null;
-      if ((!fg('platform_editor_table_auto_convert_fix') || !__livePage) && (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) !== 'view' && isContentModeSupported({
+      if (!__livePage && (pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState.currentState()) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.mode) !== 'view' && isContentModeSupported({
         allowColumnResizing: !!pluginConfig.allowColumnResizing,
         allowTableResizing: !!pluginConfig.allowTableResizing,
         isFullPageEditor: !isChromelessEditor && !isCommentEditor

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

@@ -141,18 +141,24 @@ var anyChildCellMergedAcrossColumn = function anyChildCellMergedAcrossColumn(nod
  *  - 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),
- *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction)
+ *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction,
+ *     and only applied to non-first rows — the first/sticky header row is allowed
+ *     to have merged columns within itself, gated behind platform_editor_fix_sticky_header_row)
  *
  * @param node ProseMirror node
+ * @param rowIndex index of this row within its parent (default 0 = first/sticky row)
  * @returns boolean if it meets definition
  */
 export var supportedHeaderRow = function supportedHeaderRow(node) {
+  var rowIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var allHeaders = mapChildren(node, function (child) {
     return child.type.name === 'tableHeader';
   }).every(Boolean);
   if (expValEquals('platform_editor_fix_sticky_header_malfunction', 'isEnabled', true)) {
     var someMergedAcrossRow = anyChildCellMergedAcrossRow(node);
-    var someMergedAcrossColumn = anyChildCellMergedAcrossColumn(node);
+    // Only apply the colspan check to non-first rows (rowIndex > 0) when the fix is enabled.
+    var isFirstStickyRowExempt = expValEquals('platform_editor_fix_sticky_header_row', 'isEnabled', true) && rowIndex === 0;
+    var someMergedAcrossColumn = isFirstStickyRowExempt ? false : anyChildCellMergedAcrossColumn(node);
     return allHeaders && !someMergedAcrossRow && !someMergedAcrossColumn;
   }
   var someMerged = anyChildCellMergedAcrossRow(node);

package/dist/esm/pm-plugins/utils/tableMode/apply-measured-width-to-all-tables.js

@@ -1,7 +1,6 @@
 import { ACTION_SUBJECT, EVENT_TYPE, TABLE_ACTION } from '@atlaskit/editor-common/analytics';
 import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
-import { hasTableBeenResized, isTableInContentMode } from '@atlaskit/editor-common/table';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { isTableInContentMode } from '@atlaskit/editor-common/table';
 import { applyTableMeasurement, getTableMeasurement } from '../../transforms/content-mode';
 
 /**
@@ -20,18 +19,12 @@ export var applyMeasuredWidthToAllTables = function applyMeasuredWidthToAllTable
 
   // modify only top-level tables
   doc.forEach(function (node, offset) {
-    if (fg('platform_editor_table_auto_convert_fix')) {
-      if (node.type !== table || !isTableInContentMode({
-        tableNode: node,
-        isSupported: true,
-        isTableNested: false
-      })) {
-        return;
-      }
-    } else {
-      if (node.type !== table || hasTableBeenResized(node) && node.attrs.layout !== 'align-start') {
-        return;
-      }
+    if (node.type !== table || !isTableInContentMode({
+      tableNode: node,
+      isSupported: true,
+      isTableNested: false
+    })) {
+      return;
     }
     var domNode = view.domAtPos(offset + 1).node;
     var tableWrapper = domNode instanceof HTMLElement ? domNode.closest(".".concat(TableSharedCssClassName.TABLE_VIEW_CONTENT_WRAP)) : null;

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

@@ -22,9 +22,12 @@ export declare const isTableNestedUnderBodiedSyncBlock: (state: EditorState, tab
  *  - 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),
- *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction)
+ *    (colspan check gated behind platform_editor_fix_sticky_header_malfunction,
+ *     and only applied to non-first rows — the first/sticky header row is allowed
+ *     to have merged columns within itself, gated behind platform_editor_fix_sticky_header_row)
  *
  * @param node ProseMirror node
+ * @param rowIndex index of this row within its parent (default 0 = first/sticky row)
  * @returns boolean if it meets definition
  */
-export declare const supportedHeaderRow: (node: PmNode) => boolean;
+export declare const supportedHeaderRow: (node: PmNode, rowIndex?: number) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "24.4.18",
+	"version": "24.4.20",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -52,9 +52,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^3.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^2.0.0",
 		"@atlaskit/primitives": "^22.1.0",
-		"@atlaskit/tmp-editor-statsig": "^132.1.0",
+		"@atlaskit/tmp-editor-statsig": "^132.5.0",
 		"@atlaskit/toggle": "^17.1.0",
-		"@atlaskit/tokens": "^16.2.0",
+		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@compiled/react": "^1.0.0",
@@ -67,7 +67,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.35.0",
+		"@atlaskit/editor-common": "^116.37.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
@@ -118,9 +118,6 @@
 		"platform_editor_content_mode_button_mvp": {
 			"type": "boolean"
 		},
-		"platform_editor_table_auto_convert_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_table_height_analytics": {
 			"type": "boolean"
 		},