@itwin/core-frontend 3.0.0-dev.98 → 3.0.0

package/lib/cjs/tools/ToolAdmin.js

@@ -791,10 +791,7 @@ class ToolAdmin {
                 overlayHit.onMouseMove(ev);
             return; // we're inside a pickable decoration, don't send event to tool
         }
-        const snapPromise = this._snapMotionPromise = this.onMotionSnap(ev);
-        snapPromise.then((snapOk) => {
-            if (!snapOk || snapPromise !== this._snapMotionPromise)
-                return;
+        const processMotion = async () => {
             // Update event to account for AccuSnap adjustments...
             current.fromButton(vp, pt2d, inputSource, true);
             current.toEvent(ev, true);
@@ -809,13 +806,26 @@ class ToolAdmin {
                 ev.isDragging = true;
                 if (undefined !== tool && isValidLocation)
                     tool.receivedDownEvent = true;
-                return this.onStartDrag(ev, isValidLocation ? tool : undefined);
+                await this.onStartDrag(ev, isValidLocation ? tool : undefined);
+                return;
             }
             this.updateDynamics(ev);
-            return;
-        }).catch((_) => { });
+        };
+        const snapPromise = this._snapMotionPromise = this.onMotionSnap(ev);
+        /** When forceStartDrag is true, make sure we don't return a fulfilled promise until we've processed the motion so callers can await it.
+         * The .then below happens AFTER this method returns its (fulfilled) promise so we can't use that.
+         */
+        if (forceStartDrag) {
+            await snapPromise;
+            return processMotion();
+        }
         if (this.isLocateCircleOn)
             vp.invalidateDecorations();
+        snapPromise.then((snapOk) => {
+            if (!snapOk || snapPromise !== this._snapMotionPromise)
+                return;
+            return processMotion();
+        }).catch((_) => { });
     }
     async onMouseMove(event) {
         const vp = event.vp;
@@ -1074,7 +1084,7 @@ class ToolAdmin {
             return false;
         // ### TODO Restart of primitive tool should be handled by Txn event listener...needs to happen even if not the active tool...
         if (undefined !== this._primitiveTool)
-            this._primitiveTool.onRestartTool();
+            await this._primitiveTool.onRestartTool();
         return true;
     }
     /** Called to redo previous data button for primitive tools or undo last write operation. */
@@ -1093,7 +1103,7 @@ class ToolAdmin {
             return false;
         // ### TODO Restart of primitive tool should be handled by Txn event listener...needs to happen even if not the active tool...
         if (undefined !== this._primitiveTool)
-            this._primitiveTool.onRestartTool();
+            await this._primitiveTool.onRestartTool();
         return true;
     }
     onActiveToolChanged(tool, start) {
@@ -1413,7 +1423,7 @@ class ToolAdmin {
         if (undefined !== this._inputCollector)
             this._inputCollector.onSelectedViewportChanged(previous, current);
         if (undefined !== this._primitiveTool)
-            this._primitiveTool.onSelectedViewportChanged(previous, current);
+            await this._primitiveTool.onSelectedViewportChanged(previous, current);
     }
     setLocateCircleOn(locateOn) {
         if (undefined === this._saveCursor)