@jupyter-notebook/application-extension 7.0.0-alpha.3 → 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';
@@ -316,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;
             }
@@ -375,7 +380,7 @@ const title = {
                     });
                 }
             });
-            widget.node.onclick = async () => {
+            node.onclick = async () => {
                 void commands.execute(CommandIDs.rename);
             };
         };
@@ -389,8 +394,8 @@ const title = {
 const topVisibility = {
     id: '@jupyter-notebook/application-extension:top',
     requires: [INotebookShell, ITranslator],
-    optional: [ISettingRegistry],
-    activate: (app, notebookShell, translator, settingRegistry) => {
+    optional: [ISettingRegistry, ICommandPalette],
+    activate: (app, notebookShell, translator, settingRegistry, palette) => {
         const trans = translator.load('notebook');
         const top = notebookShell.top;
         const pluginId = topVisibility.id;
@@ -425,6 +430,9 @@ const topVisibility = {
                 console.error(reason.message);
             });
         }
+        if (palette) {
+            palette.addItem({ command: CommandIDs.toggleTop, category: 'View' });
+        }
         const onChanged = () => {
             if (settingsOverride) {
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application-extension",
-  "version": "7.0.0-alpha.3",
+  "version": "7.0.0-alpha.4",
   "description": "Jupyter Notebook - Application Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -39,23 +39,23 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-alpha.3",
-    "@jupyter-notebook/ui-components": "^7.0.0-alpha.3",
-    "@jupyterlab/application": "^4.0.0-alpha.9",
-    "@jupyterlab/apputils": "^4.0.0-alpha.9",
-    "@jupyterlab/celltags": "^4.0.0-alpha.9",
-    "@jupyterlab/codeeditor": "^4.0.0-alpha.9",
-    "@jupyterlab/codemirror": "^4.0.0-alpha.9",
-    "@jupyterlab/console": "^4.0.0-alpha.9",
-    "@jupyterlab/coreutils": "^6.0.0-alpha.9",
-    "@jupyterlab/docmanager": "^4.0.0-alpha.9",
-    "@jupyterlab/docregistry": "^4.0.0-alpha.9",
-    "@jupyterlab/mainmenu": "^4.0.0-alpha.9",
-    "@jupyterlab/settingregistry": "^4.0.0-alpha.9",
-    "@jupyterlab/translation": "^4.0.0-alpha.9",
+    "@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",

package/schema/menus.json

@@ -16,6 +16,18 @@
           }
         ]
       },
+      {
+        "id": "jp-mainmenu-view",
+        "items": [
+          {
+            "type": "submenu",
+            "disabled": true,
+            "submenu": {
+              "id": "jp-mainmenu-view-appearance"
+            }
+          }
+        ]
+      },
       {
         "id": "jp-mainmenu-run",
         "items": [

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/style/base.css

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