Skip to content

Commit f7e04d5

Browse files
zzq0826zzq0826
committed
Update language picker
1 parent d32c402 commit f7e04d5

File tree

1 file changed

+96
-54
lines changed

1 file changed

+96
-54
lines changed

‎src/components/Header/LanguageSelector/LanguageSelector.astro‎

Lines changed: 96 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,91 +5,133 @@ import localeEmoji from "locale-emoji"
55
import ISO6991 from "iso-639-1"
66
77
const supportedLanguages = i18next.languages
8-
const currentLanguage = i18next.language
98
109
const { pathname } = Astro.url
1110
1211
const { showFlag = false, languageMapping, ...attributes } = Astro.props
12+
13+
const getLabel = (language) => {
14+
const flag = showFlag ? localeEmoji(language) + " " : ""
15+
let nativeName = ""
16+
if (languageMapping && languageMapping.hasOwnProperty(language)) {
17+
nativeName = languageMapping[language]
18+
} else {
19+
nativeName = ISO6991.getNativeName(language)
20+
}
21+
22+
return flag + nativeName
23+
}
1324
---
1425

1526
<div class="language-selector">
16-
<ul class="options-list">
17-
{
18-
supportedLanguages.map((supportedLanguage) => {
19-
let value = localizePath(pathname, supportedLanguage)
20-
const flag = showFlag ? localeEmoji(supportedLanguage) + " " : ""
21-
let nativeName = ""
22-
if (languageMapping && languageMapping.hasOwnProperty(supportedLanguage)) {
23-
nativeName = languageMapping[supportedLanguage]
24-
} else {
25-
nativeName = ISO6991.getNativeName(supportedLanguage)
26-
}
27-
28-
const label = flag + nativeName
29-
30-
return (
31-
<li value={value} onclick={`if ("${value}" !== window.location.pathname) location.href = "${value}";`}>
32-
{label}
33-
</li>
34-
)
35-
})
36-
}
37-
</ul>
27+
<div class="current-language">
28+
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14" fill="none">
29+
<path
30+
d="M12.0886 2.19173C11.899 1.99095 11.5825 1.98187 11.3817 2.17145C11.181 2.36103 11.1719 2.67748 11.3615 2.87827L12.0886 2.19173ZM9.82896 1.70578C10.0724 1.83614 10.3754 1.74448 10.5058 1.50104C10.6361 1.25761 10.5445 0.954588 10.301 0.824224L9.82896 1.70578ZM6.475 0.71L6.83644 1.05549L6.83781 1.05405L6.475 0.71ZM6.51 13.325L6.84218 12.9513L6.84158 12.9508L6.51 13.325ZM7.43 13.27L7.8006 13.6056L7.80182 13.6043L7.43 13.27ZM11.3615 2.87827C12.3774 3.95429 13 5.40282 13 7H14C14 5.13718 13.2726 3.44571 12.0886 2.19173L11.3615 2.87827ZM13 7C13 10.3139 10.3139 13 7 13V14C10.8661 14 14 10.8661 14 7H13ZM7 13C3.68614 13 1 10.3139 1 7H0C0 10.8661 3.13386 14 7 14V13ZM1 7C1 3.68614 3.68614 1 7 1V0C3.13386 0 0 3.13386 0 7H1ZM7 1C8.02607 1 8.98516 1.25391 9.82896 1.70578L10.301 0.824224C9.31484 0.296094 8.19393 0 7 0V1ZM1.50005 4.99H12.965V3.99H1.50005V4.99ZM1.49999 9.995H12.97V8.995H1.49999V9.995ZM7.81355 0.406447C7.39863 -0.00847185 6.63779 -0.188318 6.11219 0.365954L6.83781 1.05405C6.86485 1.02554 6.89025 1.0169 6.92687 1.01975C6.97276 1.02331 7.04172 1.04883 7.10645 1.11355L7.81355 0.406447ZM6.11356 0.364509C5.02397 1.5044 4 3.93397 4 7.225H5C5 4.10603 5.97603 1.9556 6.83644 1.05549L6.11356 0.364509ZM4 7.225C4 10.5231 5.07388 12.7206 6.17842 13.6992L6.84158 12.9508C6.01612 12.2194 5 10.3369 5 7.225H4ZM6.17782 13.6987C6.65963 14.127 7.3826 14.0672 7.8006 13.6056L7.0594 12.9344C6.9974 13.0028 6.90037 13.003 6.84218 12.9513L6.17782 13.6987ZM7.80182 13.6043C8.80675 12.4865 10 10.6511 10 7.23H9C9 10.3689 7.92325 11.9735 7.05818 12.9357L7.80182 13.6043ZM10 7.23C10 3.85511 8.90599 1.49888 7.81355 0.406447L7.10645 1.11355C7.96401 1.97112 9 4.04489 9 7.23H10Z"
31+
fill="#101010"></path>
32+
</svg>
33+
<span>{getLabel(supportedLanguages[0])}</span>
34+
</div>
35+
<div class="options-modal">
36+
<ul class="options-list">
37+
{
38+
supportedLanguages.map((supportedLanguage, idx) => {
39+
let value = localizePath(pathname, supportedLanguage)
40+
const label = getLabel(supportedLanguage)
41+
42+
return (
43+
<li value={value} onclick={`if ("${value}" !== window.location.pathname) location.href = "${value}";`}>
44+
{idx === 0 ? (
45+
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
46+
<rect x="0.5" y="0.5" width="15" height="15" rx="7.5" stroke="#101010" />
47+
<circle cx="7.99989" cy="8.00007" r="4.8" fill="#101010" />
48+
</svg>
49+
) : (
50+
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
51+
<rect x="0.5" y="0.5" width="15" height="15" rx="7.5" stroke="#101010" />
52+
</svg>
53+
)}
54+
<span>{label}</span>
55+
</li>
56+
)
57+
})
58+
}
59+
</ul>
60+
</div>
3861
</div>
3962

