Skip to content

fix: theme sorting in quick settings menu #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 18, 2022
Merged

fix: theme sorting in quick settings menu #882

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0da7aa
fix: theme sorting in quick settings menu
amanharwara Feb 18, 2022
291bdd9
Merge branch 'develop' into fix/theme-menu-sorting
amanharwara Feb 18, 2022
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
24 changes: 11 additions & 13 deletions app/assets/javascripts/components/QuickSettingsMenu/QuickSettingsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ const toggleFocusMode = (enabled: boolean) => {
}
};

export const sortThemes = (a: SNTheme, b: SNTheme) => {
const aIsLayerable = a.isLayerable();
const bIsLayerable = b.isLayerable();
export const sortThemes = (a: ThemeItem, b: ThemeItem) => {
const aIsLayerable = a.component?.isLayerable();
const bIsLayerable = b.component?.isLayerable();

if (aIsLayerable && !bIsLayerable) {
return 1;
Expand Down Expand Up @@ -105,15 +105,13 @@ export const QuickSettingsMenu: FunctionComponent<MenuProps> = observer(
const reloadThemes = useCallback(() => {
const themes = (
application.getDisplayableItems(ContentType.Theme) as SNTheme[]
)
.sort(sortThemes)
.map((item) => {
return {
name: item.name,
identifier: item.identifier,
component: item,
};
}) as ThemeItem[];
).map((item) => {
return {
name: item.name,
identifier: item.identifier,
component: item,
};
}) as ThemeItem[];

GetFeatures()
.filter(
Expand All @@ -132,7 +130,7 @@ export const QuickSettingsMenu: FunctionComponent<MenuProps> = observer(
}
});

setThemes(themes);
setThemes(themes.sort(sortThemes));

setDefaultThemeOn(
!themes
Expand Down