Fix bug

Author: sangnguyenplus

helpers/helpers.php

@@ -14,7 +14,7 @@ function getFormBuilderViewPath(string $fileName): string
 
         $path = base_path('resources/views/vendor/laravel-form-builder/' . $fileName);
 
-        return file_exists($path) ? $path : __DIR__ . '/views/' . $fileName;
+        return file_exists($path) ? $path : __DIR__ . '/../resources/views/' . $fileName;
     }
 }
 

src/Form.php

@@ -207,7 +207,7 @@ protected function isPlain(): bool
         return static::class === $this->formBuilder->getFormClass();
     }
 
-    public function buildForm()
+    public function buildForm(): void
     {
     }
 

src/FormBuilderServiceProvider.php

@@ -49,8 +49,6 @@ public function register(): void
         $this->app->alias('form', LaravelForm::class);
 
         $this->registerBladeDirectives();
-        $this->registerFormHelper();
-        $this->registerFormBuilder();
     }
 
     protected function registerBladeDirectives(): void
@@ -229,14 +227,17 @@ public function boot(): void
             __DIR__ . '/../config/config.php' => config_path('laravel-form-builder.php'),
         ]);
 
-        $form = $this->app[static::FORM_ABSTRACT];
+        $this->registerFormHelper();
+        $this->registerFormBuilder();
 
-        $form->macro('customLabel', function ($name, $value, $options = [], $escapeHtml = true) use ($form) {
-            if (isset($options['for']) && $for = $options['for']) {
-                unset($options['for']);
+        $this->app->afterResolving('form', function (LaravelForm $form) {
+            $form->macro('customLabel', function ($name, $value, $options = [], $escapeHtml = true) use ($form) {
+                if (isset($options['for']) && $for = $options['for']) {
+                    unset($options['for']);
 
-                return $form->label($for, $value, $options, $escapeHtml);
-            }
+                    return $form->label($for, $value, $options, $escapeHtml);
+                }
+            });
         });
     }