@jupyter-notebook/application 7.7.0-alpha.0 → 7.7.0-alpha.2

package/lib/app.d.ts

@@ -1,6 +1,7 @@
 import { JupyterLab, JupyterFrontEnd, JupyterFrontEndPlugin } from '@jupyterlab/application';
 import { LabStatus } from '@jupyterlab/application/lib/status';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
+import { ISignal } from '@lumino/signaling';
 import { INotebookShell } from './shell';
 /**
  * App is the main application class. It is instantiated once and shared.
@@ -35,7 +36,7 @@ export declare class NotebookApp extends JupyterFrontEnd<INotebookShell> {
     /**
      * The NotebookApp application information dictionary.
      */
-    get info(): JupyterLab.IInfo;
+    get info(): NotebookApp.IAppInfo;
     /**
      * The JupyterLab application paths dictionary.
      */
@@ -58,7 +59,12 @@ export declare class NotebookApp extends JupyterFrontEnd<INotebookShell> {
      * @param mods - The plugin modules to register.
      */
     registerPluginModules(mods: NotebookApp.IPluginModule[]): void;
+    /**
+     * Add the announced plugins to the available plugins.
+     */
+    private _onAvailablePluginsAdded;
     private _info;
+    private _availablePluginsChanged;
     private _formatter;
 }
 /**
@@ -69,6 +75,11 @@ export declare namespace NotebookApp {
      * The instantiation options for an App application.
      */
     interface IOptions extends JupyterFrontEnd.IOptions<INotebookShell>, Partial<IInfo> {
+        /**
+         * A signal announcing plugins discovered after startup, such as those of
+         * the disabled federated extensions; they are appended to `info`.
+         */
+        availablePluginsAdded?: ISignal<unknown, JupyterLab.IPluginInfo[]>;
     }
     /**
      * The information about a Jupyter Notebook application.
@@ -82,6 +93,22 @@ export declare namespace NotebookApp {
          * The information about available plugins.
          */
         readonly availablePlugins: JupyterLab.IPluginInfo[];
+        /**
+         * The collection of disabled extension patterns and matched extensions.
+         */
+        readonly disabled: {
+            patterns: string[];
+            matches: string[];
+        };
+    }
+    /**
+     * The application information, with its change signal.
+     */
+    interface IAppInfo extends JupyterLab.IInfo {
+        /**
+         * A signal emitted when `availablePlugins` changes.
+         */
+        readonly availablePluginsChanged: ISignal<JupyterLab.IInfo, void>;
     }
     /**
      * The interface for a module that exports a plugin or plugins as

package/lib/app.js

@@ -6,6 +6,7 @@ import { createRendermimePlugins } from '@jupyterlab/application/lib/mimerendere
 import { LabStatus } from '@jupyterlab/application/lib/status';
 import { PageConfig } from '@jupyterlab/coreutils';
 import { Throttler } from '@lumino/polling';
+import { Signal } from '@lumino/signaling';
 import { NotebookShell } from './shell';
 /**
  * App is the main application class. It is instantiated once and shared.
@@ -17,7 +18,7 @@ export class NotebookApp extends JupyterFrontEnd {
      * @param options The instantiation options for an application.
      */
     constructor(options = { shell: new NotebookShell() }) {
-        var _a, _b;
+        var _a, _b, _c;
         super({ ...options, shell: (_a = options.shell) !== null && _a !== void 0 ? _a : new NotebookShell() });
         /**
          * The name of the application.
@@ -35,7 +36,6 @@ export class NotebookApp extends JupyterFrontEnd {
          * The version of the application.
          */
         this.version = (_b = PageConfig.getOption('appVersion')) !== null && _b !== void 0 ? _b : 'unknown';
-        this._info = JupyterLab.defaultInfo;
         this._formatter = new Throttler(() => {
             Private.setFormat(this);
         }, 250);
@@ -53,8 +53,19 @@ export class NotebookApp extends JupyterFrontEnd {
             }
             return acc;
         }, {});
