From 6d1d549441be84f19696ab59ed7e2fbf305280d4 Mon Sep 17 00:00:00 2001 From: maria Date: Thu, 17 Sep 2026 00:37:57 -0300 Subject: [PATCH] fix(diff): collapse files by default (#12190) --- apps/web/src/clientPersistenceStorage.test.ts | 4 ++-- packages/contracts/src/settings.test.ts | 4 ++-- packages/contracts/src/settings.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/web/src/clientPersistenceStorage.test.ts b/apps/web/src/clientPersistenceStorage.test.ts index 17e531918ab1fd6ee4e966802f339534161b9d03..5154fe47e035a8e63170924c28f2c72e23022f84 100644 --- a/apps/web/src/clientPersistenceStorage.test.ts +++ b/apps/web/src/clientPersistenceStorage.test.ts @@ -114,13 +114,13 @@ describe("clientPersistenceStorage", () => { expect(settings).not.toHaveProperty("diffWordWrap"); }); - it("keeps the default diff file state across reloads and defaults it to expanded", async () => { + it("keeps the default diff file state across reloads and defaults it to collapsed", async () => { const testWindow = getTestWindow(); const { readBrowserClientSettings, writeBrowserClientSettings } = await import("./clientPersistenceStorage"); testWindow.localStorage.setItem("t3code:client-settings:v1", JSON.stringify({})); - expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(false); + expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(true); writeBrowserClientSettings({ ...DEFAULT_CLIENT_SETTINGS, diffFilesCollapsed: true }); expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(true); diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.ts index 2f8a6b63b1f039893e7ebe9d4fe9569c8a772578..2c873bbffe64f7ce4564c97476a6990f000b8419 100644 --- a/packages/contracts/src/settings.test.ts +++ b/packages/contracts/src/settings.test.ts @@ -227,8 +227,8 @@ describe("ClientSettings notifications", () => { }); describe("ClientSettings default diff file state", () => { - it("keeps files expanded when existing settings omit the preference", () => { - expect(decodeClientSettings({}).diffFilesCollapsed).toBe(false); + it("keeps files collapsed when existing settings omit the preference", () => { + expect(decodeClientSettings({}).diffFilesCollapsed).toBe(true); }); it.each([true, false])("preserves a saved collapsed preference of %s", (diffFilesCollapsed) => { diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts index 9e836309bdc42fe2b34691661787dec2132451bb..18b2d4be28fe37f29e01602b8ed4b46ea47562c4 100644 --- a/packages/contracts/src/settings.ts +++ b/packages/contracts/src/settings.ts @@ -356,7 +356,7 @@ export const ClientSettingsSchema = Schema.Struct({ dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe( Schema.withDecodingDefault(Effect.succeed([])), ), - diffFilesCollapsed: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))), + diffFilesCollapsed: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), diffIgnoreWhitespace: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))), diffLayout: DiffLayout.pipe(Schema.withDecodingDefault(Effect.succeed(DEFAULT_DIFF_LAYOUT))), environmentIdentificationMode: EnvironmentIdentificationMode.pipe( -- 2.54.0