react-hook-core 0.1.0 → 0.1.4

package/lib/useSearch.js

@@ -30,7 +30,7 @@ exports.callSearch = function (se, search3, showResults3, searchError3, lc, next
   }
   var offset;
   if (!se.limit || se.limit <= 0) {
-    se.limit = 20;
+    se.limit = 24;
   }
   if (se.firstLimit && se.firstLimit > 0) {
     offset = se.limit * (page - 2) + se.firstLimit;
@@ -56,25 +56,53 @@ var appendListOfState = function (results, list, setState2) {
 var setListOfState = function (list, setState2) {
   setState2({ list: list });
 };
-exports.pageSizes = [10, 20, 40, 60, 100, 200, 400, 800];
 function mergeParam(p) {
   if (p) {
     if (!p.sequenceNo) {
       p.sequenceNo = 'sequenceNo';
     }
     if (!p.pageSize) {
-      p.pageSize = 20;
+      p.pageSize = 24;
     }
     if (!p.pageSizes) {
-      p.pageSizes = exports.pageSizes;
+      p.pageSizes = core_1.pageSizes;
     }
     if (!p.pageMaxSize || p.pageMaxSize <= 0) {
       p.pageMaxSize = 7;
     }
+    if (p.hideFilter === undefined) {
+      p.hideFilter = true;
+    }
+    if (p.addable === undefined) {
+      p.addable = true;
+    }
+    if (p.editable === undefined) {
+      p.editable = true;
+    }
+    if (p.approvable === undefined) {
+      p.approvable = true;
+    }
+    if (p.deletable === undefined) {
+      p.deletable = true;
+    }
+    return p;
+  }
+  else {
+    return {
+      sequenceNo: 'sequenceNo',
+      pageSize: 24,
+      pageSizes: core_1.pageSizes,
+      pageMaxSize: 7,
+      hideFilter: true,
+      addable: true,
+      editable: true,
+      approvable: true,
+      deletable: true
+    };
   }
 }
-exports.useSearch = function (refForm, initialState, search, p2, p) {
-  var baseProps = exports.useCoreSearch(undefined, refForm, initialState, search, p2, p);
+exports.useSearch = function (refForm, initialState, service, p2, p) {
+  var baseProps = exports.useCoreSearch(undefined, refForm, initialState, service, p2, p);
   react_1.useEffect(function () {
     var load = baseProps.load, setState = baseProps.setState, component = baseProps.component;
     if (refForm) {
@@ -93,26 +121,26 @@ exports.useSearch = function (refForm, initialState, search, p2, p) {
   return __assign({}, baseProps);
 };
 exports.useSearchOneProps = function (p) {
-  return exports.useSearch(p.refForm, p.initialState, p.search, p, p);
+  return exports.useSearch(p.refForm, p.initialState, p.service, p, p);
 };
 exports.useSearchOne = function (p) {
-  return exports.useCoreSearch(undefined, p.refForm, p.initialState, p.search, p, p);
+  return exports.useCoreSearch(undefined, p.refForm, p.initialState, p.service, p, p);
 };
-exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1) {
-  mergeParam(p1);
+exports.useCoreSearch = function (props, refForm, initialState, service, p1, p2) {
+  var p = mergeParam(p2);
   var _a = react_1.useState(), running = _a[0], setRunning = _a[1];
   var _getModelName = function () {
-    return core_1.getName('filter', p1 && p1.name ? p1.name : undefined);
+    return core_1.getName('filter', p && p.name ? p.name : undefined);
   };
-  var getModelName = (p1 && p1.getModelName ? p1.getModelName : _getModelName);
-  var baseProps = (props ? update_1.useUpdateWithProps(props, initialState, getModelName, p2.getLocale, core_1.getRemoveError(p2), p1 ? p1.prepareCustomData : undefined) : update_1.useUpdate(initialState, getModelName, p2.getLocale, core_1.getRemoveError(p2)));
+  var getModelName = (p && p.getModelName ? p.getModelName : _getModelName);
+  var baseProps = (props ? update_1.useUpdateWithProps(props, initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1), p ? p.prepareCustomData : undefined) : update_1.useUpdate(initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1)));
   var state = baseProps.state, setState = baseProps.setState;
   var _b = [react_router_dom_1.useHistory(), react_router_dom_1.useRouteMatch()], history = _b[0], match = _b[1];
   var _getCurrencyCode = function () {
     return refForm && refForm.current ? refForm.current.getAttribute('currency-code') : null;
   };
-  var getCurrencyCode = p1 && p1.getCurrencyCode ? p1.getCurrencyCode : _getCurrencyCode;
-  var prepareCustomData = (p1 && p1.prepareCustomData ? p1.prepareCustomData : prepareData);
+  var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode;
+  var prepareCustomData = (p && p.prepareCustomData ? p.prepareCustomData : prepareData);
   var updateDateState = function (name, value) {
     var _a, _b, _c, _d, _e, _f, _g;
     var modelName = getModelName();
@@ -126,9 +154,11 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     }
     setState((_f = {}, _f[modelName] = __assign(__assign({}, currentState), (_g = {}, _g[name] = value, _g)), _f));
   };
-  var _c = merge_1.useMergeState(p1), component = _c[0], setComponent = _c[1];
+  var _c = merge_1.useMergeState(p), component = _c[0], setComponent = _c[1];
   var toggleFilter = function (event) {
-    setComponent({ hideFilter: !component.hideFilter });
+    var x = !component.hideFilter;
+    core_1.handleToggle(event.target, !x);
+    setComponent({ hideFilter: x });
   };
   var add = function (event) {
     event.preventDefault();
@@ -140,23 +170,23 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     setComponent({ fields: fs, initFields: true });
     return fs;
   };
-  var getFields = p1 && p1.getFields ? p1.getFields : _getFields;
+  var getFields = p && p.getFields ? p.getFields : _getFields;
   var getFilter = function (se) {
     if (!se) {
       se = component;
     }
-    var keys = p1 && p1.keys ? p1.keys : undefined;
-    if (!keys && typeof search !== 'function' && search.keys) {
-      keys = search.keys();
+    var keys = p && p.keys ? p.keys : undefined;
+    if (!keys && typeof service !== 'function' && service.keys) {
+      keys = service.keys();
     }
     var n = getModelName();
-    var fs = p1 && p1.fields;
+    var fs = p && p.fields;
     if (!fs || fs.length <= 0) {
       fs = getFields();
     }
-    var lc = (p2.getLocale ? p2.getLocale() : state_1.enLocale);
+    var lc = (p1.getLocale ? p1.getLocale() : state_1.enLocale);
     var cc = getCurrencyCode();
-    var obj3 = search_core_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, core_1.getDecodeFromForm(p2), lc, cc);
+    var obj3 = search_core_1.getModel(state, n, se, fs, se.excluding, keys, se.list, refForm.current, core_1.getDecodeFromForm(p1), lc, cc);
     return obj3;
   };
   var _setFilter = function (s) {
@@ -165,7 +195,7 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     objSet[n] = s;
     setState(objSet);
   };
-  var setFilter = p1 && p1.setFilter ? p1.setFilter : _setFilter;
+  var setFilter = p && p.setFilter ? p.setFilter : _setFilter;
   var _load = function (s, auto) {
     var com = Object.assign({}, component);
     var obj2 = search_core_1.initFilter(s, com);
@@ -178,9 +208,9 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
       }, 0);
     }
   };
-  var load = p1 && p1.load ? p1.load : _load;
+  var load = p && p.load ? p.load : _load;
   var doSearch = function (se, isFirstLoad) {
-    core_1.removeFormError(p2, refForm.current);
+    core_1.removeFormError(p1, refForm.current);
     var s = getFilter(se);
     var isStillRunning = running;
     validateSearch(s, function () {
@@ -188,23 +218,23 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
         return;
       }
       setRunning(true);
-      core_1.showLoading(p2.loading);
-      if (p1 && !p1.ignoreUrlParam) {
+      core_1.showLoading(p1.loading);
+      if (p && !p.ignoreUrlParam) {
         search_core_1.addParametersIntoUrl(s, isFirstLoad);
       }
-      var lc = p2.getLocale ? p2.getLocale() : state_1.enLocale;
-      if (typeof search === 'function') {
-        exports.callSearch(s, search, showResults, searchError, lc, se.nextPageToken);
+      var lc = p1.getLocale ? p1.getLocale() : state_1.enLocale;
+      if (typeof service === 'function') {
+        exports.callSearch(s, service, showResults, searchError, lc, se.nextPageToken);
       }
       else {
-        exports.callSearch(s, search.search, showResults, searchError, lc, se.nextPageToken);
+        exports.callSearch(s, service.search, showResults, searchError, lc, se.nextPageToken);
       }
     });
   };
   var _validateSearch = function (se, callback) {
-    search_core_1.validate(se, callback, refForm.current, (p2.getLocale ? p2.getLocale() : undefined), core_1.getValidateForm(p2));
+    search_core_1.validate(se, callback, refForm.current, (p1.getLocale ? p1.getLocale() : undefined), core_1.getValidateForm(p1));
   };
-  var validateSearch = p1 && p1.validateSearch ? p1.validateSearch : _validateSearch;
+  var validateSearch = p && p.validateSearch ? p.validateSearch : _validateSearch;
   var pageSizeChanged = function (event) {
     var size = parseInt(event.currentTarget.value, 10);
     component.pageSize = size;
@@ -230,7 +260,7 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
       }
     }
   };
-  var searchOnClick = function (event) {
+  var search = function (event) {
     if (event) {
       event.preventDefault();
     }
@@ -290,18 +320,18 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
   };
   var searchError = function (err) {
     setComponent({ pageIndex: component.tmpPageIndex });
-    core_1.error(err, p2.resource.value, p2.showError);
+    core_1.error(err, p1.resource.value, p1.showError);
   };
-  var appendList = (p1 && p1.appendList ? p1.appendList : appendListOfState);
-  var setList = (p1 && p1.setList ? p1.setList : setListOfState);
+  var appendList = (p && p.appendList ? p.appendList : appendListOfState);
+  var setList = (p && p.setList ? p.setList : setListOfState);
   var _showResults = function (s, sr, lc) {
     var results = sr.list;
     if (results && results.length > 0) {
-      search_core_1.formatResults(results, component.pageIndex, component.pageSize, component.initPageSize, p1 ? p1.sequenceNo : undefined, p1 ? p1.format : undefined, lc);
+      search_core_1.formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }
     var am = component.appendMode;
     var pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ itemTotal: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
+    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
     if (am) {
       var limit = s.limit;
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
@@ -320,18 +350,18 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
       setList(results, setState);
       setComponent({ tmpPageIndex: s.page });
       if (s.limit) {
-        var m1 = search_core_1.buildMessage(p2.resource, s.page, s.limit, sr.list, sr.total);
-        p2.showMessage(m1);
+        var m1 = search_core_1.buildMessage(p1.resource, s.page, s.limit, sr.list, sr.total);
+        p1.showMessage(m1);
       }
     }
     setRunning(false);
-    core_1.hideLoading(p2.loading);
+    core_1.hideLoading(p1.loading);
     if (component.triggerSearch) {
       setComponent({ triggerSearch: false });
       resetAndSearch();
     }
   };
-  var showResults = (p1 && p1.showResults ? p1.showResults : _showResults);
+  var showResults = (p && p.showResults ? p.showResults : _showResults);
   var showMore = function (event) {
     event.preventDefault();
     var n = component.pageIndex ? component.pageIndex + 1 : 2;
@@ -343,10 +373,10 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     doSearch(component);
   };
   var pageChanged = function (data) {
-    var currentPage = data.currentPage, itemsPerPage = data.itemsPerPage;
-    setComponent({ pageIndex: currentPage, pageSize: itemsPerPage, append: false });
-    component.pageIndex = currentPage;
-    component.pageSize = itemsPerPage;
+    var page = data.page, size = data.size;
+    setComponent({ pageIndex: page, pageSize: size, append: false });
+    component.pageIndex = page;
+    component.pageSize = size;
     component.append = false;
     doSearch(component);
   };
@@ -354,10 +384,10 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     running: running,
     setRunning: setRunning,
     getCurrencyCode: getCurrencyCode,
-    updateDateState: updateDateState, resource: p2.resource.resource(), setComponent: setComponent,
-    component: component, showMessage: p2.showMessage, load: load,
+    updateDateState: updateDateState, resource: p1.resource.resource(), setComponent: setComponent,
+    component: component, showMessage: p1.showMessage, load: load,
     add: add,
-    searchOnClick: searchOnClick,
+    search: search,
     sort: sort,
     changeView: changeView,
     showMore: showMore,
@@ -366,6 +396,6 @@ exports.useCoreSearch = function (props, refForm, initialState, search, p2, p1)
     pageChanged: pageChanged,
     pageSizeChanged: pageSizeChanged, clearKeyworkOnClick: clearQ, showResults: showResults,
     getFields: getFields,
-    getModelName: getModelName, format: p1 ? p1.format : undefined
+    getModelName: getModelName, format: p ? p.format : undefined
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.1.0",
+  "version": "0.1.4",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -15,7 +15,7 @@
     "react": "^16.8.0",
     "react-router-dom": "^5.2.0",
     "reflectx": "^0.0.10",
-    "search-core": "^0.1.0",
+    "search-core": "^0.1.1",
     "tslint": "^5.10.0",
     "typescript": "^3.3.3333"
   },