Skip to content

Fix CSS scale handling by passing through mjolnir.js event data #558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charlieforward9 merged 3 commits into from
Apr 9, 2026
Merged

Fix CSS scale handling by passing through mjolnir.js event data #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb2b87c
Fix CSS transformation (scale) handling by passing through mjolnir.js…
Mar 19, 2026
9f734de
add test for editable-layer.ts
Mar 19, 2026
f46f9cc
try and reduce repeated assertions
Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 54 additions & 76 deletions modules/editable-layers/src/editable-layers/editable-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,29 @@

import type {CompositeLayerProps} from '@deck.gl/core';
import {CompositeLayer} from '@deck.gl/core';
import {MjolnirEvent, MjolnirGestureEvent, MjolnirKeyEvent} from 'mjolnir.js';

import {
DraggingEvent,
ClickEvent,
StartDraggingEvent,
StopDraggingEvent,
PointerMoveEvent,
DoubleClickEvent
DoubleClickEvent,
BasePointerEvent,
ScreenCoordinates
} from '../edit-modes/types';
import {Position} from '../utils/geojson-types';

const EVENT_TYPES = ['click', 'pointermove', 'panstart', 'panmove', 'panend', 'keyup', 'dblclick'];
export const EVENT_TYPES = [
'click',
'pointermove',
'panstart',
'panmove',
'panend',
'keyup',
'dblclick'
];

// TODO(v9): remove generic layer
// eslint-disable-next-line @typescript-eslint/no-unused-vars
Expand Down Expand Up @@ -91,7 +103,7 @@ export abstract class EditableLayer<
const {eventHandler} = this.state._editableLayerState;

