From 55866d18565042d9e4362df847a7b87f0581a6b3 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Thu, 9 Oct 2025 19:07:56 +0800
Subject: [PATCH] Revert "fix: duplicate unique identifiers in MeasureRow
 column headers (#1376)"

This reverts commit c58ee99b3a3a96e4a59ad40f4cd3a710d40f455b.
---
 src/Body/MeasureRow.tsx  |  6 +--
 src/utils/measureUtil.ts | 96 ----------------------------------------
 2 files changed, 3 insertions(+), 99 deletions(-)
 delete mode 100644 src/utils/measureUtil.ts

diff --git a/src/Body/MeasureRow.tsx b/src/Body/MeasureRow.tsx
index 87438e502..1211839c6 100644
--- a/src/Body/MeasureRow.tsx
+++ b/src/Body/MeasureRow.tsx
@@ -5,7 +5,6 @@ import isVisible from '@rc-component/util/lib/Dom/isVisible';
 import { useContext } from '@rc-component/context';
 import TableContext from '../context/TableContext';
 import type { ColumnType } from '../interface';
-import { prepareMeasureTitle } from '../utils/measureUtil';
 
 export interface MeasureRowProps {
   prefixCls: string;
@@ -38,8 +37,9 @@ const MeasureRow: React.FC<MeasureRowProps> = ({
         {columnsKey.map(columnKey => {
           const column = columns.find(col => col.key === columnKey);
           const rawTitle = column?.title;
-          const titleForMeasure = prepareMeasureTitle(rawTitle);
-
+          const titleForMeasure = React.isValidElement<React.RefAttributes<any>>(rawTitle)
+            ? React.cloneElement(rawTitle, { ref: null })
+            : rawTitle;
           return (
             <MeasureCell
               key={columnKey}
diff --git a/src/utils/measureUtil.ts b/src/utils/measureUtil.ts
deleted file mode 100644
index b21e412e4..000000000
--- a/src/utils/measureUtil.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import * as React from 'react';
-
-/**
- * Props that should be filtered out from measure row elements to avoid DOM conflicts
- */
-const FILTERED_PROPS = [
-  // Unique identifiers that shouldn't be duplicated in DOM
-  'id',
-  'data-testid',
-  'data-test-id',
-  'data-cy', // Cypress
-  'data-qa',
-  'data-automation-id',
-  'data-id',
-  'data-key',
-
-  // Event handlers that are unnecessary in hidden measure elements
-  'onClick',
-  'onMouseEnter',
-  'onMouseLeave',
-  'onFocus',
-  'onBlur',
-  'onKeyDown',
-  'onKeyPress',
-  'onKeyUp',
-  'onDoubleClick',
-  'onContextMenu',
-
-  // Accessibility props that might reference other elements and cause conflicts
-  'aria-describedby',
-  'aria-labelledby',
-  'aria-controls',
-  'aria-owns',
-
-  // Form-related props that might conflict
-  'name',
-  'htmlFor',
-  'for',
-] as const;
-
-/**
- * Filter props from a React element that might cause DOM conflicts in measure row
- * @param element - The React element to filter
- * @param deep - Whether to recursively filter nested elements
- * @returns A new React element with filtered props
- */
-export function filterMeasureProps<T = any>(
-  element: React.ReactElement<T>,
-  deep: boolean = true,
-): React.ReactElement<T> {
-  if (!React.isValidElement(element)) {
-    return element;
-  }
-
-  const filteredProps = { ...element.props } as any;
-
-  FILTERED_PROPS.forEach(prop => {
-    filteredProps[prop] = undefined;
-  });
-
-  // Nullify ref to avoid warnings and conflicts
-  filteredProps.ref = null;
-
-  // Recursively filter children if deep filtering is enabled
-  if (deep && filteredProps.children) {
-    filteredProps.children = filterMeasureChildren(filteredProps.children);
-  }
-
-  return React.cloneElement(element, filteredProps);
-}
-
-/**
- * Recursively filter children elements
- * @param children - React children to filter
- * @returns Filtered children
- */
-function filterMeasureChildren(children: React.ReactNode): React.ReactNode {
-  return React.Children.map(children, child => {
-    if (React.isValidElement(child)) {
-      return filterMeasureProps(child, true);
-    }
-    return child;
-  });
-}
-
-/**
- * Prepare title content for use in measure row
- * @param title - The original title content
- * @returns Filtered title safe for measure row usage
- */
-export function prepareMeasureTitle(title: React.ReactNode): React.ReactNode {
-  if (React.isValidElement(title)) {
-    return filterMeasureProps(title, true); // Enable deep filtering
-  }
-  return title;
-}