8000 use string instead of null for dark mode system setting by andrewzamojc · Pull Request #2751 · temporalio/ui · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

use string instead of null for dark mode system setting #2751

New issue

Have a question about this project? Sign up for a free GitHub 8000 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 1 commit into from
May 29, 2025
Merged

use string instead of null for dark mode system setting #2751

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
4 changes: 2 additions & 2 deletions src/lib/components/dark-mode-icon-button.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
} from '$lib/utilities/dark-mode';

const buttonText = $derived(
$useDarkModePreference == null
$useDarkModePreference == 'system'
? translate('common.system-default')
: $useDarkModePreference
? translate('common.night')
: translate('common.day'),
);

const buttonIcon: IconName = $derived(
$useDarkModePreference == null
$useDarkModePreference == 'system'
? 'system-window'
: $useDarkModePreference
? 'moon'
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/dark-mode-navigation-button.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
} from '$lib/utilities/dark-mode';

const buttonText = $derived(
$useDarkModePreference == null
$useDarkModePreference == 'system'
? translate('common.system-default')
: $useDarkModePreference
? translate('common.night')
: translate('common.day'),
);

const buttonIcon: IconName = $derived(
$useDarkModePreference == null
$useDarkModePreference == 'system'
? 'system-window'
: $useDarkModePreference
? 'moon'
Expand Down
16 changes: 8 additions & 8 deletions src/lib/utilities/dark-mode/dark-mode.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ describe('dark-mode utilities', () => {
});

describe('useDarkMode', () => {
it('should return true if prefers-color-scheme is dark and preference is null', () => {
it('should return true if prefers-color-scheme is dark and preference is system', () => {
matchMediaMock.mockReturnValue({ matches: true }); // prefers dark
useDarkModePreference.set(null);
useDarkModePreference.set('system');
const value = get(useDarkMode);
expect(value).toBe(true);
});

it('should return false if prefers-color-scheme is not dark and preference is null', () => {
it('should return false if prefers-color-scheme is not dark and preference is system', () => {
matchMediaMock.mockReturnValue({ matches: false });
useDarkModePreference.set(null);
useDarkModePreference.set('system');
const value = get(useDarkMode);
expect(value).toBe(false);
});
Expand All @@ -51,16 +51,16 @@ describe('dark-mode utilities', () => {
});

describe('getNextDarkModePreference', () => {
it('should return true if the current value is null', () => {
expect(getNextDarkModePreference(null)).toBe(true);
it('should return true if the current value is system', () => {
expect(getNextDarkModePreference('system')).toBe(true);
});

it('should return false if the current value is true', () => {
expect(getNextDarkModePreference(true)).toBe(false);
});

it('should return null if the current value is false', () => {
expect(getNextDarkModePreference(false)).toBe(null);
it('should return system if the current value is false', () => {
expect(getNextDarkModePreference(false)).toBe('system');
});
});

Expand Down
6 changes: 3 additions & 3 deletions src/lib/utilities/dark-mode/dark-mode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { derived } from 'svelte/store';

import { persistStore } from '$lib/stores/persist-store';

type DarkModePreference = boolean | null;
type DarkModePreference = boolean | 'system';

export const useDarkModePreference = persistStore<DarkModePreference>(
'dark mode',
Expand All @@ -13,7 +13,7 @@ export const useDarkModePreference = persistStore<DarkModePreference>(
export const useDarkMode = derived(
useDarkModePreference,
($useDarkModePreference) => {
if ($useDarkModePreference == null) {
if ($useDarkModePreference == 'system') {
return (
window.matchMedia?.('(prefers-color-scheme: dark)')?.matches ?? false
);
Expand All @@ -24,7 +24,7 @@ export const useDarkMode = derived(
);

export const getNextDarkModePreference = (value: DarkModePreference) =>
value == null ? true : value == true ? false : null;
value == 'system' ? true : value == true ? false : 'system';

export const darkMode = (node: HTMLElement) => {
useDarkMode.subscribe((value) => {
Expand Down
Loading
0