Skip to content

Commit 3621948

Browse files
committed
fix: preserve terminal copy-on-select sync on stale loads
1 parent a8c4fd9 commit 3621948

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,7 @@ describe("SettingsPage", () => {
11181118
"aria-checked",
11191119
"true"
11201120
);
1121+
expect(store.get(terminalPreferencesAtom)).toEqual({ copyOnSelect: true });
11211122
});
11221123

11231124
it("updates language selection through the shared appearance pills", async () => {

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,21 @@ export function SettingsPage() {
240240
setTerminalRendererState(settings["appearance.terminalRenderer"]);
241241
}
242242
}
243+
const resolvedTerminalCopyOnSelect = resolveTerminalCopyOnSelectSetting(settings);
243244
if (typeof settings["appearance.terminalCopyOnSelect"] === "boolean") {
244245
if (
245246
appearanceSelectionVersionRef.current.terminalCopyOnSelect ===
246247
appearanceSelectionVersionAtRequestStart.terminalCopyOnSelect
247248
) {
248249
setTerminalCopyOnSelectState(settings["appearance.terminalCopyOnSelect"]);
250+
setTerminalPreferences({
251+
copyOnSelect: resolvedTerminalCopyOnSelect,
252+
});
249253
}
254+
} else {
255+
setTerminalPreferences({
256+
copyOnSelect: resolvedTerminalCopyOnSelect,
257+
});
250258
}
251259
if (settings["appearance.locale"] === "zh" || settings["appearance.locale"] === "en") {
252260
if (
@@ -256,9 +264,6 @@ export function SettingsPage() {
256264
setLocaleState(settings["appearance.locale"]);
257265
}
258266
}
259-
setTerminalPreferences({
260-
copyOnSelect: resolveTerminalCopyOnSelectSetting(settings),
261-
});
262267
setProviderAdditionalArgsById(loadProviderAdditionalArgs(settings, providers));
263268
};
264269

0 commit comments

Comments
 (0)