Merge pull request #1090 from RooVetGit/fix_settings_done_button_with_unsaved_changes

mrubens · web-flow · commit d327c21828f0 · 2025-02-20T15:50:22.000-05:00
Fix settings done button with unsaved changes
diff --git a/.changeset/twenty-rice-own.md b/.changeset/twenty-rice-own.md
@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Fix settings done button with unsaved changes
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
@@ -173,7 +173,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone },
 				text: currentApiConfigName,
 				apiConfiguration,
 			})
-			// onDone()
 			setChangeDetected(false)
 		}
 	}
@@ -217,7 +216,11 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone },
 
 	const onConfirmDialogResult = useCallback((confirm: boolean) => {
 		if (confirm) {
-			confirmDialogHandler.current?.()
+			setChangeDetected(false)
+			// Wait for the change detection to be updated
+			setTimeout(() => {
+				confirmDialogHandler.current?.()
+			}, 100)
 		}
 	}, [])
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"roo-cline": patch
 +---
++
 +Fix settings done button with unsaved changes
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone },`
`173`	`173`	`text: currentApiConfigName,`
`174`	`174`	`apiConfiguration,`
`175`	`175`	`})`
`176`		`- // onDone()`
`177`	`176`	`setChangeDetected(false)`
`178`	`177`	`}`
`179`	`178`	`}`
`@@ -217,7 +216,11 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone },`
`217`	`216`
`218`	`217`	`const onConfirmDialogResult = useCallback((confirm: boolean) => {`
`219`	`218`	`if (confirm) {`
`220`		`- confirmDialogHandler.current?.()`
	`219`	`+ setChangeDetected(false)`
	`220`	`+ // Wait for the change detection to be updated`
	`221`	`+ setTimeout(() => {`
	`222`	`+ confirmDialogHandler.current?.()`
	`223`	`+ }, 100)`
`221`	`224`	`}`
`222`	`225`	`}, [])`
`223`	`226`