Merge pull request #5781 from gitbutlerapp/disallow-edit-exit-doublepress

Disallow edit exit doublepress

Author: Caleb-T-Owens

apps/desktop/src/lib/components/EditMode.svelte

@@ -187,6 +187,7 @@
 		modeServiceAborting = 'loading';
 
 		await modeService.abortEditAndReturnToWorkspace();
+		await modeService.awaitNotEditing();
 
 		modeServiceAborting = 'completed';
 	}
@@ -195,6 +196,7 @@
 		modeServiceSaving = 'loading';
 
 		await modeService.saveEditAndReturnToWorkspace();
+		await modeService.awaitNotEditing();
 
 		modeServiceSaving = 'completed';
 	}
@@ -219,6 +221,8 @@
 	}
 
 	let isCommitListScrolled = $state(false);
+
+	const loading = $derived(modeServiceSaving === 'loading' || modeServiceAborting === 'loading');
 </script>
 
 <div class="editmode__container">
@@ -302,9 +306,7 @@
 	</p>
 
 	<div class="editmode__actions">
-		<Button style="ghost" outline onclick={abort} disabled={modeServiceAborting === 'loading'}>
-			Cancel
-		</Button>
+		<Button style="ghost" outline onclick={abort} disabled={loading} {loading}>Cancel</Button>
 		{#if conflictedFiles.length > 0}
 			<Button
 				style="neutral"
@@ -323,7 +325,8 @@
 			kind="solid"
 			icon="tick-small"
 			onclick={handleSave}
-			disabled={modeServiceSaving === 'loading'}
+			disabled={loading}
+			{loading}
 		>
 			Save and exit
 		</Button>

apps/desktop/src/lib/modes/service.ts

@@ -73,6 +73,17 @@ export class ModeService {
 			return [plainToInstance(RemoteFile, entry[0]), entry[1] as ConflictEntryPresence | undefined];
 		}) as [RemoteFile, ConflictEntryPresence | undefined][];
 	}
+
+	async awaitNotEditing(): Promise<void> {
+		return await new Promise((resolve) => {
+			const unsubscribe = this.mode.subscribe((operatingMode) => {
+				if (operatingMode && operatingMode?.type !== 'Edit') {
+					resolve();
+					unsubscribe();
+				}
+			});
+		});
+	}
 }
 
 function subscribeToHead(projectId: string, callback: (headAndMode: HeadAndMode) => void) {

crates/gitbutler-tauri/src/modes.rs

@@ -9,6 +9,8 @@ use tauri::State;
 use tracing::instrument;
 
 use crate::error::Error;
+use crate::virtual_branches::commands::emit_vbranches;
+use crate::WindowState;
 
 #[tauri::command(async)]
 #[instrument(skip(projects), err(Debug))]
@@ -37,25 +39,33 @@ pub fn enter_edit_mode(
 }
 
 #[tauri::command(async)]
-#[instrument(skip(projects), err(Debug))]
+#[instrument(skip(windows, projects), err(Debug))]
 pub fn abort_edit_and_return_to_workspace(
+    windows: State<'_, WindowState>,
     projects: State<'_, Controller>,
     project_id: ProjectId,
 ) -> Result<(), Error> {
     let project = projects.get(project_id)?;
 
-    gitbutler_edit_mode::commands::abort_and_return_to_workspace(&project).map_err(Into::into)
+    gitbutler_edit_mode::commands::abort_and_return_to_workspace(&project)?;
+
+    emit_vbranches(&windows, project_id);
+    Ok(())
 }
 
 #[tauri::command(async)]
-#[instrument(skip(projects), err(Debug))]
+#[instrument(skip(windows, projects), err(Debug))]
 pub fn save_edit_and_return_to_workspace(
+    windows: State<'_, WindowState>,
     projects: State<'_, Controller>,
     project_id: ProjectId,
 ) -> Result<(), Error> {
     let project = projects.get(project_id)?;
 
-    gitbutler_edit_mode::commands::save_and_return_to_workspace(&project).map_err(Into::into)
+    gitbutler_edit_mode::commands::save_and_return_to_workspace(&project)?;
+
+    emit_vbranches(&windows, project_id);
+    Ok(())
 }
 
 #[tauri::command(async)]