fixed contextmenu when hitting enter to not iconify. fixed : menu to add equations properly.

5 files changed, 14 insertions, 23 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index f96bffb3c..e36103938 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -1290,21 +1290,7 @@ export namespace DocUtils {
             })) as ContextMenuProps[],
             icon: "sticky-note"
         });
-        const math: ContextMenuProps = ({
-            description: ":Math", event: () => {
-                const created = Docs.Create.EquationDocument();
-                if (created) {
-                    created.author = Doc.CurrentUserEmail;
-                    created.x = x;
-                    created.y = y;
-                    created.width = 300;
-                    created.height = 35;
-                    EquationBox.SelectOnLoad = created[Id];
-                    docAdder?.(created);
-                }
-            }, icon: "calculator"
-        });
-        const documentList: ContextMenuProps[] = DocListCast(Cast(Doc.UserDoc().myItemCreators, Doc, null)?.data).filter(btnDoc => !btnDoc.hidden).map(btnDoc => Cast(btnDoc?.dragFactory, Doc, null)).filter(doc => doc && doc !== Doc.UserDoc().emptyPresentation).map((dragDoc, i) => ({
+        const documentList: ContextMenuProps[] = DocListCast(DocListCast(CurrentUserUtils.MyTools?.data).lastElement()?.data).filter(btnDoc => !btnDoc.hidden).map(btnDoc => Cast(btnDoc?.dragFactory, Doc, null)).filter(doc => doc && doc !== Doc.UserDoc().emptyPresentation).map((dragDoc, i) => ({
             description: ":" + StrCast(dragDoc.title),
             event: undoBatch((args: { x: number, y: number }) => {
                 const newDoc = Doc.copyDragFactory(dragDoc);
@@ -1312,13 +1298,13 @@ export namespace DocUtils {
                     newDoc.author = Doc.CurrentUserEmail;
                     newDoc.x = x;
                     newDoc.y = y;
+                    EquationBox.SelectOnLoad = newDoc[Id];
                     if (newDoc.type === DocumentType.RTF) FormattedTextBox.SelectOnLoad = newDoc[Id];
                     docAdder?.(newDoc);
                 }
             }),
             icon: Doc.toIcon(dragDoc),
         })) as ContextMenuProps[];
-        documentList.push(math);
         ContextMenu.Instance.addItem({
             description: "Create document",
             subitems: documentList,
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 7a38886fe..1d5a9fa09 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -77,7 +77,7 @@ export class CurrentUserUtils {
     static AssignScripts(doc:Doc, scripts?:{ [key: string]: string;}, funcs?:{[key:string]: string}) {
         scripts && Object.keys(scripts).map(key => {
             if (ScriptCast(doc[key])?.script.originalScript !== scripts[key] && scripts[key]) {
-                doc[key] = ScriptField.MakeScript(scripts[key], { dragData: DragManager.DocumentDragData.name,  value:"any", scriptContext: "any" }, {"_readOnly_": true});
+                doc[key] = ScriptField.MakeScript(scripts[key], { dragData: DragManager.DocumentDragData.name, value:"any", scriptContext: "any" }, {"_readOnly_": true});
             }
         }); 
         funcs && Object.keys(funcs).map(key => {
@@ -248,7 +248,8 @@ export class CurrentUserUtils {
               }[] = [
             {key: "emptyPresentation", creator: Docs.Create.PresDocument,  opts: { title: "Untitled Presentation", _viewType: CollectionViewType.Stacking, _width: 400, _height: 500, targetDropAction: "alias" as any, _chromeHidden: true, boxShadow: "0 0" }},
             {key: "emptyCollection", creator: (opts) => Docs.Create.FreeformDocument([], opts), opts: { title: "freeform", _width: 150, _height: 100 }},
-            {key: "emptyPane", creator: (opts) => Docs.Create.FreeformDocument([], opts), opts :  { title: "Untitled Tab", _backgroundGridShow: true, _width: 500, _height: 800 }},
+            {key: "emptyPane", creator: (opts) => Docs.Create.FreeformDocument([], opts), opts:  { title: "Untitled Tab", _backgroundGridShow: true, _width: 500, _height: 800 }},
+            {key: "emptyMath", creator: (opts) => Docs.Create.EquationDocument(opts), opts: { title: "Equation", _backgroundGridShow: true, _width: 300, _height: 35 }},
             {key: "emptySlide", creator: (opts) => Docs.Create.TreeDocument([], opts), funcs: {title: 'self.text?.Text'}, opts: {
                 _viewType: CollectionViewType.Tree, treeViewHasOverlay: true, _fontSize: "20px", _autoHeight: true, 
                 "dragFactory-count": undefined,  allowOverlayDrop: true, treeViewType: TreeViewType.outline, _xMargin: 0, _yMargin: 0, _width: 300, _height: 200, _singleLine: true, backgroundColor: "white"
@@ -265,7 +266,7 @@ export class CurrentUserUtils {
         ];
 
         emptyThings.forEach(thing => 
-            this.AssignScripts(this.AssignOpts(DocCast(doc[thing.key]), {...standardOps(), ...thing.opts}) ?? (doc[thing.key] = thing.creator({...standardOps(), ...thing.opts})), thing.funcs))
+            this.AssignScripts(this.AssignOpts(DocCast(doc[thing.key]), {...standardOps(), ...thing.opts}) ?? (doc[thing.key] = thing.creator({...standardOps(), ...thing.opts})), undefined, thing.funcs))
         
         if (doc.emptyHeader === undefined) {
             const json = {
@@ -309,6 +310,7 @@ export class CurrentUserUtils {
         return [
             { toolTip: "Tap or drag to create a note",            title: "Note", icon: "sticky-note",   dragFactory: doc.emptyNote as Doc,        scripts: {onClick: 'openOnRight(copyDragFactory(this.dragFactory))',  onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, },
             { toolTip: "Tap or drag to create a collection",      title: "Col", icon: "folder",         dragFactory: doc.emptyCollection as Doc,  scripts: {onClick: 'openOnRight(copyDragFactory(this.clickFactory))', onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, clickFactory: doc.emptyPane as Doc, },
+            { toolTip: "Tap or drag to create an equation",       title: "Math", icon: "calculator",    dragFactory: doc.emptyMath as Doc,        scripts: {onClick: 'openOnRight(copyDragFactory(this.clickFactory))', onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, },
             { toolTip: "Tap or drag to create a webpage",         title: "Web", icon: "globe-asia",     dragFactory: doc.emptyWebpage as Doc,     scripts: {onClick: 'openOnRight(copyDragFactory(this.dragFactory))',  onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, },
             { toolTip: "Tap or drag to create a comparison box",  title: "Compare", icon: "columns",    dragFactory: doc.emptyComparison as Doc,  scripts: {onClick: 'openOnRight(copyDragFactory(this.dragFactory))',  onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, },
             { toolTip: "Tap or drag to create an audio recorder", title: "Audio", icon: "microphone",   dragFactory: doc.emptyAudio as Doc,       scripts: {onClick: 'openInOverlay(copyDragFactory(this.dragFactory))',onDragStart: '{ return copyDragFactory(this.dragFactory);}'}, },
@@ -1213,7 +1215,6 @@ export class CurrentUserUtils {
     public static set ActivePresentation(val) { Doc.UserDoc().activePresentation = val; }
     public static get ActivePage() { return StrCast(Doc.UserDoc().activePage); }
     public static set ActivePage(val) { Doc.UserDoc().activePage = val; }
-    public static get EmptyPane() { return DocCast(Doc.UserDoc().emptyPane); }
     public static set ActiveTool(tool: InkTool) { Doc.UserDoc().activeTool = tool; }
     public static get ActiveTool(): InkTool { return StrCast(Doc.UserDoc().activeTool, InkTool.None) as InkTool; }
 }
diff --git a/src/client/views/ContextMenu.tsx b/src/client/views/ContextMenu.tsx
index 80ff16cf9..e2f98de1e 100644
--- a/src/client/views/ContextMenu.tsx
+++ b/src/client/views/ContextMenu.tsx
@@ -287,6 +287,7 @@ export class ContextMenu extends React.Component {
             }
             this.closeMenu();
             e.preventDefault();
+            e.stopPropagation();
         }
     }
 
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index b666b5977..d22fb5f01 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -7,8 +7,8 @@ import { DateField } from '../../fields/DateField';
 import { AclAdmin, AclEdit, DataSym, Doc, DocListCast, Field, HeightSym, WidthSym } from "../../fields/Doc";
 import { Document } from '../../fields/documentSchemas';
 import { InkField } from "../../fields/InkField";
-import { ScriptField } from '../../fields/ScriptField';
-import { Cast, NumCast, StrCast } from "../../fields/Types";
+import { ComputedField, ScriptField } from '../../fields/ScriptField';
+import { Cast, FieldValue, NumCast, StrCast } from "../../fields/Types";
 import { GetEffectiveAcl } from '../../fields/util';
 import { emptyFunction, returnFalse, setupMoveUpEvents } from "../../Utils";
 import { Docs } from "../documents/Documents";
@@ -461,6 +461,9 @@ export class DocumentDecorations extends React.Component<{ PanelWidth: number, P
                         return ScriptField.MakeFunction(this._titleControlString.substring(1), { doc: Doc.name })!.script.run({ self: selected.rootDoc, this: selected.layoutDoc }, console.log).result?.toString() || "";
                   }
                   if (this._titleControlString.startsWith("#")) {
+                    const cfield = ComputedField.WithoutComputed(() => FieldValue(selected.props.Document.title));
+                      console.log(cfield);
+                      (cfield as any)?.script.run().result;
                         return Field.toString(selected.props.Document[this._titleControlString.substring(1)] as Field) || "-unset-";
                   }
                   return this._accumulatedTitle;
diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts
index 74213652b..981514b25 100644
--- a/src/fields/Doc.ts
+++ b/src/fields/Doc.ts
@@ -233,7 +233,7 @@ export class Doc extends RefField {
     }
 
     private [CachedUpdates]: { [key: string]: () => void | Promise<any> } = {};
-    public static get noviceMode() { return BoolCast(Doc.UserDoc().noviceMode); }
+    public static get noviceMode() { return Doc.UserDoc().noviceMode as boolean; }
     public static set noviceMode(val) { Doc.UserDoc().noviceMode = val; }
     public static get defaultAclPrivate() { return Doc.UserDoc().defaultAclPrivate; }
     public static set defaultAclPrivate(val) { Doc.UserDoc().defaultAclPrivate = val; }