@itwin/core-frontend 5.1.0-dev.5 → 5.1.0-dev.52

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; }
@@ -434,6 +435,9 @@ 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);
     }
@@ -797,6 +801,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();
@@ -1538,7 +1543,8 @@ class ToolAdmin {
     }
     /** 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) {