Skip to content

[6.x] Search instructions when searching sets #13727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonvarga merged 5 commits into from
Jan 29, 2026
Merged

[6.x] Search instructions when searching sets #13727

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
43dfe29
Search instructions when searching sets
duncanmcclean Jan 29, 2026
fb291e6
filter in grid mode
jasonvarga Jan 29, 2026
e5ac11b
avoid filtering by hide twice
jasonvarga Jan 29, 2026
a3a9367
extract method
jasonvarga Jan 29, 2026
45347d6
use fuzzy sort. give instructions lower priority
jasonvarga Jan 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions resources/js/components/fieldtypes/replicator/SetPicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ body:has(:is(.bard-fullscreen, .replicator-fullscreen)) [data-reka-popper-conten

<script>
import { Primitive } from 'reka-ui';
import fuzzysort from 'fuzzysort';

export default {
emits: ['added', 'clicked-away'],
Expand Down Expand Up @@ -263,14 +264,7 @@ export default {
}, []);

if (this.search) {
return sets
.filter((set) => !set.hide)
.filter((set) => {
return (
__(set.display).toLowerCase().includes(this.search.toLowerCase()) ||
set.handle.toLowerCase().includes(this.search.toLowerCase())
);
});
sets = this.filterSetsBySearch(sets);
}

return sets.filter((set) => !set.hide);
Expand Down Expand Up @@ -317,12 +311,7 @@ export default {

// Apply search filter if there's a search term
if (this.search) {
filteredSets = filteredSets.filter(set => {
return (
__(set.display).toLowerCase().includes(this.search.toLowerCase()) ||
set.handle.toLowerCase().includes(this.search.toLowerCase())
);
});
filteredSets = this.filterSetsBySearch(filteredSets);
}

groups[group.handle] = {
Expand Down Expand Up @@ -479,6 +468,21 @@ export default {
isSetLoading(handle) {
return this.loadingSet === handle;
},

filterSetsBySearch(sets) {
return fuzzysort
.go(this.search, sets, {
all: true,
keys: [(set) => __(set.display), 'handle', (set) => __(set.instructions)],
scoreFn: (scores) => {
const displayScore = scores[0]?.score ?? -Infinity;
const handleScore = scores[1]?.score ?? -Infinity;
const instructionsScore = (scores[2]?.score ?? -Infinity) * 0.5;
return Math.max(displayScore, handleScore, instructionsScore);
},
})
.map((result) => result.obj);
}
},
};
</script>