Issue #3449653 by pdureau: Execute normalization when Twig include and embed are used

Closes #3449653

src/Element/ComponentElementAlter.php

@@ -5,11 +5,9 @@ declare(strict_types=1);
 namespace Drupal\ui_patterns\Element;
 
 use Drupal\Component\Utility\NestedArray;
-use Drupal\Core\Plugin\Component;
 use Drupal\Core\Security\TrustedCallbackInterface;
 use Drupal\Core\Theme\ComponentPluginManager;
 use Drupal\ui_patterns\Plugin\UiPatterns\PropType\SlotPropType;
-use Drupal\ui_patterns\PropTypeAdapterPluginManager;
 
 /**
  * Our additions to the SDC render element.
@@ -19,27 +17,25 @@ class ComponentElementAlter implements TrustedCallbackInterface {
   /**
    * Constructs a ComponentElementAlter.
    */
-  public function __construct(protected ComponentPluginManager $componentPluginManager, protected PropTypeAdapterPluginManager $adaptersManager) {
-  }
+  public function __construct(protected ComponentPluginManager $componentPluginManager) {}
 
   /**
    * {@inheritdoc}
    */
   public static function trustedCallbacks() {
     return ['alter'];
+
   }
 
   /**
    * Alter SDC component element.
+   *
+   * The ::normalizeProps() methods logic has been moved to
+   * TwigExtension::normalizeProps() in order to be executed also when
+   * components are loaded from Twig include or embed.
    */
   public function alter(array $element): array {
     $element = $this->normalizeSlots($element);
-    $component = $this->componentPluginManager->find($element['#component']);
-    $element = $this->normalizeProps($element, $component);
-    // Attributes prop must never be empty, to avoid the processing of SDC's
-    // ComponentsTwigExtension::mergeAdditionalRenderContext() which is adding
-    // an Attribute PHP object before running the validator.
-    $element["#props"]["attributes"]['data-component-id'] = $component->getPluginId();
     $element = $this->processAttributesRenderProperty($element);
     return $element;
   }
@@ -64,32 +60,6 @@ class ComponentElementAlter implements TrustedCallbackInterface {
     return $element;
   }
 
-  /**
-   * Normalize props.
-   */
-  public function normalizeProps(array $element, Component $component): array {
-    $props = $component->metadata->schema['properties'] ?? [];
-    foreach ($element["#props"] as $prop_id => $prop) {
-      if (!isset($props[$prop_id])) {
-        continue;
-      }
-      $definition = $props[$prop_id];
-      $prop_type = $definition['ui_patterns']['type_definition'];
-      // Normalizing attributes to an array is not working
-      // if the prop type is defined by type=Drupal\Core\Template\Attribute
-      // This should actually be done by the normalize function.
-      $data = $prop_type->normalize($prop);
-      if (isset($definition['ui_patterns']['prop_type_adapter'])) {
-        $prop_type_adapter_id = $definition['ui_patterns']['prop_type_adapter'];
-        /** @var \Drupal\ui_patterns\PropTypeAdapterInterface $prop_type_adapter */
-        $prop_type_adapter = $this->adaptersManager->createInstance($prop_type_adapter_id);
-        $data = $prop_type_adapter->transform($data);
-      }
-      $element["#props"][$prop_id] = $data;
-    }
-    return $element;
-  }
-
   /**
    * Process #attributes render property.
    *