Merge remote-tracking branch 'origin/MC-35458' into 2.4-develop-pr75

Author: zakdma

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

@@ -96,6 +96,8 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
                     . '<td colspan="4">' . $field->toHtml() . '</td></tr>';
             } else {
                 $elements .= $field->toHtml();
+                $styleTag = $this->addVisibilityTag($field);
+                $elements .= $styleTag;
             }
         }
 
@@ -168,11 +170,13 @@ protected function _getFrontendClass($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
+        $styleTag = $this->addVisibilityTag($element);
         return '<a id="' .
             $element->getHtmlId() .
             '-head" href="#' .
             $element->getHtmlId() .
             '-link">' . $element->getLegend() . '</a>' .
+            $styleTag .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
                 'event.preventDefault();' .
@@ -270,10 +274,70 @@ protected function _isCollapseState($element)
             return true;
         }
 
+        if ($this->isCollapseStateByDependentField($element)) {
+            return false;
+        }
+
         $extra = $this->_authSession->getUser()->getExtra();
+
         if (isset($extra['configState'][$element->getId()])) {
             return $extra['configState'][$element->getId()];
         }
         return $this->isCollapsedDefault;
     }
+
+    /**
+     * Check if element should be collapsed by dependent field value.
+     *
+     * @param AbstractElement $element
+     * @return bool
+     */
+    private function isCollapseStateByDependentField(AbstractElement $element): bool
+    {
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+                    $fieldSetForm = $this->getForm();
+                    $dependentFieldConfigValue = $this->_scopeConfig->getValue(
+                        $dependFieldData['id'],
+                        $fieldSetForm->getScope(),
+                        $fieldSetForm->getScopeCode()
+                    );
+
+                    if ($dependFieldData['value'] !== $dependentFieldConfigValue) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * If element or it's parent depends on other element we hide it during page load.
+     *
+     * @param AbstractElement $field
+     * @return string
+     */
+    private function addVisibilityTag(AbstractElement $field): string
+    {
+        $elementId = '';
+        $styleTag = '';
+
+        if (!empty($field->getFieldConfig()['depends']['fields'])) {
+            $elementId = '#row_' . $field->getHtmlId();
+        } elseif (!empty($field->getGroup()['depends']['fields'])) {
+            $elementId = '#' . $field->getHtmlId() . '-head';
+        }
+
+        if (!empty($elementId)) {
+            $styleTag .= $this->secureRenderer->renderStyleAsTag(
+                'display: none;',
+                $elementId
+            );
+        }
+
+        return $styleTag;
+    }
 }