ywana-core8 0.0.796 → 0.0.798

package/dist/index.cjs

@@ -10847,7 +10847,7 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
 
       var _temp14 = _catch(function () {
         return Promise.resolve(API.remove(id)).then(function () {
-          return Promise.resolve(_this12.load()).then(function () {});
+          return Promise.resolve(_this12.reload()).then(function () {});
         });
       }, function (error) {
         console.log(error);
@@ -10865,7 +10865,7 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
 
       var _temp12 = _catch(function () {
         return Promise.resolve(API.updateProperty(id, propertyName, form)).then(function () {
-          return Promise.resolve(_this10.load()).then(function () {});
+          return Promise.resolve(_this10.reload()).then(function () {});
         });
       }, function (error) {
         console.log(error);
@@ -10884,7 +10884,7 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
       var _temp10 = _catch(function () {
         if (versioning) form.version = form.version ? form.version + 1 : 1;
         return Promise.resolve(API.patch(id, form)).then(function () {
-          return Promise.resolve(_this8.load()).then(function () {});
+          return Promise.resolve(_this8.reload()).then(function () {});
         });
       }, function (error) {
         console.log(error);
@@ -10903,7 +10903,7 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
       var _temp8 = _catch(function () {
         if (versioning) form.version = form.version ? form.version + 1 : 1;
         return Promise.resolve(API.update(form)).then(function () {
-          return Promise.resolve(_this6.load()).then(function () {});
+          return Promise.resolve(_this6.reload()).then(function () {});
         });
       }, function (error) {
         console.log(error);
@@ -10922,7 +10922,7 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
       var _temp6 = _catch(function () {
         if (versioning) form.version = 1;
         return Promise.resolve(API.create(form)).then(function () {
-          return Promise.resolve(_this4.load()).then(function () {});
+          return Promise.resolve(_this4.reload()).then(function () {});
         });
       }, function (error) {
         console.log(error);
@@ -11015,20 +11015,20 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
     try {
       var _exit2;
 
-      var runCustomFilters = function runCustomFilters(all) {
-        var cfs = Object.values(customFilters);
-        var data = cfs.length ? cfs.reduce(function (acc, filter) {
-          return filter(acc);
-        }, all) : all;
-        return data;
-      };
-
+      /*
+      const runCustomFilters = (all) => {
+          const cfs = Object.values(customFilters)
+          const data = cfs.length ? cfs.reduce((acc, filter) => filter(acc), all) : all;
+          return data
+      }
+      */
       return Promise.resolve(_catch(function () {
         return Promise.resolve(API.all(filters, likes, page)).then(function (response) {
-          var next = field ? response[field] : response;
-          var data = runCustomFilters(next);
+          var next = field ? response[field] : response; //const data = runCustomFilters(next)
+          //return data
+
           _exit2 = 1;
-          return data;
+          return next;
         });
       }, function (error) {
         console.log(error);
@@ -11067,12 +11067,16 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
       setCustomFilters = _useState4[1];
 
   var _useState5 = React.useState([]),
-      queries = _useState5[0],
-      setQueries = _useState5[1];
+      filtered = _useState5[0],
+      setFiltered = _useState5[1];
+
+  var _useState6 = React.useState([]),
+      queries = _useState6[0],
+      setQueries = _useState6[1];
 
-  var _useState6 = React.useState(null),
-      selected = _useState6[0],
-      setSelected = _useState6[1];
+  var _useState7 = React.useState(null),
+      selected = _useState7[0],
+      setSelected = _useState7[1];
 
   React.useEffect(function () {
     var mounted = true;
@@ -11087,12 +11091,23 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
     return function () {
       mounted = false;
     };
-  }, [filters, customFilters]);
+  }, [filters]);
+  React.useEffect(function () {
+    runCustomFilters();
+  }, [customFilters]);
 
   function clearSelection() {
     setSelected(null);
   }
 
+  function runCustomFilters() {
+    var cfs = Object.values(customFilters);
+    var data = cfs.length ? cfs.reduce(function (acc, filter) {
+      return filter(acc);
+    }, all) : all;
+    setFiltered(data);
+  }
+
   var value = {
     all: all,
     load: load,
@@ -11104,6 +11119,8 @@ var CollectionContextProvider = function CollectionContextProvider(props) {
     setFilters: setFilters,
     setLikes: setLikes,
     customFilters: customFilters,
+    filtered: filtered,
+    runCustomFilters: runCustomFilters,
     addCustomFilter: addCustomFilter,
     removeCustomFilter: removeCustomFilter,
     queries: queries,
@@ -11389,6 +11406,8 @@ var CollectionList = function CollectionList(props) {
   var context = React.useContext(CollectionContext);
   var _context$all = context.all,
       all = _context$all === void 0 ? [] : _context$all,
+      _context$filtered = context.filtered,
+      filtered = _context$filtered === void 0 ? [] : _context$filtered,
       selected = context.selected;
 
   var _useState = React.useState(''),
@@ -11403,7 +11422,7 @@ var CollectionList = function CollectionList(props) {
     context.select(id);
   }
 
-  var searched = searchBy.length > 0 && search.length > 0 ? all.filter(function (item) {
+  var searched = searchBy.length > 0 && search.length > 0 ? filtered.filter(function (item) {
     var text = searchBy.map(function (field) {
       return item[field];
     }).join(' ').toLowerCase();