From 3be84e5083ccf7c60620d0fdbf3c0f166423f509 Mon Sep 17 00:00:00 2001
From: Liang Li <liliang.imut@gmail.com>
Date: Tue, 27 Oct 2026 12:37:16 +0800
Subject: [PATCH 1/2] fix: keep controls in the measure row out of the tab
 order

---
 src/Body/MeasureRow.tsx                       | 10 +++++++++-
 tests/FixedHeader.spec.jsx                    | 17 +++++++++++++++++
 tests/__snapshots__/ExpandRow.spec.jsx.snap   | 10 +++++-----
 tests/__snapshots__/FixedColumn.spec.tsx.snap | 10 +++++-----
 tests/__snapshots__/Table.spec.jsx.snap       |  2 +-
 5 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/Body/MeasureRow.tsx b/src/Body/MeasureRow.tsx
index 264116a2c..616595be4 100644
--- a/src/Body/MeasureRow.tsx
+++ b/src/Body/MeasureRow.tsx
@@ -23,8 +23,16 @@ const MeasureRow: React.FC<MeasureRowProps> = ({
 
   const { measureRowRender } = useContext(TableContext, ['measureRowRender']);
 
+  // The row holds copies of the column titles, which may contain controls such as a
+  // select-all checkbox. aria-hidden alone leaves those focusable; visibility: hidden
+  // takes them out of the tab order while the row still lays out for measuring.
   const measureRow = (
-    <tr aria-hidden="true" className={`${prefixCls}-measure-row`} style={{ height: 0 }} ref={ref}>
+    <tr
+      aria-hidden="true"
+      className={`${prefixCls}-measure-row`}
+      style={{ height: 0, visibility: 'hidden' }}
+      ref={ref}
+    >
       <ResizeObserver.Collection
         onBatchResize={infoList => {
           if (isVisible(ref.current)) {
diff --git a/tests/FixedHeader.spec.jsx b/tests/FixedHeader.spec.jsx
index 29add88f3..a140e7477 100644
--- a/tests/FixedHeader.spec.jsx
+++ b/tests/FixedHeader.spec.jsx
@@ -196,6 +196,23 @@ describe('Table.FixedHeader', () => {
     expect(container.querySelectorAll('th.rc-table-cell-fix-end')).toHaveLength(1);
   });
 
+  it('should keep controls copied into the measure row out of the tab order', () => {
+    const { container } = render(
+      <Table
+        columns={[
+          { title: <button type="button">Select all</button>, dataIndex: 'name', key: 'name' },
+        ]}
+        data={[{ name: 'light', key: 1 }]}
+        scroll={{ y: 10 }}
+      />,
+    );
+
+    const measureRow = container.querySelector('.rc-table-measure-row');
+    expect(measureRow.querySelector('button')).toBeTruthy();
+    expect(measureRow.getAttribute('aria-hidden')).toBe('true');
+    expect(measureRow.style.visibility).toBe('hidden');
+  });
+
   it('should support measureRowRender to wrap MeasureRow with custom provider', async () => {
     const FilterDropdown = ({ visible, onVisibleChange }) => (
       <div className="test-filter-dropdown" style={{ display: visible ? 'block' : 'none' }}>
diff --git a/tests/__snapshots__/ExpandRow.spec.jsx.snap b/tests/__snapshots__/ExpandRow.spec.jsx.snap
index e589629f2..68ac4d5f9 100644
--- a/tests/__snapshots__/ExpandRow.spec.jsx.snap
+++ b/tests/__snapshots__/ExpandRow.spec.jsx.snap
@@ -157,7 +157,7 @@ exports[`Table.Expand > does not crash if scroll is not set 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -312,7 +312,7 @@ exports[`Table.Expand > does not crash if scroll is not set 2`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -555,7 +555,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -1019,7 +1019,7 @@ exports[`Table.Expand > work in expandable fix 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -1177,7 +1177,7 @@ exports[`Table.Expand > work in expandable fix 2`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
diff --git a/tests/__snapshots__/FixedColumn.spec.tsx.snap b/tests/__snapshots__/FixedColumn.spec.tsx.snap
index f56c89857..1134d48c1 100644
--- a/tests/__snapshots__/FixedColumn.spec.tsx.snap
+++ b/tests/__snapshots__/FixedColumn.spec.tsx.snap
@@ -126,7 +126,7 @@ exports[`Table.FixedColumn > fixed column renders correctly RTL 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -917,7 +917,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - with data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -1706,7 +1706,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - without data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -2019,7 +2019,7 @@ exports[`Table.FixedColumn > renders correctly > scrollXY - with data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
@@ -2841,7 +2841,7 @@ exports[`Table.FixedColumn > renders correctly > scrollXY - without data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"
diff --git a/tests/__snapshots__/Table.spec.jsx.snap b/tests/__snapshots__/Table.spec.jsx.snap
index dca0d4471..a28c1cd5a 100644
--- a/tests/__snapshots__/Table.spec.jsx.snap
+++ b/tests/__snapshots__/Table.spec.jsx.snap
@@ -141,7 +141,7 @@ exports[`Table.Basic > custom components > renders fixed column and header corre
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
-            style="height: 0px;"
+            style="height: 0px; visibility: hidden;"
           >
             <td
               style="padding-top: 0px; padding-bottom: 0px; border-top: 0px; border-bottom: 0px; height: 0px;"

From 97d646137d132b907756d869861cb7c288d59275 Mon Sep 17 00:00:00 2001
From: Liang Li <liliang.imut@gmail.com>
Date: Tue, 27 Oct 2026 13:43:45 +0800
Subject: [PATCH 2/2] fix: make the measure row inert so a title visible on its
 own cannot take focus

---
 src/Body/MeasureRow.tsx                       | 10 +++++++-
 tests/FixedHeader.spec.jsx                    | 25 +++++++++++++++++++
 tests/__snapshots__/ExpandRow.spec.jsx.snap   |  5 ++++
 tests/__snapshots__/FixedColumn.spec.tsx.snap |  5 ++++
 tests/__snapshots__/Table.spec.jsx.snap       |  1 +
 5 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/Body/MeasureRow.tsx b/src/Body/MeasureRow.tsx
index 616595be4..aa237c93c 100644
--- a/src/Body/MeasureRow.tsx
+++ b/src/Body/MeasureRow.tsx
@@ -23,6 +23,14 @@ const MeasureRow: React.FC<MeasureRowProps> = ({
 
   const { measureRowRender } = useContext(TableContext, ['measureRowRender']);
 
+  // inert also covers a title that sets visibility: visible on itself. It is set on the
+  // element because React 18 drops a boolean `inert` prop and React 19 reads `inert=""`
+  // as false.
+  const setRowRef = React.useCallback((row: HTMLTableRowElement | null) => {
+    ref.current = row;
+    row?.setAttribute('inert', '');
+  }, []);
+
   // The row holds copies of the column titles, which may contain controls such as a
   // select-all checkbox. aria-hidden alone leaves those focusable; visibility: hidden
   // takes them out of the tab order while the row still lays out for measuring.
@@ -31,7 +39,7 @@ const MeasureRow: React.FC<MeasureRowProps> = ({
       aria-hidden="true"
       className={`${prefixCls}-measure-row`}
       style={{ height: 0, visibility: 'hidden' }}
-      ref={ref}
+      ref={setRowRef}
     >
       <ResizeObserver.Collection
         onBatchResize={infoList => {
diff --git a/tests/FixedHeader.spec.jsx b/tests/FixedHeader.spec.jsx
index a140e7477..2137bd218 100644
--- a/tests/FixedHeader.spec.jsx
+++ b/tests/FixedHeader.spec.jsx
@@ -211,6 +211,31 @@ describe('Table.FixedHeader', () => {
     expect(measureRow.querySelector('button')).toBeTruthy();
     expect(measureRow.getAttribute('aria-hidden')).toBe('true');
     expect(measureRow.style.visibility).toBe('hidden');
+    expect(measureRow.hasAttribute('inert')).toBe(true);
+  });
+
+  it('should keep a title that is visible on its own out of the tab order', () => {
+    const { container } = render(
+      <Table
+        columns={[
+          {
+            title: (
+              <button type="button" style={{ visibility: 'visible' }}>
+                Select all
+              </button>
+            ),
+            dataIndex: 'name',
+            key: 'name',
+          },
+        ]}
+        data={[{ name: 'light', key: 1 }]}
+        scroll={{ y: 10 }}
+      />,
+    );
+
+    const measureRow = container.querySelector('.rc-table-measure-row');
+    expect(measureRow.querySelector('button').style.visibility).toBe('visible');
+    expect(measureRow.hasAttribute('inert')).toBe(true);
   });
 
   it('should support measureRowRender to wrap MeasureRow with custom provider', async () => {
diff --git a/tests/__snapshots__/ExpandRow.spec.jsx.snap b/tests/__snapshots__/ExpandRow.spec.jsx.snap
index 68ac4d5f9..72baf12a6 100644
--- a/tests/__snapshots__/ExpandRow.spec.jsx.snap
+++ b/tests/__snapshots__/ExpandRow.spec.jsx.snap
@@ -157,6 +157,7 @@ exports[`Table.Expand > does not crash if scroll is not set 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -312,6 +313,7 @@ exports[`Table.Expand > does not crash if scroll is not set 2`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -555,6 +557,7 @@ exports[`Table.Expand > renders fixed column correctly > work 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -1019,6 +1022,7 @@ exports[`Table.Expand > work in expandable fix 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -1177,6 +1181,7 @@ exports[`Table.Expand > work in expandable fix 2`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
diff --git a/tests/__snapshots__/FixedColumn.spec.tsx.snap b/tests/__snapshots__/FixedColumn.spec.tsx.snap
index 1134d48c1..cd1820dda 100644
--- a/tests/__snapshots__/FixedColumn.spec.tsx.snap
+++ b/tests/__snapshots__/FixedColumn.spec.tsx.snap
@@ -126,6 +126,7 @@ exports[`Table.FixedColumn > fixed column renders correctly RTL 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -917,6 +918,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - with data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -1706,6 +1708,7 @@ exports[`Table.FixedColumn > renders correctly > scrollX - without data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -2019,6 +2022,7 @@ exports[`Table.FixedColumn > renders correctly > scrollXY - with data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
@@ -2841,6 +2845,7 @@ exports[`Table.FixedColumn > renders correctly > scrollXY - without data 1`] = `
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td
diff --git a/tests/__snapshots__/Table.spec.jsx.snap b/tests/__snapshots__/Table.spec.jsx.snap
index a28c1cd5a..8f98cc499 100644
--- a/tests/__snapshots__/Table.spec.jsx.snap
+++ b/tests/__snapshots__/Table.spec.jsx.snap
@@ -141,6 +141,7 @@ exports[`Table.Basic > custom components > renders fixed column and header corre
           <tr
             aria-hidden="true"
             class="rc-table-measure-row"
+            inert=""
             style="height: 0px; visibility: hidden;"
           >
             <td