Add form macro for label to allow custom for and id attributes.

kristijanhusak · kristijanhusak · commit 54b1af7fb95c · 2016-09-30T10:40:47.000+02:00
diff --git a/src/Kris/LaravelFormBuilder/Fields/FormField.php b/src/Kris/LaravelFormBuilder/Fields/FormField.php
@@ -275,10 +275,6 @@ protected function prepareOptions(array $options = [])
         $this->setOption('wrapperAttrs', $helper->prepareAttributes($this->getOption('wrapper')));
         $this->setOption('errorAttrs', $helper->prepareAttributes($this->getOption('errors')));
 
-        if ($this->getOption('is_child')) {
-            $this->setOption('labelAttrs', $helper->prepareAttributes($this->getOption('label_attr')));
-        }
-
         if ($this->getOption('help_block.text')) {
             $this->setOption(
                 'help_block.helpBlockAttrs',
diff --git a/src/Kris/LaravelFormBuilder/Fields/StaticType.php b/src/Kris/LaravelFormBuilder/Fields/StaticType.php
@@ -14,7 +14,6 @@ public function render(array $options = [], $showLabel = true, $showField = true
     private function setupStaticOptions(&$options)
     {
         $options['elemAttrs'] = $this->formHelper->prepareAttributes($this->getOption('attr'));
-        $options['labelAttrs'] = $this->formHelper->prepareAttributes($this->getOption('label_attr'));
     }
 
     /**
diff --git a/src/Kris/LaravelFormBuilder/FormBuilderServiceProvider.php b/src/Kris/LaravelFormBuilder/FormBuilderServiceProvider.php
@@ -56,6 +56,17 @@ public function boot()
             __DIR__ . '/../../views' => base_path('resources/views/vendor/laravel-form-builder'),
             __DIR__ . '/../../config/config.php' => config_path('laravel-form-builder.php')
         ]);
+
+        $form = $this->app['form'];
+
+        $form->macro('customLabel', function($name, $value, $options = []) use ($form) {
+            if (isset($options['for']) && $for = $options['for']) {
+                unset($options['for']);
+                return $form->label($for, $value, $options);
+            }
+
+            return $form->label($name, $value, $options);
+        });
     }
 
     /**
diff --git a/src/views/checkbox.php b/src/views/checkbox.php
@@ -11,11 +11,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?php if ($options['is_child']): ?>
-        <label <?= $options['labelAttrs'] ?>><?= $options['label'] ?></label>
-    <?php else: ?>
-        <?= Form::label($name, $options['label'], $options['label_attr']) ?>
-    <?php endif; ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php include 'errors.php' ?>
diff --git a/src/views/child_form.php b/src/views/child_form.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/choice.php b/src/views/choice.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/collection.php b/src/views/collection.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/radio.php b/src/views/radio.php
@@ -11,11 +11,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?php if ($options['is_child']): ?>
-        <label <?= $options['labelAttrs'] ?>><?= $options['label'] ?></label>
-    <?php else: ?>
-        <?= Form::label($name, $options['label'], $options['label_attr']) ?>
-    <?php endif; ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php include 'errors.php' ?>
diff --git a/src/views/select.php b/src/views/select.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/static.php b/src/views/static.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <label <?= $options['labelAttrs'] ?>><?= $options['label'] ?></label>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/text.php b/src/views/text.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/src/views/textarea.php b/src/views/textarea.php
@@ -5,7 +5,7 @@
 <?php endif; ?>
 
 <?php if ($showLabel && $options['label'] !== false && $options['label_show']): ?>
-    <?= Form::label($name, $options['label'], $options['label_attr']) ?>
+    <?= Form::customLabel($name, $options['label'], $options['label_attr']) ?>
 <?php endif; ?>
 
 <?php if ($showField): ?>
diff --git a/tests/FormTest.php b/tests/FormTest.php
@@ -695,7 +695,14 @@ public function it_can_add_child_form_as_field()
         $form->setModel($model);
 
         $form
-            ->add('title', 'text')
+            ->add('title', 'text', [
+                'label_attr' => [
+                    'for' => 'custom_title'
+                ],
+                'attr' => [
+                    'id' => 'custom_title'
+                ]
+            ])
             ->add('song', 'form', [
                 'class' => $customForm
             ])
@@ -718,6 +725,8 @@ public function it_can_add_child_form_as_field()
         $this->assertEquals('songs[1]', $customForm->getName());
 
         $this->assertEquals('song[title]', $form->song->getChild('title')->getName());
+        $this->assertEquals('custom_title', $form->title->getOption('attr.id'));
+        $this->assertEquals('custom_title', $form->title->getOption('label_attr.for'));
         $this->assertFalse($form->song->name->getOption('label_show'));
         $this->assertCount(2, $form->songs->getChildren());
         $this->assertEquals('lorem', $form->songs->getChild(0)->title->getOption('value'));
@@ -729,6 +738,8 @@ public function it_can_add_child_form_as_field()
         );
 
         $this->assertNotRegExp('/label.*for="name"/', $view);
+        $this->assertRegExp('/label.*for="custom_title"/', $view);
+        $this->assertRegExp('/input.*id="custom_title"/', $view);
 
         $this->assertTrue($form->song->getFormOption('files'));
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public function render(array $options = [], $showLabel = true, $showField = true`
`14`	`14`	`private function setupStaticOptions(&$options)`
`15`	`15`	`{`
`16`	`16`	`$options['elemAttrs'] = $this->formHelper->prepareAttributes($this->getOption('attr'));`
`17`		`- $options['labelAttrs'] = $this->formHelper->prepareAttributes($this->getOption('label_attr'));`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`/**`