Skip to content

Inject search term into searchFilter function #338

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

Closed
wants to merge 1 commit into from
Closed

Inject search term into searchFilter function #338

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
2 changes: 1 addition & 1 deletion dist/multiselect.global.js
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 21 additions & 17 deletions dist/multiselect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function arraysEqual (array1, array2) {

function useOptions (props, context, dep)
{
const {
const {
options, mode, trackBy: trackBy_, limit, hideSelected, createTag, createOption: createOption_, label,
appendNewTag, appendNewOption: appendNewOption_, multipleLabel, object, loading, delay, resolveOnLoad,
minChars, filterResults, clearOnSearch, clearOnSelect, valueProp, allowAbsent, groupLabel,
Expand Down Expand Up @@ -476,7 +476,7 @@ function useOptions (props, context, dep)
// =============== METHODS ==============

/**
* @param {array|object|string|number} option
* @param {array|object|string|number} option
*/
const select = (option) => {
if (typeof option !== 'object') {
Expand Down Expand Up @@ -564,7 +564,7 @@ function useOptions (props, context, dep)
if (max === undefined || max.value === -1 || (!hasSelected.value && max.value > 0)) {
return false
}

return iv.value.length >= max.value
};

Expand All @@ -578,7 +578,7 @@ function useOptions (props, context, dep)
delete option.__CREATE__;

option = onCreate.value(option, $this);

if (option instanceof Promise) {
resolving.value = true;
option.then((result) => {
Expand All @@ -587,7 +587,7 @@ function useOptions (props, context, dep)
});

return
}
}
}

handleOptionSelect(option);
Expand All @@ -598,7 +598,7 @@ function useOptions (props, context, dep)
option = { ...option };
delete option.__CREATE__;
}

switch (mode.value) {
case 'single':
if (option && isSelected(option)) {
Expand Down Expand Up @@ -789,7 +789,7 @@ function useOptions (props, context, dep)

// no export
const filterGroups = (groups) => {
// If the search has value we need to filter among
// If the search has value we need to filter among
// the ones that are visible to the user to avoid
// displaying groups which technically have options
// based on search but that option is already selected.
Expand All @@ -804,21 +804,23 @@ function useOptions (props, context, dep)
// no export
const filterOptions = (options, excludeHideSelected = true) => {
let fo = options;

const searchTerm = search.value;

if (search.value && filterResults.value) {
let filter = searchFilter.value;

if (!filter) {
filter = (option, $this) => {
filter = (searchValue, option, $this) => {
let target = normalize(localize(option[trackBy.value]), strict.value);

return searchStart.value
? target.startsWith(normalize(search.value, strict.value))
: target.indexOf(normalize(search.value, strict.value)) !== -1
? target.startsWith(normalize(searchValue, strict.value))
: target.indexOf(normalize(searchValue, strict.value)) !== -1
};
}

fo = fo.filter(filter);
fo = fo.filter((option, $el) => filter(searchTerm, option, $el));

}

if (hideSelected.value && excludeHideSelected) {
Expand All @@ -831,7 +833,7 @@ function useOptions (props, context, dep)
// no export
const optionsToArray = (options) => {
let uo = options;

// Transforming an object to an array of objects
if (isObject(uo)) {
uo = Object.keys(uo).map((key) => {
Expand Down Expand Up @@ -992,7 +994,7 @@ function useOptions (props, context, dep)

initInternalValue();
}

// ============== WATCHERS ==============

if (delay.value > -1) {
Expand Down Expand Up @@ -2260,10 +2262,12 @@ function resolveDeps (props, context, features, deps = {}) {
return deps
}

var script = {
console.log(" => MY Multiselect");

var script = {
name: 'Multiselect',
emits: [
'paste', 'open', 'close', 'select', 'deselect',
'paste', 'open', 'close', 'select', 'deselect',
'input', 'search-change', 'tag', 'option', 'update:modelValue',
'change', 'clear', 'keydown', 'keyup', 'max', 'create',
],
Expand Down Expand Up @@ -2582,7 +2586,7 @@ var script = {
},
},
setup(props, context)
{
{
return resolveDeps(props, context, [
useI18n,
useValue,
Expand Down
38 changes: 21 additions & 17 deletions dist/multiselect.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function arraysEqual (array1, array2) {

function useOptions (props, context, dep)
{
const {
const {
options, mode, trackBy: trackBy_, limit, hideSelected, createTag, createOption: createOption_, label,
appendNewTag, appendNewOption: appendNewOption_, multipleLabel, object, loading, delay, resolveOnLoad,
minChars, filterResults, clearOnSearch, clearOnSelect, valueProp, allowAbsent, groupLabel,
Expand Down Expand Up @@ -476,7 +476,7 @@ function useOptions (props, context, dep)
// =============== METHODS ==============

/**
* @param {array|object|string|number} option
* @param {array|object|string|number} option
*/
const select = (option) => {
if (typeof option !== 'object') {
Expand Down Expand Up @@ -564,7 +564,7 @@ function useOptions (props, context, dep)
if (max === undefined || max.value === -1 || (!hasSelected.value && max.value > 0)) {
return false
}

return iv.value.length >= max.value
};

Expand All @@ -578,7 +578,7 @@ function useOptions (props, context, dep)
delete option.__CREATE__;

option = onCreate.value(option, $this);

if (option instanceof Promise) {
resolving.value = true;
option.then((result) => {
Expand All @@ -587,7 +587,7 @@ function useOptions (props, context, dep)
});

return
}
}
}

handleOptionSelect(option);
Expand All @@ -598,7 +598,7 @@ function useOptions (props, context, dep)
option = { ...option };
delete option.__CREATE__;
}

switch (mode.value) {
case 'single':
if (option && isSelected(option)) {
Expand Down Expand Up @@ -789,7 +789,7 @@ function useOptions (props, context, dep)

// no export
const filterGroups = (groups) => {
// If the search has value we need to filter among
// If the search has value we need to filter among
// the ones that are visible to the user to avoid
// displaying groups which technically have options
// based on search but that option is already selected.
Expand All @@ -804,21 +804,23 @@ function useOptions (props, context, dep)
// no export
const filterOptions = (options, excludeHideSelected = true) => {
let fo = options;

const searchTerm = search.value;

if (search.value && filterResults.value) {
let filter = searchFilter.value;

if (!filter) {
filter = (option, $this) => {
filter = (searchValue, option, $this) => {
let target = normalize(localize(option[trackBy.value]), strict.value);

return searchStart.value
? target.startsWith(normalize(search.value, strict.value))
: target.indexOf(normalize(search.value, strict.value)) !== -1
? target.startsWith(normalize(searchValue, strict.value))
: target.indexOf(normalize(searchValue, strict.value)) !== -1
};
}

fo = fo.filter(filter);
fo = fo.filter((option, $el) => filter(searchTerm, option, $el));

}

if (hideSelected.value && excludeHideSelected) {
Expand All @@ -831,7 +833,7 @@ function useOptions (props, context, dep)
// no export
const optionsToArray = (options) => {
let uo = options;

// Transforming an object to an array of objects
if (isObject(uo)) {
uo = Object.keys(uo).map((key) => {
Expand Down Expand Up @@ -992,7 +994,7 @@ function useOptions (props, context, dep)

initInternalValue();
}

// ============== WATCHERS ==============

if (delay.value > -1) {
Expand Down Expand Up @@ -2260,10 +2262,12 @@ function resolveDeps (props, context, features, deps = {}) {
return deps
}

var script = {
console.log(" => MY Multiselect");

var script = {
name: 'Multiselect',
emits: [
'paste', 'open', 'close', 'select', 'deselect',
'paste', 'open', 'close', 'select', 'deselect',
'input', 'search-change', 'tag', 'option', 'update:modelValue',
'change', 'clear', 'keydown', 'keyup', 'max', 'create',
],
Expand Down Expand Up @@ -2582,7 +2586,7 @@ var script = {
},
},
setup(props, context)
{
{
return resolveDeps(props, context, [
useI18n,
useValue,
Expand Down
2 changes: 1 addition & 1 deletion dist/multiselect.vue2.global.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading