merging

Author: lotestudio

README.md

@@ -204,14 +204,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

@@ -228,8 +228,8 @@ private function buildNode($result, $resultMap, $disabledOptions, $hiddenOptions
         // Create a node with 'name' and 'value' attributes
         $node = [
             'name' => $result->{$this->getTitleAttribute()},
-            'value' => $key,
-            'parent' => $result->{$this->getParentAttribute()},
+            'value' => (string) $key,
+            'parent' => (string) $result->{$this->getParentAttribute()},
             'disabled' => in_array($key, $disabledOptions),
             'hidden' => in_array($key, $hiddenOptions),
         ];
@@ -312,6 +312,7 @@ public function prepend(Closure|array|null $prepend = null): static
         return $this;
     }
 
+
     public function getRelationship(): BelongsToMany|BelongsTo
     {
         return $this->getModelInstance()->{$this->evaluate($this->relationship)}();
@@ -449,7 +450,7 @@ public function getIndependent(): bool
 
     public function getCustomKey($record): string
     {
-        $key = is_null($this->customKey) ? $record->getKey() : $record->{$this->customKey};
+        $key =  is_null($this->customKey) ? $record->getKey() : $record->{$this->customKey};
 
         return (string) $key;
     }
@@ -622,15 +623,4 @@ public function createOptionModalHeading(string|Closure|null $heading): static
 
         return $this;
     }
-
-    public function getState(): mixed
-    {
-        $state = parent::getState();
-
-        if (is_array($state)) {
-            return array_map(fn ($value) => (string) $value, $state);
-        }
-
-        return (string) $state;
-    }
 }