From eab29b953a24659f16901fa10522f3787212ccc0 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Sun, 26 Jul 2020 11:25:48 -0500
Subject: merge fix again

---
 src/client/views/MainView.scss         |  2 +-
 src/client/views/PropertiesButtons.tsx | 70 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index 51548bf58..792cb5b1f 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -137,7 +137,7 @@
     right: 0;
     top: 0;
     border-left: solid 1px;
-    z-index: 10000;
+    z-index: 100000;
     cursor: auto;
 }
 
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 32a98b072..d2f6b1155 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -354,6 +354,73 @@ export class PropertiesButtons extends React.Component<{}, {}> {
         </Tooltip>;
     }
 
+    @computed
+    get onClickButton() {
+        if (this.selectedDoc) {
+            return <Tooltip title={<><div className="dash-tooltip">Choose onClick behavior</div></>}>
+                <div className="propertiesButtons-linkFlyout">
+                    <Flyout anchorPoint={anchorPoints.LEFT_TOP}
+                        content={this.onClickFlyout}>
+                        <div className={"propertiesButtons-linkButton-" + "empty"} onPointerDown={e => e.stopPropagation()} >
+                            {<FontAwesomeIcon className="documentdecorations-icon" icon="mouse-pointer" size="sm" />}
+                        </div>
+                    </Flyout>
+                </div></Tooltip>;
+        } else {
+            return null;
+        }
+    }
+
+    @computed
+    get onClickFlyout() {
+        return <div><form>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option1" checked={true} />
+                Enter Portal
+            </label>
+            </div>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option2" />
+                Toggle Detail
+            </label>
+            </div>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option3" />
+                Do Nothing
+            </label>
+            </div>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option3" />
+                Follow Link in Place
+            </label>
+            </div>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option3" />
+                Follow Link on Right
+            </label>
+            </div>
+            <div className="radio">
+                <label>
+                    <input type="radio" value="option3" />
+                Edit onClick Script
+            </label>
+            </div>
+        </form> </div>;
+
+        // onClicks.push({ description: "Enter Portal", event: this.makeIntoPortal, icon: "window-restore" });
+        // onClicks.push({ description: "Toggle Detail", event: () => this.Document.onClick = ScriptField.MakeScript(`toggleDetail(self, "${this.Document.layoutKey}")`), icon: "window-restore" });
+        // onClicks.push({ description: this.Document.ignoreClick ? "Select" : "Do Nothing", event: () => this.Document.ignoreClick = !this.Document.ignoreClick, icon: this.Document.ignoreClick ? "unlock" : "lock" });
+        // onClicks.push({ description: this.Document.isLinkButton ? "Remove Follow Behavior" : "Follow Link in Place", event: this.toggleFollowInPlace, icon: "concierge-bell" });
+        // onClicks.push({ description: this.Document.isLinkButton ? "Remove Follow Behavior" : "Follow Link on Right", event: this.toggleFollowOnRight, icon: "concierge-bell" });
+        // onClicks.push({ description: this.Document.isLinkButton || this.onClickHandler ? "Remove Click Behavior" : "Follow Link", event: this.toggleLinkButtonBehavior, icon: "concierge-bell" });
+        // onClicks.push({ description: "Edit onClick Script", event: () => UndoManager.RunInBatch(() => DocUtils.makeCustomViewClicked(this.props.Document, undefined, "onClick"), "edit onClick"), icon: "edit" });
+    }
+
 
     render() {
         if (!this.selectedDoc) return (null);
@@ -388,6 +455,9 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                 <div className="propertiesButtons-button">
                     {this.sharingButton}
                 </div>
+                <div className="propertiesButtons-button">
+                    {this.onClickButton}
+                </div>
                 <div className="propertiesButtons-button" style={{ display: !considerPush ? "none" : "" }}>
                     {this.considerGoogleDocsPush}
                 </div>
-- 
cgit v1.2.3-70-g09d2