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

package/lib/esm/tools/ToolAdmin.js

@@ -679,7 +679,13 @@ export class ToolAdmin {
         if (undefined === tool)
             return;
         const buttonMask = event.ev.buttons;
-        const cancelDrag = (current.isDragging(BeButton.Data) && !(buttonMask & 1)) || (current.isDragging(BeButton.Reset) && !(buttonMask & 2)) || (current.isDragging(BeButton.Middle) && !(buttonMask & 4));
+        let cancelDrag = false;
+        current.button.forEach((button, buttonNum) => {
+            if (button.isDragging && !(buttonMask & (1 << buttonNum))) {
+                button.isDragging = button.isDown = false;
+                cancelDrag = true;
+            }
+        });
         if (cancelDrag)
             await tool.onReinitialize();
     }
@@ -702,7 +708,8 @@ export class ToolAdmin {
                 this.fillEventFromLastDataButton(ev);
             else
                 this.fillEventFromCursorLocation(ev);
-            if (adjustPoint && undefined !== ev.viewport)
+            // NOTE: Do not call adjustPoint when snapped, refer to CurrentInputState.fromButton
+            if (adjustPoint && undefined !== ev.viewport && undefined === TentativeOrAccuSnap.getCurrentSnap(false))
                 this.adjustPoint(ev.point, ev.viewport);
         }
         if (undefined === ev.viewport)
@@ -826,16 +833,22 @@ export class ToolAdmin {
             current.toEvent(ev, true);
             ev.movement = movement;
             IModelApp.accuDraw.onMotion(ev);
-            const tool = this.activeTool;
+            let tool = this.activeTool;
             const isValidLocation = (undefined !== tool ? tool.isValidLocation(ev, false) : true);
             this.setIncompatibleViewportCursor(isValidLocation);
             if (forceStartDrag || current.isStartDrag(ev.button)) {
                 current.onStartDrag(ev.button);
                 current.changeButtonToDownPoint(ev);
                 ev.isDragging = true;
-                if (undefined !== tool && isValidLocation)
-                    tool.receivedDownEvent = true;
-                await this.onStartDrag(ev, isValidLocation ? tool : undefined);
+                if (undefined !== tool) {
+                    if (!isValidLocation)
+                        tool = undefined;
+                    else if (forceStartDrag)
+                        tool.receivedDownEvent = true;
+                    else if (!tool.receivedDownEvent)
+                        tool = undefined;
+                }
+                await this.onStartDrag(ev, tool);
                 return;
             }
             this.updateDynamics(ev);
@@ -980,8 +993,10 @@ export class ToolAdmin {
                 // Lock tool to target model of this view on first data button
                 if (tool instanceof PrimitiveTool)
                     tool.autoLockTarget();
+                // Process the active tool's pending hints from onDataButtonDown before calling updateDynamics...
+                IModelApp.accuDraw.processHints();
                 // Update tool dynamics. Use last data button location which was potentially adjusted by onDataButtonDown and not current event
-                this.updateDynamics(undefined, true);
+                this.updateDynamics(undefined, true, true);
                 break;
             }
             case BeButton.Reset: {
@@ -1047,7 +1062,7 @@ export class ToolAdmin {
         const changed = activeTool ? await activeTool.onModifierKeyTransition(wentDown, modifier, event) : EventHandled.No;
         if (changed === EventHandled.Yes) {
             IModelApp.viewManager.invalidateDecorationsAllViews();
-            this.updateDynamics();
+            this.updateDynamics(undefined, undefined, true); // Don't wait for motion to update dynamics...
         }
     }
     static getModifierKey(event) {
@@ -1177,7 +1192,7 @@ export class ToolAdmin {
         if (unsuspend)
             await this.onUnsuspendTool();
         IModelApp.accuDraw.onInputCollectorExit();
-        this.updateDynamics();
+        this.updateDynamics(undefined, undefined, true);
     }
     /** @internal */
     async startInputCollector(newTool) {
@@ -1221,7 +1236,7 @@ export class ToolAdmin {
         if (unsuspend)
             await this.onUnsuspendTool();
         IModelApp.accuDraw.onViewToolExit();
-        this.updateDynamics();
+        this.updateDynamics(undefined, undefined, true);
     }
     /** @internal */
     async startViewTool(newTool) {