From 0cb70e214ffd24070fa9e312746953faa0b8a305 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Mon, 31 May 2021 05:35:59 -0400 Subject: Changing Backdrop rootElement to default to a string (#34092) The current config can cause the "body" to become stale. Specifically, if the entire body element is swapped out for a new body element, then the backdrop will continue to append itself to the original body element, since it's stored in memory as a reference on this object. This also no longer allows an explicit null to be passed to Backdrop's rootElement This still accomplishes the laziness of "not finding the rootElement until the Backdrop is created" to avoid problems of the JavaScript being included inside (so, before body is available). --- js/src/util/backdrop.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'js/src/util') diff --git a/js/src/util/backdrop.js b/js/src/util/backdrop.js index f7990f7019..07ad20fab7 100644 --- a/js/src/util/backdrop.js +++ b/js/src/util/backdrop.js @@ -6,19 +6,19 @@ */ import EventHandler from '../dom/event-handler' -import { emulateTransitionEnd, execute, getTransitionDurationFromElement, reflow, typeCheckConfig } from './index' +import { emulateTransitionEnd, execute, getElement, getTransitionDurationFromElement, reflow, typeCheckConfig } from './index' const Default = { isVisible: true, // if false, we use the backdrop helper without adding any element to the dom isAnimated: false, - rootElement: document.body, // give the choice to place backdrop under different elements + rootElement: 'body', // give the choice to place backdrop under different elements clickCallback: null } const DefaultType = { isVisible: 'boolean', isAnimated: 'boolean', - rootElement: 'element', + rootElement: '(element|string)', clickCallback: '(function|null)' } const NAME = 'backdrop' @@ -90,7 +90,8 @@ class Backdrop { ...(typeof config === 'object' ? config : {}) } - config.rootElement = config.rootElement || document.body + // use getElement() with the default "body" to get a fresh Element on each instantiation + config.rootElement = getElement(config.rootElement) typeCheckConfig(NAME, config, DefaultType) return config } -- cgit v1.2.3