Skip to content

Commit 0177dcf

Browse files
committed
fix(react) use public deck event manager API
1 parent 680a036 commit 0177dcf

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

modules/react/src/utils/position-children-under-views.ts

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ import evaluateChildren, {isComponent} from './evaluate-children';
1010

1111
import type {ViewOrViews} from '../deckgl';
1212
import type {Deck, Viewport} from '@deck.gl/core';
13-
import type {EventManager} from 'mjolnir.js';
1413
import {DeckGlContext, type DeckGLContextValue} from './deckgl-context';
1514

16-
type DeckWithEventManager = {
17-
eventManager?: EventManager | null;
18-
getEventManager?: (viewId?: string) => EventManager | null;
19-
};
20-
2115
// Iterate over views and reposition children associated with views
2216
// TODO - Can we supply a similar function for the non-React case?
2317
export default function positionChildrenUnderViews<ViewsT extends ViewOrViews>({
@@ -35,7 +29,6 @@ export default function positionChildrenUnderViews<ViewsT extends ViewOrViews>({
3529
if (!viewManager || !viewManager.views.length) {
3630
return [];
3731
}
38-
const deckWithEventManager = deck as unknown as DeckWithEventManager;
3932

4033
const views: Record<
4134
string,
@@ -106,8 +99,7 @@ export default function positionChildrenUnderViews<ViewsT extends ViewOrViews>({
10699
viewport,
107100
// @ts-expect-error accessing protected property
108101
container: deck.canvas.offsetParent,
109-
eventManager:
110-
deckWithEventManager.getEventManager?.(viewId) || deckWithEventManager.eventManager || null,
102+
eventManager: deck.getEventManager(viewId),
111103
onViewStateChange: params => {
112104
params.viewId = viewId;
113105
// @ts-expect-error accessing protected method

test/modules/react/utils/position-children-under-views.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ test('positionChildrenUnderViews#override ContextProvider', () => {
121121
children: TEST_CHILDREN,
122122
deck: {
123123
viewManager: dummyViewManager,
124-
canvas: {}
124+
canvas: {},
125+
getEventManager: () => null
125126
},
126127
ContextProvider: context.Provider
127128
});

0 commit comments

Comments
 (0)