Skip to content

Commit

Permalink
fix: Fix wrong event type in onHover (#4861)
Browse files Browse the repository at this point in the history
* Update Cognite3DViewer.ts

* Update package.json

* MouseEvent to PointEvent

* Update getPixelCoordinatesFromEvent.ts

* MouseEvent to PointerEvent

* Update PointerEventsTarget.ts

* Revering
  • Loading branch information
nilscognite authored Nov 14, 2024
1 parent fcd8766 commit 4be4ce6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion viewer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cognite/reveal",
"version": "4.21.0",
"version": "4.21.1",
"description": "WebGL based 3D viewer for CAD and point clouds processed in Cognite Data Fusion.",
"homepage": "https://github.com/cognitedata/reveal/tree/master/viewer",
"repository": {
Expand Down
6 changes: 3 additions & 3 deletions viewer/packages/api/src/api-helpers/Image360ApiHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class Image360ApiHelper<DataSourceT extends DataSourceType> {
this.exit360ImageByTween();
}
};
public readonly onHover = (event: MouseEvent): void => this.setHoverIconOnIntersect(event.offsetX, event.offsetY);
public readonly onHover = (event: PointerEvent): void => this.setHoverIconOnIntersect(event.offsetX, event.offsetY);
public readonly onClick = (event: PointerEventData): Promise<boolean> => this.enter360ImageOnIntersect(event);

private readonly updateHoverStateOnRenderHandler = () => {
Expand Down Expand Up @@ -139,7 +139,7 @@ export class Image360ApiHelper<DataSourceT extends DataSourceType> {
this._cachedCameraManager = activeCameraManager.innerCameraManager;
}
if (this._hasEventListeners) {
domElement.addEventListener('mousemove', this.onHover);
domElement.addEventListener('pointermove', this.onHover);
this._inputHandler = inputHandler;
this._inputHandler.on('click', this.onClick);
}
Expand Down Expand Up @@ -544,7 +544,7 @@ export class Image360ApiHelper<DataSourceT extends DataSourceType> {
public dispose(): void {
this._onBeforeSceneRenderedEvent.unsubscribe(this.updateHoverStateOnRenderHandler);
if (this._hasEventListeners) {
this._domElement.removeEventListener('mousemove', this.onHover);
this._domElement.removeEventListener('pointermove', this.onHover);
this._domElement.removeEventListener('keydown', this.onKeyPressed);
if (this._inputHandler != undefined) {
this._inputHandler.off('click', this.onClick);
Expand Down
6 changes: 3 additions & 3 deletions viewer/packages/tools/src/Overlay3D/Overlay3DTool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class Overlay3DTool<ContentType = DefaultOverlay3DContentType> extends Co
this._defaultOverlayColor = toolParameters?.defaultOverlayColor ?? this._defaultOverlayColor;
this._textOverlay = new TextOverlay(viewer.domElement);

viewer.canvas.addEventListener('mousemove', this.onMouseMove);
viewer.canvas.addEventListener('pointermove', this.onPointerMove);

viewer.on('click', this.onMouseClick);
}
Expand Down Expand Up @@ -248,7 +248,7 @@ export class Overlay3DTool<ContentType = DefaultOverlay3DContentType> extends Co
*/
dispose(): void {
this.clear();
this._viewer.domElement.removeEventListener('mousemove', this.onMouseMove);
this._viewer.domElement.removeEventListener('pointermove', this.onPointerMove);
this._viewer.off('click', this.onMouseClick);
this._events.disposed.fire();

Expand All @@ -258,7 +258,7 @@ export class Overlay3DTool<ContentType = DefaultOverlay3DContentType> extends Co
super.dispose();
}

private readonly onMouseMove = (event: MouseEvent) => {
private readonly onPointerMove = (event: PointerEvent) => {
const { _textOverlay: textOverlay } = this;

const intersectedOverlay = this.intersectPointsMarkers({ offsetX: event.offsetX, offsetY: event.offsetY });
Expand Down

0 comments on commit 4be4ce6

Please sign in to comment.