gitbutlerapp · estib-vega · Oct 21, 2024 · Oct 21, 2024
diff --git a/apps/desktop/src/lib/commit/CommitCard.svelte b/apps/desktop/src/lib/commit/CommitCard.svelte
@@ -87,7 +87,7 @@
 
 	let isUndoable = commit instanceof DetailedCommit;
 
-	let commitMessageModal: Modal;
+	let commitMessageModal: ReturnType<typeof Modal> | undefined;
 	let commitMessageValid = false;
 	let description = '';
 
@@ -98,7 +98,7 @@
 
 		description = commit.description;
 
-		commitMessageModal.show();
+		commitMessageModal?.show();
 	}
 
 	function submitCommitMessageModal() {
@@ -108,7 +108,7 @@
 			branchController.updateCommitMessage(branch.id, commit.id, description);
 		}
 
-		commitMessageModal.close();
+		commitMessageModal?.close();
 	}
 
 	const commitShortSha = commit.id.substring(0, 7);

diff --git a/apps/desktop/src/lib/commit/StackingCommitCard.svelte b/apps/desktop/src/lib/commit/StackingCommitCard.svelte
@@ -97,7 +97,7 @@
 
 	let isUndoable = commit instanceof DetailedCommit && type !== 'remote';
 
-	let commitMessageModal: Modal;
+	let commitMessageModal: ReturnType<typeof Modal> | undefined;
 	let commitMessageValid = $state(false);
 	let description = $state('');
 
@@ -106,7 +106,7 @@
 
 		description = commit.description;
 
-		commitMessageModal.show();
+		commitMessageModal?.show();
 	}
 
 	function submitCommitMessageModal() {
@@ -116,7 +116,7 @@
 			branchController.updateCommitMessage(branch.id, commit.id, description);
 		}
 
-		commitMessageModal.close();
+		commitMessageModal?.close();
 	}
 
 	const commitShortSha = commit.id.substring(0, 7);

diff --git a/apps/desktop/src/lib/components/NotOnGitButlerBranch.svelte b/apps/desktop/src/lib/components/NotOnGitButlerBranch.svelte
@@ -22,13 +22,13 @@
 	const project = getContext(Project);
 
 	let isDeleting = false;
