Merge pull request #963 from jtpio/optional-notebook-tracker

Make `INotebookTracker` optional
voila-dashboards · Sep 15, 2021 · 5bc146e · 5bc146e
2 parents aa79d9c + 85227d3
commit 5bc146e
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/packages/jupyterlab-preview/src/index.ts b/packages/jupyterlab-preview/src/index.ts
@@ -85,12 +85,17 @@ class VoilaRenderButton
 const extension: JupyterFrontEndPlugin<IVoilaPreviewTracker> = {
   id: '@voila-dashboards/jupyterlab-preview:plugin',
   autoStart: true,
-  requires: [INotebookTracker],
-  optional: [ICommandPalette, ILayoutRestorer, IMainMenu, ISettingRegistry],
+  optional: [
+    INotebookTracker,
+    ICommandPalette,
+    ILayoutRestorer,
+    IMainMenu,
+    ISettingRegistry
+  ],
   provides: IVoilaPreviewTracker,
   activate: (
     app: JupyterFrontEnd,
-    notebooks: INotebookTracker,
+    notebooks: INotebookTracker | null,
     palette: ICommandPalette | null,
     restorer: ILayoutRestorer | null,
     menu: IMainMenu | null,
@@ -114,7 +119,7 @@ const extension: JupyterFrontEndPlugin<IVoilaPreviewTracker> = {
     }
 
     function getCurrent(args: ReadonlyPartialJSONObject): NotebookPanel | null {
-      const widget = notebooks.currentWidget;
+      const widget = notebooks?.currentWidget ?? null;
       const activate = args['activate'] !== false;
 
       if (activate && widget) {
@@ -126,8 +131,8 @@ const extension: JupyterFrontEndPlugin<IVoilaPreviewTracker> = {
 
     function isEnabled(): boolean {
       return (
-        notebooks.currentWidget !== null &&
-        notebooks.currentWidget === app.shell.currentWidget
+        notebooks?.currentWidget !== null &&
+        notebooks?.currentWidget === app.shell.currentWidget
       );
     }