@jupyterlab/notebook-extension 4.0.0-alpha.20 → 4.0.0-alpha.21

package/lib/index.js

@@ -18,6 +18,7 @@ import { IDefaultFileBrowser } from '@jupyterlab/filebrowser';
 import { ILauncher } from '@jupyterlab/launcher';
 import { ILSPCodeExtractorsManager, ILSPDocumentConnectionManager, ILSPFeatureManager } from '@jupyterlab/lsp';
 import { IMainMenu } from '@jupyterlab/mainmenu';
+import { IMetadataFormProvider } from '@jupyterlab/metadataform';
 import { CommandEditStatus, ExecutionIndicator, INotebookTools, INotebookTracker, INotebookWidgetFactory, NotebookActions, NotebookAdapter, NotebookModelFactory, NotebookPanel, NotebookSearchProvider, NotebookToCFactory, NotebookTools, NotebookTracker, NotebookTrustStatus, NotebookWidgetFactory, StaticNotebook, ToolbarItems } from '@jupyterlab/notebook';
 import { IPropertyInspectorProvider } from '@jupyterlab/property-inspector';
 import { IMarkdownParser, IRenderMimeRegistry } from '@jupyterlab/rendermime';
@@ -33,6 +34,8 @@ import { DisposableSet } from '@lumino/disposable';
 import { MessageLoop } from '@lumino/messaging';
 import { Panel } from '@lumino/widgets';
 import { logNotebookOutput } from './nboutput';
+import { ActiveCellTool } from './tool-widgets/activeCellToolWidget';
+import { CellMetadataField, NotebookMetadataField } from './tool-widgets/metadataEditorFields';
 /**
  * The command IDs used by the notebook plugin.
  */
@@ -584,6 +587,112 @@ const languageServerPlugin = {
     activate: activateNotebookLanguageServer,
     autoStart: true
 };
