fix(webui): sync file edit display preference
This commit is contained in:
@@ -112,8 +112,8 @@ import {
|
|||||||
import { notifyCliAppsChanged } from "@/lib/cli-app-events";
|
import { notifyCliAppsChanged } from "@/lib/cli-app-events";
|
||||||
import { copyTextToClipboard } from "@/lib/clipboard";
|
import { copyTextToClipboard } from "@/lib/clipboard";
|
||||||
import {
|
import {
|
||||||
LOCAL_PREFS_STORAGE_KEY,
|
|
||||||
readLocalPreferences,
|
readLocalPreferences,
|
||||||
|
writeLocalPreferences,
|
||||||
type FileEditDisplayMode,
|
type FileEditDisplayMode,
|
||||||
type LocalActivityMode,
|
type LocalActivityMode,
|
||||||
type LocalDensity,
|
type LocalDensity,
|
||||||
@@ -812,11 +812,7 @@ export function SettingsView({
|
|||||||
}, [activeSection, token]);
|
}, [activeSection, token]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
try {
|
writeLocalPreferences(localPrefs);
|
||||||
window.localStorage.setItem(LOCAL_PREFS_STORAGE_KEY, JSON.stringify(localPrefs));
|
|
||||||
} catch {
|
|
||||||
// Browser-only preferences should never block settings.
|
|
||||||
}
|
|
||||||
}, [localPrefs]);
|
}, [localPrefs]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
import { readLocalPreferences, type FileEditDisplayMode } from "@/lib/local-preferences";
|
import {
|
||||||
|
LOCAL_PREFS_CHANGED_EVENT,
|
||||||
|
normalizeFileEditDisplayMode,
|
||||||
|
readLocalPreferences,
|
||||||
|
type FileEditDisplayMode,
|
||||||
|
type LocalPreferences,
|
||||||
|
} from "@/lib/local-preferences";
|
||||||
|
|
||||||
export function useFileEditDisplayMode(): FileEditDisplayMode {
|
export function useFileEditDisplayMode(): FileEditDisplayMode {
|
||||||
const [mode, setMode] = useState<FileEditDisplayMode>(() =>
|
const [mode, setMode] = useState<FileEditDisplayMode>(() =>
|
||||||
@@ -9,11 +15,21 @@ export function useFileEditDisplayMode(): FileEditDisplayMode {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const refresh = () => setMode(readLocalPreferences().fileEditDisplayMode);
|
const refresh = () => setMode(readLocalPreferences().fileEditDisplayMode);
|
||||||
|
const refreshFromLocalPreferenceEvent = (event: Event) => {
|
||||||
|
const detail = (event as CustomEvent<Partial<LocalPreferences> | undefined>).detail;
|
||||||
|
setMode(
|
||||||
|
detail
|
||||||
|
? normalizeFileEditDisplayMode(detail.fileEditDisplayMode)
|
||||||
|
: readLocalPreferences().fileEditDisplayMode,
|
||||||
|
);
|
||||||
|
};
|
||||||
window.addEventListener("storage", refresh);
|
window.addEventListener("storage", refresh);
|
||||||
window.addEventListener("focus", refresh);
|
window.addEventListener("focus", refresh);
|
||||||
|
window.addEventListener(LOCAL_PREFS_CHANGED_EVENT, refreshFromLocalPreferenceEvent);
|
||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener("storage", refresh);
|
window.removeEventListener("storage", refresh);
|
||||||
window.removeEventListener("focus", refresh);
|
window.removeEventListener("focus", refresh);
|
||||||
|
window.removeEventListener(LOCAL_PREFS_CHANGED_EVENT, refreshFromLocalPreferenceEvent);
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ export interface LocalPreferences {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const LOCAL_PREFS_STORAGE_KEY = "nanobot-webui.settings-preferences";
|
export const LOCAL_PREFS_STORAGE_KEY = "nanobot-webui.settings-preferences";
|
||||||
|
export const LOCAL_PREFS_CHANGED_EVENT = "nanobot-webui.local-preferences-changed";
|
||||||
|
|
||||||
export const DEFAULT_LOCAL_PREFS: LocalPreferences = {
|
export const DEFAULT_LOCAL_PREFS: LocalPreferences = {
|
||||||
density: "comfortable",
|
density: "comfortable",
|
||||||
@@ -40,3 +41,15 @@ export function readLocalPreferences(): LocalPreferences {
|
|||||||
return DEFAULT_LOCAL_PREFS;
|
return DEFAULT_LOCAL_PREFS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function writeLocalPreferences(preferences: LocalPreferences): void {
|
||||||
|
try {
|
||||||
|
window.localStorage.setItem(LOCAL_PREFS_STORAGE_KEY, JSON.stringify(preferences));
|
||||||
|
} catch {
|
||||||
|
// Browser-only preferences should never block settings.
|
||||||
|
}
|
||||||
|
window.dispatchEvent(new CustomEvent<LocalPreferences>(
|
||||||
|
LOCAL_PREFS_CHANGED_EVENT,
|
||||||
|
{ detail: preferences },
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
import { act, render, screen, waitFor } from "@testing-library/react";
|
||||||
|
import { afterEach, describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { useFileEditDisplayMode } from "@/hooks/useFileEditDisplayMode";
|
||||||
|
import {
|
||||||
|
DEFAULT_LOCAL_PREFS,
|
||||||
|
LOCAL_PREFS_STORAGE_KEY,
|
||||||
|
writeLocalPreferences,
|
||||||
|
} from "@/lib/local-preferences";
|
||||||
|
|
||||||
|
function DisplayModeProbe() {
|
||||||
|
const mode = useFileEditDisplayMode();
|
||||||
|
return <div data-testid="mode">{mode}</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("useFileEditDisplayMode", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
localStorage.removeItem(LOCAL_PREFS_STORAGE_KEY);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("updates when local preferences change in the same document", async () => {
|
||||||
|
render(<DisplayModeProbe />);
|
||||||
|
|
||||||
|
expect(screen.getByTestId("mode")).toHaveTextContent("summary");
|
||||||
|
|
||||||
|
act(() => {
|
||||||
|
writeLocalPreferences({
|
||||||
|
...DEFAULT_LOCAL_PREFS,
|
||||||
|
fileEditDisplayMode: "diff",
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByTestId("mode")).toHaveTextContent("diff");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user