@jupyterlab/notebook-extension 4.6.0-alpha.5 → 4.6.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/notebook-extension",
-  "version": "4.6.0-alpha.5",
+  "version": "4.6.0-beta.1",
   "description": "JupyterLab - Notebook Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -36,44 +36,44 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter/ydoc": "^3.1.0",
-    "@jupyterlab/application": "^4.6.0-alpha.5",
-    "@jupyterlab/apputils": "^4.7.0-alpha.5",
-    "@jupyterlab/cell-toolbar": "^4.6.0-alpha.5",
-    "@jupyterlab/cells": "^4.6.0-alpha.5",
-    "@jupyterlab/codeeditor": "^4.6.0-alpha.5",
-    "@jupyterlab/codemirror": "^4.6.0-alpha.5",
-    "@jupyterlab/completer": "^4.6.0-alpha.5",
-    "@jupyterlab/coreutils": "^6.6.0-alpha.5",
-    "@jupyterlab/docmanager": "^4.6.0-alpha.5",
-    "@jupyterlab/docmanager-extension": "^4.6.0-alpha.5",
-    "@jupyterlab/docregistry": "^4.6.0-alpha.5",
-    "@jupyterlab/documentsearch": "^4.6.0-alpha.5",
-    "@jupyterlab/filebrowser": "^4.6.0-alpha.5",
-    "@jupyterlab/launcher": "^4.6.0-alpha.5",
-    "@jupyterlab/logconsole": "^4.6.0-alpha.5",
-    "@jupyterlab/lsp": "^4.6.0-alpha.5",
-    "@jupyterlab/mainmenu": "^4.6.0-alpha.5",
-    "@jupyterlab/metadataform": "^4.6.0-alpha.5",
-    "@jupyterlab/nbformat": "^4.6.0-alpha.5",
-    "@jupyterlab/notebook": "^4.6.0-alpha.5",
-    "@jupyterlab/observables": "^5.6.0-alpha.5",
-    "@jupyterlab/property-inspector": "^4.6.0-alpha.5",
-    "@jupyterlab/rendermime": "^4.6.0-alpha.5",
-    "@jupyterlab/services": "^7.6.0-alpha.5",
-    "@jupyterlab/settingregistry": "^4.6.0-alpha.5",
-    "@jupyterlab/statedb": "^4.6.0-alpha.5",
-    "@jupyterlab/statusbar": "^4.6.0-alpha.5",
-    "@jupyterlab/toc": "^6.6.0-alpha.5",
-    "@jupyterlab/translation": "^4.6.0-alpha.5",
-    "@jupyterlab/ui-components": "^4.6.0-alpha.5",
+    "@jupyter/ydoc": "^4.0.0-a3",
+    "@jupyterlab/application": "^4.6.0-beta.1",
+    "@jupyterlab/apputils": "^4.7.0-beta.1",
+    "@jupyterlab/cell-toolbar": "^4.6.0-beta.1",
+    "@jupyterlab/cells": "^4.6.0-beta.1",
+    "@jupyterlab/codeeditor": "^4.6.0-beta.1",
+    "@jupyterlab/codemirror": "^4.6.0-beta.1",
+    "@jupyterlab/completer": "^4.6.0-beta.1",
+    "@jupyterlab/coreutils": "^6.6.0-beta.1",
+    "@jupyterlab/docmanager": "^4.6.0-beta.1",
+    "@jupyterlab/docmanager-extension": "^4.6.0-beta.1",
+    "@jupyterlab/docregistry": "^4.6.0-beta.1",
+    "@jupyterlab/documentsearch": "^4.6.0-beta.1",
+    "@jupyterlab/filebrowser": "^4.6.0-beta.1",
+    "@jupyterlab/launcher": "^4.6.0-beta.1",
+    "@jupyterlab/logconsole": "^4.6.0-beta.1",
+    "@jupyterlab/lsp": "^4.6.0-beta.1",
+    "@jupyterlab/mainmenu": "^4.6.0-beta.1",
+    "@jupyterlab/metadataform": "^4.6.0-beta.1",
+    "@jupyterlab/nbformat": "^4.6.0-beta.1",
+    "@jupyterlab/notebook": "^4.6.0-beta.1",
+    "@jupyterlab/observables": "^5.6.0-beta.1",
+    "@jupyterlab/property-inspector": "^4.6.0-beta.1",
+    "@jupyterlab/rendermime": "^4.6.0-beta.1",
+    "@jupyterlab/services": "^7.6.0-beta.1",
+    "@jupyterlab/settingregistry": "^4.6.0-beta.1",
+    "@jupyterlab/statedb": "^4.6.0-beta.1",
+    "@jupyterlab/statusbar": "^4.6.0-beta.1",
+    "@jupyterlab/toc": "^6.6.0-beta.1",
+    "@jupyterlab/translation": "^4.6.0-beta.1",
+    "@jupyterlab/ui-components": "^4.6.0-beta.1",
     "@lumino/algorithm": "^2.0.4",
     "@lumino/commands": "^2.3.3",
     "@lumino/coreutils": "^2.2.2",
     "@lumino/disposable": "^2.1.5",
     "@lumino/messaging": "^2.0.4",
     "@lumino/polling": "^2.1.5",
