Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Improve Language Selector dropdowns
  • Loading branch information
psychlone77 committed Feb 5, 2025
commit 577dba5def17032b4723672b09f8bbdcd11d71b2
72 changes: 35 additions & 37 deletions src/components/LanguageSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -186,43 +186,41 @@ const LanguageSelector = () => {
</div>
<span className="selector__arrow" />
</button>
{isOpen && (
<ul
className="selector__dropdown"
role="listbox"
onKeyDown={handleKeyDown}
tabIndex={-1}
>
{fetchedLanguages.map((lang, index) =>
lang.subLanguages.length > 0 ? (
<SubLanguageSelector
key={lang.name}
opened={openedLanguages.includes(lang)}
parentLanguage={lang}
onDropdownToggle={handleToggleSubLanguage}
handleParentSelect={handleSelect}
afterSelect={afterSelect}
/>
) : (
<li
key={lang.name}
role="option"
tabIndex={-1}
onClick={() => handleSelect(lang)}
className={`selector__item ${
language.name === lang.name ? "selected" : ""
} ${focusedIndex === index ? "focused" : ""}`}
aria-selected={language.name === lang.name}
>
<label>
<img src={lang.icon} alt="" />
<span>{lang.name}</span>
</label>
</li>
)
)}
</ul>
)}
<ul
className={`selector__dropdown ${isOpen ? "" : " hidden"}`}
role="listbox"
onKeyDown={handleKeyDown}
tabIndex={-1}
>
{fetchedLanguages.map((lang, index) =>
lang.subLanguages.length > 0 ? (
<SubLanguageSelector
key={lang.name}
opened={openedLanguages.includes(lang)}
parentLanguage={lang}
onDropdownToggle={handleToggleSubLanguage}
handleParentSelect={handleSelect}
afterSelect={afterSelect}
/>
) : (
<li
key={lang.name}
role="option"
tabIndex={-1}
onClick={() => handleSelect(lang)}
className={`selector__item ${
language.name === lang.name ? "selected" : ""
} ${focusedIndex === index ? "focused" : ""}`}
aria-selected={language.name === lang.name}
>
<label>
<img src={lang.icon} alt="" />
<span>{lang.name}</span>
</label>
</li>
)
)}
</ul>
</div>
);
};
Expand Down
35 changes: 17 additions & 18 deletions src/components/SubLanguageSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,24 +78,23 @@ const SubLanguageSelector = ({
</label>
</li>

{opened &&
parentLanguage.subLanguages.map((sl) => (
<li
key={sl.name}
role="option"
tabIndex={-1}
className={`selector__item sublanguage__item ${
slugify(subLanguage) === slugify(sl.name) ? "selected" : ""
}`}
aria-selected={slugify(subLanguage) === slugify(sl.name)}
onClick={handleSubLanguageSelect(sl)}
>
<label>
<img src={sl.icon} alt={sl.name} />
<span>{sl.name}</span>
</label>
</li>
))}
{parentLanguage.subLanguages.map((sl) => (
<li
key={sl.name}
role="option"
tabIndex={-1}
className={`selector__item sublanguage__item ${opened ? "" : "hidden"} ${
slugify(subLanguage) === slugify(sl.name) ? "selected" : ""
}`}
aria-selected={slugify(subLanguage) === slugify(sl.name)}
onClick={handleSubLanguageSelect(sl)}
>
<label>
<img src={sl.icon} alt={sl.name} />
<span>{sl.name}</span>
</label>
</li>
))}
</>
);
};
Expand Down
31 changes: 27 additions & 4 deletions src/styles/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ abbr {
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-top: 7px solid var(--clr-text-primary); /* [1] */
transition: transform 100ms ease;
transition: transform 300ms ease;
}

.selector--open .selector__arrow {
Expand All @@ -413,7 +413,7 @@ abbr {

position: absolute;
width: 100%;
max-height: 20rem;
height: 20rem;
overflow-y: auto;

background-color: var(--clr-bg-secondary);
Expand All @@ -426,10 +426,15 @@ abbr {

box-shadow: 0 10px 25px rgba(0, 0, 0, 0.2);
z-index: 1;
transition: all 300ms ease;
}

.selector__dropdown:focus-within {
border-color: var(--clr-accent);
.selector__dropdown.hidden {
border: none;
padding: 0;
height: 0;
opacity: 0;
overflow: hidden;
}

.selector__item {
Expand All @@ -439,10 +444,19 @@ abbr {
gap: 1rem;
align-items: center;
border-radius: var(--br-md);
transition: all 300ms ease;
}

.sublanguage__item {
height: 3rem;
margin-left: 1.5rem;
transition: all 300ms ease;
}

.sublanguage__item.hidden {
height: 0;
opacity: 0;
overflow: hidden;
}

.sublanguage__button{
Expand All @@ -462,6 +476,11 @@ abbr {
transform: rotate(-90deg);
transition: transform 100ms ease;
cursor: pointer;
transition: all 200ms ease;
}

.sublanguage__arrow:hover {
border-top-color: var(--clr-accent);
}

[aria-expanded="true"] .sublanguage__arrow {
Expand All @@ -472,6 +491,10 @@ abbr {
border-top-color: var(--clr-text-tertiary);
}

.selector__item.selected .sublanguage__arrow:hover {
border-top-color: var(--clr-text-primary);
}

.selector__item label {
width: 100%;
padding: 0.25em 0.75em;
Expand Down