From 531147df4186df3d4326748a5d083579cbc9e4c6 Mon Sep 17 00:00:00 2001
From: vellichora <fangrui_tong@brown.edu>
Date: Thu, 9 Jan 2020 12:01:56 -0500
Subject: minor cleanup

---
 src/client/util/RichTextMenu.tsx  |  3 ++-
 src/client/views/AntimodeMenu.tsx | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/client/util/RichTextMenu.tsx b/src/client/util/RichTextMenu.tsx
index ae55dbd30..af2e7cc48 100644
--- a/src/client/util/RichTextMenu.tsx
+++ b/src/client/util/RichTextMenu.tsx
@@ -54,6 +54,7 @@ export default class RichTextMenu extends AntimodeMenu {
     constructor(props: Readonly<{}>) {
         super(props);
         RichTextMenu.Instance = this;
+        this._canFade = false;
     }
 
     @action
@@ -734,7 +735,7 @@ export default class RichTextMenu extends AntimodeMenu {
 
         return (
             <div className="richTextMenu" onPointerEnter={this.onPointerEnter} onPointerLeave={this.onPointerLeave}>
-                {this.getElementWithRows(buttons, 2)}
+                {this.getElementWithRows(buttons, 2, false)}
             </div>
         );
     }
diff --git a/src/client/views/AntimodeMenu.tsx b/src/client/views/AntimodeMenu.tsx
index 62ecdffaf..25bd90d87 100644
--- a/src/client/views/AntimodeMenu.tsx
+++ b/src/client/views/AntimodeMenu.tsx
@@ -18,6 +18,7 @@ export default abstract class AntimodeMenu extends React.Component {
     @observable protected _opacity: number = 1;
     @observable protected _transition: string = "opacity 0.5s";
     @observable protected _transitionDelay: string = "";
+    @observable protected _canFade: boolean = true;
 
     @observable public Pinned: boolean = false;
 
@@ -43,7 +44,7 @@ export default abstract class AntimodeMenu extends React.Component {
      * Called when you want the menu to disappear
      */
     public fadeOut = (forceOut: boolean) => {
-        if (!this.Pinned) {
+        if (!this.Pinned && this._canFade) {
             if (this._opacity === 0.2) {
                 this._transition = "opacity 0.1s";
                 this._transitionDelay = "";
@@ -62,12 +63,12 @@ export default abstract class AntimodeMenu extends React.Component {
 
     @action
     protected pointerLeave = (e: React.PointerEvent) => {
-        // if (!this.Pinned) {
-        //     this._transition = "opacity 0.5s";
-        //     this._transitionDelay = "1s";
-        //     this._opacity = 0.2;
-        //     setTimeout(() => this.fadeOut(false), 3000);
-        // }
+        if (!this.Pinned && this._canFade) {
+            this._transition = "opacity 0.5s";
+            this._transitionDelay = "1s";
+            this._opacity = 0.2;
+            setTimeout(() => this.fadeOut(false), 3000);
+        }
     }
 
     @action
@@ -100,6 +101,12 @@ export default abstract class AntimodeMenu extends React.Component {
         this._left = e.pageX - this._offsetX;
         this._top = e.pageY - this._offsetY;
 
+        // assumes dragger is on right
+        // let width = this._mainCont.current!.getBoundingClientRect().width;
+        // let height = this._mainCont.current!.getBoundingClientRect().width;
+        // this._left = Math.max(width, e.pageX - this._offsetX);
+        // this._top = Math.min(height, e.pageY - this._offsetY);
+
         e.stopPropagation();
         e.preventDefault();
     }
@@ -130,12 +137,12 @@ export default abstract class AntimodeMenu extends React.Component {
         );
     }
 
-    protected getElementWithRows(rows: JSX.Element[], numRows: number) {
+    protected getElementWithRows(rows: JSX.Element[], numRows: number, hasDragger: boolean = true) {
         return (
             <div className="antimodeMenu-cont with-rows" onPointerLeave={this.pointerLeave} onPointerEnter={this.pointerEntered} ref={this._mainCont} onContextMenu={this.handleContextMenu}
                 style={{ left: this._left, top: this._top, opacity: this._opacity, transition: this._transition, transitionDelay: this._transitionDelay, height: 35 * numRows + "px" }}>
                 {rows}
-                {/* <div className="antimodeMenu-dragger" onPointerDown={this.dragStart} style={{ width: this.Pinned ? "20px" : "0px" }} /> */}
+                {hasDragger ? <div className="antimodeMenu-dragger" onPointerDown={this.dragStart} style={{ width: this.Pinned ? "20px" : "0px" }} /> : <></>}
             </div>
         );
     }
-- 
cgit v1.2.3-70-g09d2