diff --git a/src/Http/Livewire/Traits/HandleStatamicQueries.php b/src/Http/Livewire/Traits/HandleStatamicQueries.php index 93a5e2d..30e392d 100644 --- a/src/Http/Livewire/Traits/HandleStatamicQueries.php +++ b/src/Http/Livewire/Traits/HandleStatamicQueries.php @@ -5,6 +5,7 @@ use Reach\StatamicLivewireFilters\Exceptions\BlueprintNotFoundException; use Reach\StatamicLivewireFilters\Exceptions\FieldNotFoundException; use Statamic\Facades\Blueprint; +use Statamic\Facades\Site; use Statamic\Facades\Taxonomy; trait HandleStatamicQueries @@ -13,9 +14,11 @@ protected function getTaxonomyTerms($taxonomy_handle) { $taxonomy = Taxonomy::findByHandle($taxonomy_handle); - return $taxonomy->queryTerms()->get()->flatMap(function ($term) { + $site = Site::current()->handle(); + + return $taxonomy->queryTerms()->where('site', $site)->get()->flatMap(function ($term) { return [ - $term->slug() => $term->title(), + $term->inDefaultLocale()->slug() => $term->title(), ]; }); } diff --git a/src/Http/Livewire/Traits/IsSortable.php b/src/Http/Livewire/Traits/IsSortable.php index c4501b0..e2e9a47 100644 --- a/src/Http/Livewire/Traits/IsSortable.php +++ b/src/Http/Livewire/Traits/IsSortable.php @@ -5,6 +5,7 @@ use Livewire\Attributes\Locked; use Reach\StatamicLivewireFilters\Exceptions\FieldOptionsCannotFindTaxonomyField; use Reach\StatamicLivewireFilters\Exceptions\FieldOptionsCannotSortException; +use Statamic\Facades\Site; use Statamic\Facades\Taxonomy; trait IsSortable @@ -99,9 +100,11 @@ protected function getTaxonomyTermsSortedBy($handle, $sortBy, $sortDirection): v throw new FieldOptionsCannotFindTaxonomyField($sortBy, $handle); } - $this->statamic_field['options'] = $taxonomy->queryTerms()->orderBy($sortBy, $sortDirection)->get()->flatMap(function ($term) { + $site = Site::current()->handle(); + + $this->statamic_field['options'] = $taxonomy->queryTerms()->where('site', $site)->orderBy($sortBy, $sortDirection)->get()->flatMap(function ($term) { return [ - $term->slug() => $term->title(), + $term->inDefaultLocale()->slug() => $term->title(), ]; })->all(); }