Skip to content

fix: remove unnecessary switchers in Frontend settings page #42

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
Nerivec merged 1 commit into from
Jun 3, 2025
Merged

fix: remove unnecessary switchers in Frontend settings page #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 13 additions & 14 deletions src/components/ThemeSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const ALL_THEMES = [
// XXX: workaround typing
const local = store2 as unknown as typeof store2.default;

const ThemeSwitcher = memo(({ useExistingChildren }: { useExistingChildren?: true }) => {
const ThemeSwitcher = memo(() => {
const [currentTheme, setCurrentTheme] = useState<string>(local.get(THEME_KEY, ""));

useEffect(() => {
Expand All @@ -62,19 +62,18 @@ const ThemeSwitcher = memo(({ useExistingChildren }: { useExistingChildren?: tru
buttonStyle="mx-1"
dropdownStyle="dropdown-end"
>
{!useExistingChildren &&
ALL_THEMES.map((theme) => (
<li key={theme || "default"}>
<input
type="radio"
name="theme-dropdown"
className="theme-controller w-full btn btn-block btn-ghost"
aria-label={theme || "Default"}
value={theme.toLowerCase()}
onChange={() => setCurrentTheme(theme.toLowerCase())}
/>
</li>
))}
{ALL_THEMES.map((theme) => (
<li key={theme || "default"}>
<input
type="radio"
name="theme-dropdown"
className="theme-controller w-full btn btn-block btn-ghost"
aria-label={theme || "Default"}
value={theme.toLowerCase()}
onChange={() => setCurrentTheme(theme.toLowerCase())}
/>
</li>
))}
</PopoverDropdown>
);
});
Expand Down
8 changes: 0 additions & 8 deletions src/components/settings-page/tabs/Frontend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import store2 from "store2";
import LanguageSwitcher from "../../../i18n/LanguageSwitcher.js";
import { HOMEPAGE_KEY, I18NEXTLNG_KEY, MAX_ON_SCREEN_NOTIFICATIONS_KEY, PERMIT_JOIN_TIME_KEY, THEME_KEY } from "../../../localStoreConsts.js";
import Button from "../../Button.js";
import ThemeSwitcher from "../../ThemeSwitcher.js";
import InputField from "../../form-fields/InputField.js";
import SelectField from "../../form-fields/SelectField.js";

Expand Down Expand Up @@ -49,12 +47,6 @@ export default function Frontend() {
</Button>
</div>
</div>
<div>
{t("language")} <LanguageSwitcher useExistingChildren />
</div>
<div>
{t("theme")} <ThemeSwitcher useExistingChildren />
</div>
<div>
<SelectField
name="homepage"
Expand Down
8 changes: 2 additions & 6 deletions src/i18n/LanguageSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@ const LOCALES_NAMES_MAP = {
en: "English",
};

const LanguageSwitcher = memo(({ useExistingChildren }: { useExistingChildren?: true }) => {
const LanguageSwitcher = memo(() => {
const { i18n } = useTranslation("localeNames");
const currentLanguage = useMemo(() => (LOCALES_MAP[i18n.language] ? i18n.language : i18n.language.split("-")[0]), [i18n.language]);
const children = useMemo(() => {
if (useExistingChildren) {
return null;
}

const languages: JSX.Element[] = [];

for (const language in i18n.options.resources ?? []) {
Expand All @@ -106,7 +102,7 @@ const LanguageSwitcher = memo(({ useExistingChildren }: { useExistingChildren?:
}

return languages;
}, [useExistingChildren, i18n.changeLanguage, i18n.options.resources]);
}, [i18n.changeLanguage, i18n.options.resources]);

return (
<PopoverDropdown
Expand Down