-    "@lumino/widgets": "^2.7.5",
+    "@lumino/widgets": "^2.8.0",
     "@rjsf/utils": "^5.13.4",
     "react": "^18.2.0"
   },

package/schema/panel.json

@@ -88,7 +88,10 @@
         "type": {
           "title": "Item type",
           "type": "string",
-          "enum": ["command", "spacer"]
+          "oneOf": [
+            { "const": "command", "title": "Command" },
+            { "const": "spacer", "title": "Spacer" }
+          ]
         },
         "rank": {
           "title": "Item rank",

package/schema/tracker.json

@@ -250,6 +250,21 @@
         "selector": ".jp-Notebook .jp-Cell",
         "rank": 3
       },
+      {
+        "command": "notebook:copy-selected-text",
+        "selector": ".jp-Notebook .jp-Cell",
+        "rank": 3
+      },
+      {
+        "command": "notebook:cut-selected-text",
+        "selector": ".jp-Notebook .jp-InputArea-editor",
+        "rank": 3
+      },
+      {
+        "command": "notebook:paste-text",
+        "selector": ".jp-Notebook .jp-InputArea-editor",
+        "rank": 3
+      },
       {
         "type": "separator",
         "selector": ".jp-Notebook .jp-Cell",
@@ -305,11 +320,6 @@
         "selector": ".jp-Notebook .jp-CodeCell",
         "rank": 12
       },
