fix: Prevent multiple webview panel instances

githru · Sep 27, 2023 · 2ac3c5f · 2ac3c5f
1 parent 33afc03
commit 2ac3c5f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/packages/vscode/src/extension.ts b/packages/vscode/src/extension.ts
@@ -26,12 +26,19 @@ function normalizeFsPath(fsPath: string) {
 export async function activate(context: vscode.ExtensionContext) {
   const { subscriptions, extensionPath, secrets } = context;
   const credentials = new Credentials();
+  let currentPanel: vscode.WebviewPanel | undefined = undefined;
+
   await credentials.initialize(context);
 
   console.log('Congratulations, your extension "githru" is now active!');
 
   const disposable = vscode.commands.registerCommand(COMMAND_LAUNCH, async () => {
     try {
+      console.debug(currentPanel);
+      if (currentPanel) {
+        currentPanel.reveal();
+        return;
+      }
       const gitPath = (await findGit()).path;
 
       const currentWorkspaceUri = vscode.workspace.workspaceFolders?.[0].uri;
@@ -79,6 +86,7 @@ export async function activate(context: vscode.ExtensionContext) {
         fetchBranches,
         fetchCurrentBranch,
       });
+      currentPanel = webLoader.getPanel();
 
       subscriptions.push(webLoader);
       vscode.window.showInformationMessage("Hello Githru");

diff --git a/packages/vscode/src/webview-loader.ts b/packages/vscode/src/webview-loader.ts
@@ -69,6 +69,10 @@ export default class WebviewLoader implements vscode.Disposable {
     this._panel?.dispose();
   }
 
+  getPanel() {
+    return this._panel;
+  }
+
   private async respondToMessage(message: { command: string; payload: unknown }) {
     this._panel?.webview.postMessage({
       command: message.command,