-        // Populate application info.
-        this._info = { ...JupyterLab.defaultInfo, ...info };
+        // Populate application info with own lists, as the plugins announced after
+        // startup are appended in place.
+        const appInfo = {
+            ...JupyterLab.defaultInfo,
+            availablePlugins: [],
+            disabled: { patterns: [], matches: [] },
+            ...info,
+        };
+        this._availablePluginsChanged = new Signal(appInfo);
+        this._info = Object.assign(appInfo, {
+            availablePluginsChanged: this._availablePluginsChanged,
+        });
+        (_c = options.availablePluginsAdded) === null || _c === void 0 ? void 0 : _c.connect(this._onAvailablePluginsAdded, this);
         this.restored = this.shell.restored;
         this.restored.then(() => this._formatter.invoke());
     }
@@ -139,6 +150,23 @@ export class NotebookApp extends JupyterFrontEnd {
             this.registerPluginModule(mod);
         });
     }
+    /**
+     * Add the announced plugins to the available plugins.
+     */
+    _onAvailablePluginsAdded(sender, plugins) {
+        if (plugins.length === 0) {
+            return;
+        }
+        const disabled = new Set(this._info.disabled.matches);
+        for (const plugin of plugins) {
+            this._info.availablePlugins.push(plugin);
+            if (!plugin.enabled && !disabled.has(plugin.id)) {
+                this._info.disabled.matches.push(plugin.id);
+                disabled.add(plugin.id);
+            }
+        }
+        this._availablePluginsChanged.emit();
+    }
 }
 /**
  * A namespace for module-private functionality.

package/lib/panelhandler.d.ts

@@ -189,7 +189,7 @@ type SidePanelPaletteOption = {
      * ### Notes
      * That command required 3 args :
      *      side: 'left' | 'right', the area to toggle
-     *      title: string, label of the command
+     *      title: string, title of the widget
      *      id: string, id of the widget to activate
      */
     command: string;

package/lib/panelhandler.js

@@ -285,7 +285,7 @@ export class SidePanelPalette {
             category: 'View',
             args: {
                 side: area,
-                title: `Show ${widget.title.caption}`,
+                title: widget.title.caption,
                 id: widget.id,
             },
         });

package/lib/shell.d.ts

@@ -168,6 +168,14 @@ export declare class NotebookShell extends Widget implements JupyterFrontEnd.ISh
      * Handle a change on the down panel widgets
      */
     private _onTabPanelChanged;
+    /**
+     * Show the down panel, restoring its previous relative size.
+     */
+    private _showDownPanel;
+    /**
+     * Hide the down panel, saving its relative size to restore it later.
+     */
+    private _hideDownPanel;
     private _topWrapper;
     private _topHandler;
     private _menuWrapper;
@@ -178,7 +186,9 @@ export declare class NotebookShell extends Widget implements JupyterFrontEnd.ISh
     private _spacer_bottom;
     private _skipLinkWidgetHandler;
     private _main;
+    private _vsplitPanel;
     private _downPanel;
+    private _lastDownAreaSize;
     private _translator;
     private _currentChanged;
     private _mainWidgetLoaded;

package/lib/shell.js

@@ -7,6 +7,10 @@ import { Signal } from '@lumino/signaling';
 import { BoxLayout, Panel, SplitPanel, Widget, } from '@lumino/widgets';
 import { PanelHandler, SidePanelHandler } from './panelhandler';
 import { TabPanelSvg } from '@jupyterlab/ui-components';
+/**
+ * The default relative size of the down area when it is expanded.
+ */
+const DEFAULT_DOWN_AREA_SIZE = 0.25;
 /**
  * The Jupyter Notebook application shell token.
  */