-      {
-        "command": "notebook:clear-all-cell-outputs",
-        "selector": ".jp-Notebook",
-        "rank": 13
-      },
       {
         "type": "separator",
         "selector": ".jp-Notebook",
@@ -699,7 +709,11 @@
       "title": "Default cell type",
       "description": "The default type (markdown, code, or raw) for new cells",
       "type": "string",
-      "enum": ["code", "markdown", "raw"],
+      "oneOf": [
+        { "const": "code", "title": "Code" },
+        { "const": "markdown", "title": "Markdown" },
+        { "const": "raw", "title": "Raw" }
+      ],
       "default": "code"
     },
     "autoStartDefaultKernel": {
@@ -717,7 +731,10 @@
     "inputHistoryScope": {
       "type": "string",
       "default": "global",
-      "enum": ["global", "session"],
+      "oneOf": [
+        { "const": "global", "title": "Global" },
+        { "const": "session", "title": "Session" }
+      ],
       "title": "Input History Scope",
       "description": "Whether the line history for standard input (e.g. the ipdb prompt) should kept separately for different kernel sessions (`session`) or combined (`global`)."
     },
@@ -813,7 +830,10 @@
     "renderingLayout": {
       "title": "Rendering Layout",
       "description": "Global setting to define the rendering layout in notebooks. 'default' or 'side-by-side' are supported.",
-      "enum": ["default", "side-by-side"],
+      "oneOf": [
+        { "const": "default", "title": "Default" },
+        { "const": "side-by-side", "title": "Side by side" }
+      ],
       "default": "default"
     },
     "sideBySideLeftMarginOverride": {
@@ -838,7 +858,12 @@
     "windowingMode": {
       "title": "Windowing mode",
       "description": "- 'defer': Improve loading time - Wait for idle CPU cycles to attach out of viewport cells\n- 'full': Best performance with side effects - Attach to the DOM only cells in viewport\n- 'none': Worst performance without side effects - Attach all cells to the viewport\n- 'contentVisibility': Browser-optimized rendering - Use content-visibility to skip offscreen cells",
-      "enum": ["defer", "full", "none", "contentVisibility"],
+      "oneOf": [
+        { "const": "defer", "title": "Defer" },
+        { "const": "full", "title": "Full" },
+        { "const": "none", "title": "None" },
+        { "const": "contentVisibility", "title": "Content visibility" }
+      ],
       "default": "contentVisibility"
     },
     "accessKernelHistory": {

package/src/index.ts

@@ -1,5 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * @packageDocumentation
  * @module notebook-extension
@@ -14,6 +15,7 @@ import type {
 import { ILabShell, ILayoutRestorer, IRouter } from '@jupyterlab/application';
 import type { ISessionContext } from '@jupyterlab/apputils';
 import {
+  Clipboard,
   createToolbarFactory,
   Dialog,
   ICommandPalette,
@@ -35,7 +37,7 @@ import { MarkdownCell } from '@jupyterlab/cells';
 import type { CodeEditor } from '@jupyterlab/codeeditor';
 import { IEditorServices, IPositionModel } from '@jupyterlab/codeeditor';
 import type { IChangedArgs } from '@jupyterlab/coreutils';
-import { PageConfig } from '@jupyterlab/coreutils';
+import { compareVersions, PageConfig } from '@jupyterlab/coreutils';
 
 import {
   IEditorExtensionRegistry,
@@ -317,6 +319,10 @@ namespace CommandIDs {
 
   export const selectLastRunCell = 'notebook:select-last-run-cell';
 
+  export const selectLastModifiedCell = 'notebook:select-last-modified-cell';
+
+  export const selectNextModifiedCell = 'notebook:select-next-modified-cell';
+
   export const replaceSelection = 'notebook:replace-selection';
 
   export const autoClosingBrackets = 'notebook:toggle-autoclosing-brackets';
@@ -340,6 +346,12 @@ namespace CommandIDs {
   export const accessNextHistory = 'notebook:access-next-history-entry';
 
   export const virtualScrollbar = 'notebook:toggle-virtual-scrollbar';
+
+  export const copySelectedtext = 'notebook:copy-selected-text';
+
+  export const pasteText = 'notebook:paste-text';
+
+  export const cutSelectedtext = 'notebook:cut-selected-text';
 }
 
 /**
@@ -664,11 +676,32 @@ export const exportPlugin: JupyterFrontEndPlugin<void> = {
 
         const { context } = current;
 
+        const serverVersion = PageConfig.getNotebookVersion();
+        const supportsHTMLSanitizationOption =
+          compareVersions(serverVersion, [4, 0, 0]) <
+            0 /* Jupyter Server only */ &&
+          compareVersions(serverVersion, [2, 18, 0]) >= 0;
+
+        let sanitizeHtml = false;
+
+        if (args['format'] === 'html' && supportsHTMLSanitizationOption) {
+          const result = await InputDialog.getBoolean({
+            title: trans.__('Export as HTML'),
+            label: trans.__('Sanitize HTML output'),
+            value: true
+          });
+          if (!result.button.accept) {
+            return;
+          }
+          sanitizeHtml = result.value ?? false;
+        }
+
         const exportOptions: NbConvert.IExportOptions = {
           format: args['format'] as string,
           path: current.context.path,
           exporterOptions: {
-            download: true
+            download: true,
+            sanitizeHtml
           }
         };
 
@@ -983,7 +1016,12 @@ const tocPlugin: JupyterFrontEndPlugin<void> = {
     mdParser: IMarkdownParser | null,
     settingRegistry: ISettingRegistry | null
   ): void => {
-    const nbTocFactory = new NotebookToCFactory(tracker, mdParser, sanitizer);
+    const nbTocFactory = new NotebookToCFactory(
+      tracker,
+      mdParser,
+      sanitizer,
+      app.commands
+    );
     tocRegistry.add(nbTocFactory);
     if (settingRegistry) {
       Promise.all([app.restored, settingRegistry.load(trackerPlugin.id)])
@@ -1230,7 +1268,8 @@ const openWithNoKernelPlugin: JupyterFrontEndPlugin<void> = {
               label: trans.__('Notebook (no kernel)'),
               factory: FACTORY,
               kernelPreference: {
-                shouldStart: false
+                shouldStart: false,
+                shouldReuse: false
               }
             }
           })
@@ -1305,6 +1344,10 @@ function activateNotebookTools(
     return true;
   };
   notebookTools.title.icon = buildIcon;
+  notebookTools.title.dataset = {
+    ...notebookTools.title.dataset,
+    jpTabLabel: trans.__('Notebook Tools')
+  };
   notebookTools.title.caption = trans.__('Notebook Tools');
   notebookTools.id = id;
 
@@ -2581,6 +2624,9 @@ function addCommands(
   tracker.selectionChanged.connect(() => {
     commands.notifyCommandChanged(CommandIDs.duplicateBelow);
     commands.notifyCommandChanged(CommandIDs.deleteCell);
+    commands.notifyCommandChanged(CommandIDs.copySelectedtext);
+    commands.notifyCommandChanged(CommandIDs.pasteText);
+    commands.notifyCommandChanged(CommandIDs.cutSelectedtext);
     commands.notifyCommandChanged(CommandIDs.copy);
     commands.notifyCommandChanged(CommandIDs.cut);
     commands.notifyCommandChanged(CommandIDs.pasteBelow);
@@ -2597,6 +2643,16 @@ function addCommands(
     commands.notifyCommandChanged(CommandIDs.deleteCell);
     commands.notifyCommandChanged(CommandIDs.moveUp);
     commands.notifyCommandChanged(CommandIDs.moveDown);
+    commands.notifyCommandChanged(CommandIDs.selectLastModifiedCell);
+    commands.notifyCommandChanged(CommandIDs.selectNextModifiedCell);
+  });
+  tracker.widgetAdded.connect((_, panel) => {
+    panel.content.stateChanged.connect((_, args) => {
+      if (args.name === 'lastModifiedCellStack') {
+        commands.notifyCommandChanged(CommandIDs.selectLastModifiedCell);
+        commands.notifyCommandChanged(CommandIDs.selectNextModifiedCell);
+      }
+    });
   });
 
   commands.addCommand(CommandIDs.runAndAdvance, {
@@ -3471,6 +3527,156 @@ function addCommands(
       }
     }
   });
+
+  commands.addCommand(CommandIDs.copySelectedtext, {
+    label: trans.__('Copy Selected Text'),
+    caption: trans.__('Copy selected text from the active cell or output area'),
+    execute: async args => {
+      const current = getCurrent(tracker, shell, args);
+      if (!current) {
+        return;
+      }
+
+      // copying from the editor (input area)
+      const editor = current.content.activeCell?.editor;
+      if (editor) {
+        const selection = editor.getSelection();
+        const start = editor.getOffsetAt(selection.start);
+        const end = editor.getOffsetAt(selection.end);
+        const text = editor.model.sharedModel.getSource().slice(start, end);
+        if (text) {
+          await navigator.clipboard.writeText(text);
+          return;
+        }
+      }
+
+      // fallback to DOM selection (output)
+      const domSelection = window.getSelection();
+      const selectedText = domSelection?.toString();
+      if (selectedText && selectedText.trim().length > 0) {
+        await navigator.clipboard.writeText(selectedText);
+      }
+    },
+
+    isEnabled: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      if (!current) {
+        return false;
+      }
+
+      const editor = current.content.activeCell?.editor;
+      if (editor) {
+        const selection = editor.getSelection();
+        const hasEditorSelection =
+          selection.start.line !== selection.end.line ||
+          selection.start.column !== selection.end.column;
+        if (hasEditorSelection) {
+          return true;
+        }
+      }
+
+      // Check for text selection in output area
+      const domSelection = window.getSelection();
+      return !!domSelection && domSelection.toString().trim().length > 0;
+    },
+    describedBy: {
+      args: {
+        type: 'object',
+        properties: {}
+      }
+    }
+  });
+
+  commands.addCommand(CommandIDs.cutSelectedtext, {
+    label: trans.__('Cut Selected Text'),
+    caption: trans.__('Cut selected text from the active cell or output area'),
+    execute: async args => {
+      const current = getCurrent(tracker, shell, args);
+      if (!current) {
+        return;
+      }
+
+      const editor = current.content.activeCell?.editor;
+      if (editor) {
+        const selection = editor.getSelection();
+        const start = editor.getOffsetAt(selection.start);
+        const end = editor.getOffsetAt(selection.end);
+        const text = editor.model.sharedModel.getSource().slice(start, end);
+        if (text) {
+          await navigator.clipboard.writeText(text);
+          editor.replaceSelection?.('');
+          return;
+        }
+      }
+    },
+
+    isEnabled: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      if (!current) {
+        return false;
+      }
+
+      const editor = current.content.activeCell?.editor;
+      if (!editor) {
+        return false;
+      }
+
+      const selection = editor.getSelection();
+      const hasEditorSelection =
+        selection.start.line !== selection.end.line ||
+        selection.start.column !== selection.end.column;
+      return hasEditorSelection;
+    },
+    describedBy: {
+      args: {
+        type: 'object',
+        properties: {}
+      }
+    }
+  });
+
+  commands.addCommand(CommandIDs.pasteText, {
+    label: trans.__('Paste Text'),
+    caption: trans.__(
+      'Paste text from the clipboard into the active cell editor'
+    ),
+    execute: async args => {
+      const current = getCurrent(tracker, shell, args);
+      if (!current) {
+        return;
+      }
+
+      const editor = current.content.activeCell?.editor;
+      if (!editor) {
+        return;
+      }
+
+      try {
+        const text = await navigator.clipboard.readText();
+        if (text) {
+          editor.replaceSelection?.(text);
+        }
+      } catch (err) {
+        // browser limitation fallback (e.g Firefox)
+        Clipboard.showPasteUnavailableDialog(trans);
+      }
+    },
+
+    isEnabled: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      if (!current) {
+        return false;
+      }
+      return !!current.content.activeCell?.editor;
+    },
+    describedBy: {
+      args: {
+        type: 'object',
+        properties: {}
+      }
+    }
+  });
+
   commands.addCommand(CommandIDs.split, {
     label: trans.__('Split Cell'),
     execute: args => {
@@ -3505,7 +3711,16 @@ function addCommands(
         );
       }
     },
-    isEnabled,
+    isVisible: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      if (!current) {
+        return false;
+      }
+
+      // Enable only if more than one cell is selected
+      const notebook = current.content;
+      return notebook && notebook.selectedCells.length > 1;
+    },
     describedBy: {
       args: {
         type: 'object',
@@ -4544,6 +4759,44 @@ function addCommands(
       }
     }
   });
+  commands.addCommand(CommandIDs.selectLastModifiedCell, {
+    label: trans.__('Select Last Modified Cell'),
+    execute: async args => {
+      const current = getCurrent(tracker, shell, args);
+      if (current) {
+        await NotebookActions.selectLastModifiedCell(current.content);
+      }
+    },
+    isEnabled: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      return !!current && current.content.hasNavigableModifiedCellBack();
+    },
+    describedBy: {
+      args: {
+        type: 'object',
+        properties: {}
+      }
+    }
+  });
+  commands.addCommand(CommandIDs.selectNextModifiedCell, {
+    label: trans.__('Select Next Modified Cell'),
+    execute: async args => {
+      const current = getCurrent(tracker, shell, args);
+      if (current) {
+        await NotebookActions.selectNextModifiedCell(current.content);
+      }
+    },
+    isEnabled: args => {
+      const current = getCurrent(tracker, shell, { ...args, activate: false });
+      return !!current && current.content.hasNavigableModifiedCellForward();
+    },
+    describedBy: {
+      args: {
+        type: 'object',
+        properties: {}
+      }
+    }
+  });
   commands.addCommand(CommandIDs.replaceSelection, {
     label: trans.__('Replace Selection in Notebook Cell'),
     execute: args => {
@@ -4800,6 +5053,9 @@ function populatePalette(
     CommandIDs.pasteAbove,
     CommandIDs.pasteAndReplace,
     CommandIDs.deleteCell,
+    CommandIDs.copySelectedtext,
+    CommandIDs.pasteText,
+    CommandIDs.cutSelectedtext,
     CommandIDs.split,
     CommandIDs.merge,
     CommandIDs.mergeAbove,
@@ -4838,7 +5094,9 @@ function populatePalette(
     CommandIDs.toggleRenderSideBySideCurrentNotebook,
     CommandIDs.setSideBySideRatio,
     CommandIDs.enableOutputScrolling,
-    CommandIDs.disableOutputScrolling
+    CommandIDs.disableOutputScrolling,
+    CommandIDs.selectLastModifiedCell,
+    CommandIDs.selectNextModifiedCell
   ].forEach(command => {
     palette.addItem({ command, category });
   });