WIP: filtering; cell type-checking issue

Author: quffaro

packages/frontend/src/analysis/analysis_editor.tsx

@@ -37,7 +37,7 @@ export function AnalysisNotebookEditor(props: { liveAnalysis: LiveAnalysisDoc })
                 notebook={liveDoc().doc.notebook}
                 changeNotebook={(f) => liveDoc().changeDoc((doc) => f(doc.notebook))}
                 formalCellEditor={AnalysisCellEditor}
-                cellConstructors={cellConstructors()}
+                cellConstructors={cellConstructors}
                 noShortcuts={true}
             />
         </LiveAnalysisContext.Provider>

packages/frontend/src/diagram/diagram_editor.tsx

@@ -41,7 +41,7 @@ export function DiagramNotebookEditor(props: { liveDiagram: LiveDiagramDoc }) {
                     liveDoc().changeDoc((doc) => f(doc.notebook));
                 }}
                 formalCellEditor={DiagramCellEditor}
-                cellConstructors={cellConstructors()}
+                cellConstructors={cellConstructors}
                 cellLabel={judgmentLabel}
                 duplicateCell={duplicateDiagramJudgment}
             />

packages/frontend/src/model/model_editor.tsx

@@ -26,12 +26,9 @@ import {
 export function ModelNotebookEditor(props: { liveModel: LiveModelDoc }) {
     const liveDoc = () => props.liveModel.liveDoc;
 
-    const cellConstructors = () => {
-	    // const cells = liveDoc().doc.notebook.cellOrder;
-		// console.log(cells);
-
+    const cellConstructors = (cellType?: string, cellName?: string) => {
         const theory = props.liveModel.theory();
-        return theory ? modelCellConstructors(theory) : [];
+        return theory ? modelCellConstructors(theory, cellType, cellName) : [];
     };
 
     return (
@@ -44,7 +41,7 @@ export function ModelNotebookEditor(props: { liveModel: LiveModelDoc }) {
                     liveDoc().changeDoc((doc) => f(doc.notebook));
                 }}
                 formalCellEditor={ModelCellEditor}
-                cellConstructors={cellConstructors()}
+                cellConstructors={cellConstructors}
                 cellLabel={judgmentLabel}
                 duplicateCell={duplicateModelJudgment}
             />
@@ -57,7 +54,6 @@ export function ModelCellEditor(props: FormalCellEditorProps<ModelJudgment>) {
     const liveModel = useContext(LiveModelContext);
     invariant(liveModel, "Live model should be provided as context");
 
-    console.log(props);
     return (
         <Switch>
             <Match when={props.content.tag === "object" && liveModel().theory()}>
@@ -98,9 +94,9 @@ export function ModelCellEditor(props: FormalCellEditorProps<ModelJudgment>) {
     );
 }
 
-function modelCellConstructors(theory: Theory): CellConstructor<ModelJudgment>[] {
+function modelCellConstructors(theory: Theory, cellType?: string, cellName?: string): CellConstructor<ModelJudgment>[] {
     const constructors: CellConstructor<ModelJudgment>[] = [];
-    if (theory.theory.canInstantiateModels()) {
+    if (theory.theory.canInstantiateModels() && !cellType && !cellName) {
         constructors.push({
             name: "Instantiate",
             description: "Instantiate an existing model into this one",
@@ -111,8 +107,14 @@ function modelCellConstructors(theory: Theory): CellConstructor<ModelJudgment>[]
         });
     }
 
-    for (const meta of theory.modelTypes ?? []) {
-        constructors.push(modelCellConstructor(meta));
+	for (const meta of theory.modelTypes ?? []) {
+	    if (cellName && cellType) {
+			if ((meta.name !== cellName) && (meta.tag == cellType)) {
+			  constructors.push(modelCellConstructor(meta))
+			}
+		} else {
+			constructors.push(modelCellConstructor(meta))
+		}
     }
     return constructors;
 }

packages/frontend/src/notebook/notebook_cell.css

@@ -50,3 +50,10 @@
     /* border-radius: 50%; */
     top: -2px;
 }
+
+button.plain {
+    background: transparent;
+    border: none;
+	color: darkgray;
+    font-size: 11pt;	
+}

packages/frontend/src/notebook/notebook_editor.tsx

@@ -72,7 +72,7 @@ export function NotebookEditor<T>(props: {
     changeNotebook: (f: (nb: Notebook<T>) => void) => void;
 
     formalCellEditor: Component<FormalCellEditorProps<T>>;
-    cellConstructors?: CellConstructor<T>[];
+    cellConstructors: (cellType?: string, cellName?: string) => CellConstructor<T>[];
     cellLabel?: (content: T) => string | undefined;
 
     /** Called to duplicate an existing cell.
@@ -163,17 +163,16 @@ export function NotebookEditor<T>(props: {
         props.changeNotebook((nb) => {
 			NotebookUtils.retypeCell(nb, i, mutator);
         });
-		setActiveCell(i);
     };
 
-    const cellConstructors = (): CellConstructor<T>[] => [
-        {
-            name: "Text",
-            description: "Start writing text",
-            shortcut: ["T"],
-            construct: () => newRichTextCell(),
-        },
-        ...(props.cellConstructors ?? []),
+    const cellConstructors = (cellType?: string, cellName?: string): CellConstructor<T>[] => [
+      ...((cellType && cellName) ? [] : [{
+        name: "Text",
+        description: "Start writing text",
+        shortcut: ["T"],
+        construct: () => newRichTextCell(),
+    }]),  
+        ...(props.cellConstructors(cellType, cellName) ?? []),
     ];
 
     const replaceCommands = (i: number): Completion[] =>
@@ -187,8 +186,8 @@ export function NotebookEditor<T>(props: {
             };
         });
 
-    const retypeCommands = (i: number): Completion[] =>
-        cellConstructors().map((cc) => {
+    const retypeCommands = (i: number, cellType?: string, cellName?: string): Completion[] =>
+        cellConstructors(cellType, cellName).map((cc) => {
             const { name, description, shortcut } = cc;
             return {
                 name,
@@ -327,18 +326,21 @@ export function NotebookEditor<T>(props: {
                         const cell = props.notebook.cellContents[cellId];
                         invariant(cell, `Failed to find contents for cell '${cellId}'`);
 
-						// const tag = (cell.tag === "formal" ? props.cellLabel?.(cell.content) : undefined) as string;
 						const cellName = (cell: Cell<T>) =>
                             (cell.tag === "formal"
                                 ? props.cellLabel?.(cell.content)
                                 : undefined) as string;
-						// const cellType = isFormalCell(cell)
-                            // ? isObType(cell.content)
-                                // ? "ObType"
-                                // : isMorType(cell.content)
-                                  // ? "MorType"
-                                  // : ""
-                            // : "";
+
+						const cellType = (cell: Cell<T>) => 
+							cell.tag === "formal" ? ((isObType(cell.content)) ? "ObType" : "MorType") : undefined;
+
+						// if (isObType(cellContent) && isObType(newCell.content)) {
+                // cellContent.obType = newCell.content.obType;
+            // } else if (isMorType(cellContent) && isMorType(newCell.content)) {
+                // cellContent.morType = newCell.content.morType;
+            // }
+
+						// const cellType = "ObType";
 
                         if (cell.tag !== "rich-text") {
                             cellActions.duplicate = () => {
@@ -360,13 +362,11 @@ export function NotebookEditor<T>(props: {
                                     cellId={cell.id}
                                     index={i()}
                                     actions={cellActions}
-                                    tag={
-                                       cellName(cell) 
-                                    }
+                                    tag={cellName(cell)}
                                     currentDropTarget={currentDropTarget()}
                                     setCurrentDropTarget={setCurrentDropTarget}
 									isActive={isActive()}
-									replaceCommands={retypeCommands(i())}
+									replaceCommands={retypeCommands(i(), cellType(cell), cellName(cell))}
                                 >
                                     <Switch>
                                         <Match when={cell.tag === "rich-text"}>