@itwin/core-frontend 3.3.0-dev.3 → 3.3.0-dev.32

package/lib/cjs/tools/ToolAdmin.js

@@ -709,7 +709,8 @@ 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 === AccuSnap_1.TentativeOrAccuSnap.getCurrentSnap(false))
                 this.adjustPoint(ev.point, ev.viewport);
         }
         if (undefined === ev.viewport)
@@ -987,8 +988,10 @@ class ToolAdmin {
                 // Lock tool to target model of this view on first data button
                 if (tool instanceof PrimitiveTool_1.PrimitiveTool)
                     tool.autoLockTarget();
+                // Process the active tool's pending hints from onDataButtonDown before calling updateDynamics...
+                IModelApp_1.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 Tool_1.BeButton.Reset: {
@@ -1054,7 +1057,7 @@ class ToolAdmin {
         const changed = activeTool ? await activeTool.onModifierKeyTransition(wentDown, modifier, event) : Tool_1.EventHandled.No;
         if (changed === Tool_1.EventHandled.Yes) {
             IModelApp_1.IModelApp.viewManager.invalidateDecorationsAllViews();
-            this.updateDynamics();
+            this.updateDynamics(undefined, undefined, true); // Don't wait for motion to update dynamics...
         }
     }
     static getModifierKey(event) {
@@ -1184,7 +1187,7 @@ class ToolAdmin {
         if (unsuspend)
             await this.onUnsuspendTool();
         IModelApp_1.IModelApp.accuDraw.onInputCollectorExit();
-        this.updateDynamics();
+        this.updateDynamics(undefined, undefined, true);
     }
     /** @internal */
     async startInputCollector(newTool) {
@@ -1228,7 +1231,7 @@ class ToolAdmin {
         if (unsuspend)
             await this.onUnsuspendTool();
         IModelApp_1.IModelApp.accuDraw.onViewToolExit();
-        this.updateDynamics();
+        this.updateDynamics(undefined, undefined, true);
     }
     /** @internal */
     async startViewTool(newTool) {