From cfa31b87f1c2a6597ed3cfb6a777126c58ace665 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Tue, 2 Aug 2022 16:28:18 -0400
Subject: Adjusted ScriptFields to have a rawScript, and updated ScrptingBoxes
 to create a scriptField even for scripts that don't compile.  Updated
 CurrentUserUtils setup functions for clicks.   Fixed TemplateMenu to work
 again.

---
 src/client/views/ScriptBox.tsx | 134 ++++++++++++++++++++++-------------------
 1 file changed, 73 insertions(+), 61 deletions(-)

(limited to 'src/client/views/ScriptBox.tsx')

diff --git a/src/client/views/ScriptBox.tsx b/src/client/views/ScriptBox.tsx
index b7ea124b9..416162aeb 100644
--- a/src/client/views/ScriptBox.tsx
+++ b/src/client/views/ScriptBox.tsx
@@ -1,17 +1,16 @@
-import { action, observable } from "mobx";
-import { observer } from "mobx-react";
-import * as React from "react";
-import { Doc, Opt } from "../../fields/Doc";
-import { ScriptField } from "../../fields/ScriptField";
-import { ScriptCast } from "../../fields/Types";
-import { emptyFunction } from "../../Utils";
-import { DragManager } from "../util/DragManager";
-import { CompileScript } from "../util/Scripting";
-import { EditableView } from "./EditableView";
-import { DocumentIconContainer } from "./nodes/DocumentIcon";
-import { OverlayView } from "./OverlayView";
-import "./ScriptBox.scss";
-
+import { action, observable } from 'mobx';
+import { observer } from 'mobx-react';
+import * as React from 'react';
+import { Doc, Opt } from '../../fields/Doc';
+import { ScriptField } from '../../fields/ScriptField';
+import { ScriptCast } from '../../fields/Types';
+import { emptyFunction } from '../../Utils';
+import { DragManager } from '../util/DragManager';
+import { CompileScript } from '../util/Scripting';
+import { EditableView } from './EditableView';
+import { DocumentIconContainer } from './nodes/DocumentIcon';
+import { OverlayView } from './OverlayView';
+import './ScriptBox.scss';
 
 export interface ScriptBoxProps {
     onSave: (text: string, onError: (error: string) => void) => void;
@@ -28,53 +27,58 @@ export class ScriptBox extends React.Component<ScriptBoxProps> {
 
     constructor(props: ScriptBoxProps) {
         super(props);
-        this._scriptText = props.initialText || "";
+        this._scriptText = props.initialText || '';
     }
 
     @action
     onChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
         this._scriptText = e.target.value;
-    }
+    };
 
     @action
     onError = (error: string) => {
-        console.log("ScriptBox: " + error);
-    }
+        console.log('ScriptBox: ' + error);
+    };
 
     overlayDisposer?: () => void;
     onFocus = () => {
         this.overlayDisposer?.();
         this.overlayDisposer = OverlayView.Instance.addElement(<DocumentIconContainer />, { x: 0, y: 0 });
-    }
+    };
 
     onBlur = () => {
         this.overlayDisposer?.();
-    }
+    };
 
     render() {
-        let onFocus: Opt<() => void> = undefined, onBlur: Opt<() => void> = undefined;
+        let onFocus: Opt<() => void> = undefined,
+            onBlur: Opt<() => void> = undefined;
         if (this.props.showDocumentIcons) {
             onFocus = this.onFocus;
             onBlur = this.onBlur;
         }
-        const params = <EditableView
-            contents={""}
-            display={"block"}
-            maxHeight={72}
-            height={35}
-            fontSize={28}
-            GetValue={() => ""}
-            SetValue={(value: string) => this.props.setParams && this.props.setParams(value.split(" ").filter(s => s !== " ")) ? true : true}
-        />;
+        const params = <EditableView contents={''} display={'block'} maxHeight={72} height={35} fontSize={28} GetValue={() => ''} SetValue={(value: string) => (this.props.setParams?.(value.split(' ').filter(s => s !== ' ')) ? true : true)} />;
         return (
             <div className="scriptBox-outerDiv">
-                <div style={{ display: "flex", flexDirection: "column", height: "100%" }}>
+                <div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
                     <textarea className="scriptBox-textarea" onChange={this.onChange} value={this._scriptText} onFocus={onFocus} onBlur={onBlur}></textarea>
-                    <div style={{ background: "beige" }} >{params}</div>
+                    <div style={{ background: 'beige' }}>{params}</div>
                 </div>
                 <div className="scriptBox-toolbar">
-                    <button onClick={e => { this.props.onSave(this._scriptText, this.onError); e.stopPropagation(); }}>Save</button>
-                    <button onClick={e => { this.props.onCancel && this.props.onCancel(); e.stopPropagation(); }}>Cancel</button>
+                    <button
+                        onClick={e => {
+                            this.props.onSave(this._scriptText, this.onError);
+                            e.stopPropagation();
+                        }}>
+                        Save
+                    </button>
+                    <button
+                        onClick={e => {
+                            this.props.onCancel && this.props.onCancel();
+                            e.stopPropagation();
+                        }}>
+                        Cancel
+                    </button>
                 </div>
             </div>
         );
@@ -90,35 +94,43 @@ export class ScriptBox extends React.Component<ScriptBoxProps> {
         // tslint:disable-next-line: no-unnecessary-callback-wrapper
         const params: string[] = [];
         const setParams = (p: string[]) => params.splice(0, params.length, ...p);
-        const scriptingBox = <ScriptBox initialText={originalText} setParams={setParams} onCancel={overlayDisposer} onSave={(text, onError) => {
-            if (!text) {
-                Doc.GetProto(doc)[fieldKey] = undefined;
-            } else {
-                const script = CompileScript(text, {
-                    params: { this: Doc.name, ...contextParams },
-                    typecheck: false,
-                    editable: true,
-                    transformer: DocumentIconContainer.getTransformer()
-                });
-                if (!script.compiled) {
-                    onError(script.errors.map(error => error.messageText).join("\n"));
-                    return;
-                }
+        const scriptingBox = (
+            <ScriptBox
+                initialText={originalText}
+                setParams={setParams}
+                onCancel={overlayDisposer}
+                onSave={(text, onError) => {
+                    if (!text) {
+                        Doc.GetProto(doc)[fieldKey] = undefined;
+                    } else {
+                        const script = CompileScript(text, {
+                            params: { this: Doc.name, ...contextParams },
+                            typecheck: false,
+                            editable: true,
+                            transformer: DocumentIconContainer.getTransformer(),
+                        });
+                        if (!script.compiled) {
+                            onError(script.errors.map(error => error.messageText).join('\n'));
+                            return;
+                        }
 
-                const div = document.createElement("div");
-                div.style.width = "90";
-                div.style.height = "20";
-                div.style.background = "gray";
-                div.style.position = "absolute";
-                div.style.display = "inline-block";
-                div.style.transform = `translate(${clientX}px, ${clientY}px)`;
-                div.innerHTML = "button";
-                params.length && DragManager.StartButtonDrag([div], text, doc.title + "-instance", {}, params, (button: Doc) => { }, clientX, clientY);
+                        const div = document.createElement('div');
+                        div.style.width = '90';
+                        div.style.height = '20';
+                        div.style.background = 'gray';
+                        div.style.position = 'absolute';
+                        div.style.display = 'inline-block';
+                        div.style.transform = `translate(${clientX}px, ${clientY}px)`;
+                        div.innerHTML = 'button';
+                        params.length && DragManager.StartButtonDrag([div], text, doc.title + '-instance', {}, params, (button: Doc) => {}, clientX, clientY);
 
-                Doc.GetProto(doc)[fieldKey] = new ScriptField(script);
-                overlayDisposer();
-            }
-        }} showDocumentIcons />;
+                        Doc.GetProto(doc)[fieldKey] = new ScriptField(script);
+                        overlayDisposer();
+                    }
+                }}
+                showDocumentIcons
+            />
+        );
         overlayDisposer = OverlayView.Instance.addWindow(scriptingBox, { x: 400, y: 200, width: 500, height: 400, title });
     }
 }
-- 
cgit v1.2.3-70-g09d2

