@jupyterlab/notebook 4.6.2 → 4.7.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/notebook",
-  "version": "4.6.2",
+  "version": "4.7.0-alpha.1",
   "description": "JupyterLab - Notebook",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -41,40 +41,41 @@
   },
   "dependencies": {
     "@jupyter/ydoc": "^4.0.0",
-    "@jupyterlab/apputils": "^4.7.2",
-    "@jupyterlab/cells": "^4.6.2",
-    "@jupyterlab/codeeditor": "^4.6.2",
-    "@jupyterlab/codemirror": "^4.6.2",
-    "@jupyterlab/coreutils": "^6.6.2",
-    "@jupyterlab/docregistry": "^4.6.2",
-    "@jupyterlab/documentsearch": "^4.6.2",
-    "@jupyterlab/lsp": "^4.6.2",
-    "@jupyterlab/markedparser-extension": "^4.6.2",
-    "@jupyterlab/nbformat": "^4.6.2",
-    "@jupyterlab/observables": "^5.6.2",
-    "@jupyterlab/rendermime": "^4.6.2",
-    "@jupyterlab/services": "^7.6.2",
-    "@jupyterlab/settingregistry": "^4.6.2",
-    "@jupyterlab/statusbar": "^4.6.2",
-    "@jupyterlab/toc": "^6.6.2",
-    "@jupyterlab/translation": "^4.6.2",
-    "@jupyterlab/ui-components": "^4.6.2",
-    "@lumino/algorithm": "^2.0.4",
-    "@lumino/commands": "^2.3.3",
-    "@lumino/coreutils": "^2.2.2",
-    "@lumino/disposable": "^2.1.5",
-    "@lumino/domutils": "^2.0.4",
-    "@lumino/dragdrop": "^2.1.8",
-    "@lumino/messaging": "^2.0.4",
-    "@lumino/polling": "^2.1.5",
-    "@lumino/properties": "^2.0.4",
-    "@lumino/signaling": "^2.1.5",
-    "@lumino/virtualdom": "^2.0.4",
-    "@lumino/widgets": "^2.8.0",
+    "@jupyterlab/apputils": "^4.8.0-alpha.1",
+    "@jupyterlab/cells": "^4.7.0-alpha.1",
+    "@jupyterlab/codeeditor": "^4.7.0-alpha.1",
+    "@jupyterlab/codemirror": "^4.7.0-alpha.1",
+    "@jupyterlab/coreutils": "^6.7.0-alpha.1",
+    "@jupyterlab/docregistry": "^4.7.0-alpha.1",
+    "@jupyterlab/documentsearch": "^4.7.0-alpha.1",
+    "@jupyterlab/lsp": "^4.7.0-alpha.1",
+    "@jupyterlab/markedparser-extension": "^4.7.0-alpha.1",
+    "@jupyterlab/nbformat": "^4.7.0-alpha.1",
+    "@jupyterlab/observables": "^5.7.0-alpha.1",
+    "@jupyterlab/outputarea": "^4.7.0-alpha.1",
+    "@jupyterlab/rendermime": "^4.7.0-alpha.1",
+    "@jupyterlab/services": "^7.7.0-alpha.1",
+    "@jupyterlab/settingregistry": "^4.7.0-alpha.1",
+    "@jupyterlab/statusbar": "^4.7.0-alpha.1",
+    "@jupyterlab/toc": "^6.7.0-alpha.1",
+    "@jupyterlab/translation": "^4.7.0-alpha.1",
+    "@jupyterlab/ui-components": "^4.7.0-alpha.1",
+    "@lumino/algorithm": "^2.0.5",
+    "@lumino/commands": "^2.3.4",
+    "@lumino/coreutils": "^2.2.3",
+    "@lumino/disposable": "^2.1.6",
+    "@lumino/domutils": "^2.0.5",
+    "@lumino/dragdrop": "^2.1.9",
+    "@lumino/messaging": "^2.0.5",
+    "@lumino/polling": "^2.1.6",
+    "@lumino/properties": "^2.0.5",
+    "@lumino/signaling": "^2.1.6",
+    "@lumino/virtualdom": "^2.0.5",
+    "@lumino/widgets": "^2.9.0",
     "react": "^18.2.0"
   },
   "devDependencies": {
-    "@jupyterlab/testing": "^4.6.2",
+    "@jupyterlab/testing": "^4.7.0-alpha.1",
     "@types/jest": "^29.2.0",
     "jest": "^29.2.0",
     "rimraf": "~5.0.5",

package/src/actions.tsx

@@ -1592,6 +1592,19 @@ export namespace NotebookActions {
       switch (mode) {
         case 'below':
           index = notebook.activeCellIndex + 1;
+          // If the active cell is a collapsed markdown heading with children,
+          // insert after all the children, not just after the heading.
+          {
+            const activeCell = notebook.activeCell;
+            if (
+              activeCell instanceof MarkdownCell &&
+              activeCell.headingCollapsed &&
+              activeCell.numberChildNodes > 0
+            ) {
+              index =
+                notebook.activeCellIndex + activeCell.numberChildNodes + 1;
+            }
+          }
           break;
         case 'belowSelected':
           notebook.widgets.forEach((child, childIndex) => {
@@ -1599,7 +1612,24 @@ export namespace NotebookActions {
               index = childIndex + 1;
             }
           });
-
+          // If the last selected cell is a collapsed markdown heading with children,
+          // insert after all the children, not just after the heading.
+          {
+            const lastSelectedIndex = index - 1;
+            if (
+              lastSelectedIndex >= 0 &&
+              lastSelectedIndex < notebook.widgets.length
+            ) {
+              const widget = notebook.widgets[lastSelectedIndex];
+              if (
+                widget instanceof MarkdownCell &&
+                widget.headingCollapsed &&
+                widget.numberChildNodes > 0
+              ) {
+                index = lastSelectedIndex + widget.numberChildNodes + 1;
+              }
+            }
+          }
           break;
         case 'above':
           index = notebook.activeCellIndex;
@@ -3071,8 +3101,30 @@ namespace Private {
    * @returns A list of 0 or more selected cells
    */
   export function selectedCells(notebook: Notebook): nbformat.ICell[] {
-    return notebook.widgets
-      .filter(cell => notebook.isSelectedOrActive(cell))
+    const cellsToInclude = new Set<Cell>();
+
+    // Collect all selected/active cells and expand collapsed sections
+    for (let i = 0; i < notebook.widgets.length; i++) {
+      const cell = notebook.widgets[i];
+      if (notebook.isSelectedOrActive(cell)) {
+        cellsToInclude.add(cell);
+
+        // If this is a collapsed markdown cell, add all its children
+        if (
+          cell instanceof MarkdownCell &&
+          cell.headingCollapsed &&
+          cell.numberChildNodes > 0
+        ) {
+          for (let j = i + 1; j <= i + cell.numberChildNodes; j++) {
+            if (notebook.widgets[j]) {
+              cellsToInclude.add(notebook.widgets[j]);
+            }
+          }
+        }
+      }
+    }
+
+    return Array.from(cellsToInclude)
       .map(cell => cell.model.toJSON())
       .map(cellJSON => {
         if ((cellJSON.metadata as JSONObject).deletable !== undefined) {
@@ -3279,19 +3331,40 @@ namespace Private {
     const model = notebook.model!;
     const sharedModel = model.sharedModel;
     const toDelete: number[] = [];
+    const cellsToDeleteSet = new Set<number>();
 
     notebook.mode = 'command';
 
-    // Find the cells to delete.
+    // Find the cells to delete, expanding collapsed sections.
     notebook.widgets.forEach((child, index) => {
       const deletable = child.model.getMetadata('deletable') !== false;
 
       if (notebook.isSelectedOrActive(child) && deletable) {
-        toDelete.push(index);
+        cellsToDeleteSet.add(index);
         notebook.model?.deletedCells.push(child.model.id);
+
+        // If this is a collapsed markdown cell, mark all its children for deletion
+        if (
+          child instanceof MarkdownCell &&
+          child.headingCollapsed &&
+          child.numberChildNodes > 0
+        ) {
+          for (let j = index + 1; j <= index + child.numberChildNodes; j++) {
+            if (notebook.widgets[j]) {
+              const childDeletable =
+                notebook.widgets[j].model.getMetadata('deletable') !== false;
+              if (childDeletable) {
+                cellsToDeleteSet.add(j);
+                notebook.model?.deletedCells.push(notebook.widgets[j].model.id);
+              }
+            }
+          }
+        }
       }
     });
 
+    toDelete.push(...Array.from(cellsToDeleteSet).sort((a, b) => a - b));
+
     // If cells are not deletable, we may not have anything to delete.
     if (toDelete.length > 0) {
       // Detach futures before the transaction so dispose() does not cancel them.

package/src/panel.ts

@@ -1,7 +1,5 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import type { ISessionContext } from '@jupyterlab/apputils';
 import { Dialog, Printing, showDialog } from '@jupyterlab/apputils';
 import { isMarkdownCellModel } from '@jupyterlab/cells';
@@ -191,7 +189,7 @@ export class NotebookPanel extends DocumentWidget<Notebook, INotebookModel> {
    * Handle a change in the kernel by updating the document metadata.
    */
   private _onKernelChanged(
-    sender: any,
+    sender: ISessionContext,
     args: Session.ISessionConnection.IKernelChangedArgs
   ): void {
     if (!this.model || !args.newValue) {

package/src/searchprovider.ts

@@ -1,7 +1,5 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { Dialog, showDialog } from '@jupyterlab/apputils';
 import type {
   CellSearchProvider,
@@ -66,7 +64,7 @@ export class NotebookSearchProvider extends SearchProvider<NotebookPanel> {
     this._filtersChanged.connect(this._setEnginesSelectionSearchMode, this);
   }
 
-  private _onNotebookStateChanged(_: Notebook, args: IChangedArgs<any>) {
+  private _onNotebookStateChanged(_: Notebook, args: IChangedArgs<unknown>) {
     if (args.name === 'mode') {
       // Delay the update to ensure that `document.activeElement` settled.
       window.setTimeout(() => {

package/src/widget.ts

@@ -15,6 +15,7 @@ import { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
 import type { IChangedArgs } from '@jupyterlab/coreutils';
 import type * as nbformat from '@jupyterlab/nbformat';
 import type { IObservableList } from '@jupyterlab/observables';
+import type { IPageHandler } from '@jupyterlab/outputarea';
 import type { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import type { IMapChange } from '@jupyter/ydoc';
 import { TableOfContentsUtils } from '@jupyterlab/toc';
@@ -245,6 +246,7 @@ export class StaticNotebook extends WindowedList<NotebookViewModel> {
     this.notebookConfig =
       options.notebookConfig || StaticNotebook.defaultNotebookConfig;
     this._updateNotebookConfig();
+    this._pageHandler = options.pageHandler;
     this._mimetypeService = options.mimeTypeService;
     this.renderingLayout = options.notebookConfig?.renderingLayout;
     this.kernelHistory = options.kernelHistory;
@@ -729,6 +731,7 @@ export class StaticNotebook extends WindowedList<NotebookViewModel> {
       maxNumberOutputs: this.notebookConfig.maxNumberOutputs,
       model,
       placeholder: this._notebookConfig.windowingMode !== 'none',
+      pageHandler: this._pageHandler,
       rendermime,
       translator: this.translator
     };
@@ -1222,6 +1225,7 @@ export class StaticNotebook extends WindowedList<NotebookViewModel> {
   private _renderingLayout: RenderingLayout | undefined;
   private _renderingLayoutChanged = new Signal<this, RenderingLayout>(this);
   private _contentVisibilityObserver: IntersectionObserver | null = null;
+  private _pageHandler: IPageHandler | undefined;
 }
 
 /**
@@ -1276,6 +1280,11 @@ export namespace StaticNotebook {
      * The renderer used by the underlying windowed list.
      */
     renderer?: WindowedList.IRenderer;
+
+    /**
+     * Optional handler for pager payloads (`source: page`).
+     */
+    pageHandler?: IPageHandler;
   }
 
   /**
@@ -1991,6 +2000,7 @@ export class Notebook extends StaticNotebook {
     }
 
     this._ensureFocus();
+
     if (newValue === oldValue) {
       return;
     }
@@ -2085,16 +2095,25 @@ export class Notebook extends StaticNotebook {
     if (newActiveCellIndex >= 0) {
       this.activeCellIndex = newActiveCellIndex;
     }
+
+    // Deselect all cells first to clear any stale selection state.
+    this.deselectAll();
     if (from > to) {
       isSelected.forEach((selected, idx) => {
         if (selected) {
-          this.select(this.widgets[to + idx]);
+          const widget = this.widgets[to + idx];
+          if (widget) {
+            this.select(widget);
+          }
         }
       });
     } else {
       isSelected.forEach((selected, idx) => {
         if (selected) {
-          this.select(this.widgets[to - n + 1 + idx]);
+          const widget = this.widgets[to - n + 1 + idx];
+          if (widget) {
+            this.select(widget);
+          }
         }
       });
     }
@@ -2112,6 +2131,7 @@ export class Notebook extends StaticNotebook {
       return;
     }
     Private.selectedProperty.set(widget, true);
+    this._selectCollapsedSection(widget);
     this._selectionChanged.emit(void 0);
     this.update();
   }
@@ -2127,6 +2147,19 @@ export class Notebook extends StaticNotebook {
     if (!Private.selectedProperty.get(widget)) {
       return;
     }
+    // Deselect all children if widget is a collapsed heading
+    if (
+      widget instanceof MarkdownCell &&
+      widget.headingCollapsed &&
+      widget.numberChildNodes > 0
+    ) {
+      const idx = this.widgets.indexOf(widget);
+      for (let i = idx + 1; i <= idx + widget.numberChildNodes; i++) {
+        if (this.widgets[i]) {
+          Private.selectedProperty.set(this.widgets[i], false);
+        }
+      }
+    }
     Private.selectedProperty.set(widget, false);
     this._selectionChanged.emit(void 0);
     this.update();
@@ -2162,11 +2195,8 @@ export class Notebook extends StaticNotebook {
     }
     if (changed) {
       this._selectionChanged.emit(void 0);
+      this.update();
     }
-    // Make sure we have a valid active cell.
-    // eslint-disable-next-line no-self-assign
-    this.activeCellIndex = this.activeCellIndex;
-    this.update();
   }
 
   /**
@@ -2264,6 +2294,25 @@ export class Notebook extends StaticNotebook {
     }
   }
 
+  /**
+   * Select all child cells of a collapsed heading, if applicable.
+   */
+  private _selectCollapsedSection(cell: Cell | null): void {
+    if (
+      cell instanceof MarkdownCell &&
+      cell.headingCollapsed &&
+      cell.numberChildNodes > 0
+    ) {
+      const idx = this.widgets.indexOf(cell);
+      for (let i = idx; i <= idx + cell.numberChildNodes; i++) {
+        if (this.widgets[i]) {
+          Private.selectedProperty.set(this.widgets[i], true);
+        }
+      }
+      this._selectionChanged.emit(void 0);
+    }
+  }
+
   /**
    * Get the head and anchor of a contiguous cell selection.
    *
@@ -2962,9 +3011,9 @@ export class Notebook extends StaticNotebook {
             (this.rendermime.sanitizer.allowNamedProperties ?? false)
               ? 'id'
               : 'data-jupyter-id';
-          const element = this.node.querySelector(
+          const element = this.node.querySelector<HTMLElement>(
             `h${heading.level}[${attribute}="${CSS.escape(id)}"]`
-          ) as HTMLElement;
+          )!;
 
           return {
             cell,

package/src/widgetfactory.ts

@@ -1,10 +1,9 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import type { IEditorMimeTypeService } from '@jupyterlab/codeeditor';
 import type { DocumentRegistry } from '@jupyterlab/docregistry';
 import { ABCWidgetFactory } from '@jupyterlab/docregistry';
+import type { IPageHandler } from '@jupyterlab/outputarea';
 import type { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import type { ITranslator } from '@jupyterlab/translation';
 import type { INotebookModel } from './model';
@@ -33,6 +32,7 @@ export class NotebookWidgetFactory extends ABCWidgetFactory<
       options.editorConfig || StaticNotebook.defaultEditorConfig;
     this._notebookConfig =
       options.notebookConfig || StaticNotebook.defaultNotebookConfig;
+    this._pageHandler = options.pageHandler;
   }
 
   /*
@@ -80,7 +80,7 @@ export class NotebookWidgetFactory extends ABCWidgetFactory<
     context: DocumentRegistry.IContext<INotebookModel>,
     source?: NotebookPanel
   ): NotebookPanel {
-    const translator = (context as any).translator;
+    const translator = this.translator;
     const kernelHistory = new NotebookHistory({
       sessionContext: context.sessionContext,
       translator: translator
@@ -95,6 +95,7 @@ export class NotebookWidgetFactory extends ABCWidgetFactory<
       notebookConfig: source
         ? source.content.notebookConfig
         : this._notebookConfig,
+      pageHandler: this._pageHandler,
       translator,
       kernelHistory
     };
@@ -105,6 +106,7 @@ export class NotebookWidgetFactory extends ABCWidgetFactory<
 
   private _editorConfig: StaticNotebook.IEditorConfig;
   private _notebookConfig: StaticNotebook.INotebookConfig;
+  private _pageHandler: IPageHandler | undefined;
 }
 
 /**
@@ -142,6 +144,11 @@ export namespace NotebookWidgetFactory {
      */
     notebookConfig?: StaticNotebook.INotebookConfig;
 
+    /**
+     * Optional handler for pager payloads (`source: page`).
+     */
+    pageHandler?: IPageHandler;
+
     /**
      * The application language translator.
      */

package/style/index.css

@@ -14,6 +14,7 @@
 @import url('~@jupyterlab/documentsearch/style/index.css');
 @import url('~@jupyterlab/codemirror/style/index.css');
 @import url('~@jupyterlab/docregistry/style/index.css');
+@import url('~@jupyterlab/outputarea/style/index.css');
 @import url('~@jupyterlab/toc/style/index.css');
 @import url('~@jupyterlab/cells/style/index.css');
 @import url('~@jupyterlab/lsp/style/index.css');

package/style/index.js

@@ -14,6 +14,7 @@ import '@jupyterlab/codeeditor/style/index.js';
 import '@jupyterlab/documentsearch/style/index.js';
 import '@jupyterlab/codemirror/style/index.js';
 import '@jupyterlab/docregistry/style/index.js';
+import '@jupyterlab/outputarea/style/index.js';
 import '@jupyterlab/toc/style/index.js';
 import '@jupyterlab/cells/style/index.js';
 import '@jupyterlab/lsp/style/index.js';