improve handling of initial currentWidget

jupyter-server · Jul 27, 2023 · 4837114 · 4837114
1 parent c591323
commit 4837114
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/packages/labextension/src/tracker.ts b/packages/labextension/src/tracker.ts
@@ -34,8 +34,15 @@ export class KernelWidgetTracker {
         });
       }
     }
-    this._currentWidget =
-      notebookTracker.currentWidget ?? consoleTracker?.currentWidget ?? null;
+    // handle an existing current widget in case the KernelWidgetTracker
+    // is created a bit later, or if there is already a Notebook widget available
+    // on page load like in Notebook 7.
+    if (labShell?.currentWidget && hasKernelSession(labShell?.currentWidget)) {
+      this._currentWidget = labShell.currentWidget;
+    } else {
+      this._currentWidget =
+        notebookTracker.currentWidget ?? consoleTracker?.currentWidget ?? null;
+    }
   }
 
   /**