Merge pull request #8473 from sagemathinc/jupyter-celltype-cellmenu-8472

frontend/jupyter: add cell-type switches to the button menu of a cell

Author: williamstein

src/packages/frontend/cspell.json

@@ -41,7 +41,8 @@
     "timetravel",
     "tolerations",
     "undelete",
-    "undeleting"
+    "undeleting",
+    "revealjs"
   ],
   "ignoreWords": [
     "antd",
@@ -64,7 +65,9 @@
     "vertexai",
     "vfill",
     "xsmall",
-    "flyouts"
+    "flyouts",
+    "buttonbar",
+    "noconf"
   ],
   "flagWords": [],
   "ignorePaths": ["node_modules/**", "dist/**", "dist-ts/**", "build/**"],

src/packages/frontend/frame-editors/jupyter-editor/cell-notebook/actions.ts

@@ -14,8 +14,9 @@ import {
 } from "@cocalc/frontend/jupyter/commands";
 import { create_key_handler } from "@cocalc/frontend/jupyter/keyboard";
 import Fragment from "@cocalc/frontend/misc/fragment-id";
-import { Cell, CellType, Scroll } from "@cocalc/jupyter/types";
+import { Cell, Scroll } from "@cocalc/jupyter/types";
 import { move_selected_cells } from "@cocalc/jupyter/util/cell-utils";
