diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js index b73292469b7..de2d0973e64 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js +++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js @@ -49,6 +49,11 @@ define(["mage/translate", "Magento_PageBuilder/js/events", "Magento_Ui/js/modal/ _.each(styles, function (stylesArray, selector) { var element = document.querySelector(selector); + if (!element) { + console.error('Element not found for selector: %o. Unable to set attribute: "%s".', selector, "data-" + name + "-style"); + return; + } + _.each(stylesArray, function (style) { element.setAttribute("data-" + name + "-style", element.getAttribute("data-" + name + "-style") ? element.getAttribute("data-" + name + "-style") + style.cssText : style.cssText); }); diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts index 01c61e09ba5..da2ccf1fcf0 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts +++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts @@ -58,7 +58,12 @@ function convertToInlineStyles(document: Document): void { _.each(viewportStyles, (styles, name: string) => { _.each(styles, (stylesArray: CSSStyleDeclaration[], selector: string) => { - const element: HTMLElement = document.querySelector(selector); + const element = document.querySelector(selector); + + if (!element) { + console.error('Element not found for selector: %o. Unable to set attribute: "%s".', selector, `data-${name}-style`); + return; + } _.each(stylesArray, (style: CSSStyleDeclaration) => { element.setAttribute(