@@ -231,7 +231,8 @@ export default async function({ addon }) {
231
231
return ;
232
232
}
233
233
234
- element = document . querySelector ( `div[class="ReactModalPortal"] div[class*="ReactModal__Overlay"]` ) ?. firstChild ;
234
+ element = elementName === "addonModal" ? document . querySelector ( `div[class^="modal_modal-overlay"] div[class*="modal_modal-content"]` ) ;
235
+ : document . querySelector ( `div[class="ReactModalPortal"] div[class*="ReactModal__Overlay"]` ) ?. firstChild ;
235
236
if ( ! element ) return ;
236
237
if ( type === "library" ) {
237
238
animTime = 500 ;
@@ -255,7 +256,8 @@ export default async function({ addon }) {
255
256
// Monkey Patch
256
257
const ogRemoveChild = document . body . constructor . prototype . removeChild ;
257
258
document . body . constructor . prototype . removeChild = function ( child ) {
258
- const element = document . querySelector ( `div[class="ReactModalPortal"]` ) ;
259
+ const element = elementName === "addonModal" ? document . querySelector ( `div[class^="modal_modal-overlay"]` ) ;
260
+ : document . querySelector ( `div[class="ReactModalPortal"]` ) ;
259
261
if ( ! element ) return ogRemoveChild . call ( this , child ) ;
260
262
261
263
let animTime = 200 ;
@@ -430,9 +432,9 @@ export default async function({ addon }) {
430
432
}
431
433
432
434
/* addon modal API */
433
- addon . traps . vm . on ( "ADDON_WORKER_MODAL" , ( ) => {
434
- handleOpenAnimation ( "modal " ) ;
435
- attachCloseHijack ( "modal " ) ;
435
+ window . vm . on ( "ADDON_WORKER_MODAL" , ( ) => {
436
+ handleOpenAnimation ( "addonModal " ) ;
437
+ attachCloseHijack ( "addonModal " ) ;
436
438
} ) ;
437
439
} ) ;
438
440
}
@@ -461,7 +463,7 @@ export default async function({ addon }) {
461
463
function startListenerWorker ( ) {
462
464
const checkInEditor = ( ) => ! ReduxStore . getState ( ) . scratchGui . mode . isPlayerOnly ;
463
465
464
- addon . traps . vm . on ( "workspaceUpdate" , ( ) => {
466
+ window . vm . on ( "workspaceUpdate" , ( ) => {
465
467
queueMicrotask ( ( ) => compileClasses ( ) ) ;
466
468
} ) ;
467
469
0 commit comments