Merge remote-tracking branch 'origin/AC-1077' into GL_PR_21102021

Author: glo71317

lib/internal/Magento/Framework/View/Element/BlockFactory.php

@@ -6,6 +6,8 @@
 namespace Magento\Framework\View\Element;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\ObjectManager\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Creates Blocks
@@ -16,20 +18,29 @@
 class BlockFactory
 {
     /**
-     * Object manager
-     *
      * @var ObjectManagerInterface
      */
     protected $objectManager;
 
+    /**
+     * Object manager config
+     *
+     * @var ConfigInterface
+     */
+    private $config;
+
     /**
      * Constructor
      *
      * @param ObjectManagerInterface $objectManager
+     * @param ConfigInterface $config
      */
-    public function __construct(ObjectManagerInterface $objectManager)
-    {
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        ?ConfigInterface $config = null
+    ) {
         $this->objectManager = $objectManager;
+        $this->config        = $config ?: ObjectManager::getInstance()->get(ConfigInterface::class);
     }
 
     /**
@@ -42,8 +53,9 @@ public function __construct(ObjectManagerInterface $objectManager)
      */
     public function createBlock($blockName, array $arguments = [])
     {
-        $blockName = ltrim($blockName, '\\');
-        $block = $this->objectManager->create($blockName, $arguments);
+        $blockName  = ltrim($blockName, '\\');
+        $arguments  = $this->getConfigArguments($blockName, $arguments);
+        $block      = $this->objectManager->create($blockName, $arguments);
         if (!$block instanceof BlockInterface) {
             throw new \LogicException($blockName . ' does not implement BlockInterface');
         }
@@ -52,4 +64,24 @@ public function createBlock($blockName, array $arguments = [])
         }
         return $block;
     }
+
+    /**
+     * Get All Config Arguments based on Block Name
+     *
+     * @param string $blockName
+     * @param array $arguments
+     * @return array $arguments
+     */
+    private function getConfigArguments($blockName, array $arguments = [])
+    {
+        if (!$this->config) {
+            return $arguments;
+        }
+        $configArguments    = $this->config->getArguments($blockName);
+        if ($configArguments && isset($configArguments['data'])) {
+            $arguments['data'] = ($arguments && isset($arguments['data'])) ?
+                array_merge($arguments['data'], $configArguments['data']) : $configArguments['data'];
+        }
+        return $arguments;
+    }
 }