Merge pull request #153 from lotestudio/fix-131

Fix 131

Author: CodeWithDennis

README.md

@@ -210,14 +210,12 @@ use CodeWithDennis\FilamentSelectTree\SelectTree;
                 ])
         ])
         ->query(function (Builder $query, array $data) {
-            $categories = [(int) $data['category']];
-            
-            return $query->when($data['category'], function (Builder $query, $categories) {
-                if($data['category'] === -1){
-                    return $query->whereDoesntHave('categories');
+            return $query->when($data['categories'], function (Builder $query, $categories) {
+                if (collect($categories)->contains('-1')) {
+                    $query->whereDoesntHave('categories');
                 }
-                
-                return $query->whereHas('categories', fn(Builder $query) => $query->whereIn('id', $categories));
+                return $query->orWhereHas('categories',
+                    fn(Builder $query) => $query->whereIn('id', $categories));
             });
         })
 ])

resources/dist/filament-select-tree.js

@@ -27,12 +27,21 @@ export default function selectTree({
         /** @type Treeselect */
         tree: null,
 
+        formatState: function (state) {
+            if (Array.isArray(state)) {
+                return (state ?? []).map((item) => item?.toString())
+            }
+
+            return state?.toString()
+        },
+        
+
         init() {
             this.tree = new Treeselect({
                 id: `tree-${name}-id`,
                 ariaLabel: `tree-${name}-label`,
                 parentHtmlContainer: this.$refs.tree,
-                value: this.state,
+                value: this.formatState(this.state),
                 options,
                 searchable,
                 showCount,

resources/js/index.js

@@ -233,7 +233,7 @@ private function buildNode($result, $resultMap, $disabledOptions, $hiddenOptions
         $node = [
             'name' => $result->{$this->getTitleAttribute()},
             'value' => $key,
-            'parent' => $result->{$this->getParentAttribute()},
+            'parent' => (string) $result->{$this->getParentAttribute()},
             'disabled' => in_array($key, $disabledOptions),
             'hidden' => in_array($key, $hiddenOptions),
         ];
@@ -305,7 +305,13 @@ public function multiple(Closure|bool $multiple = true): static
 
     public function prepend(Closure|array|null $prepend = null): static
     {
-        $this->prepend = $prepend;
+        $this->prepend = $this->evaluate($prepend);
+
+        if (is_array($this->prepend) && isset($this->prepend['name'], $this->prepend['value'])) {
+            $this->prepend['value'] = (string) $this->prepend['value'];
+        } else {
+            throw new \InvalidArgumentException('The provided prepend value must be an array with "name" and "value" keys.');
+        }
 
         return $this;
     }
@@ -445,9 +451,11 @@ public function getIndependent(): bool
         return $this->evaluate($this->independent);
     }
 
-    public function getCustomKey($record)
+    public function getCustomKey($record): string
     {
-        return is_null($this->customKey) ? $record->getKey() : $record->{$this->customKey};
+        $key = is_null($this->customKey) ? $record->getKey() : $record->{$this->customKey};
+
+        return (string) $key;
     }
 
     public function getWithCount(): bool