File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -683,7 +683,7 @@ export default function generateSelector<
683
683
}
684
684
685
685
useSelectTriggerControl (
686
- [ containerRef . current , triggerRef . current && triggerRef . current . getPopupElement ( ) ] ,
686
+ ( ) => [ containerRef . current , triggerRef . current ? .getPopupElement ( ) ] ,
687
687
triggerOpen ,
688
688
onToggleOpen ,
689
689
) ;
@@ -897,8 +897,7 @@ export default function generateSelector<
897
897
898
898
const onInternalMouseDown : React . MouseEventHandler < HTMLDivElement > = ( event , ...restArgs ) => {
899
899
const { target } = event ;
900
- const popupElement : HTMLDivElement =
901
- triggerRef . current && triggerRef . current . getPopupElement ( ) ;
900
+ const popupElement : HTMLDivElement = triggerRef . current ?. getPopupElement ( ) ;
902
901
903
902
// We should give focus back to selector if clicked item is not focusable
904
903
if ( popupElement && popupElement . contains ( target as HTMLElement ) ) {
Original file line number Diff line number Diff line change 1
1
import * as React from 'react' ;
2
2
3
3
export default function useSelectTriggerControl (
4
- elements : ( HTMLElement | undefined ) [ ] ,
4
+ elements : ( ) => ( HTMLElement | undefined ) [ ] ,
5
5
open : boolean ,
6
6
triggerOpen : ( open : boolean ) => void ,
7
7
) {
8
8
const propsRef = React . useRef ( null ) ;
9
9
propsRef . current = {
10
- elements : elements . filter ( e => e ) ,
11
10
open,
12
11
triggerOpen,
13
12
} ;
@@ -22,7 +21,9 @@ export default function useSelectTriggerControl(
22
21
23
22
if (
24
23
propsRef . current . open &&
25
- propsRef . current . elements . every ( element => ! element . contains ( target ) && element !== target )
24
+ elements ( )
25
+ . filter ( ( element ) => element )
26
+ . every ( ( element ) => ! element . contains ( target ) && element !== target )
26
27
) {
27
28
// Should trigger close
28
29
propsRef . current . triggerOpen ( false ) ;
You can’t perform that action at this time.
0 commit comments