@jupyterlab/notebook-extension 4.6.2 → 4.6.4

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/lib/tool-widgets/metadataEditorFields.js

@@ -40,9 +40,13 @@ export class CellMetadataField extends NotebookTools.MetadataEditorTool {
     render(props) {
         var _a;
         const cell = this._tracker.activeCell;
+        // The editor detaches the previous source but does not dispose it, and
+        // this runs on every rebuild of the form.
+        const previousSource = this.editor.source;
         this.editor.source = cell
             ? new ObservableJSON({ values: cell.model.metadata })
             : null;
+        previousSource === null || previousSource === void 0 ? void 0 : previousSource.dispose();
         (_a = this.editor.source) === null || _a === void 0 ? void 0 : _a.changed.connect(this._onSourceChanged, this);
         return (React.createElement("div", { className: CELL_METADATA_EDITOR_CLASS },
             React.createElement("div", { ref: ref => ref === null || ref === void 0 ? void 0 : ref.appendChild(this.node) })));
@@ -73,9 +77,13 @@ export class NotebookMetadataField extends NotebookTools.MetadataEditorTool {
     render(props) {
         var _a, _b;
         const notebook = this._tracker.currentWidget;
+        // The editor detaches the previous source but does not dispose it, and
+        // this runs on every rebuild of the form.
+        const previousSource = this.editor.source;
         this.editor.source = notebook
             ? new ObservableJSON({ values: (_a = notebook.model) === null || _a === void 0 ? void 0 : _a.metadata })
             : null;
+        previousSource === null || previousSource === void 0 ? void 0 : previousSource.dispose();
         (_b = this.editor.source) === null || _b === void 0 ? void 0 : _b.changed.connect(this._onSourceChanged, this);
         return (React.createElement("div", { className: NOTEBOOK_METADATA_EDITOR_CLASS },
             React.createElement("div", { ref: ref => ref === null || ref === void 0 ? void 0 : ref.appendChild(this.node) })));

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

@@ -1 +1 @@
-{"version":3,"file":"metadataEditorFields.js","sourceRoot":"","sources":["../../src/tool-widgets/metadataEditorFields.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAGrD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAGzD,MAAM,0BAA0B,GAAG,uBAAuB,CAAC;AAC3D,MAAM,8BAA8B,GAAG,2BAA2B,CAAC;AA6BnE;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAkB,SAAQ,aAAa,CAAC,kBAAkB;IACrE,YAAY,OAAyB;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IAEO,gBAAgB;;QACtB,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,QAAQ,CAAC,UAAU,0CAAE,KAAK,CAAC,WAAW,CAAC;QAC/D,IAAI,UAAU,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACrC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,UAAU,CAAC,QAAQ,mCAAI,EAAE,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,mCAAI,EAAE,CAAC;YAEjD,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE;gBACvB,+DAA+D;gBAC/D,0EAA0E;gBAC1E,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC5D,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAiB;;QACtB,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI;YACvB,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,QAAsB,EAAE,CAAC;YACnE,CAAC,CAAC,IAAI,CAAC;QACT,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAEjE,OAAO,CACL,6BAAK,SAAS,EAAE,0BAA0B;YACxC,6BAAK,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAQ,CAChD,CACP,CAAC;IACJ,CAAC;CAGF;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,qBAAsB,SAAQ,aAAa,CAAC,kBAAkB;IACzE,YAAY,OAAyB;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;QAEhC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvE,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IAEO,gBAAgB;;QACtB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,MAAA,MAAA,IAAI,CAAC,QAAQ,CAAC,aAAa,0CAAE,KAAK,0CAAE,WAAW,CAAC,WAAW,CACzD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAC5B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,CAAC,KAAiB;;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,QAAQ;YAC3B,CAAC,CAAC,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,MAAA,QAAQ,CAAC,KAAK,0CAAE,QAAsB,EAAE,CAAC;YACxE,CAAC,CAAC,IAAI,CAAC;QACT,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAEjE,OAAO,CACL,6BAAK,SAAS,EAAE,8BAA8B;YAC5C,6BAAK,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAQ,CAChD,CACP,CAAC;IACJ,CAAC;CAGF"}
+{"version":3,"file":"metadataEditorFields.js","sourceRoot":"","sources":["../../src/tool-widgets/metadataEditorFields.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/notebook-extension",
-  "version": "4.6.2",
+  "version": "4.6.4",
   "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.2",
-    "@jupyterlab/apputils": "^4.7.2",
-    "@jupyterlab/cell-toolbar": "^4.6.2",
-    "@jupyterlab/cells": "^4.6.2",
-    "@jupyterlab/codeeditor": "^4.6.2",
-    "@jupyterlab/codemirror": "^4.6.2",
-    "@jupyterlab/completer": "^4.6.2",
-    "@jupyterlab/coreutils": "^6.6.2",
-    "@jupyterlab/docmanager": "^4.6.2",
-    "@jupyterlab/docmanager-extension": "^4.6.2",
-    "@jupyterlab/docregistry": "^4.6.2",
-    "@jupyterlab/documentsearch": "^4.6.2",
-    "@jupyterlab/filebrowser": "^4.6.2",
-    "@jupyterlab/launcher": "^4.6.2",
-    "@jupyterlab/logconsole": "^4.6.2",
-    "@jupyterlab/lsp": "^4.6.2",
-    "@jupyterlab/mainmenu": "^4.6.2",
-    "@jupyterlab/metadataform": "^4.6.2",
-    "@jupyterlab/nbformat": "^4.6.2",
-    "@jupyterlab/notebook": "^4.6.2",
-    "@jupyterlab/observables": "^5.6.2",
-    "@jupyterlab/property-inspector": "^4.6.2",
-    "@jupyterlab/rendermime": "^4.6.2",
-    "@jupyterlab/services": "^7.6.2",
-    "@jupyterlab/settingregistry": "^4.6.2",
-    "@jupyterlab/statedb": "^4.6.2",
-    "@jupyterlab/statusbar": "^4.6.2",
-    "@jupyterlab/toc": "^6.6.2",
-    "@jupyterlab/translation": "^4.6.2",
-    "@jupyterlab/ui-components": "^4.6.2",
+    "@jupyterlab/application": "^4.6.4",
+    "@jupyterlab/apputils": "^4.7.4",
+    "@jupyterlab/cell-toolbar": "^4.6.4",
+    "@jupyterlab/cells": "^4.6.4",
+    "@jupyterlab/codeeditor": "^4.6.4",
+    "@jupyterlab/codemirror": "^4.6.4",
+    "@jupyterlab/completer": "^4.6.4",
+    "@jupyterlab/coreutils": "^6.6.4",
+    "@jupyterlab/docmanager": "^4.6.4",
+    "@jupyterlab/docmanager-extension": "^4.6.4",
+    "@jupyterlab/docregistry": "^4.6.4",
+    "@jupyterlab/documentsearch": "^4.6.4",
+    "@jupyterlab/filebrowser": "^4.6.4",
+    "@jupyterlab/launcher": "^4.6.4",
+    "@jupyterlab/logconsole": "^4.6.4",
+    "@jupyterlab/lsp": "^4.6.4",
+    "@jupyterlab/mainmenu": "^4.6.4",
+    "@jupyterlab/metadataform": "^4.6.4",
+    "@jupyterlab/nbformat": "^4.6.4",
+    "@jupyterlab/notebook": "^4.6.4",
+    "@jupyterlab/observables": "^5.6.4",
+    "@jupyterlab/property-inspector": "^4.6.4",
+    "@jupyterlab/rendermime": "^4.6.4",
+    "@jupyterlab/services": "^7.6.4",
+    "@jupyterlab/settingregistry": "^4.6.4",
+    "@jupyterlab/statedb": "^4.6.4",
+    "@jupyterlab/statusbar": "^4.6.4",
+    "@jupyterlab/toc": "^6.6.4",
+    "@jupyterlab/translation": "^4.6.4",
+    "@jupyterlab/ui-components": "^4.6.4",
     "@lumino/algorithm": "^2.0.4",
     "@lumino/commands": "^2.3.3",
     "@lumino/coreutils": "^2.2.2",

package/src/index.ts

@@ -16,6 +16,7 @@ import { ILabShell, ILayoutRestorer, IRouter } from '@jupyterlab/application';
 import type { ISessionContext } from '@jupyterlab/apputils';
 import {
   Clipboard,
+  CommandLinker,
   createToolbarFactory,
   Dialog,
   ICommandPalette,
@@ -772,6 +773,9 @@ export const exportPlugin: JupyterFrontEndPlugin<void> = {
       const formatList = Object.keys(response);
       formatList.forEach(function (key) {
         const formattedKey = key[0].toLocaleUpperCase() + key.slice(1);
+        // Fallback for export formats the server offers but `formatLabels`
+        // does not know about, so there is no literal to extract.
+        // eslint-disable-next-line jupyter/no-dynamic-translation
         const capCaseKey = trans.__(formattedKey);
         const labelStr = formatLabels[key] ? formatLabels[key] : capCaseKey;
         let args = {
@@ -1114,6 +1118,9 @@ const updateRawMimetype: JupyterFrontEndPlugin<void> = {
           ).length > 0;
         if (!mimetypeExists) {
           const formattedKey = key[0].toLocaleUpperCase() + key.slice(1);
+          // Fallback for export formats the server offers but `formatLabels`
+          // does not know about, so there is no literal to extract.
+          // eslint-disable-next-line jupyter/no-dynamic-translation
           const altOption = trans.__(formattedKey);
           const option = formatLabels[key] ? formatLabels[key] : altOption;
           const mimeTypeValue = response[key].output_mimetype;
@@ -1151,15 +1158,20 @@ const customMetadataEditorFields: JupyterFrontEndPlugin<void> = {
   ) => {
     const editorFactory: CodeEditor.Factory = options =>
       editorServices.factoryService.newInlineEditor(options);
-    // Register the custom fields.
+    // Register the custom fields. As with the active cell tool below, the
+    // field renderers are used by rjsf as React components, so they run on
+    // every rebuild of the metadata form. Each field is created once and
+    // reused: constructing one per render abandons an editor, its host node
+    // and its listeners on every keystroke that rebuilds the form.
+    const cellMetadataField = new CellMetadataField({
+      editorFactory,
+      tracker,
+      label: 'Cell metadata',
+      translator: translator
+    });
     const cellComponent: IFormRenderer = {
       fieldRenderer: (props: FieldProps) => {
-        return new CellMetadataField({
-          editorFactory,
-          tracker,
-          label: 'Cell metadata',
-          translator: translator
-        }).render(props);
+        return cellMetadataField.render(props);
       }
     };
     formRegistry.addRenderer(
@@ -1167,14 +1179,15 @@ const customMetadataEditorFields: JupyterFrontEndPlugin<void> = {
       cellComponent
     );
 
+    const notebookMetadataField = new NotebookMetadataField({
+      editorFactory,
+      tracker,
+      label: 'Notebook metadata',
+      translator: translator
+    });
     const notebookComponent: IFormRenderer = {
       fieldRenderer: (props: FieldProps) => {
-        return new NotebookMetadataField({
-          editorFactory,
-          tracker,
-          label: 'Notebook metadata',
-          translator: translator
-        }).render(props);
+        return notebookMetadataField.render(props);
       }
     };
     formRegistry.addRenderer(
@@ -1199,12 +1212,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(
@@ -2969,8 +2988,14 @@ function addCommands(
   commands.addCommand(CommandIDs.trust, {
     label: () => trans.__('Trust Notebook'),
     execute: async args => {
-      const current = getCurrent(tracker, shell, args);
-      if (current) {
+      const trustBoundaryId = args[CommandLinker.TRUST_BOUNDARY_ID_ARG];
+      const current =
+        typeof trustBoundaryId === 'string'
+          ? (tracker.find(
+              widget => widget.content.node.id === trustBoundaryId
+            ) ?? null)
+          : getCurrent(tracker, shell, args);
+      if (current && !current.isDisposed) {
         const { context, content } = current;
         const trustResult = await NotebookActions.trust(content);
         if (trustResult.trusted) {
@@ -2984,7 +3009,12 @@ function addCommands(
     describedBy: {
       args: {
         type: 'object',
-        properties: {}
+        properties: {
+          [CommandLinker.TRUST_BOUNDARY_ID_ARG]: {
+            type: 'string',
+            description: trans.__('The notebook trust boundary ID')
+          }
+        }
       }
     }
   });