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

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();
     }
@@ -827,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);