From 1a266f7bd1228625c12b661e585c8d8d778bb820 Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Mon, 4 Dec 2023 15:34:50 +0100
Subject: [PATCH] Refactor resizing of branches list in sidebar

- remove dependency on userSettings.ts (we're working to remove it)
- use rem units over pixels
---
 packages/ui/src/lib/settings/userSettings.ts  |  2 --
 .../[projectId]/navigation/Branches.svelte    | 21 ++++++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/ui/src/lib/settings/userSettings.ts b/packages/ui/src/lib/settings/userSettings.ts
index e1df0532f..7fe836be4 100644
--- a/packages/ui/src/lib/settings/userSettings.ts
+++ b/packages/ui/src/lib/settings/userSettings.ts
@@ -10,7 +10,6 @@ export interface Settings {
 	peekTrayWidth: number;
 	theme?: string;
 	trayWidth: number;
-	vbranchExpandableHeight: number;
 	stashedBranchesHeight: number;
 	defaultLaneWidth: number;
 	defaultFileWidth: number;
@@ -27,7 +26,6 @@ const defaults: Settings = {
 	defaultLaneWidth: 460,
 	defaultFileWidth: 460,
 	defaultTreeHeight: 100,
-	vbranchExpandableHeight: 150,
 	stashedBranchesHeight: 150,
 	zoom: 1
 };
diff --git a/packages/ui/src/routes/[projectId]/navigation/Branches.svelte b/packages/ui/src/routes/[projectId]/navigation/Branches.svelte
index 1ab6f896f..5ce637c70 100644
--- a/packages/ui/src/routes/[projectId]/navigation/Branches.svelte
+++ b/packages/ui/src/routes/[projectId]/navigation/Branches.svelte
@@ -4,15 +4,13 @@
 	import type { UIEventHandler } from 'svelte/elements';
 	import BranchItem from './BranchItem.svelte';
 	import Resizer from '$lib/components/Resizer.svelte';
-	import { getContext, onDestroy, onMount } from 'svelte';
-	import { SETTINGS_CONTEXT, type SettingsStore } from '$lib/settings/userSettings';
+	import { onDestroy, onMount } from 'svelte';
 	import SectionHeader from './SectionHeader.svelte';
 	import { accordion } from './accordion';
 	import BranchFilter, { type TypeFilter } from './BranchFilter.svelte';
 	import { BehaviorSubject, combineLatest } from 'rxjs';
 	import type { CombinedBranch } from '$lib/branches/types';
-
-	const userSettings = getContext<SettingsStore>(SETTINGS_CONTEXT);
+	import { persisted } from '@square/svelte-store';
 
 	export let branchService: BranchService;
 	export let projectId: string;
@@ -21,6 +19,8 @@
 	export const textFilter$ = new BehaviorSubject<string | undefined>(undefined);
 	export const typeFilter$ = new BehaviorSubject<TypeFilter>('all');
 
+	const height = persisted<number | undefined>(undefined, 'branchesHeight_' + projectId);
+
 	$: branches$ = branchService.branches$;
 	$: filteredBranches$ = combineLatest(
 		[branches$, typeFilter$, textFilter$],
@@ -33,7 +33,7 @@
 	let contents: HTMLElement;
 
 	let observer: ResizeObserver;
-	let maxHeight: number | undefined = undefined;
+	let maxHeight: number;
 
 	let scrolled: boolean;
 	const onScroll: UIEventHandler<HTMLDivElement> = (e) => {
@@ -60,7 +60,7 @@
 
 	function updateResizable() {
 		if (resizeGuard) {
-			maxHeight = resizeGuard.offsetHeight;
+			maxHeight = resizeGuard.offsetHeight / 16;
 		}
 	}
 
@@ -77,8 +77,8 @@
 	<div
 		class="branch-list"
 		bind:this={rsViewport}
-		style:height={`${$userSettings.vbranchExpandableHeight}px`}
-		style:max-height={maxHeight ? `${maxHeight}px` : undefined}
+		style:height={expanded && $height ? `${$height}rem` : undefined}
+		style:max-height={maxHeight ? `${maxHeight}rem` : undefined}
 	>
 		{#if expanded}
 			<Resizer
@@ -87,10 +87,7 @@
 				inside
 				minHeight={90}
 				on:height={(e) => {
-					userSettings.update((s) => ({
-						...s,
-						vbranchExpandableHeight: maxHeight ? Math.min(maxHeight, e.detail) : e.detail
-					}));
+					$height = Math.min(maxHeight, e.detail / 16);
 				}}
 			/>
 		{/if}