Skip to content

Commit

Permalink
fix: revert measurement blocking (#3727)
Browse files Browse the repository at this point in the history
* Revert "fix(viewer): only do measurement on canvas (#3636)"

This reverts commit 1dae829.

* Revert "fix(viewer): block events to viewer when measurement tool is active (#3616)"

This reverts commit ab563ea.
  • Loading branch information
haakonflatval-cognite authored Sep 22, 2023
1 parent 54b7489 commit 539068a
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions viewer/packages/tools/src/Measurement/MeasurementTool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ export class MeasurementTool extends Cognite3DViewerToolBase {
if (this._measurementMode) {
throw new Error('Measurement mode is active, call exitMeasurementMode()');
}
this._viewer.domElement.addEventListener('pointerdown', this._handlePointerClick, { capture: true });
this._viewer.on('click', this._handlePointerClick);
this._viewer.on('beforeSceneRendered', this._handleClippingPlanes);
this._events.measurementStarted.fire();
this._measurementMode = true;
Expand All @@ -251,7 +251,7 @@ export class MeasurementTool extends Cognite3DViewerToolBase {
throw new Error('Measurement mode is not active, call enterMeasurementMode()');
}
this.cancelActiveMeasurement();
this._viewer.domElement.removeEventListener('pointerdown', this._handlePointerClick, { capture: true });
this._viewer.off('click', this._handlePointerClick);
this._viewer.off('beforeSceneRendered', this._handleClippingPlanes);
this._events.measurementEnded.fire();
this._measurementMode = false;
Expand Down Expand Up @@ -377,13 +377,7 @@ export class MeasurementTool extends Cognite3DViewerToolBase {
super.dispose();
}

private async onPointerClick(event: MouseEvent): Promise<void> {
if (event.target !== this._viewer.canvas) {
return;
}

event.stopPropagation();

private async onPointerClick(event: { offsetX: number; offsetY: number }): Promise<void> {
const { offsetX, offsetY } = event;

const intersection = await this._viewer.getIntersectionFromPixel(offsetX, offsetY);
Expand Down

0 comments on commit 539068a

Please sign in to comment.