merge magento/2.4.0-develop into magento-tsg/2.4.0-develop-pr56

Author: magento-mts-svc

app/code/Magento/Backend/Block/Widget/Button.php

@@ -162,7 +162,7 @@ protected function _beforeToHtml()
     {
         parent::_beforeToHtml();
 
-        $buttonId = 'buttonId' .$this->random->getRandomString(32);
+        $buttonId = 'buttonId' .$this->random->getRandomString(10);
         $this->setData('backend_button_widget_hook_id', $buttonId);
 
         $afterHtml = $this->getAfterHtml();

app/code/Magento/Backend/Block/Widget/Button/SplitButton.php

@@ -243,7 +243,7 @@ private function identifyOption(array $option): string
             ? $this->getId() .'-' .$option['id']
             : (isset($option['id_attribute']) ?
                 $option['id_attribute']
-                : $this->getId() .'-optId' .$this->random->getRandomString(32));
+                : $this->getId() .'-optId' .$this->random->getRandomString(10));
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Action.php

@@ -132,7 +132,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
         }
 
         if (empty($action['id'])) {
-            $action['id'] = 'id' .$this->random->getRandomString(32);
+            $action['id'] = 'id' .$this->random->getRandomString(10);
         }
         $actionAttributes->setData($action);
         $onclick = $actionAttributes->getData('onclick');

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php

@@ -176,7 +176,7 @@ public function renderHeader()
         if ($this->getColumn()->getDisabled()) {
             $disabled = ' disabled="disabled"';
         }
-        $id = 'id' .$this->random->getRandomString(32);
+        $id = 'id' .$this->random->getRandomString(10);
         $html = '<th class="data-grid-th data-grid-actions-cell"><input type="checkbox" ';
         $html .= 'id="' .$id .'" ';
         $html .= 'name="' . $this->getColumn()->getFieldName() . '" ';

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml

@@ -13,33 +13,18 @@
         "window.productConfigure && productConfigure.onLoadIFrame()",
         'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
     ) ?>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        "width:0; height:0; border:0px solid #fff; position:absolute; top:-1000px; left:-1000px",
-        'iframe[name=\'product_composite_configure_iframe\']:last-of-type'
-    ) ?>
 
     <form action="" method="post" id="product_composite_configure_form" enctype="multipart/form-data"
           target="product_composite_configure_iframe" class="product_composite_configure_form">
         <div class="entry-edit">
             <div id="product_composite_configure_messages" class="product_composite_configure_messages">
                 <div class="messages"><div class="message message-error error"><div></div></div></div>
             </div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_messages:last-of-type'
-            ) ?>
             <div id="product_composite_configure_form_fields" class="content product-composite-configure-inner"></div>
             <div id="product_composite_configure_form_additional" class="product_composite_configure_form_additional">
             </div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_form_additional:last-of-type'
-            ) ?>
-            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed"></div>
-            <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                'display:none;',
-                '.product_composite_configure_form_confirmed:last-of-type'
-            ) ?>
+            <div id="product_composite_configure_form_confirmed" class="product_composite_configure_form_confirmed">
+            </div>
         </div>
         <input type="hidden" name="as_js_varname" value="iFrameResponse" />
         <input type="hidden" name="form_key" value="<?= $block->escapeHtmlAttr($block->getFormKey()) ?>" />
@@ -51,12 +36,36 @@
     ) ?>
 
     <div id="product_composite_configure_confirmed" class="product_composite_configure_confirmed"></div>
-    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-        'display:none;',
-        '.product_composite_configure_confirmed:last-of-type'
-    ) ?>
 
     <?php $scriptString = <<<script
