Skip to content
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

Allows custom matcher and highlighter functions to be provided #159

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allows custom matcher and highlighter functions to be provided #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions src/components/VueTypeaheadBootstrap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
v-show="isFocused && data.length > 0"
:query="inputValue"
:data="formattedData"
:matcher="matcher"
:highlighter="highlighter"
:background-variant="backgroundVariant"
:background-variant-resolver="backgroundVariantResolver"
:text-variant="textVariant"
Expand Down Expand Up @@ -112,6 +114,14 @@ export default {
default: (d) => d,
validator: d => d instanceof Function
},
matcher: {
type: Function,
validator: d => d instanceof Function
},
highlighter: {
type: Function,
validator: d => d instanceof Function
},
// Don't call this method, use _screenReaderTextSerializer()
// Using _screenReaderTextSerializer allows for defaulting based on .serializer
screenReaderTextSerializer: {
Expand Down
37 changes: 32 additions & 5 deletions src/components/VueTypeaheadBootstrapList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ export default {
backgroundVariant: {
type: String
},
matcher: {
type: Function,
validator: d => d instanceof Function
},
highlighter: {
type: Function,
validator: d => d instanceof Function
},
backgroundVariantResolver: {
type: Function,
default: (d) => null,
Expand Down Expand Up @@ -120,7 +128,9 @@ export default {
if (this.query.length === 0) {
return text
}

if (this.highlighter) {
return this.highlighter(text, this.escapedQuery, this.highlightClass);
}
const re = new RegExp(this.escapedQuery, 'gi')
return text.replace(re, `<span class='${this.highlightClass}'>$&</span>`)
}
Expand All @@ -145,12 +155,29 @@ export default {

// Filter, sort, and concat
return this.data
.filter(i => i.text.match(re) !== null)
.filter((i) => {
if (this.showAllResults) {
return true;
}

if (this.matcher) {
return this.matcher(i.text, this.escapedQuery);
}
return i.text.match(re) !== null;
})
.sort((a, b) => {
if (this.disableSort) return 0

const aIndex = a.text.indexOf(a.text.match(re)[0])
const bIndex = b.text.indexOf(b.text.match(re)[0])
if (this.matcher) {
var aMatch = this.matcher(a.text, this.escapedQuery);
var bMatch = this.matcher(b.text, this.escapedQuery);
}
else {
var aMatch = a.text.match(re);
var bMatch = b.text.match(re);
}
const aIndex = a.text.indexOf(aMatch[0])
const bIndex = b.text.indexOf(bMatch[0])

if (aIndex < bIndex) { return -1 }
if (aIndex > bIndex) { return 1 }
Expand Down Expand Up @@ -180,7 +207,7 @@ export default {
},
hitActiveListItem() {
if (this.activeListItem < 0) {
this.selectNextListItem()
this.selectNextListItem();
}
if (this.activeListItem >= 0) {
this.$emit('hit', this.matchedItems[this.activeListItem])
Expand Down