@itwin/core-frontend 5.13.0-dev.2 → 5.13.0-dev.4

package/lib/cjs/tools/ToolAdmin.js

@@ -187,9 +187,10 @@ class CurrentInputState {
             ev.viewPoint = ev.viewport.worldToView(ev.rawPoint);
     }
     updateDownPoint(ev) { this.button[ev.button].downUorPt = ev.point; }
-    onButtonDown(button) {
+    onButtonDown(button, eventTime) {
         let isDoubleClick = false;
-        const now = Date.now();
+        // Use event.timeStamp epoch (performance.now) so comparisons are immune to event-loop stalls
+        const now = eventTime ?? performance.now();
         const vp = this.viewport;
         if (undefined !== vp) {
             const viewPt = vp.worldToView(this.button[button].downRawPt);
@@ -266,14 +267,15 @@ class CurrentInputState {
         }
         IModelApp_1.IModelApp.toolAdmin.adjustPoint(this._point, vp, true, applyLocks);
     }
-    isStartDrag(button) {
+    isStartDrag(button, motionEventTime) {
         // First make sure we aren't already dragging any button
         if (this.isAnyDragging())
             return false;
         const state = this.button[button];
         if (!state.isDown)
             return false;
-        if ((Date.now() - state.downTime) <= ToolSettings_1.ToolSettings.startDragDelay.milliseconds)
+        const elapsed = (motionEventTime ?? performance.now()) - state.downTime;
+        if (elapsed <= ToolSettings_1.ToolSettings.startDragDelay.milliseconds)
             return false;
         const vp = this.viewport;
         if (undefined === vp)
@@ -493,7 +495,7 @@ class ToolAdmin {
         const pos = this.getMousePosition(event);
         const button = this.getMouseButton(ev.button);
         this.currentInputState.setKeyQualifiers(ev);
-        return isDown ? this.onButtonDown(vp, pos, button, Tool_1.InputSource.Mouse) : this.onButtonUp(vp, pos, button, Tool_1.InputSource.Mouse);
+        return isDown ? this.onButtonDown(vp, pos, button, Tool_1.InputSource.Mouse, ev.timeStamp) : this.onButtonUp(vp, pos, button, Tool_1.InputSource.Mouse);
     }
     async onWheel(event) {
         const ev = event.ev;
@@ -930,7 +932,7 @@ class ToolAdmin {
         // Pass start drag event to idle tool if active tool doesn't explicitly handle it
         return this.idleTool.onMouseStartDrag(ev);
     }
-    async onMotion(vp, pt2d, inputSource, forceStartDrag = false, movement) {
+    async onMotion(vp, pt2d, inputSource, forceStartDrag = false, movement, eventTime) {
         const current = this.currentInputState;
         current.onMotion(pt2d);
         if (this.filterViewport(vp)) {
@@ -952,9 +954,10 @@ class ToolAdmin {
         }
         this._mouseMoveOverTimeout = setTimeout(async () => {
             await this.onMotionEnd(vp, pt2d, inputSource);
-            await processMotion();
+            // Evaluate drag at the nominal timeout fire time, not the frozen event timestamp.
+            await processMotion(eventTime !== undefined ? eventTime + 100 : undefined);
         }, 100);
-        const processMotion = async () => {
+        const processMotion = async (motionTime) => {
             // Update event to account for AccuSnap adjustments...
             current.fromButton(vp, pt2d, inputSource, true);
             current.toEvent(ev, true);
@@ -963,7 +966,7 @@ class ToolAdmin {
             let tool = this.activeTool;
             const isValidLocation = (undefined !== tool ? tool.isValidLocation(ev, false) : true);
             this.setIncompatibleViewportCursor(isValidLocation);
-            if (forceStartDrag || current.isStartDrag(ev.button)) {
+            if (forceStartDrag || current.isStartDrag(ev.button, motionTime)) {
                 current.onStartDrag(ev.button);
                 current.changeButtonToDownPoint(ev);
                 ev.isDragging = true;
@@ -986,14 +989,14 @@ class ToolAdmin {
          */
         if (forceStartDrag) {
             await snapPromise;
-            return processMotion();
+            return processMotion(eventTime);
         }
         if (this.isLocateCircleOn)
             vp.invalidateDecorations();
         snapPromise.then(async (snapOk) => {
             if (!snapOk || snapPromise !== this._snapMotionPromise)
                 return;
-            return processMotion();
+            return processMotion(eventTime);
         }).catch((_) => { });
     }
     // Called when we detect that the motion stopped
@@ -1015,7 +1018,7 @@ class ToolAdmin {
         const buttonMask = event.ev.buttons;
         if (!(buttonMask & 1))
             this.currentInputState.button[Tool_1.BeButton.Data].isDown = false;
-        return this.onMotion(vp, pos, Tool_1.InputSource.Mouse, false, mov);
+        return this.onMotion(vp, pos, Tool_1.InputSource.Mouse, false, mov, event.ev.timeStamp);
     }
     adjustPointToACS(pointActive, vp, perpendicular) {
         // The "I don't want ACS lock" flag can be set by tools to override the default behavior
@@ -1167,7 +1170,7 @@ class ToolAdmin {
         // Update tool dynamics for current cursor location to not require a motion event.
         this.updateDynamics(undefined, undefined, true);
     }
-    async onButtonDown(vp, pt2d, button, inputSource) {
+    async onButtonDown(vp, pt2d, button, inputSource, eventTime) {
         const filtered = this.filterViewport(vp);
         if (undefined === this._viewTool && button === Tool_1.BeButton.Data)
             await IModelApp_1.IModelApp.viewManager.setSelectedView(vp);
@@ -1177,7 +1180,7 @@ class ToolAdmin {
         const ev = new Tool_1.BeButtonEvent();
         const current = this.currentInputState;
         current.fromButton(vp, pt2d, inputSource, true);
-        current.onButtonDown(button);
+        current.onButtonDown(button, eventTime);
         current.toEvent(ev, true);
         current.updateDownPoint(ev);
         return this.sendButtonEvent(ev);