@jupyterlab/notebook-extension 4.6.1 → 4.6.3

package/lib/tool-widgets/activeCellToolWidget.d.ts

@@ -22,14 +22,52 @@ declare namespace Private {
  *
  * ## Note
  * This field does not work as other metadata form fields, as it does not update metadata.
+ *
+ * A single instance is meant to be shared by every render of the field. The
+ * displayed cell follows the notebook tracker rather than the render calls, so
+ * that the field keeps working when the metadata form is not being rebuilt, and
+ * so that it does not hold on to a cell model of a closed notebook.
+ *
+ * One instance owns one node, so the field can only be mounted in one place at
+ * a time: `render` moves the node to the most recent mount point and leaves any
+ * earlier one empty. Nothing renders this field twice today.
  */
 export declare class ActiveCellTool extends NotebookTools.Tool {
     constructor(options: Private.IOptions);
+    dispose(): void;
     render(props: FieldProps): JSX.Element;
-    private refresh;
+    /**
+     * Follow the active cell of the tracker, which is null once the last
+     * notebook is closed.
+     */
+    private _onActiveCellChanged;
+    /**
+     * Handle a change to the current cell source, mime type or execution count.
+     */
+    private _onCellContentChanged;
+    /**
+     * Stop listening to the cell model the tool is currently displaying.
+     */
+    private _disconnectCellModel;
+    /**
+     * Reflect the execution count of the current cell.
+     */
+    private _updatePrompt;
+    /**
+     * Refresh the preview, writing an outdated prompt along with it.
+     *
+     * The prompt is written in the same task as the preview it belongs with, so
+     * that the field never shows the prompt of one cell above the source line of
+     * another while a language mode is being loaded.
+     */
+    private _update;
     private _tracker;
+    private _languages;
     private _cellModel;
-    private _refreshDebouncer;
+    private _previewDebouncer;
+    private _updateId;
+    private _pendingUpdate;
+    private _promptOutdated;
     private _editorEl;
     private _inputPrompt;
 }

package/lib/tool-widgets/activeCellToolWidget.js

@@ -5,7 +5,7 @@
 import React from 'react';
 import { NotebookTools } from '@jupyterlab/notebook';
 import { PanelLayout, Widget } from '@lumino/widgets';
-import { InputPrompt } from '@jupyterlab/cells';
+import { InputPrompt, isCodeCellModel } from '@jupyterlab/cells';
 import { Debouncer } from '@lumino/polling';
 /**
  * The class name added to the ActiveCellTool.
@@ -24,12 +24,25 @@ const ACTIVE_CELL_TOOL_CELL_CONTENT_CLASS = 'jp-ActiveCellTool-CellContent';
  *
  * ## Note
  * This field does not work as other metadata form fields, as it does not update metadata.
+ *
+ * A single instance is meant to be shared by every render of the field. The
+ * displayed cell follows the notebook tracker rather than the render calls, so
+ * that the field keeps working when the metadata form is not being rebuilt, and
+ * so that it does not hold on to a cell model of a closed notebook.
+ *
+ * One instance owns one node, so the field can only be mounted in one place at
+ * a time: `render` moves the node to the most recent mount point and leaves any
+ * earlier one empty. Nothing renders this field twice today.
  */
 export class ActiveCellTool extends NotebookTools.Tool {
     constructor(options) {
         super();
-        const { languages } = options;
+        this._cellModel = null;
+        this._updateId = 0;
+        this._pendingUpdate = false;
+        this._promptOutdated = false;
         this._tracker = options.tracker;
+        this._languages = options.languages;
         this.addClass(ACTIVE_CELL_TOOL_CLASS);
         this.layout = new PanelLayout();
         this._inputPrompt = new InputPrompt();
@@ -42,37 +55,155 @@ export class ActiveCellTool extends NotebookTools.Tool {
         container.className = ACTIVE_CELL_TOOL_CELL_CONTENT_CLASS;
         this._editorEl = editor;
         this.layout.addWidget(new Widget({ node }));
-        const update = async () => {
-            var _a, _b;
-            this._editorEl.innerHTML = '';
-            if (((_a = this._cellModel) === null || _a === void 0 ? void 0 : _a.type) === 'code') {
-                this._inputPrompt.executionCount = `${(_b = this._cellModel.executionCount) !== null && _b !== void 0 ? _b : ''}`;
-                this._inputPrompt.show();
-            }
-            else {
-                this._inputPrompt.executionCount = null;
-                this._inputPrompt.hide();
-            }
-            if (this._cellModel) {
-                await languages.highlight(this._cellModel.sharedModel.getSource().split('\n')[0], languages.findByMIME(this._cellModel.mimeType), this._editorEl);
-            }
-        };
-        this._refreshDebouncer = new Debouncer(update, 150);
+        // Only edits to the current cell are rate-limited; switching cells updates
+        // the display immediately, see `_onActiveCellChanged`.
+        this._previewDebouncer = new Debouncer(() => this._update(), 150);
+        this._tracker.activeCellChanged.connect(this._onActiveCellChanged, this);
+        // `activeCellChanged` is not emitted when the last notebook is closed:
+        // NotebookTracker.onCurrentChanged returns early on a null widget. Without
+        // this second connection the field would keep the cell model of a closed
+        // notebook, and its shared model, alive for the rest of the session.
+        this._tracker.currentChanged.connect(this._onActiveCellChanged, this);
+        this._onActiveCellChanged();
+    }
+    dispose() {
+        if (this.isDisposed) {
+            return;
+        }
+        this._tracker.activeCellChanged.disconnect(this._onActiveCellChanged, this);
+        this._tracker.currentChanged.disconnect(this._onActiveCellChanged, this);
+        this._disconnectCellModel();
+        this._previewDebouncer.dispose();
+        super.dispose();
     }
     render(props) {
+        // The content is driven by the tracker; React only supplies the mount
+        // point, which is a different element on every rebuild of the form.
+        return (React.createElement("div", { ref: ref => {
+                if (!ref || this.node.parentElement === ref) {
+                    return;
+                }
+                ref.appendChild(this.node);
+                if (this._pendingUpdate) {
+                    this._update().catch(console.warn);
+                }
+            } }));
+    }
+    /**
+     * Follow the active cell of the tracker, which is null once the last
+     * notebook is closed.
+     */
+    _onActiveCellChanged() {
         var _a, _b;
-        const activeCell = this._tracker.activeCell;
-        if (activeCell)
-            this._cellModel = (activeCell === null || activeCell === void 0 ? void 0 : activeCell.model) || null;
-        ((_a = this._cellModel) === null || _a === void 0 ? void 0 : _a.sharedModel).changed.connect(this.refresh, this);
-        (_b = this._cellModel) === null || _b === void 0 ? void 0 : _b.mimeTypeChanged.connect(this.refresh, this);
-        this.refresh()
-            .then(() => undefined)
-            .catch(console.warn);
-        return React.createElement("div", { ref: ref => ref === null || ref === void 0 ? void 0 : ref.appendChild(this.node) });
+        const cellModel = (_b = (_a = this._tracker.activeCell) === null || _a === void 0 ? void 0 : _a.model) !== null && _b !== void 0 ? _b : null;
+        if (cellModel === this._cellModel) {
+            return;
+        }
+        this._disconnectCellModel();
+        this._cellModel = cellModel;
+        if (cellModel) {
+            cellModel.sharedModel.changed.connect(this._onCellContentChanged, this);
+            cellModel.mimeTypeChanged.connect(this._onCellContentChanged, this);
+        }
+        // The prompt now belongs to a cell whose source line is not on screen yet,
+        // so leave it to `_update` to write both together.
+        this._promptOutdated = true;
+        this._update().catch(console.warn);
+    }
+    /**
+     * Handle a change to the current cell source, mime type or execution count.
+     */
+    _onCellContentChanged() {
+        if (!this.node.isConnected) {
+            this._pendingUpdate = true;
+            this._promptOutdated = true;
+            return;
+        }
+        if (!this._promptOutdated) {
+            // The cell is unchanged and no switch is in flight, so writing the prompt
+            // now cannot pair it with the source line of a different cell.
+            this._updatePrompt();
+        }
+        this._previewDebouncer.invoke().catch(console.warn);
+    }
+    /**
+     * Stop listening to the cell model the tool is currently displaying.
+     */
+    _disconnectCellModel() {
+        const cellModel = this._cellModel;
+        if (!cellModel) {
+            return;
+        }
+        cellModel.sharedModel.changed.disconnect(this._onCellContentChanged, this);
+        cellModel.mimeTypeChanged.disconnect(this._onCellContentChanged, this);
+        this._cellModel = null;
+    }
+    /**
+     * Reflect the execution count of the current cell.
+     */
+    _updatePrompt() {
+        var _a;
+        const cellModel = this._cellModel;
+        if (cellModel && isCodeCellModel(cellModel)) {
+            this._inputPrompt.executionCount = `${(_a = cellModel.executionCount) !== null && _a !== void 0 ? _a : ''}`;
+            this._inputPrompt.show();
+        }
+        else {
+            this._inputPrompt.executionCount = null;
+            this._inputPrompt.hide();
+        }
     }
-    async refresh() {
-        await this._refreshDebouncer.invoke();
+    /**
+     * Refresh the preview, writing an outdated prompt along with it.
+     *
+     * The prompt is written in the same task as the preview it belongs with, so
+     * that the field never shows the prompt of one cell above the source line of
+     * another while a language mode is being loaded.
+     */
+    async _update() {
+        if (!this.node.isConnected) {
+            // Nothing is on screen; catch up when the field is mounted again.
+            this._pendingUpdate = true;
+            return;
+        }
+        this._pendingUpdate = false;
+        const cellModel = this._cellModel;
+        const pending = ++this._updateId;
+        if (!cellModel) {
+            this._promptOutdated = false;
+            this._updatePrompt();
+            this._editorEl.replaceChildren();
+            return;
+        }
+        const source = cellModel.sharedModel.getSource();
+        const lineEnd = source.indexOf('\n');
+        const firstLine = lineEnd === -1 ? source : source.slice(0, lineEnd);
+        // Highlight into a detached node, so that the preview is never cleared
+        // while waiting for a language mode to load.
+        const staging = document.createElement('pre');
+        try {
+            await this._languages.highlight(firstLine, this._languages.findByMIME(cellModel.mimeType), staging);
+        }
+        catch (error) {
+            // Fall back to unhighlighted source rather than keeping the previous
+            // cell's line on screen.
+            console.warn(error);
+            staging.replaceChildren(document.createTextNode(firstLine));
+        }
+        if (pending !== this._updateId) {
+            // A newer update started while this one was highlighting; it still owes
+            // the prompt write, so `_promptOutdated` is deliberately left set.
+            return;
+        }
+        if (this._promptOutdated) {
+            this._updatePrompt();
+            this._promptOutdated = false;
+        }
+        const fragment = document.createDocumentFragment();
+        while (staging.firstChild) {
+            fragment.appendChild(staging.firstChild);
+        }
+        this._editorEl.replaceChildren(fragment);
     }
 }
 //# sourceMappingURL=activeCellToolWidget.js.map

package/lib/tool-widgets/activeCellToolWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"activeCellToolWidget.js","sourceRoot":"","sources":["../../src/tool-widgets/activeCellToolWidget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"activeCellToolWidget.js","sourceRoot":"","sources":["../../src/tool-widgets/activeCellToolWidget.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/notebook-extension",
-  "version": "4.6.1",
+  "version": "4.6.3",
   "description": "JupyterLab - Notebook Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -37,36 +37,36 @@
   },
   "dependencies": {
     "@jupyter/ydoc": "^4.0.0",
-    "@jupyterlab/application": "^4.6.1",
-    "@jupyterlab/apputils": "^4.7.1",
-    "@jupyterlab/cell-toolbar": "^4.6.1",
-    "@jupyterlab/cells": "^4.6.1",
-    "@jupyterlab/codeeditor": "^4.6.1",
-    "@jupyterlab/codemirror": "^4.6.1",
-    "@jupyterlab/completer": "^4.6.1",
-    "@jupyterlab/coreutils": "^6.6.1",
-    "@jupyterlab/docmanager": "^4.6.1",
-    "@jupyterlab/docmanager-extension": "^4.6.1",
-    "@jupyterlab/docregistry": "^4.6.1",
-    "@jupyterlab/documentsearch": "^4.6.1",
-    "@jupyterlab/filebrowser": "^4.6.1",
-    "@jupyterlab/launcher": "^4.6.1",
-    "@jupyterlab/logconsole": "^4.6.1",
-    "@jupyterlab/lsp": "^4.6.1",
-    "@jupyterlab/mainmenu": "^4.6.1",
-    "@jupyterlab/metadataform": "^4.6.1",
-    "@jupyterlab/nbformat": "^4.6.1",
-    "@jupyterlab/notebook": "^4.6.1",
-    "@jupyterlab/observables": "^5.6.1",
-    "@jupyterlab/property-inspector": "^4.6.1",
-    "@jupyterlab/rendermime": "^4.6.1",
-    "@jupyterlab/services": "^7.6.1",
-    "@jupyterlab/settingregistry": "^4.6.1",
-    "@jupyterlab/statedb": "^4.6.1",
-    "@jupyterlab/statusbar": "^4.6.1",
-    "@jupyterlab/toc": "^6.6.1",
-    "@jupyterlab/translation": "^4.6.1",
-    "@jupyterlab/ui-components": "^4.6.1",
+    "@jupyterlab/application": "^4.6.3",
+    "@jupyterlab/apputils": "^4.7.3",
+    "@jupyterlab/cell-toolbar": "^4.6.3",
+    "@jupyterlab/cells": "^4.6.3",
+    "@jupyterlab/codeeditor": "^4.6.3",
+    "@jupyterlab/codemirror": "^4.6.3",
+    "@jupyterlab/completer": "^4.6.3",
+    "@jupyterlab/coreutils": "^6.6.3",
+    "@jupyterlab/docmanager": "^4.6.3",
+    "@jupyterlab/docmanager-extension": "^4.6.3",
+    "@jupyterlab/docregistry": "^4.6.3",
+    "@jupyterlab/documentsearch": "^4.6.3",
+    "@jupyterlab/filebrowser": "^4.6.3",
+    "@jupyterlab/launcher": "^4.6.3",
+    "@jupyterlab/logconsole": "^4.6.3",
+    "@jupyterlab/lsp": "^4.6.3",
+    "@jupyterlab/mainmenu": "^4.6.3",
+    "@jupyterlab/metadataform": "^4.6.3",
+    "@jupyterlab/nbformat": "^4.6.3",
+    "@jupyterlab/notebook": "^4.6.3",
+    "@jupyterlab/observables": "^5.6.3",
+    "@jupyterlab/property-inspector": "^4.6.3",
+    "@jupyterlab/rendermime": "^4.6.3",
+    "@jupyterlab/services": "^7.6.3",
+    "@jupyterlab/settingregistry": "^4.6.3",
+    "@jupyterlab/statedb": "^4.6.3",
+    "@jupyterlab/statusbar": "^4.6.3",
+    "@jupyterlab/toc": "^6.6.3",
+    "@jupyterlab/translation": "^4.6.3",
+    "@jupyterlab/ui-components": "^4.6.3",
     "@lumino/algorithm": "^2.0.4",
     "@lumino/commands": "^2.3.3",
     "@lumino/coreutils": "^2.2.2",

package/schema/tracker.json

@@ -841,12 +841,14 @@
       "title": "Side-by-side left margin override",
       "description": "Side-by-side left margin override.",
       "type": "string",
+      "pattern": "^-?(?:0|(?:[0-9]+|[0-9]*\\.[0-9]+)(?:px|em|rem|%|vw|vh|vmin|vmax|ch|ex|cm|mm|in|pt|pc))$",
       "default": "10px"
     },
     "sideBySideRightMarginOverride": {
       "title": "Side-by-side right margin override",
       "description": "Side-by-side right margin override.",
       "type": "string",
+      "pattern": "^-?(?:0|(?:[0-9]+|[0-9]*\\.[0-9]+)(?:px|em|rem|%|vw|vh|vmin|vmax|ch|ex|cm|mm|in|pt|pc))$",
       "default": "10px"
     },
     "sideBySideOutputRatio": {

package/src/index.ts

@@ -1199,12 +1199,18 @@ const activeCellTool: JupyterFrontEndPlugin<void> = {
     formRegistry: IFormRendererRegistry,
     languages: IEditorLanguageRegistry
   ) => {
+    // The field renderer is used by rjsf as a React component, so it runs on
+    // every rebuild of the metadata form. The tool is created once and reused:
+    // constructing one per render would rebuild the prompt and the preview from
+    // scratch (showing them empty until the next update) and would leave a
+    // connection to the cell model behind for every abandoned instance.
+    const tool = new ActiveCellTool({
+      tracker,
+      languages
+    });
     const component: IFormRenderer = {
       fieldRenderer: (props: FieldProps) => {
-        return new ActiveCellTool({
-          tracker,
-          languages
-        }).render(props);
+        return tool.render(props);
       }
     };
     formRegistry.addRenderer(
@@ -2197,15 +2203,16 @@ function activateNotebookHandler(
     setSideBySideOutputRatio(factory.notebookConfig.sideBySideOutputRatio);
     const sideBySideMarginStyle = `.jp-mod-sideBySide.jp-Notebook .jp-Notebook-cell {
       margin-left: ${factory.notebookConfig.sideBySideLeftMarginOverride} !important;
-      margin-right: ${factory.notebookConfig.sideBySideRightMarginOverride} !important;`;
+      margin-right: ${factory.notebookConfig.sideBySideRightMarginOverride} !important;
+    }`;
     const sideBySideMarginTag = document.getElementById(SIDE_BY_SIDE_STYLE_ID);
     if (sideBySideMarginTag) {
-      sideBySideMarginTag.innerText = sideBySideMarginStyle;
+      sideBySideMarginTag.textContent = sideBySideMarginStyle;
     } else {
-      document.head.insertAdjacentHTML(
-        'beforeend',
-        `<style id="${SIDE_BY_SIDE_STYLE_ID}">${sideBySideMarginStyle}}</style>`
-      );
+      const style = document.createElement('style');
+      style.id = SIDE_BY_SIDE_STYLE_ID;
+      style.textContent = sideBySideMarginStyle;
+      document.head.appendChild(style);
     }
     factory.autoStartDefault = settings.get('autoStartDefaultKernel')
       .composite as boolean;