Merge pull request #33 from pelmered/fix/resolve-closures-in-getLabel

Resolve closures in getLabel()
pelmered · May 10, 2024 · b9e3173 · b9e3173
2 parents ca6dd35 + ee9a728
commit b9e3173
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/Forms/Components/MoneyInput.php b/src/Forms/Components/MoneyInput.php
@@ -97,7 +97,7 @@ public function maxValue(mixed $value): static
 
     public function getLabel(): string
     {
-        return $this->label
+        return $this->evaluate($this->label)
                ?? (string)str($this->getName())
                 ->afterLast('.')
             ->kebab()

diff --git a/tests/FormInputTest.php b/tests/FormInputTest.php
@@ -62,7 +62,7 @@ public function testCurrencySymbolPlacementAfter()
         $field = $component->getComponent('data.price');
         $this->assertEquals('$', $field->getSuffixLabel());
         $this->assertNull($field->getPrefixLabel());
-}
+    }
 
     public function testCurrencySymbolPlacementBefore()
     {
@@ -179,7 +179,6 @@ public function testAllowLabelToBeOverrided(): void
     {
         $field = (new MoneyInput('price'))->label('Custom Label');
 
-
         $component = ComponentContainer::make(FormTestComponent::make())
                                        ->statePath('data')
                                        ->components([
@@ -189,4 +188,20 @@ public function testAllowLabelToBeOverrided(): void
         $field = $component->getComponent('data.price');
         $this->assertEquals('Custom Label', $field->getLabel());
     }
+
+    public function testResolveLabelClosures(): void
+    {
+        $field = (new MoneyInput('price'))->label(function () {
+            return 'Custom Label in Closure';
+        });
+
+        $component = ComponentContainer::make(FormTestComponent::make())
+                                       ->statePath('data')
+                                       ->components([
+                                           $field,
+                                       ])->fill([$field->getName() => 45345]);
+
+        $field = $component->getComponent('data.price');
+        $this->assertEquals('Custom Label in Closure', $field->getLabel());
+    }
 }