Refactor renderContainerTag method to accept an optional id parameter. (

#181)
php-forge · Dec 30, 2023 · 3bd2b30 · 3bd2b30
1 parent de1c219
commit 3bd2b30
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/src/Attribute/Custom/HasContainer.php b/src/Attribute/Custom/HasContainer.php
@@ -96,12 +96,13 @@ public function getContainerId(): string|null
         return $id;
     }
 
-    private function renderContainerTag(string ...$content): string
+    private function renderContainerTag(string|null $id, string ...$content): string
     {
         return match ($this->container) {
             true => Tag::widget()
                 ->attributes($this->containerAttributes)
                 ->content(...$content)
+                ->id($id)
                 ->tagName($this->containerTag)
                 ->render(),
             default => implode(PHP_EOL, $content),

diff --git a/src/Button.php b/src/Button.php
@@ -90,6 +90,7 @@ protected function run(): string
         }
 
         return $this->renderContainerTag(
+            null,
             Tag::widget()
                 ->attributes($attributes)
                 ->content($this->content)

diff --git a/src/Input/Base/AbstractButton.php b/src/Input/Base/AbstractButton.php
@@ -56,23 +56,24 @@ protected function run(): string
             $attributes['aria-describedby'] = "$id-help";
         }
 
-        $inputTag = Tag::widget()
-            ->attributes($attributes)
-            ->id($id)
-            ->prefix($this->prefix)
-            ->prefixContainer($this->prefixContainer)
-            ->prefixContainerAttributes($this->prefixContainerAttributes)
-            ->prefixContainerTag($this->prefixContainerTag)
-            ->suffix($this->suffix)
-            ->suffixContainer($this->suffixContainer)
-            ->suffixContainerAttributes($this->suffixContainerAttributes)
-            ->suffixContainerTag($this->suffixContainerTag)
-            ->tagName('input')
-            ->template($this->template)
-            ->tokenValue('{label}', $this->renderLabelTag($labelFor))
-            ->type($type)
-            ->render();
-
-        return $this->renderContainerTag($inputTag);
+        return $this->renderContainerTag(
+            null,
+            Tag::widget()
+                ->attributes($attributes)
+                ->id($id)
+                ->prefix($this->prefix)
+                ->prefixContainer($this->prefixContainer)
+                ->prefixContainerAttributes($this->prefixContainerAttributes)
+                ->prefixContainerTag($this->prefixContainerTag)
+                ->suffix($this->suffix)
+                ->suffixContainer($this->suffixContainer)
+                ->suffixContainerAttributes($this->suffixContainerAttributes)
+                ->suffixContainerTag($this->suffixContainerTag)
+                ->tagName('input')
+                ->template($this->template)
+                ->tokenValue('{label}', $this->renderLabelTag($labelFor))
+                ->type($type)
+                ->render()
+        );
     }
 }
diff --git a/src/Input/Base/AbstractButtonGroup.php b/src/Input/Base/AbstractButtonGroup.php
@@ -52,7 +52,7 @@ public function individualContainer(bool $value): static
 
     protected function run(): string
     {
-        return $this->renderContainerTag($this->renderButtons());
+        return $this->renderContainerTag(null, $this->renderButtons());
     }
 
     private function renderButtons(): string

diff --git a/src/Input/Base/AbstractInputChoice.php b/src/Input/Base/AbstractInputChoice.php
@@ -94,7 +94,7 @@ protected function buildChoiceTag(string $type): string
 
         $choiceTag = $this->prepareTemplate($tag, $labelTag);
 
-        return $this->renderContainerTag($choiceTag);
+        return $this->renderContainerTag(null, $choiceTag);
     }
 
     private function prepareTemplate(string $tag, string $labelTag): string