+import { CellType } from "@cocalc/util/jupyter/types";
 import {
   bind_methods,
   close,
@@ -214,7 +215,7 @@ export class NotebookFrameActions {
   }
 
   /***
-   * Debugging related functioanlity
+   * Debugging related functionality
    ***/
 
   private dbg(f: string, ...args): void {
@@ -281,7 +282,7 @@ export class NotebookFrameActions {
   }
 
   /* Run the selected cells; triggered by either clicking the play button or
-     press shift+enter.  Note that this has weird and inconsitent
+     press shift+enter.  Note that this has weird and inconsistent
      behavior in official Jupyter for usability reasons and due to
      their "modal" approach.
      In particular, if the selections goes to the end of the document, we
@@ -421,8 +422,7 @@ export class NotebookFrameActions {
       undefined,
       false,
     );
-    let md_edit_ids = this.store.get("md_edit_ids");
-    if (md_edit_ids == null) md_edit_ids = Set();
+    const md_edit_ids = this.store.get("md_edit_ids", Set());
     if (md_edit_ids.contains(id)) {
       return;
     }
@@ -487,7 +487,7 @@ export class NotebookFrameActions {
     const cell = this.get_cell_by_id(id);
     if (cell == null) return;
 
-    if (cell.getIn(["metadata", "editable"]) === false) {
+    if (!this.jupyter_actions.store.is_cell_editable(id)) {
       // TODO: NEVER ever silently fail!
       return;
     }
@@ -496,6 +496,29 @@ export class NotebookFrameActions {
     this.set_mode("edit");
   }
 
+  public cell_md_is_editing(id): boolean {
+    const md_edit_ids = this.store.get("md_edit_ids", Set());
+    return md_edit_ids.contains(id);
+  }
+
+  public toggle_md_cell_edit(id: string): void {
+    const cell = this.get_cell_by_id(id);
+    if (cell == null) return;
+    if (!this.jupyter_actions.store.is_cell_editable(id)) {
+      // TODO: NEVER ever silently fail!
+      return;
+    }
+
+    if (this.cell_md_is_editing(id)) {
+      this.set_md_cell_not_editing(id);
+      this.set_mode("escape");
+    } else {
+      this.switch_md_cell_to_edit(id);
+      this.set_mode("edit");
+    }
+    this.set_cur_id(id);
+  }
+
   public switch_code_cell_to_edit(id: string): void {
     const cell = this.get_cell_by_id(id);
     if (cell == null) return;
@@ -594,7 +617,7 @@ export class NotebookFrameActions {
   }
 
   // select all cells, possibly of a given type.
-  select_all_cells = (cell_type?: "code" | "markdown" | "raw") => {
+  select_all_cells = (cell_type?: CellType) => {
     let sel_ids;
     if (cell_type) {
       sel_ids =

src/packages/frontend/frame-editors/jupyter-editor/editor.ts

@@ -5,9 +5,12 @@
 
 /*
 Spec for editing Jupyter notebooks via a frame tree.
+
+cSpell:ignore JSONIPynb
 */
 
 import { createElement } from "react";
+
 import type { Command } from "@cocalc/frontend/frame-editors/frame-tree/commands";
 import { addEditorMenus } from "@cocalc/frontend/frame-editors/frame-tree/commands";
 import { FORMAT_SOURCE_ICON } from "@cocalc/frontend/frame-editors/frame-tree/config";
@@ -25,10 +28,10 @@ import { Introspect } from "./introspect/introspect";
 import JSONIPynb from "./json-ipynb";
 import KernelMenuItem from "./kernel-menu-item";
 import { RawIPynb } from "./raw-ipynb";
+import { search } from "./search";
 import { Slideshow } from "./slideshow-revealjs/slideshow";
 import { JupyterSnippets } from "./snippets";
 import { TableOfContents } from "./table-of-contents";
-import { search } from "./search";
 
 const SNIPPET_ICON_NAME = "magic";
 

src/packages/frontend/i18n/common.ts

@@ -1280,6 +1280,20 @@ export const jupyter = {
       defaultMessage: "None",
       description: "Jupyter Notebook cell toolbar 'None' hides the toolbar",
     },
+    change_cell_to_code: {
+      id: "jupyter.commands.change_cell_to_code.label",
+      defaultMessage: "Change Cell to Code",
+    },
+    change_cell_to_markdown: {
+      id: "jupyter.commands.change_cell_to_markdown.label",
+      defaultMessage: "Change Cell to Markdown",
+      description: "Cell in a Jupyter Notebook",
+    },
+    change_cell_to_raw: {
+      id: "jupyter.commands.change_cell_to_raw.label",
+      defaultMessage: "Change Cell to Raw",
+      description: "Cell in a Jupyter Notebook",
+    },
     restart_kernel_noconf_menu: {
       id: "jupyter.commands.restart_kernel_noconf.menu",
       defaultMessage: "Restart kernel",

src/packages/frontend/i18n/trans/ar_EG.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "تغيير Markdown إلى Heading 5",
   "jupyter.commands.change_cell_to_heading_6.label": "تغيير Markdown إلى العنوان 6",
   "jupyter.commands.change_cell_to_markdown.label": "تغيير الخلية إلى Markdown",
-  "jupyter.commands.change_cell_to_row.label": "تغيير الخلية إلى خام",
+  "jupyter.commands.change_cell_to_raw.label": "تغيير الخلية إلى خام",
   "jupyter.commands.change_kernel": "تغيير النواة...",
   "jupyter.commands.change_kernel_title": "اختر من أي من النوى المتاحة",
   "jupyter.commands.clear_all_cells_output.label": "مسح جميع مخرجات الخلايا",

src/packages/frontend/i18n/trans/de_DE.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "Ändern Sie Markdown in Überschrift 5",
   "jupyter.commands.change_cell_to_heading_6.label": "Ändern Sie Markdown in Überschrift 6",
   "jupyter.commands.change_cell_to_markdown.label": "Ändere Zelle zu Markdown",
-  "jupyter.commands.change_cell_to_row.label": "Zelle in Rohdaten ändern",
+  "jupyter.commands.change_cell_to_raw.label": "Zelle in Rohdaten ändern",
   "jupyter.commands.change_kernel": "Kernel ändern...",
   "jupyter.commands.change_kernel_title": "Wählen Sie aus den verfügbaren Kernels.",
   "jupyter.commands.clear_all_cells_output.label": "Alle Zellausgaben löschen",

src/packages/frontend/i18n/trans/es_ES.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "Cambiar Markdown a Encabezado 5",
   "jupyter.commands.change_cell_to_heading_6.label": "Cambiar Markdown a Encabezado 6",
   "jupyter.commands.change_cell_to_markdown.label": "Cambiar Celda a Markdown",
-  "jupyter.commands.change_cell_to_row.label": "Cambiar Celda a Raw",
+  "jupyter.commands.change_cell_to_raw.label": "Cambiar Celda a Raw",
   "jupyter.commands.change_kernel": "Cambiar Kernel...",
   "jupyter.commands.change_kernel_title": "Seleccionar de cualquiera de los kernels disponibles",
   "jupyter.commands.clear_all_cells_output.label": "Borrar todas las salidas de celdas",

src/packages/frontend/i18n/trans/es_PV.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "Aldatu Markdown 5. goiburura",
   "jupyter.commands.change_cell_to_heading_6.label": "Aldatu Markdown 6. Izenburura",
   "jupyter.commands.change_cell_to_markdown.label": "Aldatu Zela Markdown-era",
-  "jupyter.commands.change_cell_to_row.label": "Aldatu Zelaia Gordin bihurtzeko",
+  "jupyter.commands.change_cell_to_raw.label": "Aldatu Zelaia Gordin bihurtzeko",
   "jupyter.commands.change_kernel": "Aldatu Kernel...",
   "jupyter.commands.change_kernel_title": "Hautatu eskuragarri dauden kernel batetik.",
   "jupyter.commands.clear_all_cells_output.label": "Garbitu Gelaxka Irteera Guztiak",

src/packages/frontend/i18n/trans/fr_FR.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "Changer Markdown en Titre 5",
   "jupyter.commands.change_cell_to_heading_6.label": "Changer Markdown en Titre 6",
   "jupyter.commands.change_cell_to_markdown.label": "Changer la cellule en Markdown",
-  "jupyter.commands.change_cell_to_row.label": "Changer la cellule en brut",
+  "jupyter.commands.change_cell_to_raw.label": "Changer la cellule en brut",
   "jupyter.commands.change_kernel": "Changer de noyau...",
   "jupyter.commands.change_kernel_title": "Sélectionnez parmi les noyaux disponibles.",
   "jupyter.commands.clear_all_cells_output.label": "Effacer tous les résultats des cellules",

src/packages/frontend/i18n/trans/he_IL.json

@@ -664,7 +664,7 @@
   "jupyter.commands.change_cell_to_heading_5.label": "שנה את Markdown לכותרת 5",
   "jupyter.commands.change_cell_to_heading_6.label": "שנה את Markdown לכותרת 6",
   "jupyter.commands.change_cell_to_markdown.label": "שנה תא למרקדאון",
-  "jupyter.commands.change_cell_to_row.label": "שנה תא לתא גולמי",
+  "jupyter.commands.change_cell_to_raw.label": "שנה תא לתא גולמי",
   "jupyter.commands.change_kernel": "שנה קרנל...",
   "jupyter.commands.change_kernel_title": "בחר מתוך כל הליבות הזמינות",
   "jupyter.commands.clear_all_cells_output.label": "נקה את כל הפלטים של התאים",