@jupyter-notebook/docmanager-extension 7.0.0-alpha.1 → 7.0.0-alpha.11

package/lib/index.js

@@ -1,31 +1,62 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 import { PageConfig, PathExt } from '@jupyterlab/coreutils';
-import { IDocumentManager } from '@jupyterlab/docmanager';
+import { IDocumentWidgetOpener } from '@jupyterlab/docmanager';
+import { Signal } from '@lumino/signaling';
 /**
- * A plugin to open document in a new browser tab.
+ * A plugin to open documents in a new browser tab.
  *
- * TODO: remove and use a custom doc manager?
  */
 const opener = {
     id: '@jupyter-notebook/docmanager-extension:opener',
-    requires: [IDocumentManager],
     autoStart: true,
-    activate: (app, docManager) => {
+    provides: IDocumentWidgetOpener,
+    activate: (app) => {
         const baseUrl = PageConfig.getBaseUrl();
-        // patch the `docManager.open` option to prevent the default behavior
-        const docOpen = docManager.open;
-        docManager.open = (path, widgetName = 'default', kernel, options) => {
-            const ref = options === null || options === void 0 ? void 0 : options.ref;
-            if (ref === '_noref') {
-                docOpen.call(docManager, path, widgetName, kernel, options);
-                return;
+        let id = 0;
+        return new (class {
+            constructor() {
+                this._opened = new Signal(this);
             }
-            const ext = PathExt.extname(path);
-            const route = ext === '.ipynb' ? 'notebooks' : 'edit';
-            window.open(`${baseUrl}${route}/${path}`);
-            return undefined;
-        };
+            open(widget, options) {
+                const widgetName = options === null || options === void 0 ? void 0 : options.type;
+                const ref = options === null || options === void 0 ? void 0 : options.ref;
+                if (ref !== '_noref') {
+                    const path = widget.context.path;
+                    const ext = PathExt.extname(path);
+                    let route = 'edit';
+                    if ((widgetName === 'default' && ext === '.ipynb') ||
+                        widgetName === 'Notebook') {
+                        route = 'notebooks';
+                    }
+                    let url = `${baseUrl}${route}/${path}`;
+                    // append ?factory only if it's not the default
+                    if (widgetName !== 'default') {
+                        url = `${url}?factory=${widgetName}`;
+                    }
+                    window.open(url);
+                    // dispose the widget since it is not used on this page
+                    widget.dispose();
+                    return;
+                }
+                // otherwise open the document on the current page
+                if (!widget.id) {
+                    widget.id = `document-manager-${++id}`;
+                }
+                widget.title.dataset = {
+                    type: 'document-title',
+                    ...widget.title.dataset
+                };
+                if (!widget.isAttached) {
+                    app.shell.add(widget, 'main', options || {});
+                }
+                app.shell.activateById(widget.id);
+                this._opened.emit(widget);
+            }
+            get opened() {
+                return this._opened;
+            }
+        })();
     }
 };
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/docmanager-extension",
-  "version": "7.0.0-alpha.1",
+  "version": "7.0.0-alpha.11",
   "description": "Jupyter Notebook - Document Manager Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -39,16 +39,17 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^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/services": "^7.0.0-alpha.5",
-    "@lumino/algorithm": "^1.9.1"
+    "@jupyterlab/application": "^4.0.0-alpha.17",
+    "@jupyterlab/coreutils": "^6.0.0-alpha.17",
+    "@jupyterlab/docmanager": "^4.0.0-alpha.17",
+    "@jupyterlab/docregistry": "^4.0.0-alpha.17",
+    "@jupyterlab/services": "^7.0.0-alpha.17",
+    "@lumino/algorithm": "^2.0.0-alpha.7",
+    "@lumino/signaling": "^2.0.0-alpha.7"
   },
   "devDependencies": {
-    "rimraf": "~3.0.0",
-    "typescript": "~4.1.3"
+    "rimraf": "^3.0.2",
+    "typescript": "~4.9.3"
   },
   "publishConfig": {
     "access": "public"