@@ -9,7 +9,7 @@ import iconGroup from '@ui5/webcomponents-icons/dist/group-2.js';
99import iconSortAscending from '@ui5/webcomponents-icons/dist/sort-ascending.js' ;
1010import iconSortDescending from '@ui5/webcomponents-icons/dist/sort-descending.js' ;
1111import { enrichEventWithDetails , useI18nBundle } from '@ui5/webcomponents-react-base' ;
12- import { useEffect , useMemo , useRef } from 'react' ;
12+ import { useEffect , useId , useMemo , useRef } from 'react' ;
1313import { FlexBoxAlignItems } from '../../../../enums/FlexBoxAlignItems.js' ;
1414import { TextAlign } from '../../../../enums/TextAlign.js' ;
1515import {
@@ -31,20 +31,21 @@ import { Popover } from '../../../../webComponents/Popover/index.js';
3131import { Text } from '../../../../webComponents/Text/index.js' ;
3232import { FlexBox } from '../../../FlexBox/index.js' ;
3333import type { TableInstanceWithPopoverProps } from '../../types/index.js' ;
34+ import { RenderColumnTypes } from '../../types/index.js' ;
3435
3536export const ColumnHeaderModal = ( instance : TableInstanceWithPopoverProps ) => {
3637 const { setOpen, openerRef } = instance . popoverProps ;
3738 const { column, state, webComponentsReactProperties } = instance ;
3839 const { isRtl, groupBy } = state ;
3940 const { onGroup, onSort, classes : classNames } = webComponentsReactProperties ;
41+ const uniqueId = useId ( ) ;
4042
4143 const showFilter = column . canFilter ;
4244 const showGroup = column . canGroupBy ;
4345 const showSort = column . canSort ;
4446
4547 const ref = useRef < PopoverDomRef > ( null ) ;
4648 const listRef = useRef ( null ) ;
47- const { Filter } = column ;
4849
4950 const i18nBundle = useI18nBundle ( '@ui5/webcomponents-react' ) ;
5051
@@ -231,10 +232,14 @@ export const ColumnHeaderModal = (instance: TableInstanceWithPopoverProps) => {
231232 style = { {
232233 fontSize : filterStyles . fontSize
233234 } }
235+ id = { `${ uniqueId } -filter-text` }
234236 >
235237 { filterText }
236238 </ Text >
237- < Filter column = { column } popoverRef = { ref } />
239+ { column . render ( RenderColumnTypes . Filter , {
240+ accessibleNameRef : `${ uniqueId } -filter-text` ,
241+ popoverRef : ref
242+ } ) }
238243 </ FlexBox >
239244 </ ListItemCustom >
240245 ) }
0 commit comments