File tree Expand file tree Collapse file tree 2 files changed +4
-13
lines changed Expand file tree Collapse file tree 2 files changed +4
-13
lines changed Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ const LanguageSelector = () => {
92
92
if ( language . mainLanguage ) {
93
93
handleToggleSublanguage ( language . mainLanguage ) ;
94
94
}
95
- } , [ language ] ) ;
95
+ } , [ language , handleToggleSublanguage ] ) ;
96
96
97
97
useEffect ( ( ) => {
98
98
if ( isOpen && focusedIndex >= 0 ) {
Original file line number Diff line number Diff line change 1
- import { useState } from "react" ;
2
-
3
1
import { useAppContext } from "@contexts/AppContext" ;
4
2
import { LanguageType } from "@types" ;
5
3
@@ -17,15 +15,9 @@ const SubLanguageSelector = ({
17
15
opened,
18
16
} : SubLanguageSelectorProps ) => {
19
17
const { language, setLanguage } = useAppContext ( ) ;
20
- const [ isOpen , setIsOpen ] = useState (
21
- mainLanguage . subLanguages . some (
22
- ( subLanguage ) => language . name === subLanguage . name
23
- )
24
- ) ;
25
18
26
19
const handleSelect = ( selected : LanguageType ) => {
27
20
setLanguage ( selected ) ;
28
- setIsOpen ( false ) ;
29
21
onDropdownToggle ( mainLanguage ) ;
30
22
afterSelect ( ) ;
31
23
} ;
@@ -48,19 +40,19 @@ const SubLanguageSelector = ({
48
40
< button
49
41
className = "sublanguage__button"
50
42
tabIndex = { - 1 }
51
- aria-expanded = { isOpen }
43
+ aria-expanded = { opened }
52
44
aria-haspopup = "listbox"
53
45
onClick = { ( e ) => {
54
46
e . stopPropagation ( ) ;
55
- setIsOpen ( ! isOpen ) ;
47
+ onDropdownToggle ( mainLanguage ) ;
56
48
} }
57
49
>
58
50
< span className = "sublanguage__arrow" />
59
51
</ button >
60
52
</ label >
61
53
</ li >
62
54
63
- { ( opened || isOpen ) && (
55
+ { opened && (
64
56
< >
65
57
{ mainLanguage . subLanguages . map ( ( subLanguage ) => (
66
58
< li
@@ -77,7 +69,6 @@ const SubLanguageSelector = ({
77
69
mainLanguage : mainLanguage ,
78
70
subLanguages : [ ] ,
79
71
} ) ;
80
- setIsOpen ( false ) ;
81
72
} }
82
73
>
83
74
< label >
You can’t perform that action at this time.
0 commit comments