Merge pull request #4 from NicksonJoe/master

edit: base component

Author: wdda

src/Components/Base/UikitBaseComponent.php

@@ -4,26 +4,26 @@
 
 abstract class UikitBaseComponent implements UikitBaseComponentInterface
 {
-    protected string $name;
     protected ?string $id = null;
     protected ?string $value = null;
     protected ?string $label = null;
     protected ?string $class = null;
     protected string $attributes = '';
 
+    public function __construct(protected string $name)
+    {
+        if (empty($this->label)) {
+            $this->label = ucfirst(str_replace('_', ' ', $this->name));
+        }
+    }
+
     abstract public function render(): string;
 
     public function __toString(): string
     {
         return $this->render();
     }
 
-    public function name(string $name): self
-    {
-        $this->name = $name;
-        return $this;
-    }
-
     public function id(?string $id): self
     {
         $this->id = $id ?? $this->name;

src/Components/Base/UikitBaseComponentInterface.php

@@ -4,8 +4,6 @@
 
 interface UikitBaseComponentInterface
 {
-    public function name(string $name): self;
-
     public function label(string $label): self;
 
     public function id(?string $id): self;

src/Components/UikitCheckbox.php

@@ -7,16 +7,16 @@
 
 class UikitCheckbox extends UikitBaseComponent
 {
-    protected bool $checked = false;
+    protected ?bool $checked = false;
 
-    public static function create(): self
+    public static function create(string $name): self
     {
-        return new self();
+        return new self($name);
     }
 
-    public function checked(bool $checked): self
+    public function checked(?bool $checked): self
     {
-        $this->checked = $checked;
+        $this->checked = $checked ?? false;
         return $this;
     }
 

src/Components/UikitInput.php

@@ -7,9 +7,9 @@
 
 class UikitInput extends UikitBaseComponent
 {
-    public static function create(): self
+    public static function create(string $name): self
     {
-        return new self();
+        return new self($name);
     }
 
     /**
@@ -22,7 +22,7 @@ public function render(): string
             'label' => $this->label,
             'name' => $this->name,
             'value' => $this->value,
-            'class' => $this->class,
+            'class' => $this->class ?? 'uk-input',
             'attributes' => $this->attributes,
         ])->render();
     }

src/Components/UikitRadio.php

@@ -7,16 +7,16 @@
 
 class UikitRadio extends UikitBaseComponent
 {
-    protected bool $checked = false;
+    protected ?bool $checked = false;
 
-    public static function create(): self
+    public static function create(string $name): self
     {
-        return new self();
+        return new self($name);
     }
 
-    public function checked(bool $checked): self
+    public function checked(?bool $checked): self
     {
-        $this->checked = $checked;
+        $this->checked = $checked ?? false;
         return $this;
     }
 

src/Components/UikitSelect.php

@@ -3,19 +3,20 @@
 namespace WDDA\LaravelUikitForm\Components;
 
 use Throwable;
+use Illuminate\Support\Collection;
 use WDDA\LaravelUikitForm\Components\Base\UikitBaseComponent;
 
 class UikitSelect extends UikitBaseComponent
 {
-    protected array $options = [];
+    protected Collection|array $options = [];
     protected array $attributesArray = [];
 
-    public static function create(): self
+    public static function create(string $name): self
     {
-        return new self();
+        return new self($name);
     }
 
-    public function options(array $options): self
+    public function options(Collection|array $options): self
     {
         $this->options = $options;
         return $this;

src/Components/UikitTextarea.php

@@ -9,12 +9,12 @@ class UikitTextarea extends UikitBaseComponent
 {
     protected int $rows = 6;
 
-    public static function create(): self
+    public static function create(string $name): self
     {
-        return new self();
+        return new self($name);
     }
 
-    public function rows($rows): self
+    public function rows(int $rows): self
     {
         $this->rows = $rows;
         return $this;

src/helpers.php

@@ -3,36 +3,36 @@
 use WDDA\LaravelUikitForm\Components\{UikitCheckbox, UikitInput, UikitRadio, UikitSelect, UikitTextarea};
 
 if (!function_exists('formRadio')) {
-    function formRadio(): UikitRadio
+    function formRadio(string $name): UikitRadio
     {
-        return UikitRadio::create();
+        return UikitRadio::create($name);
     }
 }
 
 if (!function_exists('formInput')) {
-    function formInput()
+    function formInput(string $name)
     {
-        return UikitInput::create();
+        return UikitInput::create($name);
     }
 }
 
 if (!function_exists('formTextarea')) {
-    function formTextarea()
+    function formTextarea(string $name)
     {
-        return UikitTextarea::create();
+        return UikitTextarea::create($name);
     }
 }
 
 if (!function_exists('formSelect')) {
-    function formSelect()
+    function formSelect(string $name)
     {
-        return UikitSelect::create();
+        return UikitSelect::create($name);
     }
 }
 
 if (!function_exists('formCheckbox')) {
-    function formCheckbox()
+    function formCheckbox(string $name)
     {
-        return UikitCheckbox::create();
+        return UikitCheckbox::create($name);
     }
 }

src/views/input.blade.php

@@ -1,10 +1,9 @@
 <div class="uk-margin-small-bottom">
-    <label @if($id)for="{{ $id }}"@endif>{{ $label }}</label>
+    <label @if($id) for="{{ $id }}" @endif>{{ $label }}</label>
     <div class="uk-form-controls">
-        <input @if(!$class)class="uk-input" @endif
-            @if($id)id="{{ $id }}" @endif
-            @if($name)name="{{ $name }}" @endif
-            value="{{ $value }}"{!! $attributes !!}>
+        <input class="{{ $class }}"
+               @if($id) id="{{ $id }}" @endif
+               @if($name) name="{{ $name }}" @endif
+               value="{{ $value }}" {!! $attributes !!}>
     </div>
 </div>
-