+        prodCompConfIframe = document.querySelector("iframe[name='product_composite_configure_iframe']:last-of-type");
+        prodCompConfIframe.style.width = 0;
+        prodCompConfIframe.style.height = 0;
+        prodCompConfIframe.style.border = "0px solid #fff";
+        prodCompConfIframe.style.position = "absolute";
+        prodCompConfIframe.style.top = "-1000px";
+        prodCompConfIframe.style.left = "-1000px";
+        prodCompConfMessages = document.querySelectorAll(".product_composite_configure_messages");
+        for (var i = 0; i < prodCompConfMessages.length; i++) {
+            prodCompConfMessages[i].style.display = "none";
+        }
+        prodCompConfFormAdd = document.querySelectorAll(".product_composite_configure_form_additional");
+        for (var i = 0; i < prodCompConfFormAdd.length; i++) {
+            prodCompConfFormAdd[i].style.display = "none";
+        }
+        prodCompConfFormConf = document.querySelectorAll(".product_composite_configure_form_confirmed");
+        for (var i = 0; i < prodCompConfFormConf.length; i++) {
+            prodCompConfFormConf[i].style.display = "none";
+        }
+        prodCompConfConf = document.querySelectorAll(".product_composite_configure_confirmed");
+        for (var i = 0; i < prodCompConfConf.length; i++) {
+            prodCompConfConf[i].style.display = "none";
+        }
+        prodConfPopup = document.querySelectorAll(".product-configure-popup");
+        for (var i = 0; i < prodConfPopup.length; i++) {
+            prodConfPopup[i].style.display = "none";
+        }
+
         require([
             "jquery",
             "mage/mage"
@@ -69,8 +78,3 @@ script;
     ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-    'display:none',
-    '.product-configure-popup:last-of-type'
-) ?>
-

app/code/Magento/Config/Block/System/Config/Form/Fieldset.php

@@ -175,6 +175,7 @@ protected function _getHeaderTitleHtml($element)
             '-link">' . $element->getLegend() . '</a>' .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
+                'event.preventDefault();' .
                 "Fieldset.toggleCollapse('" . $element->getHtmlId() . "', '" .
                  $this->_urlBuilder->getUrl('*/*/state') . "'); return false;",
                 'a#' . $element->getHtmlId() . '-head'
@@ -225,7 +226,7 @@ protected function _getFooterHtml($element)
                 );
                 $html .= $this->secureRenderer->renderStyleAsTag(
                     'display:none;',
-                    'row_' . $field->getId() . '_comment'
+                    '#row_' . $field->getId() . '_comment'
                 );
             }
         }

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php

@@ -243,7 +243,7 @@ public function testRenderWithStoredElements($expanded, $nested, $extra)
         $this->assertStringContainsString('test_field_toHTML', $actual);
 
         $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box">test_field_tootip</div>' .
-        '<style>row_test_field_id_comment { display:none; }</style>';
+        '<style>#row_test_field_id_comment { display:none; }</style>';
         $this->assertStringContainsString($expected, $actual);
         if ($nested) {
             $this->assertStringContainsString('nested', $actual);

app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Region.php

@@ -74,9 +74,8 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
             '" class="select required-entry admin__control-select">';
         $html .= '<option value="">' . __('Please select') . '</option>';
         $html .= '</select>';
-        $html .= $this->secureRenderer->renderStyleAsTag("display:none", '#region');
 
-        $scriptString = "\n";
+        $scriptString = "\ndocument.querySelector('#$selectId').style.display = 'none';\n";
         $scriptString .= 'require(["prototype", "mage/adminhtml/form"], function(){';
         $scriptString .= '$("' . $selectId . '").setAttribute("defaultValue", "' . $regionId . '");' . "\n";
         $scriptString .= 'new regionUpdater("' .

app/code/Magento/Customer/Block/Adminhtml/Grid/Renderer/Multiaction.php

@@ -85,7 +85,7 @@ protected function _toLinkHtml($action, \Magento\Framework\DataObject $row)
 
         if (isset($action['process']) && $action['process'] == 'configurable') {
             if ($product->canConfigure()) {
-                $id = 'id' .$this->random->getRandomString(32);
+                $id = 'id' .$this->random->getRandomString(10);
                 $onClick = sprintf('return %s.configureItem(%s)', $action['control_object'], $row->getId());
                 return sprintf(
                     '<a href="%s" id="%s" class="configure-item-link">%s</a>%s',

app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml

@@ -7,7 +7,7 @@
 /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 ?>
-<div id="authenticationPopup" data-bind="scope:'authenticationPopup'">
+<div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
     <!-- ko template: getTemplate() --><!-- /ko -->
@@ -24,4 +24,3 @@
         }
     </script>
 </div>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag('display:none', '#authenticationPopup'); ?>