for (const eventType of EVENT_TYPES) {
eventManager.on(eventType as any, eventHandler, {
eventManager.on(eventType, eventHandler, {
// give nebula a higher priority so that it can stop propagation to deck.gl's map panning handlers
priority: 100
});
Expand All @@ -104,14 +116,14 @@ export abstract class EditableLayer<
const {eventHandler} = this.state._editableLayerState;

for (const eventType of EVENT_TYPES) {
eventManager.off(eventType as any, eventHandler);
eventManager.off(eventType, eventHandler);
}
}

// A new layer instance is created on every render, so forward the event to the current layer
// This means that the first layer instance will stick around to be the event listener, but will forward the event
// to the latest layer instance.
_forwardEventToCurrentLayer(event: any) {
_forwardEventToCurrentLayer(event: MjolnirEvent) {
const currentLayer = this.getCurrentLayer();

// Use a naming convention to find the event handling function for this event type
Expand All @@ -123,77 +135,55 @@ export abstract class EditableLayer<
func(event);
}

_onclick({srcEvent}: any) {
const screenCoords = this.getScreenCoords(srcEvent) as [number, number];
const mapCoords = this.getMapCoords(screenCoords);

const picks = this.getPicks(screenCoords);

this.onLayerClick({
mapCoords,
screenCoords,
picks,
sourceEvent: srcEvent
});
_onclick(event: MjolnirGestureEvent) {
this.onLayerClick(this.toBasePointerEvent(event));
}

_ondblclick({srcEvent}: any) {
this.onLayerDoubleClick(srcEvent);
_ondblclick(event: MjolnirGestureEvent) {
this.onLayerDoubleClick(this.toBasePointerEvent(event));
}

_onkeyup({srcEvent}: {srcEvent: KeyboardEvent}) {
_onkeyup({srcEvent}: MjolnirKeyEvent) {
this.onLayerKeyUp(srcEvent);
}

_onpanstart(event: any) {
const screenCoords = this.getScreenCoords(event.srcEvent) as [number, number];
const mapCoords = this.getMapCoords(screenCoords);
const picks = this.getPicks(screenCoords);
_onpanstart(event: MjolnirGestureEvent) {
const basePointerEvent = this.toBasePointerEvent(event);
const {picks, screenCoords, mapCoords} = basePointerEvent;

this.setState({
_editableLayerState: {
...this.state._editableLayerState,
pointerDownPicks: picks,
pointerDownScreenCoords: screenCoords,
pointerDownMapCoords: mapCoords,
pointerDownPicks: picks
pointerDownMapCoords: mapCoords
}
});

this.onStartDragging({
picks,
screenCoords,
mapCoords,
...basePointerEvent,
pointerDownPicks: picks,
pointerDownScreenCoords: screenCoords,
pointerDownMapCoords: mapCoords,
cancelPan: () => {
if (this.props.onCancelPan) {
this.props.onCancelPan();
}

event.stopImmediatePropagation();
},
sourceEvent: event.srcEvent
}
});
}

_onpanmove(event: any) {
const {srcEvent} = event;
const screenCoords = this.getScreenCoords(srcEvent) as [number, number];
const mapCoords = this.getMapCoords(screenCoords);

_onpanmove(event: MjolnirGestureEvent) {
const basePointerEvent = this.toBasePointerEvent(event);
const {pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords} =
this.state._editableLayerState;

const picks = this.getPicks(screenCoords);

this.onDragging({
screenCoords,
mapCoords,
picks,
...basePointerEvent,
pointerDownPicks,
pointerDownScreenCoords,
pointerDownMapCoords,
sourceEvent: srcEvent,
cancelPan: event.stopImmediatePropagation
// another (hacky) approach for cancelling map panning
// const controller = this.context.deck.viewManager.controllers[
Expand All @@ -203,23 +193,16 @@ export abstract class EditableLayer<
});
}

_onpanend({srcEvent}: any) {
const screenCoords = this.getScreenCoords(srcEvent) as [number, number];
const mapCoords = this.getMapCoords(screenCoords);

_onpanend(event: MjolnirGestureEvent) {
const basePointerEvent = this.toBasePointerEvent(event);
const {pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords} =
this.state._editableLayerState;

const picks = this.getPicks(screenCoords);

this.onStopDragging({
picks,
screenCoords,
mapCoords,
...basePointerEvent,
pointerDownPicks,
pointerDownScreenCoords,
pointerDownMapCoords,
sourceEvent: srcEvent
pointerDownMapCoords
});

this.setState({
Expand All @@ -232,29 +215,33 @@ export abstract class EditableLayer<
});
}

_onpointermove(event: any) {
const {srcEvent} = event;
const screenCoords = this.getScreenCoords(srcEvent) as [number, number];
const mapCoords = this.getMapCoords(screenCoords);

_onpointermove(event: MjolnirGestureEvent) {
const basePointerEvent = this.toBasePointerEvent(event);
const {pointerDownPicks, pointerDownScreenCoords, pointerDownMapCoords} =
this.state._editableLayerState;

const picks = this.getPicks(screenCoords);

this.onPointerMove({
screenCoords,
mapCoords,
picks,
...basePointerEvent,
pointerDownPicks,
pointerDownScreenCoords,
pointerDownMapCoords,
sourceEvent: srcEvent,
cancelPan: event.stopImmediatePropagation
});
}

getPicks(screenCoords: [number, number]) {
toBasePointerEvent(event: MjolnirGestureEvent): BasePointerEvent {
const screenCoords: ScreenCoordinates = [event.offsetCenter.x, event.offsetCenter.y];
const mapCoords = this.getMapCoords(screenCoords);
const picks = this.getPicks(screenCoords);
return {
screenCoords,
mapCoords,
picks,
sourceEvent: event.srcEvent
};
}

getPicks(screenCoords: ScreenCoordinates) {
return this.context.deck.pickMultipleObjects({
x: screenCoords[0],
y: screenCoords[1],
Expand All @@ -264,16 +251,7 @@ export abstract class EditableLayer<
});
}

getScreenCoords(pointerEvent: any): Position {
return [
pointerEvent.clientX -
(this.context.gl.canvas as HTMLCanvasElement).getBoundingClientRect().left,
pointerEvent.clientY -
(this.context.gl.canvas as HTMLCanvasElement).getBoundingClientRect().top
];
}

getMapCoords(screenCoords: Position): Position {
getMapCoords(screenCoords: ScreenCoordinates): Position {
return this.context.viewport.unproject([screenCoords[0], screenCoords[1]]) as Position;
}
}
Loading
Loading