@@ -21,6 +25,7 @@ const DEFAULT_RANK = 900;
 export class NotebookShell extends Widget {
     constructor() {
         super();
+        this._lastDownAreaSize = DEFAULT_DOWN_AREA_SIZE;
         this._translator = nullTranslator;
         this._currentChanged = new Signal(this);
         this._mainWidgetLoaded = new PromiseDelegate();
@@ -73,6 +78,7 @@ export class NotebookShell extends Widget {
         middlePanel.addWidget(this._spacer_bottom);
         middlePanel.layout = middleLayout;
         const vsplitPanel = new SplitPanel();
+        this._vsplitPanel = vsplitPanel;
         vsplitPanel.id = 'jp-main-vsplit-panel';
         vsplitPanel.spacing = 1;
         vsplitPanel.orientation = 'vertical';
@@ -82,6 +88,7 @@ export class NotebookShell extends Widget {
         });
         this._downPanel = downPanel;
         this._downPanel.id = 'jp-down-stack';
+        SplitPanel.setStretch(downPanel, 0);
         // TODO: Consider storing this as an attribute this._hsplitPanel if saving/restoring layout needed
         const hsplitPanel = new SplitPanel();
         hsplitPanel.id = 'main-split-panel';
@@ -204,8 +211,14 @@ export class NotebookShell extends Widget {
                     this.expandRight(id);
                 }
                 else if (area === 'down') {
-                    this._downPanel.show();
-                    widget.activate();
+                    const tabIndex = this._downPanel.tabBar.titles.findIndex((title) => title.owner.id === id);
+                    if (tabIndex >= 0) {
+                        this._downPanel.currentIndex = tabIndex;
+                        if (this._downPanel.isHidden) {
+                            this._showDownPanel();
+                        }
+                        widget.activate();
+                    }
                 }
                 else {
                     widget.activate();
@@ -417,9 +430,31 @@ export class NotebookShell extends Widget {
      */
     _onTabPanelChanged() {
         if (this._downPanel.stackedPanel.widgets.length === 0) {
-            this._downPanel.hide();
+            this._hideDownPanel();
         }
     }
+    /**
+     * Show the down panel, restoring its previous relative size.
+     */
+    _showDownPanel(size = this._lastDownAreaSize) {
+        const downSize = size > 0.0 ? size : DEFAULT_DOWN_AREA_SIZE;
+        this._lastDownAreaSize = downSize;
+        this._vsplitPanel.setRelativeSizes([
+            Math.max(1.0 - downSize, 0.0),
+            downSize,
+        ]);
+        this._downPanel.show();
+    }
+    /**
+     * Hide the down panel, saving its relative size to restore it later.
+     */
+    _hideDownPanel() {
+        const size = this._vsplitPanel.relativeSizes()[1];
+        if (size > 0.0) {
+            this._lastDownAreaSize = size;
+        }
+        this._downPanel.hide();
+    }
 }
 export var Private;
 (function (Private) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application",
-  "version": "7.7.0-alpha.0",
+  "version": "7.7.0-alpha.2",
   "description": "Jupyter Notebook - Application",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -42,11 +42,11 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "~4.7.0-alpha.0",
-    "@jupyterlab/coreutils": "~6.7.0-alpha.0",
-    "@jupyterlab/docregistry": "~4.7.0-alpha.0",
-    "@jupyterlab/rendermime-interfaces": "~3.15.0-alpha.0",
-    "@jupyterlab/ui-components": "~4.7.0-alpha.0",
+    "@jupyterlab/application": "~4.7.0-alpha.2",
+    "@jupyterlab/coreutils": "~6.7.0-alpha.2",
+    "@jupyterlab/docregistry": "~4.7.0-alpha.2",
+    "@jupyterlab/rendermime-interfaces": "~3.15.0-alpha.2",
+    "@jupyterlab/ui-components": "~4.7.0-alpha.2",
     "@lumino/algorithm": "^2.0.4",
     "@lumino/coreutils": "^2.2.2",
     "@lumino/messaging": "^2.0.4",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "@babel/core": "^7.29.6",
     "@babel/preset-env": "^7.12.1",
-    "@jupyterlab/testutils": "~4.7.0-alpha.0",
+    "@jupyterlab/testutils": "~4.7.0-alpha.2",
     "@types/jest": "^29.2.5",
     "jest": "^29.3.1",
     "rimraf": "^3.0.2",