ywana-core8 0.0.797 → 0.0.799
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +38 -21
- package/dist/index.cjs.map +1 -1
- package/dist/index.modern.js +38 -21
- package/dist/index.modern.js.map +1 -1
- package/dist/index.umd.js +38 -21
- package/dist/index.umd.js.map +1 -1
- package/package.json +1 -1
- package/src/domain2/CollectionContext.js +22 -4
- package/src/domain2/CollectionContext.test.js +20 -7
- package/src/domain2/CollectionList.js +3 -3
package/dist/index.modern.js
CHANGED
@@ -11007,20 +11007,20 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
|
|
11007
11007
|
try {
|
11008
11008
|
var _exit2;
|
11009
11009
|
|
11010
|
-
|
11011
|
-
|
11012
|
-
|
11013
|
-
|
11014
|
-
|
11015
|
-
|
11016
|
-
|
11017
|
-
|
11010
|
+
/*
|
11011
|
+
const runCustomFilters = (all) => {
|
11012
|
+
const cfs = Object.values(customFilters)
|
11013
|
+
const data = cfs.length ? cfs.reduce((acc, filter) => filter(acc), all) : all;
|
11014
|
+
return data
|
11015
|
+
}
|
11016
|
+
*/
|
11018
11017
|
return Promise.resolve(_catch(function () {
|
11019
11018
|
return Promise.resolve(API.all(filters, likes, page)).then(function (response) {
|
11020
|
-
var next = field ? response[field] : response;
|
11021
|
-
|
11019
|
+
var next = field ? response[field] : response; //const data = runCustomFilters(next)
|
11020
|
+
//return data
|
11021
|
+
|
11022
11022
|
_exit2 = 1;
|
11023
|
-
return
|
11023
|
+
return next;
|
11024
11024
|
});
|
11025
11025
|
}, function (error) {
|
11026
11026
|
console.log(error);
|
@@ -11059,12 +11059,16 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
|
|
11059
11059
|
setCustomFilters = _useState4[1];
|
11060
11060
|
|
11061
11061
|
var _useState5 = useState([]),
|
11062
|
-
|
11063
|
-
|
11062
|
+
filtered = _useState5[0],
|
11063
|
+
setFiltered = _useState5[1];
|
11064
|
+
|
11065
|
+
var _useState6 = useState([]),
|
11066
|
+
queries = _useState6[0],
|
11067
|
+
setQueries = _useState6[1];
|
11064
11068
|
|
11065
|
-
var
|
11066
|
-
selected =
|
11067
|
-
setSelected =
|
11069
|
+
var _useState7 = useState(null),
|
11070
|
+
selected = _useState7[0],
|
11071
|
+
setSelected = _useState7[1];
|
11068
11072
|
|
11069
11073
|
useEffect(function () {
|
11070
11074
|
var mounted = true;
|
@@ -11079,12 +11083,23 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
|
|
11079
11083
|
return function () {
|
11080
11084
|
mounted = false;
|
11081
11085
|
};
|
11082
|
-
}, [filters
|
11086
|
+
}, [filters]);
|
11087
|
+
useEffect(function () {
|
11088
|
+
runCustomFilters();
|
11089
|
+
}, [customFilters]);
|
11083
11090
|
|
11084
11091
|
function clearSelection() {
|
11085
11092
|
setSelected(null);
|
11086
11093
|
}
|
11087
11094
|
|
11095
|
+
function runCustomFilters() {
|
11096
|
+
var cfs = Object.values(customFilters);
|
11097
|
+
var data = cfs.length ? cfs.reduce(function (acc, filter) {
|
11098
|
+
return filter(acc);
|
11099
|
+
}, all) : all;
|
11100
|
+
setFiltered(data);
|
11101
|
+
}
|
11102
|
+
|
11088
11103
|
var value = {
|
11089
11104
|
all: all,
|
11090
11105
|
load: load,
|
@@ -11096,6 +11111,8 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
|
|
11096
11111
|
setFilters: setFilters,
|
11097
11112
|
setLikes: setLikes,
|
11098
11113
|
customFilters: customFilters,
|
11114
|
+
filtered: filtered,
|
11115
|
+
runCustomFilters: runCustomFilters,
|
11099
11116
|
addCustomFilter: addCustomFilter,
|
11100
11117
|
removeCustomFilter: removeCustomFilter,
|
11101
11118
|
queries: queries,
|
@@ -11379,8 +11396,8 @@ var CollectionList = function CollectionList(props) {
|
|
11379
11396
|
sortBy = props.sortBy,
|
11380
11397
|
sortDir = props.sortDir;
|
11381
11398
|
var context = useContext(CollectionContext);
|
11382
|
-
var _context$
|
11383
|
-
|
11399
|
+
var _context$filtered = context.filtered,
|
11400
|
+
filtered = _context$filtered === void 0 ? [] : _context$filtered,
|
11384
11401
|
selected = context.selected;
|
11385
11402
|
|
11386
11403
|
var _useState = useState(''),
|
@@ -11395,12 +11412,12 @@ var CollectionList = function CollectionList(props) {
|
|
11395
11412
|
context.select(id);
|
11396
11413
|
}
|
11397
11414
|
|
11398
|
-
var searched = searchBy.length > 0 && search.length > 0 ?
|
11415
|
+
var searched = searchBy.length > 0 && search.length > 0 ? filtered.filter(function (item) {
|
11399
11416
|
var text = searchBy.map(function (field) {
|
11400
11417
|
return item[field];
|
11401
11418
|
}).join(' ').toLowerCase();
|
11402
11419
|
return text.includes(search.toLowerCase());
|
11403
|
-
}) :
|
11420
|
+
}) : filtered;
|
11404
11421
|
var sorted = sortBy ? searched.sort(function (a, b) {
|
11405
11422
|
var valueA = a[sortBy];
|
11406
11423
|
var valueB = b[sortBy];
|