Skip to content

Commit e0fae98

Browse files
committed
Fix #22942 by falling back findCanvasEventTarget to findEventTarget, and fix default canvas lookup bug
1 parent 299be0b commit e0fae98

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/library_html5.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ var LibraryHTML5 = {
344344
},
345345

346346
#if OFFSCREENCANVAS_SUPPORT
347-
$findCanvasEventTarget__deps: ['$GL', '$maybeCStringToJsString'],
347+
$findCanvasEventTarget__deps: ['$GL', '$maybeCStringToJsString', "$findEventTarget"],
348348
$findCanvasEventTarget: (target) => {
349349
target = maybeCStringToJsString(target);
350350

@@ -362,13 +362,9 @@ var LibraryHTML5 = {
362362
return GL.offscreenCanvases[target.substr(1)] // Remove '#' prefix
363363
// If not found, if one is querying by using DOM tag name selector 'canvas', grab the first
364364
// OffscreenCanvas that we can find.
365-
|| (target == 'canvas' && Object.keys(GL.offscreenCanvases)[0])
365+
|| (target == 'canvas' && Object.keys(GL.offscreenCanvases) && GL.offscreenCanvases[Object.keys(GL.offScreenCanvases)[0]])
366366
// If that is not found either, query via the regular DOM selector.
367-
#if PTHREADS
368-
|| (typeof document != 'undefined' && document.querySelector(target));
369-
#else
370-
|| document.querySelector(target);
371-
#endif
367+
|| findEventTarget(target);
372368
},
373369
#else
374370
$findCanvasEventTarget: '$findEventTarget',

0 commit comments

Comments
 (0)