From 21a453967704e9738efdd4561adaa7d8d842ec14 Mon Sep 17 00:00:00 2001
From: David Ringle <ringunger@gmail.com>
Date: Tue, 19 Nov 2024 21:58:29 +0300
Subject: [PATCH 1/3] Added possibility to use flat arrays

---
 src/Selectable.php | 99 ++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/src/Selectable.php b/src/Selectable.php
index 6b0c2d3..5b1d8b8 100644
--- a/src/Selectable.php
+++ b/src/Selectable.php
@@ -35,31 +35,29 @@ public function __construct(Collection $collection, string|Closure|null $label =
     /**
      * Check if the item should be selected
      * @param object $item
-     * @param int|null $index
+     * @param int|string|null $index
      * @return bool
      */
-    private function _shouldSelect(object $item, int|null $index = null): bool
+    private function _shouldSelect(mixed $item, int|string|null $index = null): bool
     {
-        $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : $item->{$this->_value} ?? "";
         if ($this->_selected instanceof Closure) {
-            if (call_user_func($this->_selected, $item) === true) {
-                return true;
-            }
-        } else if (is_object($this->_selected)) {
-            if ((string)$this->_selected->{$this->_value} === (string)$optionValue) {
-                return true;
-            }
-        } else if (is_array($this->_selected)) {
+            return (bool)call_user_func($this->_selected, $item, $index);
+        }
+
+        $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : (is_object($item) ? ($item->{$this->_value} ?? "") : $item);
+        if (is_object($this->_selected)) {
+            return ((string)$this->_selected->{$this->_value} === (string)$optionValue);
+        }
+
+        if (is_array($this->_selected)) {
             foreach ($this->_selected as $selectedItem) {
                 if (is_object($selectedItem)) {
-                    if ((string)$selectedItem->{$this->_value} === (string)$optionValue) {
-                        return true;
-                    }
-                } else if (is_array($selectedItem)) {
-                    if (array_key_exists($this->_value, $selectedItem) && (string)$selectedItem[$this->_value] === (string)$optionValue) {
-                        return true;
-                    }
-                } else if ((string)$selectedItem === (string)$optionValue) {
+                    return ((string)$selectedItem->{$this->_value} === (string)$optionValue);
+                }
+                if (is_array($selectedItem)) {
+                    return (array_key_exists($this->_value, $selectedItem) && (string)$selectedItem[$this->_value] === (string)$optionValue);
+                }
+                if ((string)$selectedItem === (string)$optionValue) {
                     return true;
                 }
             }
@@ -71,32 +69,35 @@ private function _shouldSelect(object $item, int|null $index = null): bool
 
     /**
      * Check if the item should be selected
-     * @param object $item
-     * @param int|null $index
+     * @param mixed $item
+     * @param int|string|null $index
      * @return bool
      */
-    private function _shouldDisable(object $item, int|null $index = null): bool
+    private function _shouldDisable(mixed $item, int|string|null $index = null): bool
     {
-        $lineValue = $item->{$this->_value} ?? "";
-        if (is_callable($this->_disabled)) {
-            if (call_user_func($this->_disabled, $item) === true) {
-                return true;
-            }
-        } else if (is_object($this->_disabled)) {
-            if ((string)$this->_disabled->{$this->_value} === (string)$lineValue) {
-                return true;
-            }
-        } else if (is_array($this->_disabled)) {
+        if ($this->_disabled instanceof Closure) {
+            return (bool)call_user_func($this->_disabled, $item, $index);
+        }
+
+        if ($this->_value instanceof Closure) {
+            $lineValue = call_user_func($this->_value, $item, $index);
+        } else {
+            $lineValue = (is_object($item) ? ($item->{$this->_value} ?? "") : $item);
+        }
+
+        if (is_object($this->_disabled)) {
+            return ((string)$this->_disabled->{$this->_value} === (string)$lineValue);
+        }
+
+        if (is_array($this->_disabled)) {
             foreach ($this->_disabled as $disabledItem) {
                 if (is_object($disabledItem)) {
-                    if ((string)$disabledItem->{$this->_value} === (string)$lineValue) {
-                        return true;
-                    }
-                } else if (is_array($disabledItem)) {
-                    if (array_key_exists($this->_value, $disabledItem) && (string)$disabledItem[$this->_value] === (string)$lineValue) {
-                        return true;
-                    }
-                } else if ((string)$disabledItem === (string)$lineValue) {
+                    return ((string)$disabledItem->{$this->_value} === (string)$lineValue);
+                }
+                if (is_array($disabledItem)) {
+                    return (array_key_exists($this->_value, $disabledItem) && (string)$disabledItem[$this->_value] === (string)$lineValue);
+                }
+                if ((string)$disabledItem === (string)$lineValue) {
                     return true;
                 }
             }
@@ -126,9 +127,10 @@ private function _getDataAttributes(mixed $item, int|null $index = null): array
     /**
      * Generate select options from a Collection instance
      * @param Collection $collection
+     * @param int $lastIndex
      * @return string
      */
-    private function _generateOptions(Collection $collection): string
+    private function _generateOptions(Collection $collection, int $lastIndex = 0): string
     {
         $html = "";
         foreach ($collection as $index => $item) {
@@ -137,8 +139,19 @@ private function _generateOptions(Collection $collection): string
                 $html .= $this->_generateOptions($item);
                 $html .= "</optgroup>";
             } else {
-                $optionLabel = ($this->_label instanceof Closure) ? call_user_func($this->_label, $item, $index) : $item->{$this->_label} ?? "N/A";
-                $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : $item->{$this->_value} ?? "";
+                if ($this->_label instanceof Closure) {
+                    $optionLabel = call_user_func($this->_label, $item, $index);
+                } else {
+                    $optionLabel = is_object($item) ? ($item->{$this->_label} ?? "N/A") : ($item);
+                }
+                if ($this->_value instanceof Closure) {
+                    $optionValue = call_user_func($this->_value, $item, $index);
+                } else {
+                    $optionValue = is_object($item) ? ($item->{$this->_value} ?? "") : $item;
+                    if (is_string($index) && is_string($item)) {
+                        $optionValue = $index;
+                    }
+                }
                 $html .= "<option value=\"{$optionValue}\"";
                 if ($this->_shouldSelect($item, $index)) {
                     $html .= " selected";

From 09a2251d9605a613bce3ef73f3bb22fadde82af0 Mon Sep 17 00:00:00 2001
From: David Ringle <ringunger@gmail.com>
Date: Tue, 19 Nov 2024 22:30:01 +0300
Subject: [PATCH 2/3] Enabled collections of  MultiDimensional arrays

---
 src/Selectable.php | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/Selectable.php b/src/Selectable.php
index 5b1d8b8..938d01c 100644
--- a/src/Selectable.php
+++ b/src/Selectable.php
@@ -44,7 +44,14 @@ private function _shouldSelect(mixed $item, int|string|null $index = null): bool
             return (bool)call_user_func($this->_selected, $item, $index);
         }
 
-        $optionValue = ($this->_value instanceof Closure) ? call_user_func($this->_value, $item, $index) : (is_object($item) ? ($item->{$this->_value} ?? "") : $item);
+        if($this->_value instanceof Closure) {
+            $optionValue = call_user_func($this->_value, $item, $index);
+        } else {
+            $optionValue = (is_object($item) ? ($item->{$this->_value} ?? "") : $item);
+            if(is_array($item)) {
+                $optionValue = $item[$this->_value] ?? reset($item);
+            }
+        }
         if (is_object($this->_selected)) {
             return ((string)$this->_selected->{$this->_value} === (string)$optionValue);
         }
@@ -83,6 +90,9 @@ private function _shouldDisable(mixed $item, int|string|null $index = null): boo
             $lineValue = call_user_func($this->_value, $item, $index);
         } else {
             $lineValue = (is_object($item) ? ($item->{$this->_value} ?? "") : $item);
+            if(is_array($item)){
+                $lineValue = $item[$this->_value] ??reset($item);
+            }
         }
 
         if (is_object($this->_disabled)) {
@@ -143,11 +153,17 @@ private function _generateOptions(Collection $collection, int $lastIndex = 0): s
                     $optionLabel = call_user_func($this->_label, $item, $index);
                 } else {
                     $optionLabel = is_object($item) ? ($item->{$this->_label} ?? "N/A") : ($item);
+                    if(is_array($item)) {
+                        $optionLabel = $item[$this->_label] ?? array_keys($item)[0];
+                    }
                 }
                 if ($this->_value instanceof Closure) {
                     $optionValue = call_user_func($this->_value, $item, $index);
                 } else {
                     $optionValue = is_object($item) ? ($item->{$this->_value} ?? "") : $item;
+                    if(is_array($item)) {
+                        $optionValue = $item[$this->_value] ?? reset($item);
+                    }
                     if (is_string($index) && is_string($item)) {
                         $optionValue = $index;
                     }
@@ -219,9 +235,22 @@ public function toSelectOptions(): string
     public function toSelectItems(): Collection
     {
         return $this->_collection->map(function ($item, $index) {
+            if ($this->_label instanceof Closure) {
+                $optionLabel = call_user_func($this->_label, $item, $index);
+            } else {
+                $optionLabel = is_object($item) ? ($item->{$this->_label} ?? "N/A") : ($item);
+            }
+            if ($this->_value instanceof Closure) {
+                $optionValue = call_user_func($this->_value, $item, $index);
+            } else {
+                $optionValue = is_object($item) ? ($item->{$this->_value} ?? "") : $item;
+                if (is_string($index) && is_string($item)) {
+                    $optionValue = $index;
+                }
+            }
             return [
-                'value' => $item->{$this->_value} ?? "",
-                'label' => $index,
+                'value' => $optionValue,
+                'label' => $optionLabel,
                 'isSelected' => $this->_shouldSelect($item, $index),
                 'isDisabled' => $this->_shouldDisable($item, $index),
                 'data' => $this->_getDataAttributes($item, $index),

From e1155369c315843d86b77451605a52f3d6a661ce Mon Sep 17 00:00:00 2001
From: David Ringle <ringunger@gmail.com>
Date: Tue, 19 Nov 2024 22:37:59 +0300
Subject: [PATCH 3/3] Completed support for non-object array collections

---
 README.md     | 12 ++++++++++++
 composer.json |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec30c4f..5f101f9 100644
--- a/README.md
+++ b/README.md
@@ -137,6 +137,18 @@ other than '`active`', and a custom class '`form-option custom`' will be applied
 > <small><strong>Note:</strong> Writing queries within blade templates is not recommended. This is only for simplifying
 > demonstration</small>
 
+### Non-object Array Collections
+You can work with collections of non-object arrays both flat and associative
+```php
+    $array1 = ["First", "Second", "Third"];
+    $array2 = ['first' => "First", 'second' => "Second", 'third' => "Third"];
+    $array3 = [['name' => 'First', 'number' => 1],['name' => 'Second', 'number' => 2],['name' => 'Third', 'number' => 3]]
+    $options = collect($array)->toSelectOptions();
+    $options2 = collect($array2)->toSelectOptions();
+    $options3 = collect($array3)->toSelectable()->withValue('number')->toSelectOptions();
+```
+
+
 ##  Get Selectable Items
 ```php
     $selectableItems = \App\Models\User::all()->toSelectable()->toSelectItems();
diff --git a/composer.json b/composer.json
index 40e0b8d..4579b04 100644
--- a/composer.json
+++ b/composer.json
@@ -51,7 +51,7 @@
             "name": "master"
         }
     },
-    "version": "1.0.2",
+    "version": "1.0.3",
     "minimum-stability": "dev",
     "prefer-stable": true
 }