fix
This commit is contained in:
@@ -28,7 +28,6 @@ const DEFAULT_FOLDER_NAME = 'Documents';
|
||||
const ROW_KEY_SEPARATOR = ':';
|
||||
const DOCUMENT_ROW_PREFIX = 'document';
|
||||
const FOLDER_ROW_PREFIX = 'folder';
|
||||
const THEME_STORAGE_KEY = 'papercrate_theme_settings';
|
||||
|
||||
const resolveApiPath = (path = '') => path;
|
||||
|
||||
@@ -199,66 +198,6 @@ const AppLayout = () => {
|
||||
});
|
||||
const lastNonDeskViewRef = useRef(documentsViewMode === 'desk' ? 'list' : documentsViewMode);
|
||||
|
||||
const loadThemeSettings = () => {
|
||||
const defaults = { neutralHue: 260, mode: 'system' };
|
||||
if (typeof window === 'undefined') {
|
||||
if (typeof document !== 'undefined') {
|
||||
const current = document.documentElement.style.getPropertyValue('--neutral-hue');
|
||||
const parsed = Number.parseInt(current, 10);
|
||||
return {
|
||||
neutralHue: Number.isNaN(parsed) ? defaults.neutralHue : parsed,
|
||||
mode: defaults.mode,
|
||||
};
|
||||
}
|
||||
return defaults;
|
||||
}
|
||||
|
||||
const root = document.documentElement;
|
||||
const loadFromRoot = () => {
|
||||
const current = root.style.getPropertyValue('--neutral-hue');
|
||||
const parsed = Number.parseInt(current, 10);
|
||||
return Number.isNaN(parsed) ? defaults.neutralHue : parsed;
|
||||
};
|
||||
|
||||
let neutralHueValue = loadFromRoot();
|
||||
let modeValue = defaults.mode;
|
||||
|
||||
const composite = window.localStorage.getItem(THEME_STORAGE_KEY);
|
||||
if (composite) {
|
||||
try {
|
||||
const parsed = JSON.parse(composite);
|
||||
const storedHue = Number.parseInt(parsed?.neutralHue, 10);
|
||||
if (!Number.isNaN(storedHue)) {
|
||||
neutralHueValue = storedHue;
|
||||
}
|
||||
const storedMode = parsed?.mode;
|
||||
if (storedMode === 'light' || storedMode === 'dark' || storedMode === 'system') {
|
||||
modeValue = storedMode;
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('[theme] failed to parse stored theme settings', error);
|
||||
}
|
||||
} else {
|
||||
const legacyHue = window.localStorage.getItem('papercrate_neutral_hue');
|
||||
if (legacyHue) {
|
||||
const parsedLegacyHue = Number.parseInt(legacyHue, 10);
|
||||
if (!Number.isNaN(parsedLegacyHue)) {
|
||||
neutralHueValue = parsedLegacyHue;
|
||||
}
|
||||
}
|
||||
const legacyMode = window.localStorage.getItem('papercrate_theme_mode');
|
||||
if (legacyMode === 'light' || legacyMode === 'dark' || legacyMode === 'system') {
|
||||
modeValue = legacyMode;
|
||||
}
|
||||
}
|
||||
|
||||
return { neutralHue: neutralHueValue, mode: modeValue };
|
||||
};
|
||||
|
||||
const initialThemeSettings = loadThemeSettings();
|
||||
const [neutralHue, setNeutralHue] = useState(initialThemeSettings.neutralHue);
|
||||
const [themeMode, setThemeMode] = useState(initialThemeSettings.mode);
|
||||
|
||||
useEffect(() => {
|
||||
if (documentsViewMode !== 'desk') {
|
||||
lastNonDeskViewRef.current = documentsViewMode;
|
||||
@@ -363,56 +302,6 @@ const AppLayout = () => {
|
||||
}
|
||||
}, [token, appStatus, refreshAccessToken]);
|
||||
|
||||
useEffect(() => {
|
||||
if (typeof document !== 'undefined') {
|
||||
document.documentElement.style.setProperty('--neutral-hue', `${neutralHue}deg`);
|
||||
}
|
||||
}, [neutralHue]);
|
||||
|
||||
useEffect(() => {
|
||||
if (typeof document !== 'undefined') {
|
||||
const root = document.documentElement;
|
||||
if (themeMode === 'system') {
|
||||
root.removeAttribute('data-theme');
|
||||
} else {
|
||||
root.setAttribute('data-theme', themeMode);
|
||||
}
|
||||
}
|
||||
}, [themeMode]);
|
||||
|
||||
useEffect(() => {
|
||||
if (typeof window === 'undefined') {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
const payload = JSON.stringify({ neutralHue, mode: themeMode });
|
||||
window.localStorage.setItem(THEME_STORAGE_KEY, payload);
|
||||
window.localStorage.removeItem('papercrate_neutral_hue');
|
||||
window.localStorage.removeItem('papercrate_theme_mode');
|
||||
} catch (error) {
|
||||
console.warn('[theme] failed to persist theme settings', error);
|
||||
}
|
||||
}, [neutralHue, themeMode]);
|
||||
|
||||
const handleNeutralHueChange = useCallback((value) => {
|
||||
if (value === '') {
|
||||
setNeutralHue(180);
|
||||
return;
|
||||
}
|
||||
const parsed = Number(value);
|
||||
if (Number.isNaN(parsed)) {
|
||||
return;
|
||||
}
|
||||
setNeutralHue(parsed);
|
||||
}, []);
|
||||
|
||||
const handleThemeModeChange = useCallback((mode) => {
|
||||
if (mode !== 'light' && mode !== 'dark' && mode !== 'system') {
|
||||
return;
|
||||
}
|
||||
setThemeMode(mode);
|
||||
}, []);
|
||||
|
||||
const clearFilters = useCallback(() => {
|
||||
setSearchQuery('');
|
||||
setActiveTagFilters([]);
|
||||
@@ -5084,10 +4973,6 @@ const AppLayout = () => {
|
||||
draggedFolderId,
|
||||
onCreateFolder: handlePromptCreateFolder,
|
||||
creatingFolder,
|
||||
onNeutralHueChange: handleNeutralHueChange,
|
||||
neutralHue,
|
||||
themeMode,
|
||||
onThemeModeChange: handleThemeModeChange,
|
||||
tags,
|
||||
activeTagIds: activeTagFilters,
|
||||
onToggleTagFilter: toggleTagFilter,
|
||||
@@ -5146,10 +5031,6 @@ const AppLayout = () => {
|
||||
handleCorrespondentCreate,
|
||||
handlePromptCreateFolder,
|
||||
creatingFolder,
|
||||
handleNeutralHueChange,
|
||||
neutralHue,
|
||||
themeMode,
|
||||
handleThemeModeChange,
|
||||
],
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user