fix: use terminal preferences atom for settings sync

Author: pallyoung

packages/web/src/features/settings/components/settings-page.test.tsx

@@ -1076,6 +1076,34 @@ describe("SettingsPage", () => {
     expect(store.get(terminalPreferencesAtom)).toEqual({ copyOnSelect: true });
   });
 
+  it("renders copy-on-select from the terminal preferences atom before settings load resolves", async () => {
+    let resolveSettingsGet: ((value: Record<string, unknown>) => void) | undefined;
+    const settingsGetPromise = new Promise<Record<string, unknown>>((resolve) => {
+      resolveSettingsGet = resolve;
+    });
+    const sendCommand = vi.fn().mockImplementation(async (op: string) => {
+      if (op === "settings.get") {
+        return await settingsGetPromise;
+      }
+      return {};
+    });
+    const store = createConnectedStore(sendCommand);
+    store.set(terminalPreferencesAtom, { copyOnSelect: true });
+
+    renderSettingsPage(store);
+    fireEvent.click(screen.getByRole("button", { name: "外观" }));
+
+    expect(await screen.findByRole("switch", { name: "选中自动复制" })).toHaveAttribute(
+      "aria-checked",
+      "true"
+    );
+
+    await act(async () => {
+      resolveSettingsGet?.({});
+      await settingsGetPromise;
+    });
+  });
+
   it("preserves copy-on-select when a stale settings load resolves afterward", async () => {
     let resolveSettingsGet: ((value: Record<string, unknown>) => void) | undefined;
     const settingsGetPromise = new Promise<Record<string, unknown>>((resolve) => {

packages/web/src/features/settings/components/settings-page.tsx

@@ -151,7 +151,6 @@ export function SettingsPage() {
   const [terminalRenderer, setTerminalRendererState] = useState<"standard" | "compatibility">(
     "standard"
   );
-  const [terminalCopyOnSelect, setTerminalCopyOnSelectState] = useState(false);
   const [providerAdditionalArgsById, setProviderAdditionalArgsById] = useState<
     Record<string, string>
   >({});
@@ -160,6 +159,7 @@ export function SettingsPage() {
   const [settingsRefreshKey, setSettingsRefreshKey] = useState(0);
   const [locale, setLocaleState] = useAtom(localeAtom);
   const [theme, setTheme] = useAtom(themeAtom);
+  const terminalPreferences = useAtomValue(terminalPreferencesAtom);
   const setNotificationPreferences = useSetAtom(notificationPreferencesAtom);
   const setTerminalPreferences = useSetAtom(terminalPreferencesAtom);
   const settingsLoadFailedUnknownRef = useRef(settingsLoadFailedUnknown);
@@ -245,7 +245,6 @@ export function SettingsPage() {
         appearanceSelectionVersionAtRequestStart.terminalCopyOnSelect
       ) {
         const resolvedTerminalCopyOnSelect = resolveTerminalCopyOnSelectSetting(settings);
-        setTerminalCopyOnSelectState(resolvedTerminalCopyOnSelect);
         setTerminalPreferences({
           copyOnSelect: resolvedTerminalCopyOnSelect,
         });
@@ -286,7 +285,6 @@ export function SettingsPage() {
 
   const handleTerminalCopyOnSelectSelection = (value: boolean) => {
     appearanceSelectionVersionRef.current.terminalCopyOnSelect += 1;
-    setTerminalCopyOnSelectState(value);
     setTerminalPreferences({ copyOnSelect: value });
   };
 
@@ -337,7 +335,7 @@ export function SettingsPage() {
             setLocale={handleLocaleSelection}
             terminalRenderer={terminalRenderer}
             setTerminalRenderer={handleTerminalRendererSelection}
-            terminalCopyOnSelect={terminalCopyOnSelect}
+            terminalCopyOnSelect={terminalPreferences.copyOnSelect}
             setTerminalCopyOnSelect={handleTerminalCopyOnSelectSelection}
             theme={theme}
             setTheme={setTheme}