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

package/lib/index.js

@@ -3,9 +3,10 @@
 import { DOMUtils, IToolbarWidgetRegistry, } from '@jupyterlab/apputils';
 import { Text, Time } from '@jupyterlab/coreutils';
 import { IDocumentManager } from '@jupyterlab/docmanager';
+import { IMainMenu } from '@jupyterlab/mainmenu';
 import { NotebookPanel, INotebookTracker, INotebookTools, } from '@jupyterlab/notebook';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
-import { ITranslator } from '@jupyterlab/translation';
+import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { INotebookShell } from '@jupyter-notebook/application';
 import { Poll } from '@lumino/polling';
 import { Widget } from '@lumino/widgets';
@@ -79,6 +80,34 @@ const checkpoints = {
         });
     },
 };
+/**
+ * Add a command to close the browser tab when clicking on "Close and Shut Down"
+ */
+const closeTab = {
+    id: '@jupyter-notebook/notebook-extension:close-tab',
+    autoStart: true,
+    requires: [IMainMenu],
+    optional: [ITranslator],
+    activate: (app, menu, translator) => {
+        const { commands } = app;
+        translator = translator !== null && translator !== void 0 ? translator : nullTranslator;
+        const trans = translator.load('notebook');
+        const id = 'notebook:close-and-halt';
+        commands.addCommand(id, {
+            label: trans.__('Close and Shut Down Notebook'),
+            execute: async () => {
+                await commands.execute('notebook:close-and-shutdown');
+                window.close();
+            },
+        });
+        menu.fileMenu.closeAndCleaners.add({
+            id,
+            // use a small rank to it takes precedence over the default
+            // shut down action for the notebook
+            rank: 0,
+        });
+    },
+};
 /**
  * The kernel logo plugin.
  */
@@ -274,7 +303,7 @@ const notebookToolsWidget = {
             }
             // Add the notebook tools in right area.
             if (notebookTools) {
-                shell.add(notebookTools, 'right');
+                shell.add(notebookTools, 'right', { type: 'Property Inspector' });
             }
         };
         shell.currentChanged.connect(onChange);
@@ -296,7 +325,9 @@ const trusted = {
             const notebook = current.content;
             await current.context.ready;
             const widget = TrustedComponent.create({ notebook, translator });
-            notebookShell.add(widget, 'menu', { rank: 11000 });
+            notebookShell.add(widget, 'menu', {
+                rank: 11000,
+            });
         };
         notebookShell.currentChanged.connect(onChange);
     },
@@ -306,6 +337,7 @@ const trusted = {
  */
 const plugins = [
     checkpoints,
+    closeTab,
     kernelLogo,
     kernelStatus,
     scrollOutput,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/notebook-extension",
-  "version": "7.0.0-beta.4",
+  "version": "7.0.0-rc.1",
   "description": "Jupyter Notebook - Notebook Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,14 +38,14 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.0.0-beta.4",
-    "@jupyterlab/application": "^4.0.1",
-    "@jupyterlab/apputils": "^4.1.1",
-    "@jupyterlab/cells": "^4.0.1",
-    "@jupyterlab/docmanager": "^4.0.1",
-    "@jupyterlab/notebook": "^4.0.1",
-    "@jupyterlab/settingregistry": "^4.0.1",
-    "@jupyterlab/translation": "^4.0.1",
+    "@jupyter-notebook/application": "^7.0.0-rc.1",
+    "@jupyterlab/application": "^4.0.2",
+    "@jupyterlab/apputils": "^4.1.2",
+    "@jupyterlab/cells": "^4.0.2",
+    "@jupyterlab/docmanager": "^4.0.2",
+    "@jupyterlab/notebook": "^4.0.2",
+    "@jupyterlab/settingregistry": "^4.0.2",
+    "@jupyterlab/translation": "^4.0.2",
     "@lumino/polling": "^2.1.1",
     "@lumino/widgets": "^2.1.1"
   },