@@ -7,12 +7,12 @@ import KeyCode from 'rc-util/lib/KeyCode';
77import { useComposeRef } from 'rc-util/lib/ref' ;
88import type { ScrollConfig , ScrollTo } from 'rc-virtual-list/lib/List' ;
99import * as React from 'react' ;
10- import { useAllowClear } from './hooks/useAllowClear' ;
11- import { BaseSelectContext } from './hooks/useBaseProps' ;
12- import type { BaseSelectContextProps } from './hooks/useBaseProps' ;
13- import useDelayReset from './hooks/useDelayReset' ;
14- import useLock from './hooks/useLock' ;
15- import useSelectTriggerControl from './hooks/useSelectTriggerControl' ;
10+ import { useAllowClear } from '.. /hooks/useAllowClear' ;
11+ import { BaseSelectContext } from '.. /hooks/useBaseProps' ;
12+ import type { BaseSelectContextProps } from '.. /hooks/useBaseProps' ;
13+ import useDelayReset from '.. /hooks/useDelayReset' ;
14+ import useLock from '.. /hooks/useLock' ;
15+ import useSelectTriggerControl from '.. /hooks/useSelectTriggerControl' ;
1616import type {
1717 DisplayInfoType ,
1818 DisplayValueType ,
@@ -21,15 +21,16 @@ import type {
2121 RawValueType ,
2222 RenderDOMFunc ,
2323 RenderNode ,
24- } from './interface' ;
25- import type { RefSelectorProps } from './Selector' ;
26- import Selector from './Selector' ;
27- import type { RefTriggerProps } from './SelectTrigger' ;
28- import SelectTrigger from './SelectTrigger' ;
29- import TransBtn from './TransBtn' ;
30- import { getSeparatedContent , isValidCount } from './utils/valueUtil' ;
31- import SelectContext from './SelectContext' ;
32- import type { SelectContextProps } from './SelectContext' ;
24+ } from '../interface' ;
25+ import type { RefSelectorProps } from '../Selector' ;
26+ import Selector from '../Selector' ;
27+ import type { RefTriggerProps } from '../SelectTrigger' ;
28+ import SelectTrigger from '../SelectTrigger' ;
29+ import TransBtn from '../TransBtn' ;
30+ import { getSeparatedContent , isValidCount } from '../utils/valueUtil' ;
31+ import SelectContext from '../SelectContext' ;
32+ import type { SelectContextProps } from '../SelectContext' ;
33+ import Polite from './Polite' ;
3334
3435export type {
3536 DisplayInfoType ,
@@ -816,19 +817,7 @@ const BaseSelect = React.forwardRef<BaseSelectRef, BaseSelectProps>((props, ref)
816817 onFocus = { onContainerFocus }
817818 onBlur = { onContainerBlur }
818819 >
819- { mockFocused && ! mergedOpen && (
820- < span
821- aria-live = "polite"
822- style = { { width : 0 , height : 0 , position : 'absolute' , overflow : 'hidden' , opacity : 0 } }
823- >
824- { /* Merge into one string to make screen reader work as expect */ }
825- { `${ displayValues
826- . map ( ( { label, value } ) =>
827- [ 'number' , 'string' ] . includes ( typeof label ) ? label : value ,
828- )
829- . join ( ', ' ) } `}
830- </ span >
831- ) }
820+ < Polite visible = { mockFocused && ! mergedOpen } values = { displayValues } />
832821 { selectorNode }
833822 { arrowNode }
834823 { mergedAllowClear && clearNode }
0 commit comments