diff --git a/abstract/Block.js b/abstract/Block.js index fe977f6f1..b718acb46 100644 --- a/abstract/Block.js +++ b/abstract/Block.js @@ -196,7 +196,10 @@ export class Block extends BaseComponent { Data.deleteCtx(this); if (blocksRegistry.size === 0) { - this.destroyCtxCallback(); + setTimeout(() => { + // Destroy global context after all blocks are destroyed and all callbacks are run + this.destroyCtxCallback(); + }, 0); } } diff --git a/abstract/UploaderBlock.js b/abstract/UploaderBlock.js index efe63ee0f..a53700df3 100644 --- a/abstract/UploaderBlock.js +++ b/abstract/UploaderBlock.js @@ -90,10 +90,6 @@ export class UploaderBlock extends ActivityBlock { } } - destroyCallback() { - super.destroyCallback(); - } - destroyCtxCallback() { this._unobserveCollectionProperties?.(); this._unobserveCollection?.();