Ensures settings webview state is not stale

tmobile · Aug 27, 2024 · 980e0bf · 980e0bf
1 parent c2172ed
commit 980e0bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/webviews/apps/settings/settings.ts b/src/webviews/apps/settings/settings.ts
@@ -149,6 +149,8 @@ export class SettingsApp extends App<State> {
 				onIpc(DidChangeConfigurationNotificationType, msg, params => {
 					this.state.config = params.config;
 					this.state.customSettings = params.customSettings;
+					this.state.timestamp = Date.now();
+					this.setState(this.state);
 
 					this.updateState();
 				});

diff --git a/src/webviews/settings/settingsWebview.ts b/src/webviews/settings/settingsWebview.ts
@@ -54,6 +54,10 @@ export class SettingsWebviewProvider implements WebviewProvider<State> {
 		};
 	}
 
+	onReloaded(): void {
+		void this.notifyDidChangeConfiguration();
+	}
+
 	onShowing?(
 		loading: boolean,
 		_options: { column?: ViewColumn; preserveFocus?: boolean },

diff --git a/src/webviews/webviewController.ts b/src/webviews/webviewController.ts
@@ -375,6 +375,7 @@ export class WebviewController<
 				if (this._ready) {
 					this.sendPendingIpcNotifications();
 				} else if (this.provider.onReloaded != null) {
+					this.clearPendingIpcNotifications();
 					this.provider.onReloaded();
 				} else {
 					void this.refresh();