Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c6419044cb |
@@ -1,3 +1,4 @@
|
|||||||
|
import { useEffect, useState } from 'react';
|
||||||
import { useAtomValue } from 'jotai';
|
import { useAtomValue } from 'jotai';
|
||||||
import { focusAssistActiveAtom } from '../state/focusAssist';
|
import { focusAssistActiveAtom } from '../state/focusAssist';
|
||||||
import { manualDndAtom } from '../state/manualDnd';
|
import { manualDndAtom } from '../state/manualDnd';
|
||||||
@@ -6,6 +7,8 @@ import { isWithinTimeWindow } from '../utils/timeWindow';
|
|||||||
import { useSetting } from '../state/hooks/settings';
|
import { useSetting } from '../state/hooks/settings';
|
||||||
import { settingsAtom } from '../state/settings';
|
import { settingsAtom } from '../state/settings';
|
||||||
|
|
||||||
|
const QUIET_TICK_MS = 30_000;
|
||||||
|
|
||||||
export type NotificationsQuietInputs = {
|
export type NotificationsQuietInputs = {
|
||||||
focusAssistActive: boolean;
|
focusAssistActive: boolean;
|
||||||
manualDnd: boolean;
|
manualDnd: boolean;
|
||||||
@@ -40,6 +43,15 @@ export function isNotificationsQuiet({
|
|||||||
// Live-atoms/settings-backed version of `isNotificationsQuiet` for use in
|
// Live-atoms/settings-backed version of `isNotificationsQuiet` for use in
|
||||||
// components.
|
// components.
|
||||||
export function useNotificationsQuiet(): boolean {
|
export function useNotificationsQuiet(): boolean {
|
||||||
|
// [Gitea #325] The quiet-hours window and the snooze expiry depend on the
|
||||||
|
// clock, but the long-lived notifiers using this hook rarely re-render, so a
|
||||||
|
// window starting (or a 30-minute pause ending) while the app stayed open was
|
||||||
|
// never noticed. Re-evaluate on a tick, like the night-light overlay.
|
||||||
|
const [, setTick] = useState(0);
|
||||||
|
useEffect(() => {
|
||||||
|
const id = setInterval(() => setTick((t) => t + 1), QUIET_TICK_MS);
|
||||||
|
return () => clearInterval(id);
|
||||||
|
}, []);
|
||||||
const focusAssistActive = useAtomValue(focusAssistActiveAtom);
|
const focusAssistActive = useAtomValue(focusAssistActiveAtom);
|
||||||
const manualDnd = useAtomValue(manualDndAtom);
|
const manualDnd = useAtomValue(manualDndAtom);
|
||||||
const snoozeUntil = useAtomValue(notificationSnoozeUntilAtom);
|
const snoozeUntil = useAtomValue(notificationSnoozeUntilAtom);
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ import {
|
|||||||
const EMOJI_FONTS = 'var(--font-flags), var(--font-emoji)';
|
const EMOJI_FONTS = 'var(--font-flags), var(--font-emoji)';
|
||||||
const FONT_MAP: Record<string, string> = {
|
const FONT_MAP: Record<string, string> = {
|
||||||
system: `system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', ${EMOJI_FONTS}, sans-serif`,
|
system: `system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', ${EMOJI_FONTS}, sans-serif`,
|
||||||
inter: `'Inter Variable', 'InterVariable', ${EMOJI_FONTS}, sans-serif`,
|
inter: `'InterVariable', ${EMOJI_FONTS}, sans-serif`,
|
||||||
'jetbrains-mono': `'JetBrains Mono', ${EMOJI_FONTS}, monospace`,
|
'jetbrains-mono': `'JetBrains Mono', ${EMOJI_FONTS}, monospace`,
|
||||||
'fira-code': `'Fira Code', ${EMOJI_FONTS}, monospace`,
|
'fira-code': `'Fira Code', ${EMOJI_FONTS}, monospace`,
|
||||||
};
|
};
|
||||||
|
|||||||
+2
-3
@@ -42,8 +42,7 @@
|
|||||||
|
|
||||||
--font-emoji: 'Twemoji_DISABLED';
|
--font-emoji: 'Twemoji_DISABLED';
|
||||||
--font-flags: 'TwemojiFlags_DISABLED';
|
--font-flags: 'TwemojiFlags_DISABLED';
|
||||||
--font-secondary:
|
--font-secondary: 'InterVariable', var(--font-flags), var(--font-emoji), sans-serif;
|
||||||
'Inter Variable', 'InterVariable', var(--font-flags), var(--font-emoji), sans-serif;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark-theme,
|
.dark-theme,
|
||||||
@@ -67,7 +66,7 @@
|
|||||||
--mx-uc-7: hsl(243, 100%, 80%);
|
--mx-uc-7: hsl(243, 100%, 80%);
|
||||||
--mx-uc-8: hsl(94, 100%, 80%);
|
--mx-uc-8: hsl(94, 100%, 80%);
|
||||||
|
|
||||||
--font-secondary: 'Inter Variable', 'InterVariable', var(--font-emoji), sans-serif;
|
--font-secondary: 'InterVariable', var(--font-emoji), sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
|
|||||||
Reference in New Issue
Block a user