@jupyter-notebook/application-extension 7.0.0-alpha.1 → 7.0.0-alpha.4

package/lib/index.js

@@ -1,7 +1,7 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { ILabStatus, IRouter, ITreePathUpdater, JupyterFrontEnd, Router } from '@jupyterlab/application';
-import { sessionContextDialogs, ISessionContextDialogs, DOMUtils, ICommandPalette } from '@jupyterlab/apputils';
+import { sessionContextDialogs, ISessionContextDialogs, DOMUtils, ICommandPalette, IToolbarWidgetRegistry } from '@jupyterlab/apputils';
 import { ConsolePanel } from '@jupyterlab/console';
 import { PageConfig, PathExt, URLExt } from '@jupyterlab/coreutils';
 import { IDocumentManager, renameDialog } from '@jupyterlab/docmanager';
@@ -14,14 +14,6 @@ import { jupyterIcon } from '@jupyter-notebook/ui-components';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { DisposableDelegate, DisposableSet } from '@lumino/disposable';
 import { Widget } from '@lumino/widgets';
-/**
- * The default notebook factory.
- */
-const NOTEBOOK_FACTORY = 'Notebook';
-/**
- * The editor factory.
- */
-const EDITOR_FACTORY = 'Editor';
 /**
  * A regular expression to match path to notebooks and documents
  */
@@ -116,7 +108,7 @@ const opener = {
         const command = 'router:tree';
         commands.addCommand(command, {
             execute: (args) => {
-                var _a;
+                var _a, _b;
                 const parsed = args;
                 const matches = (_a = parsed.path.match(TREE_PATTERN)) !== null && _a !== void 0 ? _a : [];
                 const [, , path] = matches;
@@ -124,19 +116,12 @@ const opener = {
                     return;
                 }
                 const file = decodeURIComponent(path);
-                const ext = PathExt.extname(file);
+                const urlParams = new URLSearchParams(parsed.search);
+                const factory = (_b = urlParams.get('factory')) !== null && _b !== void 0 ? _b : 'default';
                 app.restored.then(async () => {
-                    // TODO: get factory from file type instead?
-                    if (ext === '.ipynb') {
-                        docManager.open(file, NOTEBOOK_FACTORY, undefined, {
-                            ref: '_noref'
-                        });
-                    }
-                    else {
-                        docManager.open(file, EDITOR_FACTORY, undefined, {
-                            ref: '_noref'
-                        });
-                    }
+                    docManager.open(file, factory, undefined, {
+                        ref: '_noref'
+                    });
                 });
             }
         });
@@ -173,6 +158,19 @@ const menus = {
         }
     }
 };
+/**
+ * A plugin to provide a spacer at rank 900 in the menu area
+ */
+const menuSpacer = {
+    id: '@jupyter-notebook/application-extension:menu-spacer',
+    autoStart: true,
+    activate: (app) => {
+        const menu = new Widget();
+        menu.id = DOMUtils.createDomID();
+        menu.addClass('jp-NotebookSpacer');
+        app.shell.add(menu, 'menu', { rank: 900 });
+    }
+};
 /**
  * Add commands to open the tree and running pages.
  */
