Skip to content

fix(lib): 🐛 fix a problem where theme selector was not accessible #858

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(lib): 🐛 fix a problem where theme selector was not accessible #858

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
49 changes: 19 additions & 30 deletions packages/lib/src/components/Header/components/ThemeSelector/ThemeSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,7 @@
* along with Essencium Frontend. If not, see <http://www.gnu.org/licenses/>.
*/

import {
ActionIcon,
Group,
Popover,
PopoverDropdown,
PopoverTarget,
Text,
useMantineColorScheme,
} from '@mantine/core'
import { ActionIcon, Menu, useMantineColorScheme } from '@mantine/core'
import { IconDeviceLaptop, IconMoon, IconSun } from '@tabler/icons-react'
import { useTranslation } from 'next-i18next'
import { type JSX } from 'react'
Expand All @@ -49,8 +41,8 @@ export function ThemeSelector(): JSX.Element {
const isAutoMode = colorScheme === COLOR_SCHEME.AUTO

return (
<Popover width={130} position="bottom" withArrow>
<PopoverTarget>
<Menu width={130} position="bottom" withArrow>
<Menu.Target>
<ActionIcon
variant="subtle"
className="hover:bg-gray-50 dark:hover:bg-gray-900"
Expand All @@ -59,10 +51,10 @@ export function ThemeSelector(): JSX.Element {
>
{isLightMode ? <IconSun /> : <IconMoon />}
</ActionIcon>
</PopoverTarget>
</Menu.Target>

<PopoverDropdown className="p-0 shadow-sm">
<Group
<Menu.Dropdown>
<Menu.Item
onClick={() => {
setColorScheme(COLOR_SCHEME.LIGHT)
}}
Expand All @@ -72,13 +64,12 @@ export function ThemeSelector(): JSX.Element {
!isAutoMode &&
'text-primary-600 dark:text-primary-200 bg-gray-50 dark:bg-gray-900',
)}
leftSection={<IconSun className="size-5" />}
>
<IconSun className="size-5" />
{t('header.themeToggle.lightMode')}
</Menu.Item>

<Text className="text-sm">{t('header.themeToggle.lightMode')}</Text>
</Group>

<Group
<Menu.Item
onClick={() => {
setColorScheme(COLOR_SCHEME.DARK)
}}
Expand All @@ -88,13 +79,12 @@ export function ThemeSelector(): JSX.Element {
!isAutoMode &&
'text-primary-600 dark:text-primary-200 bg-gray-50 dark:bg-gray-900',
)}
leftSection={<IconMoon className="size-5" />}
>
<IconMoon className="size-5" />

<Text className="text-sm">{t('header.themeToggle.darkMode')}</Text>
</Group>
{t('header.themeToggle.darkMode')}
</Menu.Item>

<Group
<Menu.Item
onClick={() => {
clearColorScheme()
}}
Expand All @@ -104,12 +94,11 @@ export function ThemeSelector(): JSX.Element {
isAutoMode &&
'text-primary-600 dark:text-primary-200 bg-gray-50 dark:bg-gray-900',
)}
leftSection={<IconDeviceLaptop className="size-5" />}
>
<IconDeviceLaptop className="size-5" />

<Text className="text-sm">{t('header.themeToggle.systemMode')}</Text>
</Group>
</PopoverDropdown>
</Popover>
{t('header.themeToggle.systemMode')}
</Menu.Item>
</Menu.Dropdown>
</Menu>
)
}