New: Include Livewire child component

New: Auto select single array value Fix: view() not available for Array or KeyVal fields
tanthammar · Aug 12, 2020 · f284f4f · f284f4f
1 parent e885867
commit f284f4f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 17 deletions.
diff --git a/resources/views/form-layout.blade.php b/resources/views/form-layout.blade.php
@@ -9,9 +9,11 @@
                 @if(filled($field))
             <div class="sm:col-span-{{ $field->colspan ?? 6 }}">
                 @if($field->view)
-                @include($field->view)
+                    @include($field->view)
+                @elseif($field->livewireComponent)
+                    @livewire($field->livewireComponent, $field->livewireParams)
                 @else
-                @include('tall-forms::fields.' . $field->type)
+                    @include('tall-forms::fields.' . $field->type)
                 @endif
             </div>
                 @endif

diff --git a/src/BaseField.php b/src/BaseField.php
@@ -16,7 +16,6 @@ class BaseField
     protected $placeholder;
     protected $help;
     protected $rules;
-    protected $view;
     protected $prefix;
     protected $icon;
     protected $colspan;
@@ -172,18 +171,6 @@ public function rules($rules): BaseField
         return $this;
     }
 
-
-    /**
-     * Display a custom view instad of the default field view
-     * @param string $view
-     * @return $this
-     */
-    public function view(string $view): BaseField
-    {
-        $this->view = $view;
-        return $this;
-    }
-
     /**
      * Default 6 of 6 columns
      * @param int $width

diff --git a/src/Field.php b/src/Field.php
@@ -12,6 +12,9 @@ class Field extends BaseField
     protected $array_fields = [];
     protected $keyval_fields = [];
     protected $array_sortable = false;
+    protected $view;
+    protected $livewireComponent;
+    protected $livewireParams;
 
 
     public function __construct($label, $name)
@@ -57,4 +60,22 @@ public function sortable(): Field
         $this->array_sortable = true;
         return $this;
     }
+
+    /**
+     * Display a custom view instad of the default field view
+     * @param string $view
+     * @return $this
+     */
+    public function view(string $view): BaseField
+    {
+        $this->view = $view;
+        return $this;
+    }
+
+    public function livewireComponent(string $component, array $params = []): BaseField
+    {
+        $this->livewireComponent = $component;
+        $this->livewireParams = $params;
+        return $this;
+    }
 }
diff --git a/src/FormComponent.php b/src/FormComponent.php
@@ -136,8 +136,6 @@ public function errorMessage($message)
 
     public function success()
     {
-        // $this->form_data['password'] = bcrypt($this->form_data['password']);
-        // \App\Models\User::create($this->form_data);
         ($this->action == 'update')
             ? $this->model->update($this->form_data)
             : $this->create($this->form_data);

diff --git a/src/Traits/HandlesArrays.php b/src/Traits/HandlesArrays.php
@@ -45,4 +45,11 @@ public function arrayRemove($field_name, $key)
         unset($this->form_data[$field_name][$key]);
         $this->form_data[$field_name] = array_values($this->form_data[$field_name]);
     }
+
+    public function autoSelectSingleArrayValue(string $arrayName, string $field)
+    {
+        if (count($this->$arrayName) === 1) {
+            $this->form_data[$field] = array_values($this->$arrayName);
+        }
+    }
 }