@@ -180,8 +178,8 @@ const pages = {
     id: '@jupyter-notebook/application-extension:pages',
     autoStart: true,
     requires: [ITranslator],
-    optional: [ICommandPalette, IMainMenu],
-    activate: (app, translator, palette, menu) => {
+    optional: [ICommandPalette],
+    activate: (app, translator, palette) => {
         const trans = translator.load('notebook');
         const baseUrl = PageConfig.getBaseUrl();
         app.commands.addCommand(CommandIDs.openLab, {
@@ -201,9 +199,6 @@ const pages = {
                 palette.addItem({ command, category: 'View' });
             });
         }
-        if (menu) {
-            menu.viewMenu.addGroup([{ command: CommandIDs.openLab }, { command: CommandIDs.openTree }], 0);
-        }
     }
 };
 /**
@@ -266,25 +261,6 @@ const shell = {
     autoStart: true,
     provides: INotebookShell
 };
-/**
- * A plugin to provide a spacer at rank 900 for flex panels
- * TODO: reuse upstream @jupyterlab/application-extension:top-spacer plugin when fixed
- * in https://github.com/jupyterlab/jupyterlab/pull/11900
- */
-const spacer = {
-    id: '@jupyter-notebook/application-extension:spacer',
-    autoStart: true,
-    activate: (app) => {
-        const top = new Widget();
-        top.id = DOMUtils.createDomID();
-        top.addClass('jp-NotebookSpacer');
-        app.shell.add(top, 'top', { rank: 900 });
-        const menu = new Widget();
-        menu.id = DOMUtils.createDomID();
-        menu.addClass('jp-NotebookSpacer');
-        app.shell.add(menu, 'menu', { rank: 900 });
-    }
-};
 /**
  * The default JupyterLab application status provider.
  */
@@ -340,25 +316,30 @@ const title = {
     id: '@jupyter-notebook/application-extension:title',
     autoStart: true,
     requires: [INotebookShell, ITranslator],
-    optional: [IDocumentManager, IRouter],
-    activate: (app, shell, translator, docManager, router) => {
+    optional: [IDocumentManager, IRouter, IToolbarWidgetRegistry],
+    activate: (app, shell, translator, docManager, router, toolbarRegistry) => {
         const { commands } = app;
         const trans = translator.load('notebook');
-        const widget = new Widget();
-        widget.id = 'jp-title';
-        app.shell.add(widget, 'top', { rank: 10 });
+        const node = document.createElement('div');
+        if (toolbarRegistry) {
+            toolbarRegistry.addFactory('TopBar', 'widgetTitle', toolbar => {
+                const widget = new Widget({ node });
+                widget.id = 'jp-title';
+                return widget;
+            });
+        }
         const addTitle = async () => {
             const current = shell.currentWidget;
             if (!current || !(current instanceof DocumentWidget)) {
                 return;
             }
-            if (widget.node.children.length > 0) {
+            if (node.children.length > 0) {
                 return;
             }
             const h = document.createElement('h1');
             h.textContent = current.title.label.replace(STRIP_IPYNB, '');
-            widget.node.appendChild(h);
-            widget.node.style.marginLeft = '10px';
+            node.appendChild(h);
+            node.style.marginLeft = '10px';
             if (!docManager) {
                 return;
             }
@@ -399,7 +380,7 @@ const title = {
                     });
                 }
             });
-            widget.node.onclick = async () => {
+            node.onclick = async () => {
                 void commands.execute(CommandIDs.rename);
             };
         };
@@ -413,8 +394,8 @@ const title = {
 const topVisibility = {
     id: '@jupyter-notebook/application-extension:top',
     requires: [INotebookShell, ITranslator],
-    optional: [IMainMenu, ISettingRegistry],
-    activate: (app, notebookShell, translator, menu, settingRegistry) => {
+    optional: [ISettingRegistry, ICommandPalette],
+    activate: (app, notebookShell, translator, settingRegistry, palette) => {
         const trans = translator.load('notebook');
         const top = notebookShell.top;
         const pluginId = topVisibility.id;
@@ -428,9 +409,6 @@ const topVisibility = {
             },
             isToggled: () => top.isVisible
         });
-        if (menu) {
-            menu.viewMenu.addGroup([{ command: CommandIDs.toggleTop }], 2);
-        }
         let settingsOverride = false;
         if (settingRegistry) {
             const loadSettings = settingRegistry.load(pluginId);
@@ -452,6 +430,9 @@ const topVisibility = {
                 console.error(reason.message);
             });
         }
+        if (palette) {
+            palette.addItem({ command: CommandIDs.toggleTop, category: 'View' });
+        }
         const onChanged = () => {
             if (settingsOverride) {
                 return;
@@ -537,8 +518,8 @@ const zen = {
     id: '@jupyter-notebook/application-extension:zen',
     autoStart: true,
     requires: [ITranslator],
-    optional: [ICommandPalette, INotebookShell, IMainMenu],
-    activate: (app, translator, palette, notebookShell, menu) => {
+    optional: [ICommandPalette, INotebookShell],
+    activate: (app, translator, palette, notebookShell) => {
         const { commands } = app;
         const elem = document.documentElement;
         const trans = translator.load('notebook');
@@ -574,9 +555,6 @@ const zen = {
         if (palette) {
             palette.addItem({ command: CommandIDs.toggleZen, category: 'Mode' });
         }
-        if (menu) {
-            menu.viewMenu.addGroup([{ command: CommandIDs.toggleZen }], 3);
-        }
     }
 };
 /**
@@ -586,13 +564,13 @@ const plugins = [
     dirty,
     logo,
     menus,
+    menuSpacer,
     opener,
     pages,
     paths,
     router,
     sessionDialogs,
     shell,
-    spacer,
     status,
     tabTitle,
     title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application-extension",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.4",
   "description": "Jupyter Notebook - Application Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -39,27 +39,27 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-alpha.1",
-    "@jupyter-notebook/ui-components": "^7.0.0-alpha.1",
-    "@jupyterlab/application": "^4.0.0-alpha.5",
-    "@jupyterlab/apputils": "^4.0.0-alpha.5",
-    "@jupyterlab/celltags": "^4.0.0-alpha.5",
-    "@jupyterlab/codeeditor": "^4.0.0-alpha.5",
-    "@jupyterlab/codemirror": "^4.0.0-alpha.5",
-    "@jupyterlab/console": "^4.0.0-alpha.5",
-    "@jupyterlab/coreutils": "^6.0.0-alpha.5",
-    "@jupyterlab/docmanager": "^4.0.0-alpha.5",
-    "@jupyterlab/docregistry": "^4.0.0-alpha.5",
-    "@jupyterlab/mainmenu": "^4.0.0-alpha.5",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.5",
-    "@jupyterlab/translation": "^4.0.0-alpha.4",
+    "@jupyter-notebook/application": "^7.0.0-alpha.4",
+    "@jupyter-notebook/ui-components": "^7.0.0-alpha.4",
+    "@jupyterlab/application": "^4.0.0-alpha.10",
+    "@jupyterlab/apputils": "^4.0.0-alpha.10",
+    "@jupyterlab/celltags": "^4.0.0-alpha.10",
+    "@jupyterlab/codeeditor": "^4.0.0-alpha.10",
+    "@jupyterlab/codemirror": "^4.0.0-alpha.10",
+    "@jupyterlab/console": "^4.0.0-alpha.10",
+    "@jupyterlab/coreutils": "^6.0.0-alpha.10",
+    "@jupyterlab/docmanager": "^4.0.0-alpha.10",
+    "@jupyterlab/docregistry": "^4.0.0-alpha.10",
+    "@jupyterlab/mainmenu": "^4.0.0-alpha.10",
+    "@jupyterlab/settingregistry": "^4.0.0-alpha.10",
+    "@jupyterlab/translation": "^4.0.0-alpha.10",
     "@lumino/coreutils": "^1.12.0",
     "@lumino/disposable": "^1.10.1",
-    "@lumino/widgets": "^1.31.1"
+    "@lumino/widgets": "^1.32.0"
   },
   "devDependencies": {
     "rimraf": "~3.0.0",
-    "typescript": "~4.1.3"
+    "typescript": "~4.6.3"
   },
   "publishConfig": {
     "access": "public"

package/schema/menus.json

@@ -8,13 +8,56 @@
         "items": [
           {
             "command": "application:rename",
-            "rank": 4
+            "rank": 4.5
           },
           {
             "command": "notebook:trust",
             "rank": 20
           }
         ]
+      },
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "type": "submenu",
+            "disabled": true,
+            "submenu": {
+              "id": "jp-mainmenu-view-appearance"
+            }
+          }
+        ]
+      },
+      {
+        "id": "jp-mainmenu-run",
+        "items": [
+          {
+            "type": "separator",
+            "rank": 1000
+          },
+          {
+            "type": "submenu",
+            "rank": 1010,
+            "submenu": {
+              "id": "jp-runmenu-change-cell-type",
+              "label": "Cell Type",
+              "items": [
+                {
+                  "command": "notebook:change-cell-to-code",
+                  "rank": 0
+                },
+                {
+                  "command": "notebook:change-cell-to-markdown",
+                  "rank": 0
+                },
+                {
+                  "command": "notebook:change-cell-to-raw",
+                  "rank": 0
+                }
+              ]
+            }
+          }
+        ]
       }
     ]
   },

package/schema/pages.json

@@ -0,0 +1,24 @@
+{
+  "title": "Jupyter Notebook Pages",
+  "description": "Jupyter Notebook Pages",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:open-lab",
+            "rank": 2
+          },
+          {
+            "command": "application:open-tree",
+            "rank": 2
+          }
+        ]
+      }
+    ]
+  },
+  "properties": {},
+  "additionalProperties": false,
+  "type": "object"
+}

package/schema/title.json

@@ -0,0 +1,10 @@
+{
+  "title": "Title widget",
+  "description": "Title widget",
+  "jupyter.lab.toolbars": {
+    "TopBar": [{ "name": "widgetTitle", "rank": 10 }]
+  },
+  "properties": {},
+  "additionalProperties": false,
+  "type": "object"
+}

package/schema/top.json

@@ -3,6 +3,19 @@
   "jupyter.lab.setting-icon-label": "Jupyter Notebook Top Area",
   "title": "Jupyter Notebook Top Area",
   "description": "Jupyter Notebook Top Area settings",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:toggle-top",
+            "rank": 2
+          }
+        ]
+      }
+    ]
+  },
   "properties": {
     "visible": {
       "type": "boolean",

package/schema/zen.json

@@ -0,0 +1,20 @@
+{
+  "title": "Jupyter Notebook Zen Mode",
+  "description": "Jupyter Notebook Zen Mode",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "command": "application:toggle-zen",
+            "rank": 3
+          }
+        ]
+      }
+    ]
+  },
+  "properties": {},
+  "additionalProperties": false,
+  "type": "object"
+}

package/style/base.css

@@ -12,3 +12,7 @@
 .jp-MainAreaWidget {
   height: 100%;
 }
+
+.jp-Toolbar > .jp-Toolbar-item {
+  height: unset;
+}