@itwin/core-frontend 5.1.0-dev.7 → 5.1.0-dev.71

package/lib/cjs/tools/ToolAdmin.js

@@ -141,6 +141,7 @@ class CurrentInputState {
     lastButton = Tool_1.BeButton.Data;
     inputSource = Tool_1.InputSource.Unknown;
     lastMotion = new core_geometry_1.Point2d();
+    lastMotionEvent;
     lastWheelEvent;
     lastTouchStart;
     touchTapTimer;
@@ -158,7 +159,7 @@ class CurrentInputState {
     onStartDrag(button) { this.button[button].isDragging = true; }
     onInstallTool() {
         this.clearKeyQualifiers();
-        this.lastWheelEvent = undefined;
+        this.lastWheelEvent = this.lastMotionEvent = undefined;
         this.lastTouchStart = this.touchTapTimer = this.touchTapCount = undefined;
     }
     clearKeyQualifiers() { this.qualifiers = Tool_1.BeModifierKeys.None; }
@@ -187,11 +188,15 @@ class CurrentInputState {
     }
     updateDownPoint(ev) { this.button[ev.button].downUorPt = ev.point; }
     onButtonDown(button) {
-        const viewPt = this.viewport.worldToView(this.button[button].downRawPt);
-        const center = this.viewport.npcToView(core_common_1.NpcCenter);
-        viewPt.z = center.z;
+        let isDoubleClick = false;
         const now = Date.now();
-        const isDoubleClick = ((now - this.button[button].downTime) < ToolSettings_1.ToolSettings.doubleClickTimeout.milliseconds) && (viewPt.distance(this.viewPoint) < this.viewport.pixelsFromInches(ToolSettings_1.ToolSettings.doubleClickToleranceInches));
+        const vp = this.viewport;
+        if (undefined !== vp) {
+            const viewPt = vp.worldToView(this.button[button].downRawPt);
+            const center = vp.npcToView(core_common_1.NpcCenter);
+            viewPt.z = center.z;
+            isDoubleClick = ((now - this.button[button].downTime) < ToolSettings_1.ToolSettings.doubleClickTimeout.milliseconds) && (viewPt.distance(this.viewPoint) < vp.pixelsFromInches(ToolSettings_1.ToolSettings.doubleClickToleranceInches));
+        }
         this.button[button].init(this.point, this.rawPoint, now, true, isDoubleClick, false, this.inputSource);
         this.lastButton = button;
     }
@@ -270,10 +275,13 @@ class CurrentInputState {
             return false;
         if ((Date.now() - state.downTime) <= ToolSettings_1.ToolSettings.startDragDelay.milliseconds)
             return false;
-        const viewPt = this.viewport.worldToView(state.downRawPt);
+        const vp = this.viewport;
+        if (undefined === vp)
+            return false;
+        const viewPt = vp.worldToView(state.downRawPt);
         const deltaX = Math.abs(this._viewPoint.x - viewPt.x);
         const deltaY = Math.abs(this._viewPoint.y - viewPt.y);
-        return ((deltaX + deltaY) > this.viewport.pixelsFromInches(ToolSettings_1.ToolSettings.startDragDistanceInches));
+        return ((deltaX + deltaY) > vp.pixelsFromInches(ToolSettings_1.ToolSettings.startDragDistanceInches));
     }
 }
 exports.CurrentInputState = CurrentInputState;
@@ -434,13 +442,18 @@ class ToolAdmin {
         this.clearMotionPromises();
         // make sure tools don't think the cursor is still in this viewport.
         this.onMouseLeave(vp);
+        // Invalidate last motion if for this viewport...
+        if (this.currentInputState.lastMotionEvent?.viewport === vp)
+            this.currentInputState.lastMotionEvent = undefined;
         // Remove any events associated with this viewport.
         ToolAdmin._toolEvents = ToolAdmin._toolEvents.filter((ev) => ev.vp !== vp);
     }
     getMousePosition(event) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return event.vp.mousePosFromEvent(event.ev);
     }
     getMouseMovement(event) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return event.vp.mouseMovementFromEvent(event.ev);
     }
     getMouseButton(button) {
@@ -452,6 +465,7 @@ class ToolAdmin {
     }
     async onMouseButton(event, isDown) {
         const ev = event.ev;
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const vp = event.vp;
         const pos = this.getMousePosition(event);
         const button = this.getMouseButton(ev.button);
@@ -461,7 +475,7 @@ class ToolAdmin {
     async onWheel(event) {
         const ev = event.ev;
         const vp = event.vp;
-        if (this.filterViewport(vp))
+        if (undefined === vp || this.filterViewport(vp))
             return Tool_1.EventHandled.Yes;
         const current = this.currentInputState;
         current.setKeyQualifiers(ev);
@@ -494,7 +508,9 @@ class ToolAdmin {
         return Tool_1.EventHandled.Yes;
     }
     async sendTapEvent(touchEv) {
-        touchEv.viewport.setAnimator();
+        const vp = touchEv.viewport;
+        if (undefined !== vp)
+            vp.setAnimator();
         const overlayHit = this.pickCanvasDecoration(touchEv);
         if (undefined !== overlayHit && undefined !== overlayHit.onMouseButton && overlayHit.onMouseButton(touchEv))
             return Tool_1.EventHandled.Yes;
@@ -521,7 +537,7 @@ class ToolAdmin {
     async onTouch(event) {
         const touchEvent = event.ev;
         const vp = event.vp;
-        if (this.filterViewport(vp))
+        if (undefined === vp || this.filterViewport(vp))
             return;
         const ev = new Tool_1.BeTouchEvent({ touchEvent });
         const current = this.currentInputState;
@@ -660,6 +676,7 @@ class ToolAdmin {
             case "mouseup": return this.onMouseButton(event, false);
             case "mousemove": return this.onMouseMove(event);
             case "mouseover": return this.onMouseEnter(event);
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             case "mouseout": return this.onMouseLeave(event.vp);
             case "wheel": return this.onWheel(event);
             case "keydown": return this.onKeyTransition(event, true);
@@ -797,6 +814,7 @@ class ToolAdmin {
         toolPromise.then(() => {
             if (undefined === this._toolMotionPromise)
                 return; // Only early return if canceled, result from a previous motion is preferable to showing nothing...
+            this.currentInputState.lastMotionEvent = motion; // Save to use for simulation motion...
             // Update decorations when dynamics are inactive...
             if (!IModelApp_1.IModelApp.viewManager.inDynamicsMode) {
                 vp.invalidateDecorations();
@@ -835,6 +853,8 @@ class ToolAdmin {
     }
     pickCanvasDecoration(ev) {
         const vp = ev.viewport;
+        if (undefined === vp)
+            return undefined;
         const decoration = (undefined === this.viewTool) ? vp.pickCanvasDecoration(ev.viewPoint) : undefined;
         this.setCanvasDecoration(vp, decoration, ev);
         return decoration;
@@ -960,6 +980,8 @@ class ToolAdmin {
     }
     async onMouseMove(event) {
         const vp = event.vp;
+        if (undefined === vp)
+            return;
         const pos = this.getMousePosition(event);
         const mov = this.getMouseMovement(event);
         // Sometimes the mouse goes down in a view, but we lose focus while its down so we never receive the up event.
@@ -1511,34 +1533,53 @@ class ToolAdmin {
     setAdjustedDataPoint(ev) { this.currentInputState.adjustLastDataPoint(ev); }
     /** Can be called by tools that wish to emulate mouse button down/up events for onTouchTap. */
     async convertTouchTapToButtonDownAndUp(ev, button = Tool_1.BeButton.Data) {
+        const vp = ev.viewport;
+        if (undefined === vp)
+            return;
         const pt2d = ev.viewPoint;
-        await this.onButtonDown(ev.viewport, pt2d, button, Tool_1.InputSource.Touch);
-        return this.onButtonUp(ev.viewport, pt2d, button, Tool_1.InputSource.Touch);
+        await this.onButtonDown(vp, pt2d, button, Tool_1.InputSource.Touch);
+        return this.onButtonUp(vp, pt2d, button, Tool_1.InputSource.Touch);
     }
     /** Can be called by tools that wish to emulate moving the mouse with a button depressed for onTouchMoveStart.
      * @note Calls the tool's onMouseStartDrag method from onMotion.
      */
     async convertTouchMoveStartToButtonDownAndMotion(startEv, ev, button = Tool_1.BeButton.Data) {
-        await this.onButtonDown(startEv.viewport, startEv.viewPoint, button, Tool_1.InputSource.Touch);
-        return this.onMotion(ev.viewport, ev.viewPoint, Tool_1.InputSource.Touch, true);
+        const startVp = startEv.viewport;
+        if (undefined === startVp)
+            return;
+        const vp = ev.viewport;
+        if (undefined === vp)
+            return;
+        await this.onButtonDown(startVp, startEv.viewPoint, button, Tool_1.InputSource.Touch);
+        return this.onMotion(vp, ev.viewPoint, Tool_1.InputSource.Touch, true);
     }
     /** Can be called by tools that wish to emulate pressing the mouse button for onTouchStart or onTouchMoveStart. */
     async convertTouchStartToButtonDown(ev, button = Tool_1.BeButton.Data) {
-        return this.onButtonDown(ev.viewport, ev.viewPoint, button, Tool_1.InputSource.Touch);
+        const vp = ev.viewport;
+        if (undefined === vp)
+            return;
+        return this.onButtonDown(vp, ev.viewPoint, button, Tool_1.InputSource.Touch);
     }
     /** Can be called by tools that wish to emulate releasing the mouse button for onTouchEnd or onTouchComplete.
      * @note Calls the tool's onMouseEndDrag method if convertTouchMoveStartToButtonDownAndMotion was called for onTouchMoveStart.
      */
     async convertTouchEndToButtonUp(ev, button = Tool_1.BeButton.Data) {
-        return this.onButtonUp(ev.viewport, ev.viewPoint, button, Tool_1.InputSource.Touch);
+        const vp = ev.viewport;
+        if (undefined === vp)
+            return;
+        return this.onButtonUp(vp, ev.viewPoint, button, Tool_1.InputSource.Touch);
     }
     /** Can be called by tools that wish to emulate a mouse motion event for onTouchMove. */
     async convertTouchMoveToMotion(ev) {
-        return this.onMotion(ev.viewport, ev.viewPoint, Tool_1.InputSource.Touch);
+        const vp = ev.viewport;
+        if (undefined === vp)
+            return;
+        return this.onMotion(vp, ev.viewPoint, Tool_1.InputSource.Touch);
     }
     /** Can be called by tools to invoke their [[InteractiveTool.onDynamicFrame]] method without requiring a motion event. */
     simulateMotionEvent() {
-        this.updateDynamics(undefined, undefined, true);
+        // NOTE: Prefer last resolved motion over current cursor location which could be out of the view, or moved from last AccuSnap etc.
+        this.updateDynamics(this.currentInputState.lastMotionEvent, undefined, true);
     }
     /** @internal */
     setIncompatibleViewportCursor(restore) {