Allow override label in Checkbox (#291)

yiisoft · Dec 2, 2023 · 3a825d3 · 3a825d3
1 parent 39cd245
commit 3a825d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/Field/Base/PartsField.php b/src/Field/Base/PartsField.php
@@ -31,6 +31,7 @@ abstract class PartsField extends BaseField
     protected string $templateBegin = "{label}\n{input}";
     protected string $templateEnd = "{input}\n{hint}\n{error}";
     protected string $template = "{label}\n{input}\n{hint}\n{error}";
+    protected ?string $label = null;
     protected ?bool $hideLabel = null;
 
     /**
@@ -236,7 +237,7 @@ final public function addLabelClass(?string ...$class): static
     final public function label(?string $content): static
     {
         $new = clone $this;
-        $new->labelConfig['content()'] = [$content];
+        $new->label = $content;
         return $new;
     }
 
@@ -468,7 +469,12 @@ private function makeContent(string $template, array $parts): string
 
     private function generateLabel(): string
     {
-        $label = Label::widget([], $this->labelConfig);
+        $labelConfig = $this->labelConfig;
+        if ($this->label !== null) {
+            $labelConfig['content()'] = [$this->label];
+        }
+
+        $label = Label::widget([], $labelConfig);
 
         $labelAttributes = $this->labelAttributes;
         if (!empty($labelAttributes)) {

diff --git a/src/Field/Checkbox.php b/src/Field/Checkbox.php
@@ -236,9 +236,8 @@ protected function generateInput(): string
 
         $checkbox = Html::checkbox($this->getName(), $inputValue, $inputAttributes);
 
-        $label = $this->inputLabel ?? $this->getInputData()->getLabel();
-
         if ($this->enclosedByLabel) {
+            $label = $this->inputLabel ?? $this->label ?? $this->getInputData()->getLabel();
             $checkbox = $checkbox
                 ->label($label, $this->inputLabelAttributes)
                 ->labelEncode($this->inputLabelEncode);

diff --git a/tests/Field/CheckboxTest.php b/tests/Field/CheckboxTest.php
@@ -449,10 +449,9 @@ public function testDisabled(): void
 
     public function testAriaDescibedBy(): void
     {
-        $inputData = new PureInputData('test-name', label: 'Blue color');
-
         $result = Checkbox::widget()
-            ->inputData($inputData)
+            ->name('test-name')
+            ->label('Blue color')
             ->ariaDescribedBy('hint')
             ->uncheckValue(null)
             ->render();