Skip to content

Commit b734efa

Browse files
chrisgervangPessimistress
authored andcommitted
use className since there may be many deck instances
Signed-off-by: Chris Gervang <chris@gervang.com>
1 parent e3d64f2 commit b734efa

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

modules/core/src/lib/deck.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,9 @@ export default class Deck<ViewsT extends ViewOrViews = null> {
10721072
timeline.play();
10731073
this.animationLoop.attachTimeline(timeline);
10741074

1075-
this.eventManager = new EventManager(this.props.parent || this.canvas, {
1075+
const eventRoot =
1076+
this.props.parent?.querySelector<HTMLDivElement>('.event-manager-root') || this.canvas;
1077+
this.eventManager = new EventManager(eventRoot, {
10761078
touchAction: this.props.touchAction,
10771079
recognizers: Object.keys(RECOGNIZERS).map((eventName: string) => {
10781080
// Resolve recognizer settings
@@ -1129,12 +1131,12 @@ export default class Deck<ViewsT extends ViewOrViews = null> {
11291131
this.deckPicker = new DeckPicker(this.device);
11301132

11311133
const parent = this.props.parent || document.body;
1132-
const widgetContainer =
1134+
const widgetParent =
11331135
parent.querySelector<HTMLDivElement>('.deck-widgets-container') || this.canvas?.parentElement;
11341136

11351137
this.widgetManager = new WidgetManager({
11361138
deck: this,
1137-
parentElement: widgetContainer
1139+
parentElement: widgetParent
11381140
});
11391141
this.widgetManager.addDefault(new TooltipWidget());
11401142

modules/react/src/deckgl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ function DeckGLWithRef<ViewsT extends ViewOrViews = null>(
261261

262262
const eventRoot = createElement(
263263
'div',
264-
{key: 'event-manager-root', className: 'event-manager-root', ref: containerRef},
264+
{key: 'event-manager-root', className: 'event-manager-root'},
265265
[canvas, childrenUnderViews]
266266
);
267267

@@ -273,7 +273,7 @@ function DeckGLWithRef<ViewsT extends ViewOrViews = null>(
273273
// Render deck.gl as the last child
274274
thisRef.control = createElement(
275275
'div',
276-
{id: `${id || 'deckgl'}-wrapper`, style: containerStyle},
276+
{id: `${id || 'deckgl'}-wrapper`, ref: containerRef, style: containerStyle},
277277
[eventRoot, widgetRoot]
278278
);
279279
}

0 commit comments

Comments
 (0)