4063
<style>
4164
.language-selector {
4265
position: relative;
43-
height: 22px;
44-
width: 83px;
66+
}
67+
68+
.language-selector:hover .options-modal {
69+
display: flex;
70+
}
71+
72+
.options-modal {
73+
position: absolute;
74+
top: 36px;
4575
display: none;
76+
padding-top: 4px;
77+
}
78+
.current-language {
79+
width: 100px;
80+
border-radius: 5px;
81+
border: 1px solid #101010;
82+
display: flex;
83+
height: 36px;
84+
padding: 0 12px;
85+
justify-content: space-between;
86+
align-items: center;
87+
cursor: pointer;
4688
}
4789

4890
.options-list {
49-
width: 83px;
50-
background-color: white;
51-
background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6 9 12 15 18 9'%3e%3c/polyline%3e%3c/svg%3e");
52-
background-repeat: no-repeat;
53-
background-position: right 6px top 3px;
54-
background-size: 1em;
55-
text-align: center;
91+
width: 100px;
5692
font-size: 14px;
5793
font-weight: 500;
58-
line-height: 22px;
59-
height: 22px;
6094
letter-spacing: 0.14px;
61-
padding: 0px 15px;
62-
border-radius: 18px;
95+
padding: 4px 12px;
96+
border-radius: 5px;
6397
border: 1px solid var(--black-100);
6498
overflow: hidden;
6599
cursor: pointer;
66-
position: absolute;
67-
top: 0;
68100
transition: height 0.3s ease;
101+
display: flex;
102+
justify-content: center;
103+
align-items: center;
104+
flex-direction: column;
105+
background: #fff;
106+
}
107+
108+
.options-list li {
109+
display: flex;
110+
width: 100%;
111+
justify-content: space-between;
112+
align-items: center;
113+
flex-direction: row;
114+
padding: 8px 0px;
115+
}
116+
117+
.options-list li svg,
118+
.current-language svg {
119+
flex-shrink: 0;
120+
width: 16px;
121+
height: 16px;
69122
}
70123

71-
.options-list:hover {
72-
height: auto;
124+
.options-list li span,
125+
.current-language span {
126+
flex: 1;
127+
text-align: left;
128+
margin-left: 8px;
73129
}
74130

75131
.options-list li:hover {
76132
color: var(--orange-500);
77133
}
78134

79135
@media (min-width: 50em) {
80-
.language-selector {
81-
width: 94px;
82-
height: 35px;
83-
}
84-
85-
.options-list {
86-
background-position: right 4px top 8px;
87-
88-
font-weight: 400;
89-
line-height: 35px;
90-
letter-spacing: 0.16px;
91-
height: 35px;
92-
width: 94px;
93-
}
94136
}
95137
</style>

0 commit comments

Comments
 (0)