-	let deleteConfirmationModal: RemoveProjectButton;
+	let deleteConfirmationModal: ReturnType<typeof RemoveProjectButton> | undefined;
 
 	async function onDeleteClicked() {
 		if (project) {
 			isDeleting = true;
 			try {
-				deleteConfirmationModal.close();
+				deleteConfirmationModal?.close();
 				await projectsService.deleteProject(project.id);
 				toasts.success('Project deleted');
 				goto('/', { invalidateAll: true });

diff --git a/apps/desktop/src/lib/components/ProblemLoadingRepo.svelte b/apps/desktop/src/lib/components/ProblemLoadingRepo.svelte
@@ -18,12 +18,12 @@
 	const project = getContext(Project);
 
 	let loading = false;
-	let deleteConfirmationModal: RemoveProjectButton;
+	let deleteConfirmationModal: ReturnType<typeof RemoveProjectButton> | undefined;
 
 	async function onDeleteClicked() {
 		loading = true;
 		try {
-			deleteConfirmationModal.close();
+			deleteConfirmationModal?.close();
 			await projectsService.deleteProject(project.id);
 			toasts.success('Project deleted');
 			goto('/');

diff --git a/apps/desktop/src/lib/components/ShareIssueModal.svelte b/apps/desktop/src/lib/components/ShareIssueModal.svelte
@@ -27,7 +27,7 @@
 	const user = getContextStore(User);
 
 	export function show() {
-		modal.show();
+		modal?.show();
 	}
 
 	async function gitIndexLength() {
@@ -36,7 +36,7 @@
 		});
 	}
 
-	let modal: Modal;
+	let modal: ReturnType<typeof Modal> | undefined;
 
 	let messageInputValue = '';
 	let emailInputValue = '';
@@ -140,7 +140,7 @@
 
 	function close() {
 		reset();
-		modal.close();
+		modal?.close();
 	}
 
 	onMount(() => {

diff --git a/apps/desktop/src/lib/file/FileContextMenu.svelte b/apps/desktop/src/lib/file/FileContextMenu.svelte
@@ -30,7 +30,7 @@
 	const project = getContext(Project);
 	const userSettings = getContextStoreBySymbol<Settings, Writable<Settings>>(SETTINGS);
 
-	let confirmationModal: Modal;
+	let confirmationModal: ReturnType<typeof Modal> | undefined;
 	let contextMenu: ReturnType<typeof ContextMenu>;
 
 	function isDeleted(item: any): boolean {
@@ -66,7 +66,7 @@
 					<ContextMenuItem
 						label="Discard changes"
 						onclick={() => {
-							confirmationModal.show(item);
+							confirmationModal?.show(item);
 							contextMenu.close();
 						}}
 					/>

diff --git a/apps/desktop/src/lib/hunk/HunkContextMenu.svelte b/apps/desktop/src/lib/hunk/HunkContextMenu.svelte
@@ -21,14 +21,14 @@
 	const branchController = getContext(BranchController);
 	const userSettings = getContextStoreBySymbol<Settings, Writable<Settings>>(SETTINGS);
 
-	let contextMenu: ReturnType<typeof ContextMenu>;
+	let contextMenu: ReturnType<typeof ContextMenu> | undefined;
 
 	export function open(e: MouseEvent, item: any) {
-		contextMenu.open(e, item);
+		contextMenu?.open(e, item);
 	}
 
 	export function close() {
-		contextMenu.close();
+		contextMenu?.close();
 	}
 </script>
 
@@ -40,7 +40,7 @@
 					label="Discard"
 					onclick={() => {
 						branchController.unapplyHunk(item.hunk);
-						contextMenu.close();
+						contextMenu?.close();
 					}}
 				/>
 			{/if}
@@ -52,7 +52,7 @@
 							openExternalUrl(
 								`${$userSettings.defaultCodeEditor.schemeIdentifer}://file${projectPath}/${filePath}:${item.lineNumber}`
 							);
-						contextMenu.close();
+						contextMenu?.close();
 					}}
 				/>
 			{/if}

diff --git a/apps/desktop/src/lib/pr/CopyLinkContextMenu.svelte b/apps/desktop/src/lib/pr/CopyLinkContextMenu.svelte
@@ -6,10 +6,10 @@
 
 	const { target, url }: { target: HTMLElement | undefined; url: string } = $props();
 
-	let menu: ReturnType<typeof ContextMenu>;
+	let menu: ReturnType<typeof ContextMenu> | undefined;
 
 	export function openByMouse(e: MouseEvent) {
-		menu.open(e);
+		menu?.open(e);
 	}
 </script>
 
@@ -19,7 +19,7 @@
 			label="Copy to Clipbaord"
 			onclick={() => {
 				copyToClipboard(url);
-				menu.close();
+				menu?.close();
 			}}
 		/>
 	</ContextMenuSection>

diff --git a/apps/desktop/src/lib/pr/MergeButton.svelte b/apps/desktop/src/lib/pr/MergeButton.svelte
@@ -20,7 +20,7 @@
 	const dispatch = createEventDispatcher<{ click: { method: MergeMethod } }>();
 	const action = persistedAction(projectId);
 
-	let dropDown: DropDownButton;
+	let dropDown: ReturnType<typeof DropDownButton> | undefined;
 
 	const labels = {
 		[MergeMethod.Merge]: 'Merge pull request',
@@ -49,7 +49,7 @@
 					label={labels[method]}
 					onclick={() => {
 						$action = method;
-						dropDown.close();
+						dropDown?.close();
 					}}
 				/>
 			{/each}

diff --git a/apps/desktop/src/lib/settings/GithubIntegration.svelte b/apps/desktop/src/lib/settings/GithubIntegration.svelte
@@ -27,13 +27,13 @@
 	let loading = false;
 	let userCode = '';
 	let deviceCode = '';
-	let gitHubOauthModal: Modal;
+	let gitHubOauthModal: ReturnType<typeof Modal> | undefined;
 
 	function gitHubStartOauth() {
 		initDeviceOauth().then((verification) => {
 			userCode = verification.user_code;
 			deviceCode = verification.device_code;
-			gitHubOauthModal.show();
+			gitHubOauthModal?.show();
 		});
 	}
 
@@ -52,7 +52,7 @@
 			console.error(err);
 			toasts.error('GitHub authentication failed');
 		} finally {
-			gitHubOauthModal.close();
+			gitHubOauthModal?.close();
 			loading = false;
 		}
 	}

diff --git a/apps/desktop/src/routes/settings/profile/+page.svelte b/apps/desktop/src/routes/settings/profile/+page.svelte
@@ -26,7 +26,7 @@
 
 	$: userPicture = $user?.picture;
 
-	let deleteConfirmationModal: Modal;
+	let deleteConfirmationModal: ReturnType<typeof Modal> | undefined;
 
 	$: if ($user && !loaded) {
 		loaded = true;
@@ -84,7 +84,7 @@
 			console.error(err);
 			showError('Failed to delete project', err);
 		} finally {
-			deleteConfirmationModal.close();
+			deleteConfirmationModal?.close();
 			isDeleting = false;
 		}
 	}
@@ -145,7 +145,7 @@
 			Your code remains safe. it only clears the configuration.
 		</svelte:fragment>
 
-		<Button style="error" kind="soft" onclick={() => deleteConfirmationModal.show()}>
+		<Button style="error" kind="soft" onclick={() => deleteConfirmationModal?.show()}>
 			Remove projects…
 		</Button>