aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/util/CurrentUserUtils.ts99
-rw-r--r--src/client/views/nodes/ComparisonBox.tsx4
2 files changed, 98 insertions, 5 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 84bed08fa..3a928d0af 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -2,6 +2,7 @@ import { observable, reaction, runInAction } from "mobx";
import * as rp from 'request-promise';
import { OmitKeys, Utils } from "../../Utils";
import { Doc, DocListCast, DocListCastAsync, Opt } from "../../fields/Doc";
+import { DocData } from "../../fields/DocSymbols";
import { InkTool } from "../../fields/InkField";
import { List } from "../../fields/List";
import { PrefetchProxy } from "../../fields/Proxy";
@@ -234,6 +235,95 @@ export class CurrentUserUtils {
MakeTemplate(Doc.GetProto(slide), true, "Untitled Slide View");
return slide;
}
+ const plotlyView = (opts:DocumentOptions) => {
+ var plotly = Doc.MyPublishedDocs.find(doc => doc.title === "@plotly");
+ if (!plotly) {
+ const plotly = Docs.Create.TextDocument(
+ `await import("https://cdn.plot.ly/plotly-2.27.0.min.js");
+ Plotly.newPlot(dashDiv.id, [ --DOCDATA-- ])`
+ , {title: "@plotly", title_custom: true, _width:300,_height:400});
+ Doc.AddToMyPublished(plotly);
+ }
+ const rtfield = new RichTextField(JSON.stringify(
+ {doc: {type:"doc",content:[
+ {type:"code_block",content:[
+ {type:"text",text:"^@plotly"},
+ {type:"text",text:"\n"},
+ {type:"text",text:"\n{"},
+ {type:"text",text:"\n x: [1,2,3,5,19],"},
+ {type:"text",text:"\n y: [1, 9, 15, 12,3],"},
+ {type:"text",text:"\n mode: 'lines+markers', "},
+ {type:"text",text:"\n type: 'scatter'"},
+ {type:"text",text:"\n}"}
+ ]}
+ ]},
+ selection:{type:"text",anchor:2,head:2}}),
+ `^@plotly
+ {
+ x: [1,2,3,5,19],
+ y: [1, 9, 15, 12,3],
+ mode: 'lines+markers',
+ type: 'scatter'
+ }`);
+ const slide = Docs.Create.TextDocument("", opts);
+ slide[DocData].text = rtfield;
+ slide[DocData].layout_textPainted = `<CollectionView {...props} fieldKey={'text'}/>`;
+ slide[DocData]._type_collection = CollectionViewType.Freeform;
+ slide.onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted", "")`);
+ return slide;
+ }
+ const mermaidsView = (opts:DocumentOptions) => {
+ var mermaids = Doc.MyPublishedDocs.find(doc => doc.title === "@mermaids");
+ if (!mermaids) {
+ const mermaids = Docs.Create.TextDocument(
+ `const mdef = (await import("https://cdn.jsdelivr.net/npm/mermaid\@10.8.0/dist/mermaid.esm.min.mjs")).default;
+ window["callb"] = (x) => {
+ alert(x);
+ }
+ mdef.initialize({
+ securityLevel : "loose",
+ startOnLoad: true,
+ flowchart: { useMaxWidth: true, htmlLabels: true, curve: 'cardinal' },
+ });
+ const mermaid = async (str) => (await mdef.render("graph"+Date.now(),str));
+ const {svg, bindFunctions} = await mermaid(\`--DOCDATA--\`);
+ dashDiv.innerHTML = svg;
+ if (bindFunctions) {
+ bindFunctions(dashDiv);
+ }`
+ , {title: "@mermaids", title_custom: true, _width:300,_height:400});
+ Doc.AddToMyPublished(mermaids);
+ }
+ const rtfield = new RichTextField(JSON.stringify(
+ {doc: {type:"doc",content:[
+ {type:"code_block",content:[
+ {type:"text",text:"^@mermaids"},
+ {type:"text",text:"\n\n"},
+ {type:"text",text:"pie "},
+ {type:"text",text:"title"},
+ {type:"text",text:" "},
+ {type:"text",text:"Minerals in my tap water"},
+ {type:"text",text:"\n \"Calcium\" : "},
+ {type:"dashField",attrs:{fieldKey:"calcium",docId:"","hideKey":false,editable:true}},
+ {type:"text",text:"\n \"Potassium\" : "},
+ {type:"dashField",attrs:{fieldKey:"pot",docId:"",hideKey:false,editable:true}},
+ {type:"text",text:"\n \"Magnesium\" : 10.01"}
+ ]}
+ ]},
+ selection:{type:"text",anchor:109,head:109}
+ }),
+ `^@mermaids
+pie title Minerals in my tap water
+ "Calcium" : 42.96
+ "Potassium" : 50
+ "Magnesium" : 10.01`);
+ const slide = Docs.Create.TextDocument("", opts);
+ slide[DocData].text = rtfield;
+ slide[DocData].layout_textPainted = `<CollectionView {...props} fieldKey={'text'}/>`;
+ slide[DocData]._type_collection = CollectionViewType.Freeform;
+ slide.onPaint = ScriptField.MakeScript(`toggleDetail(documentView, "textPainted", "")`);
+ return slide;
+ }
const emptyThings:{key:string, // the field name where the empty thing will be stored
opts:DocumentOptions, // the document options that are required for the empty thing
funcs?:{[key:string]: any}, // computed fields that are rquired for the empth thing
@@ -264,7 +354,9 @@ export class CurrentUserUtils {
dropAction:dropActionType.move, treeView_Type: TreeViewType.outline,
backgroundColor: "white", _xMargin: 0, _yMargin: 0, _createDocOnCR: true
}, funcs: {title: 'this.text?.Text'}},
- ];
+ {key: "Mermaids", creator: mermaidsView, opts: { _width: 300, _height: 300, }},
+ {key: "Plotly", creator: plotlyView, opts: { _width: 300, _height: 300, }},
+ ];
emptyThings.forEach(thing => DocUtils.AssignDocField(doc, "empty"+thing.key, (opts) => thing.creator(opts), {...standardOps(thing.key), ...thing.opts}, undefined, thing.scripts, thing.funcs));
@@ -272,6 +364,8 @@ export class CurrentUserUtils {
{ toolTip: "Tap or drag to create a note", title: "Note", icon: "sticky-note", dragFactory: doc.emptyNote as Doc, clickFactory: DocCast(doc.emptyNote)},
{ toolTip: "Tap or drag to create a flashcard", title: "Flashcard", icon: "id-card", dragFactory: doc.emptyFlashcard as Doc, clickFactory: DocCast(doc.emptyFlashcard)},
{ toolTip: "Tap or drag to create an equation", title: "Math", icon: "calculator", dragFactory: doc.emptyEquation as Doc, clickFactory: DocCast(doc.emptyEquation)},
+ { toolTip: "Tap or drag to create a mermaid node", title: "Mermaids", icon: "rocket", dragFactory: doc.emptyMermaids as Doc, clickFactory: DocCast(doc.emptyMermaids)},
+ { toolTip: "Tap or drag to create a plotly node", title: "Plotly", icon: "rocket", dragFactory: doc.emptyPlotly as Doc, clickFactory: DocCast(doc.emptyMermaids)},
{ toolTip: "Tap or drag to create a physics simulation",title: "Simulation", icon: "rocket",dragFactory: doc.emptySimulation as Doc, clickFactory: DocCast(doc.emptySimulation), funcs: { hidden: "IsNoviceMode()"}},
{ toolTip: "Tap or drag to create a note board", title: "Notes", icon: "folder", dragFactory: doc.emptyNoteboard as Doc, clickFactory: DocCast(doc.emptyNoteboard)},
{ toolTip: "Tap or drag to create a collection", title: "Col", icon: "folder", dragFactory: doc.emptyCollection as Doc, clickFactory: DocCast(doc.emptyTab)},
@@ -442,8 +536,7 @@ export class CurrentUserUtils {
/// Initializes the panel of draggable tools that is opened from the left sidebar.
static setupToolsBtnPanel(doc: Doc, field:string) {
- const myTools = DocCast(doc[field]);
- const allTools = DocListCast(myTools?.data);
+ const allTools = DocListCast(DocCast(doc[field])?.data);
const creatorBtns = CurrentUserUtils.setupCreatorButtons(doc, allTools?.length ? allTools[0]:undefined);
const userTools = allTools && allTools?.length > 1 ? allTools[1]:undefined;
const userBtns = CurrentUserUtils.setupUserDocumentCreatorButtons(doc, userTools);
diff --git a/src/client/views/nodes/ComparisonBox.tsx b/src/client/views/nodes/ComparisonBox.tsx
index 116dc48a6..ef8c045cc 100644
--- a/src/client/views/nodes/ComparisonBox.tsx
+++ b/src/client/views/nodes/ComparisonBox.tsx
@@ -6,7 +6,7 @@ import { emptyFunction, returnFalse, returnNone, returnZero, setupMoveUpEvents }
import { Doc, Opt } from '../../../fields/Doc';
import { DocCast, NumCast, StrCast } from '../../../fields/Types';
import { DocUtils, Docs } from '../../documents/Documents';
-import { DragManager } from '../../util/DragManager';
+import { DragManager, dropActionType } from '../../util/DragManager';
import { undoBatch } from '../../util/UndoManager';
import { ViewBoxAnnotatableComponent, ViewBoxInterface } from '../DocComponent';
import { StyleProp } from '../StyleProvider';
@@ -135,7 +135,7 @@ export class ComparisonBox extends ViewBoxAnnotatableComponent<FieldViewProps>()
this,
e,
e => {
- const de = new DragManager.DocumentDragData([DocCast(this.dataDoc[which])], 'move');
+ const de = new DragManager.DocumentDragData([DocCast(this.dataDoc[which])], dropActionType.move);
de.moveDocument = (doc: Doc | Doc[], targetCollection: Doc | undefined, addDocument: (doc: Doc | Doc[]) => boolean): boolean => {
this.clearDoc(which);
return addDocument(doc);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-06 18:41:52 +0000