Fix(web-twig): Render input and main props if the prop value is not `…

…null` or empty
lmc-eu · Jun 11, 2023 · 09212b6 · 09212b6
1 parent c168eea
commit 09212b6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/web-twig/src/Resources/partials/inputProps.twig b/packages/web-twig/src/Resources/partials/inputProps.twig
@@ -1 +1 @@
-{%- for propName, propValue in transferringAttributes  %} {{ propName }}="{{ propValue }}"{% endfor -%}
+{%- for propName, propValue in transferringAttributes  %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
diff --git a/packages/web-twig/src/Resources/partials/mainProps.twig b/packages/web-twig/src/Resources/partials/mainProps.twig
@@ -1 +1 @@
-{%- if id != null %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %} {{ propName }}="{{ propValue }}"{% endfor -%}
+{%- if id != null %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
diff --git a/packages/web-twig/src/Twig/PropsExtension.php b/packages/web-twig/src/Twig/PropsExtension.php
@@ -54,7 +54,7 @@ public function renderMainProps(Environment $environment, $props = [], $allowedA
                     // allow manually specified attributes
                     || in_array($propName, $allowedAttributes)
                 ) {
-                    if ($propValue !== '') {
+                    if (! is_null($propValue) && $propValue !== '') {
                         $transferringAttributes[$propName] = $propValue;
                     }
                 }
@@ -76,7 +76,9 @@ public function renderInputProps(Environment $environment, array $props, $allowe
         $transferringAttributes = [];
         foreach ($props as $propName => $propValue) {
             if (in_array($propName, self::VALIDATION_ATTRIBUTES, true) || in_array($propName, $allowedAttributes)) {
-                $transferringAttributes[$propName] = $propValue;
+                if (! is_null($propValue) && $propValue !== '') {
+                    $transferringAttributes[$propName] = $propValue;
+                }
             }
         }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{%- for propName, propValue in transferringAttributes %} {{ propName }}="{{ propValue }}"{% endfor -%}
		{%- for propName, propValue in transferringAttributes %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{%- if id != null %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %} {{ propName }}="{{ propValue }}"{% endfor -%}
		{%- if id != null %} id="{{ id }}"{% endif -%}{%- for propName, propValue in transferringAttributes %}{%- if propValue is not null and propValue != '' %} {{ propName }}="{{ propValue }}"{% endif -%}{% endfor -%}