Comparing version 1.0.24 to 1.0.25
@@ -156,3 +156,3 @@ "use strict"; | ||
var generateClassName = (0, react_1.useCallback)(function () { | ||
return "qbs-textfield-default ".concat(className, " ").concat(errors && errors[name] ? 'textfield-error' : 'textfield'); | ||
return "qbs-textfield-default ".concat(className, " ").concat(errors && (errors === null || errors === void 0 ? void 0 : errors.message) ? 'textfield-error' : 'textfield'); | ||
}, [errors, name]); | ||
@@ -182,3 +182,3 @@ var handleRemoveSelectedItem = function (index) { | ||
var selected = isMultiple ? selectedItems : inputValue; | ||
var filteredData = (0, filterSuggestions_1.filterSuggestions)(suggestions, searchValue, type, selected); | ||
var filteredData = (0, filterSuggestions_1.filterSuggestions)(suggestions, searchValue, type, selected, desc); | ||
var isSelected = function (item, selectedItems) { | ||
@@ -185,0 +185,0 @@ if (Array.isArray(selectedItems)) { |
interface Item { | ||
[key: string]: string; | ||
} | ||
export declare const filterSuggestions: (data: Item[], query: string, type: string, inputValue?: string) => Item[]; | ||
export declare const filterSuggestions: (data: Item[], query: string, type: string, desc: string, inputValue?: string) => Item[]; | ||
export {}; |
@@ -13,3 +13,3 @@ "use strict"; | ||
exports.filterSuggestions = void 0; | ||
var filterSuggestions = function (data, query, type, inputValue) { | ||
var filterSuggestions = function (data, query, type, desc, inputValue) { | ||
if (type === 'custom_search_select' && query) { | ||
@@ -20,6 +20,6 @@ return data === null || data === void 0 ? void 0 : data.filter(function (item) { | ||
} | ||
return sortedArrayData(data, inputValue); | ||
return sortedArrayData(data, inputValue, desc); | ||
}; | ||
exports.filterSuggestions = filterSuggestions; | ||
var sortedArrayData = function (filteredData, selectedItems) { | ||
var sortedArrayData = function (filteredData, selectedItems, desc) { | ||
return __spreadArray([], filteredData, true).sort(function (a, b) { | ||
@@ -29,8 +29,8 @@ var aIsSelected; | ||
if (Array.isArray(selectedItems)) { | ||
aIsSelected = selectedItems.some(function (item) { return item.name === a.name; }); | ||
bIsSelected = selectedItems.some(function (item) { return item.name === b.name; }); | ||
aIsSelected = selectedItems.some(function (item) { return item[desc] === a[desc]; }); | ||
bIsSelected = selectedItems.some(function (item) { return item[desc] === b[desc]; }); | ||
} | ||
else { | ||
aIsSelected = a.name === selectedItems; | ||
bIsSelected = b.name === selectedItems; | ||
aIsSelected = a[desc] === selectedItems; | ||
bIsSelected = b[desc] === selectedItems; | ||
} | ||
@@ -37,0 +37,0 @@ return (bIsSelected ? 1 : 0) - (aIsSelected ? 1 : 0); |
{ | ||
"name": "qbs-core", | ||
"version": "1.0.24", | ||
"version": "1.0.25", | ||
"description": "React Components", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -9,2 +9,3 @@ interface Item { | ||
type: string, | ||
desc: string, | ||
inputValue?: string | ||
@@ -17,3 +18,3 @@ ): Item[] => { | ||
} | ||
return sortedArrayData(data, inputValue); | ||
return sortedArrayData(data, inputValue, desc); | ||
}; | ||
@@ -23,3 +24,4 @@ | ||
filteredData: any[], | ||
selectedItems: any[] | string | ||
selectedItems: any[] | string, | ||
desc: any | ||
) => { | ||
@@ -31,7 +33,7 @@ return [...filteredData].sort((a, b) => { | ||
if (Array.isArray(selectedItems)) { | ||
aIsSelected = selectedItems.some((item) => item.name === a.name); | ||
bIsSelected = selectedItems.some((item) => item.name === b.name); | ||
aIsSelected = selectedItems.some((item) => item[desc] === a[desc]); | ||
bIsSelected = selectedItems.some((item) => item[desc] === b[desc]); | ||
} else { | ||
aIsSelected = a.name === selectedItems; | ||
bIsSelected = b.name === selectedItems; | ||
aIsSelected = a[desc] === selectedItems; | ||
bIsSelected = b[desc] === selectedItems; | ||
} | ||
@@ -38,0 +40,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
91710
1803