+const updateRawMimetype = {
+    id: '@jupyterlab/notebook-extension:update-raw-mimetype',
+    autoStart: true,
+    requires: [INotebookTracker, IMetadataFormProvider, ITranslator],
+    activate: (app, tracker, metadataForms, translator) => {
+        const trans = translator.load('jupyterlab');
+        let formatsInitialized = false;
+        async function maybeInitializeFormats() {
+            if (formatsInitialized) {
+                return;
+            }
+            if (!metadataForms.get('commonToolsSection')) {
+                return;
+            }
+            const properties = metadataForms
+                .get('commonToolsSection')
+                .getProperties('/raw_mimetype');
+            if (!properties) {
+                return;
+            }
+            tracker.widgetAdded.disconnect(maybeInitializeFormats);
+            formatsInitialized = true;
+            const services = app.serviceManager;
+            const response = await services.nbconvert.getExportFormats(false);
+            if (!response) {
+                return;
+            }
+            // convert exportList to palette and menu items
+            const formatList = Object.keys(response);
+            const formatLabels = Private.getFormatLabels(translator);
+            formatList.forEach(function (key) {
+                var _a;
+                const mimetypeExists = ((_a = properties.oneOf) === null || _a === void 0 ? void 0 : _a.filter(value => value.const === key).length) > 0;
+                if (!mimetypeExists) {
+                    const altOption = trans.__(key[0].toUpperCase() + key.substr(1));
+                    const option = formatLabels[key] ? formatLabels[key] : altOption;
+                    const mimeTypeValue = response[key].output_mimetype;
+                    properties.oneOf.push({
+                        const: mimeTypeValue,
+                        title: option
+                    });
+                }
+            });
+            metadataForms
+                .get('commonToolsSection')
+                .setProperties('/raw_mimetype', properties);
+        }
+        tracker.widgetAdded.connect(maybeInitializeFormats);
+    }
+};
+/**
+ * Registering metadata editor fields.
+ */
+const customMetadataEditorFields = {
+    id: '@jupyterlab/notebook-extension:metadata-editor',
+    autoStart: true,
+    requires: [INotebookTracker, IEditorServices, IFormRendererRegistry],
+    optional: [ITranslator],
+    activate: (app, tracker, editorServices, formRegistry, translator) => {
+        const editorFactory = options => editorServices.factoryService.newInlineEditor(options);
+        // Register the custom fields.
+        const cellComponent = {
+            fieldRenderer: (props) => {
+                return new CellMetadataField({
+                    editorFactory,
+                    tracker,
+                    label: 'Cell metadata',
+                    translator: translator
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:metadata-editor.cell-metadata', cellComponent);
+        const notebookComponent = {
+            fieldRenderer: (props) => {
+                return new NotebookMetadataField({
+                    editorFactory,
+                    tracker,
+                    label: 'Notebook metadata',
+                    translator: translator
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:metadata-editor.notebook-metadata', notebookComponent);
+    }
+};
+/**
+ * Registering active cell field.
+ */
+const activeCellTool = {
+    id: '@jupyterlab/notebook-extension:active-cell-tool',
+    autoStart: true,
+    requires: [INotebookTracker, IFormRendererRegistry, IEditorLanguageRegistry],
+    activate: (
+    // Register the custom field.
+    app, tracker, formRegistry, languages) => {
+        const component = {
+            fieldRenderer: (props) => {
+                return new ActiveCellTool({
+                    tracker,
+                    languages
+                }).render(props);
+            }
+        };
+        formRegistry.addRenderer('notebook-extension:active-cell-tool.renderer', component);
+    }
+};
 /**
  * Export the plugins as default.
  */
@@ -605,7 +714,10 @@ const plugins = [
     completerPlugin,
     searchProvider,
     tocPlugin,
-    languageServerPlugin
+    languageServerPlugin,
+    updateRawMimetype,
+    customMetadataEditorFields,
+    activeCellTool
 ];
 export default plugins;
 /**
@@ -615,21 +727,6 @@ function activateNotebookTools(app, tracker, editorServices, languages, state, t
     const trans = translator.load('jupyterlab');
     const id = 'notebook-tools';
     const notebookTools = new NotebookTools({ tracker, translator });
-    const activeCellTool = new NotebookTools.ActiveCellTool(languages);
-    const editable = NotebookTools.createEditableToggle(translator);
-    const slideShow = NotebookTools.createSlideShowSelector(translator);
-    const tocBaseNumbering = NotebookTools.createToCBaseNumbering(translator);
-    const editorFactory = options => editorServices.factoryService.newInlineEditor(options);
-    const cellMetadataEditor = new NotebookTools.CellMetadataEditorTool({
-        editorFactory,
-        collapsed: false,
-        translator
-    });
-    const notebookMetadataEditor = new NotebookTools.NotebookMetadataEditorTool({
-        editorFactory,
-        translator
-    });
-    const services = app.serviceManager;
     // Create message hook for triggers to save to the database.
     const hook = (sender, message) => {
         switch (message.type) {
@@ -645,63 +742,9 @@ function activateNotebookTools(app, tracker, editorServices, languages, state, t
         }
         return true;
     };
-    const optionsMap = {};
-    optionsMap.None = null;
-    let formatsInitialized = false;
-    async function maybeInitializeFormats() {
-        if (formatsInitialized) {
-            return;
-        }
-        tracker.widgetAdded.disconnect(maybeInitializeFormats);
-        formatsInitialized = true;
-        const response = await services.nbconvert.getExportFormats(false);
-        if (!response) {
-            return;
-        }
-        /**
-         * The excluded Cell Inspector Raw NbConvert Formats
-         * (returned from nbconvert's export list)
-         */
-        const rawFormatExclude = ['pdf', 'slides', 'script', 'notebook', 'custom'];
-        let optionValueArray = [
-            [trans.__('PDF'), 'pdf'],
-            [trans.__('Slides'), 'slides'],
-            [trans.__('Script'), 'script'],
-            [trans.__('Notebook'), 'notebook'],
-            [trans.__('Custom'), 'custom']
-        ];
-        // convert exportList to palette and menu items
-        const formatList = Object.keys(response);
-        const formatLabels = Private.getFormatLabels(translator);
-        formatList.forEach(function (key) {
-            if (rawFormatExclude.indexOf(key) === -1) {
-                const altOption = trans.__(key[0].toUpperCase() + key.substr(1));
-                const option = formatLabels[key] ? formatLabels[key] : altOption;
-                const mimeTypeValue = response[key].output_mimetype;
-                optionValueArray.push([option, mimeTypeValue]);
-            }
-        });
-        const nbConvert = NotebookTools.createNBConvertSelector(optionValueArray, translator);
-        notebookTools.addItem({ tool: nbConvert, section: 'common', rank: 3 });
-    }
-    tracker.widgetAdded.connect(maybeInitializeFormats);
     notebookTools.title.icon = buildIcon;
     notebookTools.title.caption = trans.__('Notebook Tools');
     notebookTools.id = id;
-    notebookTools.addItem({ tool: activeCellTool, section: 'common', rank: 1 });
-    notebookTools.addItem({ tool: editable, section: 'common', rank: 2 });
-    notebookTools.addItem({ tool: slideShow, section: 'common', rank: 3 });
-    notebookTools.addItem({ tool: tocBaseNumbering, section: 'common', rank: 4 });
-    notebookTools.addItem({
-        tool: cellMetadataEditor,
-        section: 'advanced',
-        rank: 1
-    });
-    notebookTools.addItem({
-        tool: notebookMetadataEditor,
-        section: 'advanced',
-        rank: 2
-    });
     MessageLoop.installMessageHook(notebookTools, hook);
     if (inspectorProvider) {
         tracker.widgetAdded.connect((sender, panel) => {
@@ -1183,7 +1226,8 @@ function activateNotebookHandler(app, factory, extensions, palette, defaultBrows
             overscanCount: settings.get('overscanCount').composite,
             maxNumberOutputs: settings.get('maxNumberOutputs').composite,
             showEditorForReadOnlyMarkdown: settings.get('showEditorForReadOnlyMarkdown').composite,
-            disableDocumentWideUndoRedo: settings.get('experimentalDisableDocumentWideUndoRedo').composite,
+            disableDocumentWideUndoRedo: !settings.get('documentWideUndoRedo')
+                .composite,
             renderingLayout: settings.get('renderingLayout').composite,
             sideBySideLeftMarginOverride: settings.get('sideBySideLeftMarginOverride')
                 .composite,
@@ -1205,7 +1249,7 @@ function activateNotebookHandler(app, factory, extensions, palette, defaultBrows
         }
         factory.shutdownOnClose = settings.get('kernelShutdown')
             .composite;
-        modelFactory.disableDocumentWideUndoRedo = settings.get('experimentalDisableDocumentWideUndoRedo').composite;
+        modelFactory.disableDocumentWideUndoRedo = !settings.get('documentWideUndoRedo').composite;
         updateTracker({
             editorConfig: factory.editorConfig,
             notebookConfig: factory.notebookConfig,
@@ -1427,9 +1471,36 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
             NotebookActions.expandParent(cell, notebook);
         });
     });
+    tracker.selectionChanged.connect(() => {
+        commands.notifyCommandChanged(CommandIDs.duplicateBelow);
+        commands.notifyCommandChanged(CommandIDs.deleteCell);
+        commands.notifyCommandChanged(CommandIDs.copy);
+        commands.notifyCommandChanged(CommandIDs.cut);
+        commands.notifyCommandChanged(CommandIDs.pasteBelow);
+        commands.notifyCommandChanged(CommandIDs.pasteAbove);
+        commands.notifyCommandChanged(CommandIDs.pasteAndReplace);
+        commands.notifyCommandChanged(CommandIDs.moveUp);
+        commands.notifyCommandChanged(CommandIDs.moveDown);
+        commands.notifyCommandChanged(CommandIDs.run);
+        commands.notifyCommandChanged(CommandIDs.runAll);
+        commands.notifyCommandChanged(CommandIDs.runAndAdvance);
+        commands.notifyCommandChanged(CommandIDs.runAndInsert);
+    });
+    tracker.activeCellChanged.connect(() => {
+        commands.notifyCommandChanged(CommandIDs.moveUp);
+        commands.notifyCommandChanged(CommandIDs.moveDown);
+    });
     commands.addCommand(CommandIDs.runAndAdvance, {
-        label: trans.__('Run Selected Cells'),
-        caption: trans.__('Run the selected cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell', 'Run Selected Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run this cell and advance', 'Run these %1 cells and advance', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1440,8 +1511,11 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.run, {
-        label: trans.__('Run Selected Cells and Do not Advance'),
-        caption: trans.__('Run the selected cells and do not advance'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell and Do not Advance', 'Run Selected Cells and Do not Advance', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1452,7 +1526,11 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.runAndInsert, {
-        label: trans.__('Run Selected Cells and Insert Below'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Run Selected Cell and Insert Below', 'Run Selected Cells and Insert Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1686,8 +1764,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.cut, {
-        label: trans.__('Cut Cells'),
-        caption: trans.__('Cut the selected cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Cut Cell', 'Cut Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Cut this cell', 'Cut these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1698,8 +1784,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.copy, {
-        label: trans.__('Copy Cells'),
-        caption: trans.__('Copy the selected cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Copy Cell', 'Copy Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Copy this cell', 'Copy these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1710,8 +1804,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteBelow, {
-        label: trans.__('Paste Cells Below'),
-        caption: trans.__('Paste cells from the clipboard'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell Below', 'Paste Cells Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste this cell from the clipboard', 'Paste these %1 cells from the clipboard', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1722,7 +1824,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteAbove, {
-        label: trans.__('Paste Cells Above'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell Above', 'Paste Cells Above', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste this cell from the clipboard', 'Paste these %1 cells from the clipboard', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1732,8 +1843,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.duplicateBelow, {
-        label: trans.__('Duplicate Cells Below'),
-        caption: trans.__('Copy the selected cells and paste them below the selection'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Duplicate Cell Below', 'Duplicate Cells Below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Create a duplicate of this cell below', 'Create duplicates of %1 cells below', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1744,7 +1863,11 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.pasteAndReplace, {
-        label: trans.__('Paste Cells and Replace'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Paste Cell and Replace', 'Paste Cells and Replace', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1754,7 +1877,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.deleteCell, {
-        label: trans.__('Delete Cells'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Delete Cell', 'Delete Cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Delete this cell', 'Delete these %1 cells', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1805,6 +1937,7 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     });
     commands.addCommand(CommandIDs.insertAbove, {
         label: trans.__('Insert Cell Above'),
+        caption: trans.__('Insert a cell above'),
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1947,7 +2080,16 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
         isEnabled
     });
     commands.addCommand(CommandIDs.moveUp, {
-        label: trans.__('Move Cells Up'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move Cell Up', 'Move Cells Up', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move this cell up', 'Move these %1 cells up', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1955,11 +2097,26 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 Private.raiseSilentNotification(trans.__('Notebook cell shifted up successfully'), current.node);
             }
         },
-        isEnabled,
+        isEnabled: args => {
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            if (!current) {
+                return false;
+            }
+            return current.content.activeCellIndex >= 1;
+        },
         icon: args => (args.toolbar ? moveUpIcon : undefined)
     });
     commands.addCommand(CommandIDs.moveDown, {
-        label: trans.__('Move Cells Down'),
+        label: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move Cell Down', 'Move Cells Down', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
+        caption: args => {
+            var _a;
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            return trans._n('Move this cell down', 'Move these %1 cells down', (_a = current === null || current === void 0 ? void 0 : current.content.selectedCells.length) !== null && _a !== void 0 ? _a : 1);
+        },
         execute: args => {
             const current = getCurrent(tracker, shell, args);
             if (current) {
@@ -1967,7 +2124,14 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
                 Private.raiseSilentNotification(trans.__('Notebook cell shifted down successfully'), current.node);
             }
         },
-        isEnabled,
+        isEnabled: args => {
+            const current = getCurrent(tracker, shell, { ...args, activate: false });
+            if (!current || !current.content.model) {
+                return false;
+            }
+            const length = current.content.model.cells.length;
+            return current.content.activeCellIndex < length - 1;
+        },
         icon: args => (args.toolbar ? moveDownIcon : undefined)
     });
     commands.addCommand(CommandIDs.toggleAllLines, {
@@ -2035,20 +2199,28 @@ function addCommands(app, tracker, translator, sessionDialogs, isEnabled) {
     commands.addCommand(CommandIDs.redo, {
         label: trans.__('Redo'),
         execute: args => {
-            var _a, _b;
+            var _a;
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return (_b = (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor) === null || _b === void 0 ? void 0 : _b.redo();
+                const cell = current.content.activeCell;
+                if (cell) {
+                    cell.inputHidden = false;
+                    return (_a = cell.editor) === null || _a === void 0 ? void 0 : _a.redo();
+                }
             }
         }
     });
     commands.addCommand(CommandIDs.undo, {
         label: trans.__('Undo'),
         execute: args => {
-            var _a, _b;
+            var _a;
             const current = getCurrent(tracker, shell, args);
             if (current) {
-                return (_b = (_a = current.content.activeCell) === null || _a === void 0 ? void 0 : _a.editor) === null || _b === void 0 ? void 0 : _b.undo();
+                const cell = current.content.activeCell;
+                if (cell) {
+                    cell.inputHidden = false;
+                    return (_a = cell.editor) === null || _a === void 0 ? void 0 : _a.undo();
+                }
             }
         }
     });