Issue 4 - Show errors feedback on input groups

bgaze · Dec 7, 2019 · a85bc4e · a85bc4e
1 parent 83da540
commit a85bc4e
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/src/Inputs/CheckChoice.php b/src/Inputs/CheckChoice.php
@@ -17,11 +17,6 @@
 class CheckChoice extends Input
 {
 
-    /**
-     * The format to use to display error messages.
-     */
-    const ERRORS_FORMAT = '<div class="invalid-feedback d-block">:message</div>';
-
     /**
      * Get the input default options.
      *
@@ -82,6 +77,14 @@ protected function configureLabel($label, array $options)
         }
     }
 
+    /**
+     * Get the template to build up error messages.
+     */
+    protected function errorTemplate()
+    {
+        return '<div class="invalid-feedback d-block">:message</div>';
+    }
+
     /**
      * Compile input to a HTML string.
      *

diff --git a/src/Support/Input.php b/src/Support/Input.php
@@ -35,11 +35,6 @@ abstract class Input
 
     use HasSettings;
 
-    /**
-     * The format to use to display error messages.
-     */
-    const ERRORS_FORMAT = '<div class="invalid-feedback">:message</div>';
-
     /**
      * Illuminate HtmlBuilder instance.
      *
@@ -190,10 +185,17 @@ protected function configureGroup(array $options)
         }
     }
 
+    /**
+     * Get the template to build up error messages.
+     */
+    protected function errorTemplate()
+    {
+        return '<div class="invalid-feedback">:message</div>';
+    }
+
     /**
      * Compile inputs errors to and HTML string.
      * Add error class to input and group if there is any errors.
-     *
      */
     protected function getErrors()
     {
@@ -215,9 +217,9 @@ protected function getErrors()
         }
 
         if ($this->show_all_errors) {
-            $this->errors = implode('', $errorBag->get($field, static::ERRORS_FORMAT));
+            $this->errors = implode('', $errorBag->get($field, $this->errorTemplate()));
         } else {
-            $this->errors = $errorBag->first($field, static::ERRORS_FORMAT);
+            $this->errors = $errorBag->first($field, $this->errorTemplate());
         }
 
         $this->input_attributes->addClass('is-invalid');

diff --git a/src/Support/Traits/HasAddons.php b/src/Support/Traits/HasAddons.php
@@ -11,6 +11,18 @@
 trait HasAddons
 {
 
+    /**
+     * Get the template to build up error messages.
+     */
+    protected function errorTemplate()
+    {
+        if ($this->append || $this->prepend) {
+            return '<div class="invalid-feedback d-block">:message</div>';
+        }
+
+        return '<div class="invalid-feedback">:message</div>';
+    }
+
     /**
      * Build a Bootstrap input group if append or prepend options are provided.
      *