@jupyterlab/notebook-extension 4.6.2 → 4.6.4

package/lib/index.js

@@ -6,7 +6,7 @@
  * @module notebook-extension
  */
 import { ILabShell, ILayoutRestorer, IRouter } from '@jupyterlab/application';
-import { Clipboard, createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, InputDialog, ISanitizer, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, Sanitizer, SemanticCommand, SessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
+import { Clipboard, CommandLinker, createToolbarFactory, Dialog, ICommandPalette, IKernelStatusModel, InputDialog, ISanitizer, ISessionContextDialogs, IToolbarWidgetRegistry, MainAreaWidget, Sanitizer, SemanticCommand, SessionContextDialogs, showDialog, Toolbar, WidgetTracker } from '@jupyterlab/apputils';
 import { MarkdownCell } from '@jupyterlab/cells';
 import { IEditorServices, IPositionModel } from '@jupyterlab/codeeditor';
 import { compareVersions, PageConfig } from '@jupyterlab/coreutils';
@@ -480,6 +480,9 @@ export const exportPlugin = {
             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 = {
@@ -748,6 +751,9 @@ const updateRawMimetype = {
                 const mimetypeExists = ((_a = properties.oneOf) === null || _a === void 0 ? void 0 : _a.filter(value => value.const === key).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;
@@ -775,26 +781,32 @@ const customMetadataEditorFields = {
     optional: [ITranslator],
     activate: (app, tracker, editorServices, formRegistry, translator) => {
         const editorFactory = 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 = {
             fieldRenderer: (props) => {
-                return new CellMetadataField({
-                    editorFactory,
-                    tracker,
-                    label: 'Cell metadata',
-                    translator: translator
-                }).render(props);
+                return cellMetadataField.render(props);
             }
         };
         formRegistry.addRenderer('@jupyterlab/notebook-extension:metadata-editor.cell-metadata', cellComponent);
+        const notebookMetadataField = new NotebookMetadataField({
+            editorFactory,
+            tracker,
+            label: 'Notebook metadata',
+            translator: translator
+        });
         const notebookComponent = {
             fieldRenderer: (props) => {
-                return new NotebookMetadataField({
-                    editorFactory,
-                    tracker,
-                    label: 'Notebook metadata',
-                    translator: translator
-                }).render(props);
+                return notebookMetadataField.render(props);
             }
         };
         formRegistry.addRenderer('@jupyterlab/notebook-extension:metadata-editor.notebook-metadata', notebookComponent);
@@ -811,12 +823,18 @@ const activeCellTool = {
     activate: (
     // Register the custom field.
     app, tracker, formRegistry, languages) => {
+        // 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 = {
             fieldRenderer: (props) => {
-                return new ActiveCellTool({
-                    tracker,
-                    languages
-                }).render(props);
+                return tool.render(props);
             }
         };
         formRegistry.addRenderer('@jupyterlab/notebook-extension:active-cell-tool.renderer', component);
@@ -2182,8 +2200,12 @@ function addCommands(app, tracker, translator, sessionDialogs, settings, isEnabl
     commands.addCommand(CommandIDs.trust, {
         label: () => trans.__('Trust Notebook'),
         execute: async (args) => {
-            const current = getCurrent(tracker, shell, args);
-            if (current) {
+            var _a;
+            const trustBoundaryId = args[CommandLinker.TRUST_BOUNDARY_ID_ARG];
+            const current = typeof trustBoundaryId === 'string'
+                ? ((_a = tracker.find(widget => widget.content.node.id === trustBoundaryId)) !== null && _a !== void 0 ? _a : null)
+                : getCurrent(tracker, shell, args);
+            if (current && !current.isDisposed) {
                 const { context, content } = current;
                 const trustResult = await NotebookActions.trust(content);
                 if (trustResult.trusted) {
@@ -2197,7 +2219,12 @@ function addCommands(app, tracker, translator, sessionDialogs, settings, isEnabl
         describedBy: {
             args: {
                 type: 'object',
-                properties: {}
+                properties: {
+                    [CommandLinker.TRUST_BOUNDARY_ID_ARG]: {
+                        type: 'string',
+                        description: trans.__('The notebook trust boundary ID')
+                    }
+                }
             }
         }
     });