some fixes to thumb movements

5 files changed, 86 insertions, 56 deletions

diff --git a/package-lock.json b/package-lock.json
index 31524932c..825890038 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5391,7 +5391,8 @@
                 },
                 "ansi-regex": {
                     "version": "2.1.1",
-                    "bundled": true
+                    "bundled": true,
+                    "optional": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -5428,7 +5429,8 @@
                 },
                 "code-point-at": {
                     "version": "1.1.0",
-                    "bundled": true
+                    "bundled": true,
+                    "optional": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
@@ -5437,7 +5439,8 @@
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
-                    "bundled": true
+                    "bundled": true,
+                    "optional": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -5551,6 +5554,7 @@
                 "is-fullwidth-code-point": {
                     "version": "1.0.0",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -5576,6 +5580,7 @@
                 "minipass": {
                     "version": "2.9.0",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -5592,6 +5597,7 @@
                 "mkdirp": {
                     "version": "0.5.1",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -5683,6 +5689,7 @@
                 "once": {
                     "version": "1.4.0",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -5758,7 +5765,8 @@
                 },
                 "safe-buffer": {
                     "version": "5.1.2",
-                    "bundled": true
+                    "bundled": true,
+                    "optional": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -5788,6 +5796,7 @@
                 "string-width": {
                     "version": "1.0.2",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -5805,6 +5814,7 @@
                 "strip-ansi": {
                     "version": "3.0.1",
                     "bundled": true,
+                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -5843,7 +5853,8 @@
                 },
                 "wrappy": {
                     "version": "1.0.2",
-                    "bundled": true
+                    "bundled": true,
+                    "optional": true
                 },
                 "yallist": {
                     "version": "3.1.1",
@@ -13826,7 +13837,7 @@
         },
         "readable-stream": {
             "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+            "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
             "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
             "requires": {
                 "core-util-is": "~1.0.0",
@@ -15742,7 +15753,7 @@
         },
         "strip-ansi": {
             "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+            "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
             "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
             "requires": {
                 "ansi-regex": "^2.0.0"
@@ -18314,4 +18325,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/client/views/GestureOverlay.scss b/src/client/views/GestureOverlay.scss
index 2fad87ee0..7474ca839 100644
--- a/src/client/views/GestureOverlay.scss
+++ b/src/client/views/GestureOverlay.scss
@@ -26,7 +26,7 @@
 
         .menuItem-cont {
             width: 100%;
-            height: 20px;
+            height: 25px;
             padding: 2.5px;
             border-bottom: .5px solid black;
         }
diff --git a/src/client/views/GestureOverlay.tsx b/src/client/views/GestureOverlay.tsx
index cd535bd53..b23d4d020 100644
--- a/src/client/views/GestureOverlay.tsx
+++ b/src/client/views/GestureOverlay.tsx
@@ -130,7 +130,7 @@ export default class GestureOverlay extends Touchable {
 
         if (nts.nt.length < 5) {
             const target = document.elementFromPoint(te.changedTouches.item(0).clientX, te.changedTouches.item(0).clientY);
-            target ?.dispatchEvent(
+            target?.dispatchEvent(
                 new CustomEvent<InteractionUtils.MultiTouchEvent<React.TouchEvent>>("dashOnTouchStart",
                     {
                         bubbles: true,
@@ -144,34 +144,34 @@ export default class GestureOverlay extends Touchable {
                     }
                 )
             );
-            if (this.prevPoints.size === 1 && this._holdTimer === undefined) {
-                console.log("started");
-                this._holdTimer = setTimeout(() => {
-                    console.log("hold");
-                    const target = document.elementFromPoint(te.changedTouches.item(0).clientX, te.changedTouches.item(0).clientY);
-                    target ?.dispatchEvent(
-                        new CustomEvent<InteractionUtils.MultiTouchEvent<React.TouchEvent>>("dashOnTouchHoldStart",
-                            {
-                                bubbles: true,
-                                detail: {
-                                    fingers: this.prevPoints.size,
-                                    targetTouches: nts.ntt,
-                                    touches: nts.nt,
-                                    changedTouches: nts.nct,
-                                    touchEvent: te
-                                }
-                            }
-                        )
-                    );
-                    this._holdTimer = undefined;
-                    document.removeEventListener("touchmove", this.onReactTouchMove);
-                    document.removeEventListener("touchend", this.onReactTouchEnd);
-                    document.removeEventListener("touchmove", this.onReactHoldTouchMove);
-                    document.removeEventListener("touchend", this.onReactHoldTouchEnd);
-                    document.addEventListener("touchmove", this.onReactHoldTouchMove);
-                    document.addEventListener("touchend", this.onReactHoldTouchEnd);
-                }, (1000));
-            }
+            // if (this.prevPoints.size === 1 && this._holdTimer === undefined) {
+            //     console.log("started");
+            //     this._holdTimer = setTimeout(() => {
+            //         console.log("hold");
+            //         const target = document.elementFromPoint(te.changedTouches.item(0).clientX, te.changedTouches.item(0).clientY);
+            //         target?.dispatchEvent(
+            //             new CustomEvent<InteractionUtils.MultiTouchEvent<React.TouchEvent>>("dashOnTouchHoldStart",
+            //                 {
+            //                     bubbles: true,
+            //                     detail: {
+            //                         fingers: this.prevPoints.size,
+            //                         targetTouches: nts.ntt,
+            //                         touches: nts.nt,
+            //                         changedTouches: nts.nct,
+            //                         touchEvent: te
+            //                     }
+            //                 }
+            //             )
+            //         );
+            //         this._holdTimer = undefined;
+            //         document.removeEventListener("touchmove", this.onReactTouchMove);
+            //         document.removeEventListener("touchend", this.onReactTouchEnd);
+            //         document.removeEventListener("touchmove", this.onReactHoldTouchMove);
+            //         document.removeEventListener("touchend", this.onReactHoldTouchEnd);
+            //         document.addEventListener("touchmove", this.onReactHoldTouchMove);
+            //         document.addEventListener("touchend", this.onReactHoldTouchEnd);
+            //     }, (1000));
+            // }
             document.removeEventListener("touchmove", this.onReactTouchMove);
             document.removeEventListener("touchend", this.onReactTouchEnd);
             document.addEventListener("touchmove", this.onReactTouchMove);
@@ -304,7 +304,7 @@ export default class GestureOverlay extends Touchable {
             if (pt.radiusX > 1 && pt.radiusY > 1) {
                 for (let j = 0; j < e.targetTouches.length; j++) {
                     const tPt = e.targetTouches.item(j);
-                    if (tPt ?.screenX === pt ?.screenX && tPt ?.screenY === pt ?.screenY) {
+                    if (tPt?.screenX === pt?.screenX && tPt?.screenY === pt?.screenY) {
                         if (pt && this.prevPoints.has(pt.identifier)) {
                             fingers.push(pt);
                         }
@@ -392,17 +392,32 @@ export default class GestureOverlay extends Touchable {
         for (let i = 0; i < e.changedTouches.length; i++) {
             const pt = e.changedTouches.item(i);
             if (pt && pt.identifier === this.thumbIdentifier && this._thumbY) {
-                if (this._thumbX && this._thumbDoc) {
-                    if (Math.abs(pt.clientX - this._thumbX) > 30) {
-                        this._thumbDoc.selectedIndex = Math.max(0, NumCast(this._thumbDoc.selectedIndex) - Math.sign(pt.clientX - this._thumbX));
-                        this._thumbX = pt.clientX;
+                if (this._thumbX && this._thumbY) {
+                    const yOverX = Math.abs(pt.clientX - this._thumbX) < Math.abs(pt.clientY - this._thumbY);
+                    if ((yOverX && this._inkToTextDoc) || this._selectedIndex > 0) {
+                        if (Math.abs(pt.clientY - this._thumbY) > 20) {
+                            this._selectedIndex = Math.min(Math.max(0, -Math.ceil((pt.clientY - this._thumbY) / 20)), this._possibilities.length - 1);
+                        }
                     }
-                }
-                if (this._thumbY && this._inkToTextDoc) {
-                    if (Math.abs(pt.clientY - this._thumbY) > 20) {
-                        this._selectedIndex = Math.max(0, -Math.floor((pt.clientY - this._thumbY) / 20));
+                    else if (this._thumbDoc) {
+                        if (Math.abs(pt.clientX - this._thumbX) > 30) {
+                            this._thumbDoc.selectedIndex = Math.max(0, NumCast(this._thumbDoc.selectedIndex) - Math.sign(pt.clientX - this._thumbX));
+                            this._thumbX = pt.clientX;
+                        }
                     }
                 }
+
+                // if (this._thumbX && this._thumbDoc) {
+                //     if (Math.abs(pt.clientX - this._thumbX) > 30) {
+                //         this._thumbDoc.selectedIndex = Math.max(0, NumCast(this._thumbDoc.selectedIndex) - Math.sign(pt.clientX - this._thumbX));
+                //         this._thumbX = pt.clientX;
+                //     }
+                // }
+                // if (this._thumbY && this._inkToTextDoc) {
+                //     if (Math.abs(pt.clientY - this._thumbY) > 20) {
+                //         this._selectedIndex = Math.min(Math.max(0, -Math.ceil((pt.clientY - this._thumbY) / 20)), this._possibilities.length - 1);
+                //     }
+                // }
             }
             if (pt && pt.identifier === this.pointerIdentifier) {
                 this._pointerY = pt.clientY;
@@ -506,8 +521,8 @@ export default class GestureOverlay extends Touchable {
                     callbackFn: callback
                 }
             });
-        target1 ?.dispatchEvent(ge);
-        target2 ?.dispatchEvent(ge);
+        target1?.dispatchEvent(ge);
+        target2?.dispatchEvent(ge);
         return actionPerformed;
     }
 
@@ -529,12 +544,16 @@ export default class GestureOverlay extends Touchable {
                         this._strokes.push(new Array(...this._points));
                         this._points = [];
                         CognitiveServices.Inking.Appliers.InterpretStrokes(this._strokes).then((results) => {
-                            const wordResults = results.filter((r: any) => r.category === "inkWord" || r.category === "paragraph");
+                            console.log(results);
+                            const wordResults = results.filter((r: any) => r.category === "line");
                             const possibilities: string[] = [];
-                            if (wordResults[0]?.recognizedText) {
-                                possibilities.push(wordResults[0]?.recognizedText)
+                            for (const wR of wordResults) {
+                                console.log(wR);
+                                if (wR?.recognizedText) {
+                                    possibilities.push(wR?.recognizedText)
+                                }
+                                possibilities.push(...wR?.alternates?.map((a: any) => a.recognizedString));
                             }
-                            possibilities.push(...wordResults[0]?.alternates?.map((a: any) => a.recognizedString));
                             console.log(possibilities);
                             const r = Math.max(this.svgBounds.right, ...this._strokes.map(s => this.getBounds(s).right));
                             const l = Math.min(this.svgBounds.left, ...this._strokes.map(s => this.getBounds(s).left));
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 87a81504c..4e81f528a 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -526,7 +526,7 @@ export class MainView extends React.Component {
             </GestureOverlay>
             <PreviewCursor />
             <ContextMenu />
-            <RadialMenu />
+            {/* <RadialMenu /> */}
             <PDFMenu />
             <MarqueeOptionsMenu />
             <RichTextMenu />
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 925a590ca..4a5613428 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -170,7 +170,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
         this._mainCont.current && (this._dropDisposer = DragManager.MakeDropTarget(this._mainCont.current, this.drop.bind(this)));
         this._mainCont.current && (this._gestureEventDisposer = GestureUtils.MakeGestureTarget(this._mainCont.current, this.onGesture.bind(this)));
         this._mainCont.current && (this.multiTouchDisposer = InteractionUtils.MakeMultiTouchTarget(this._mainCont.current, this.onTouchStart.bind(this)));
-        this._mainCont.current && (this.holdDisposer = InteractionUtils.MakeHoldTouchTarget(this._mainCont.current, this.handle1PointerHoldStart.bind(this)));
+        // this._mainCont.current && (this.holdDisposer = InteractionUtils.MakeHoldTouchTarget(this._mainCont.current, this.handle1PointerHoldStart.bind(this)));
 
         !this.props.dontRegisterView && DocumentManager.Instance.DocumentViews.push(this);
     }
@@ -184,7 +184,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
         this._mainCont.current && (this._dropDisposer = DragManager.MakeDropTarget(this._mainCont.current, this.drop.bind(this)));
         this._mainCont.current && (this._gestureEventDisposer = GestureUtils.MakeGestureTarget(this._mainCont.current, this.onGesture.bind(this)));
         this._mainCont.current && (this.multiTouchDisposer = InteractionUtils.MakeMultiTouchTarget(this._mainCont.current, this.onTouchStart.bind(this)));
-        this._mainCont.current && (this.holdDisposer = InteractionUtils.MakeHoldTouchTarget(this._mainCont.current, this.handle1PointerHoldStart.bind(this)));
+        // this._mainCont.current && (this.holdDisposer = InteractionUtils.MakeHoldTouchTarget(this._mainCont.current, this.handle1PointerHoldStart.bind(this)));
     }
 
     @action