Skip to content

Commit 6d1d549

Browse files
authored
fix(diff): collapse files by default (pingdotgg#12190)
1 parent f17165a commit 6d1d549

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎apps/web/src/clientPersistenceStorage.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ describe("clientPersistenceStorage", () => {
114114
expect(settings).not.toHaveProperty("diffWordWrap");
115115
});
116116

117-
it("keeps the default diff file state across reloads and defaults it to expanded", async () => {
117+
it("keeps the default diff file state across reloads and defaults it to collapsed", async () => {
118118
const testWindow = getTestWindow();
119119
const { readBrowserClientSettings, writeBrowserClientSettings } =
120120
await import("./clientPersistenceStorage");
121121

122122
testWindow.localStorage.setItem("t3code:client-settings:v1", JSON.stringify({}));
123-
expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(false);
123+
expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(true);
124124

125125
writeBrowserClientSettings({ ...DEFAULT_CLIENT_SETTINGS, diffFilesCollapsed: true });
126126
expect(readBrowserClientSettings()?.diffFilesCollapsed).toBe(true);

‎packages/contracts/src/settings.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ describe("ClientSettings notifications", () => {
227227
});
228228

229229
describe("ClientSettings default diff file state", () => {
230-
it("keeps files expanded when existing settings omit the preference", () => {
231-
expect(decodeClientSettings({}).diffFilesCollapsed).toBe(false);
230+
it("keeps files collapsed when existing settings omit the preference", () => {
231+
expect(decodeClientSettings({}).diffFilesCollapsed).toBe(true);
232232
});
233233

234234
it.each([true, false])("preserves a saved collapsed preference of %s", (diffFilesCollapsed) => {

‎packages/contracts/src/settings.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ export const ClientSettingsSchema = Schema.Struct({
356356
dismissedProviderUpdateNotificationKeys: Schema.Array(TrimmedNonEmptyString).pipe(
357357
Schema.withDecodingDefault(Effect.succeed([])),
358358
),
359-
diffFilesCollapsed: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
359+
diffFilesCollapsed: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
360360
diffIgnoreWhitespace: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
361361
diffLayout: DiffLayout.pipe(Schema.withDecodingDefault(Effect.succeed(DEFAULT_DIFF_LAYOUT))),
362362
environmentIdentificationMode: EnvironmentIdentificationMode.pipe(

0 commit comments

Comments
 (0)