Feat(web-twig): Allow transfer of attributes directly to input element

refs #DS-812
lmc-eu · Jun 11, 2023 · 0c9db8d · 0c9db8d
1 parent 75548bb
commit 0c9db8d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/packages/web-twig/src/Twig/PropsExtension.php b/packages/web-twig/src/Twig/PropsExtension.php
@@ -70,8 +70,9 @@ public function renderMainProps(Environment $environment, $props = [], $allowedA
     /**
      * @param array<string, mixed> $props
      * @param array<string, mixed> $allowedAttributes
+     * @param array<string, mixed> $inputProps
      */
-    public function renderInputProps(Environment $environment, array $props, $allowedAttributes = []): string
+    public function renderInputProps(Environment $environment, array $props, $allowedAttributes = [], array $inputProps = []): string
     {
         $transferringAttributes = [];
         foreach ($props as $propName => $propValue) {
@@ -82,6 +83,8 @@ public function renderInputProps(Environment $environment, array $props, $allowe
             }
         }
 
+        $transferringAttributes = array_merge($transferringAttributes, $inputProps);
+
         return $environment->render('@partials/inputProps.twig', [
             'transferringAttributes' => $transferringAttributes,
         ]);

diff --git a/packages/web-twig/tests/Twig/PropsExtensionTest.php b/packages/web-twig/tests/Twig/PropsExtensionTest.php
@@ -144,9 +144,10 @@ public function renderMainPropsDataProvider(): array
      * @dataProvider renderInputPropsDataProvider
      * @param array<string, mixed> $props
      * @param array<string, mixed> $allowedAttributes
+     * @param array<string, mixed> $inputProps
      * @param array<string, mixed> $expectedRenderProps
      */
-    public function testShouldRenderInputProps(array $props, array $allowedAttributes, array $expectedRenderProps): void
+    public function testShouldRenderInputProps(array $props, array $allowedAttributes, array $inputProps, array $expectedRenderProps): void
     {
         $expectedResponse = '';
         $environment = m::mock(Environment::class);
@@ -156,7 +157,7 @@ public function testShouldRenderInputProps(array $props, array $allowedAttribute
             ->with('@partials/inputProps.twig', $expectedRenderProps)
             ->andReturn($expectedResponse);
 
-        $renderResponse = $this->propsExtension->renderInputProps($environment, $props, $allowedAttributes);
+        $renderResponse = $this->propsExtension->renderInputProps($environment, $props, $allowedAttributes, $inputProps);
 
         $this->assertSame($expectedResponse, $renderResponse);
     }
@@ -167,7 +168,7 @@ public function testShouldRenderInputProps(array $props, array $allowedAttribute
     public function renderInputPropsDataProvider(): array
     {
         return [
-            'empty props' => [[], [], [
+            'empty props' => [[], [], [], [
                 'transferringAttributes' => [],
             ]],
             'filter only allowed attributes' => [[
@@ -176,7 +177,7 @@ public function renderInputPropsDataProvider(): array
                 'max' => '6',
                 'autocomplete' => 'on',
                 'placeholder' => 'Your name',
-            ], ['autocomplete', 'placeholder'], [
+            ], ['autocomplete', 'placeholder'], [], [
                 'transferringAttributes' => [
                     'min' => '1',
                     'max' => '6',
@@ -190,13 +191,22 @@ public function renderInputPropsDataProvider(): array
                 'max' => '6',
                 'autocomplete' => 'on',
                 'placeholder' => null,
-            ], ['autocomplete', 'placeholder'], [
+            ], ['autocomplete', 'placeholder'], [], [
                 'transferringAttributes' => [
                     'min' => '1',
                     'max' => '6',
                     'autocomplete' => 'on',
                 ],
             ]],
+            'pass down input props' => [[], [], [
+                'data-test' => 'test-id',
+                'autocomplete' => 'on',
+            ], [
+                'transferringAttributes' => [
+                    'data-test' => 'test-id',
+                    'autocomplete' => 'on',
+                ],
+            ]],
         ];
     }