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

package/lib/index.js

@@ -23,6 +23,10 @@ const TREE_PATTERN = new RegExp('/(notebooks|edit)/(.*)');
  * A regular expression to suppress the file extension from display for .ipynb files.
  */
 const STRIP_IPYNB = /\.ipynb$/;
+/**
+ * The JupyterLab document manager plugin id.
+ */
+const JUPYTERLAB_DOCMANAGER_PLUGIN_ID = '@jupyterlab/docmanager-extension:plugin';
 /**
  * The command IDs used by the application plugin.
  */
@@ -101,6 +105,7 @@ const logo = {
             height: '28px',
             width: 'auto',
             cursor: 'pointer',
+            margin: 'auto',
         });
         logo.id = 'jp-NotebookLogo';
         app.shell.add(logo, 'top', { rank: 0 });
@@ -113,22 +118,43 @@ const opener = {
     id: '@jupyter-notebook/application-extension:opener',
     autoStart: true,
     requires: [IRouter, IDocumentManager],
-    activate: (app, router, docManager) => {
-        const { commands } = app;
+    optional: [ISettingRegistry],
+    activate: (app, router, docManager, settingRegistry) => {
+        const { commands, docRegistry } = app;
         const command = 'router:tree';
         commands.addCommand(command, {
             execute: (args) => {
-                var _a, _b;
+                var _a;
                 const parsed = args;
                 const matches = (_a = parsed.path.match(TREE_PATTERN)) !== null && _a !== void 0 ? _a : [];
                 const [, , path] = matches;
                 if (!path) {
                     return;
                 }
-                const file = decodeURIComponent(path);
-                const urlParams = new URLSearchParams(parsed.search);
-                const factory = (_b = urlParams.get('factory')) !== null && _b !== void 0 ? _b : 'default';
                 app.started.then(async () => {
+                    var _a;
+                    const file = decodeURIComponent(path);
+                    const urlParams = new URLSearchParams(parsed.search);
+                    let defaultFactory = docRegistry.defaultWidgetFactory(path).name;
+                    // Explicitely get the default viewers from the settings because
+                    // JupyterLab might not have had the time to load the settings yet (race condition)
+                    // Relevant code: https://github.com/jupyterlab/jupyterlab/blob/d56ff811f39b3c10c6d8b6eb27a94624b753eb53/packages/docmanager-extension/src/index.tsx#L265-L293
+                    if (settingRegistry) {
+                        const settings = await settingRegistry.load(JUPYTERLAB_DOCMANAGER_PLUGIN_ID);
+                        const defaultViewers = settings.get('defaultViewers').composite;
+                        // get the file types for the path
+                        const types = docRegistry.getFileTypesForPath(path);
+                        // for each file type, check if there is a default viewer and if it
+                        // is available in the docRegistry. If it is the case, use it as the
+                        // default factory
+                        types.forEach((ft) => {
+                            if (defaultViewers[ft.name] !== undefined &&
+                                docRegistry.getWidgetFactory(defaultViewers[ft.name])) {
+                                defaultFactory = defaultViewers[ft.name];
+                            }
+                        });
+                    }
+                    const factory = (_a = urlParams.get('factory')) !== null && _a !== void 0 ? _a : defaultFactory;
                     docManager.open(file, factory, undefined, {
                         ref: '_noref',
                     });
@@ -293,14 +319,30 @@ const rendermime = {
  */
 const shell = {
     id: '@jupyter-notebook/application-extension:shell',
-    activate: (app) => {
+    autoStart: true,
+    provides: INotebookShell,
+    optional: [ISettingRegistry],
+    activate: (app, settingRegistry) => {
         if (!(app.shell instanceof NotebookShell)) {
             throw new Error(`${shell.id} did not find a NotebookShell instance.`);
         }
-        return app.shell;
+        const notebookShell = app.shell;
+        if (settingRegistry) {
+            settingRegistry
+                .load(shell.id)
+                .then((settings) => {
+                // Add a layer of customization to support app shell mode
+                const customLayout = settings.composite['layout'];
+                // Restore the layout.
+                void notebookShell.restoreLayout(customLayout);
+            })
+                .catch((reason) => {
+                console.error('Fail to load settings for the layout restorer.');
+                console.error(reason);
+            });
+        }
+        return notebookShell;
     },
-    autoStart: true,
-    provides: INotebookShell,
 };
 /**
  * The default splash screen provider.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application-extension",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-rc.1",
   "description": "Jupyter Notebook - Application Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,19 +38,19 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-beta.4",
-    "@jupyter-notebook/ui-components": "^7.0.0-beta.4",
-    "@jupyterlab/application": "^4.0.1",
-    "@jupyterlab/apputils": "^4.1.1",
-    "@jupyterlab/codeeditor": "^4.0.1",
-    "@jupyterlab/console": "^4.0.1",
-    "@jupyterlab/coreutils": "^6.0.1",
-    "@jupyterlab/docmanager": "^4.0.1",
-    "@jupyterlab/docregistry": "^4.0.1",
-    "@jupyterlab/mainmenu": "^4.0.1",
-    "@jupyterlab/rendermime": "^4.0.1",
-    "@jupyterlab/settingregistry": "^4.0.1",
-    "@jupyterlab/translation": "^4.0.1",
+    "@jupyter-notebook/application": "^7.0.0-rc.1",
+    "@jupyter-notebook/ui-components": "^7.0.0-rc.1",
+    "@jupyterlab/application": "^4.0.2",
+    "@jupyterlab/apputils": "^4.1.2",
+    "@jupyterlab/codeeditor": "^4.0.2",
+    "@jupyterlab/console": "^4.0.2",
+    "@jupyterlab/coreutils": "^6.0.2",
+    "@jupyterlab/docmanager": "^4.0.2",
+    "@jupyterlab/docregistry": "^4.0.2",
+    "@jupyterlab/mainmenu": "^4.0.2",
+    "@jupyterlab/rendermime": "^4.0.2",
+    "@jupyterlab/settingregistry": "^4.0.2",
+    "@jupyterlab/translation": "^4.0.2",
     "@lumino/coreutils": "^2.1.1",
     "@lumino/disposable": "^2.1.1",
     "@lumino/widgets": "^2.1.1"

package/schema/menus.json

@@ -14,6 +14,14 @@
             "command": "notebook:trust",
             "rank": 20
           },
+          {
+            "type": "separator",
+            "rank": 30
+          },
+          {
+            "command": "filemenu:close-and-cleanup",
+            "rank": 40
+          },
           {
             "command": "application:close",
             "disabled": true

package/schema/shell.json

@@ -0,0 +1,34 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema",
+  "title": "Notebook Shell",
+  "description": "Notebook Shell layout settings.",
+  "properties": {
+    "layout": {
+      "$ref": "#/definitions/layout",
+      "type": "object",
+      "title": "Customize shell widget positioning",
+      "description": "Overrides default widget position in the application layout",
+      "default": {
+        "Markdown Preview": { "area": "right" }
+      }
+    }
+  },
+  "additionalProperties": false,
+  "type": "object",
+  "definitions": {
+    "layout": {
+      "type": "object",
+      "properties": {
+        "[\\w-]+": {
+          "type": "object",
+          "properties": {
+            "area": {
+              "enum": ["left", "right"]
+            }
+          },
+          "additionalProperties": false
+        }
+      }
+    }
+  }
+}

package/style/base.css

@@ -33,3 +33,8 @@
 .jp-MainAreaWidget > .jp-Toolbar-micro {
   display: none;
 }
+
+#jp-NotebookLogo {
+  /* bring logo to the front so it is selectable by tab*/
+  z-index: 10;
+}