react-hook-core 0.0.1 → 0.1.0

package/lib/core.js

@@ -39,7 +39,13 @@ var resource = (function () {
 }());
 exports.resource = resource;
 function getCurrencyCode(form) {
-  return (form ? form.getAttribute('currency-code') : null);
+  if (form) {
+    var x = form.getAttribute('currency-code');
+    if (x) {
+      return x;
+    }
+  }
+  return undefined;
 }
 exports.getCurrencyCode = getCurrencyCode;
 function removePhoneFormat(phone) {
@@ -51,28 +57,35 @@ function removePhoneFormat(phone) {
   }
 }
 exports.removePhoneFormat = removePhoneFormat;
+function getString(key, gv) {
+  if (typeof gv === 'function') {
+    return gv(key);
+  }
+  else {
+    return gv[key];
+  }
+}
+exports.getString = getString;
 function message(gv, msg, title, yes, no) {
-  var m2 = (msg && msg.length > 0 ? gv(msg) : '');
-  var m = {
-    message: m2
-  };
+  var m2 = (msg && msg.length > 0 ? getString(msg, gv) : '');
+  var m = { message: m2, title: '' };
   if (title && title.length > 0) {
-    m.title = gv(title);
+    m.title = getString(title, gv);
   }
   if (yes && yes.length > 0) {
-    m.yes = gv(yes);
+    m.yes = getString(yes, gv);
   }
   if (no && no.length > 0) {
-    m.no = gv(no);
+    m.no = getString(no, gv);
   }
   return m;
 }
 exports.message = message;
 function messageByHttpStatus(status, gv) {
   var k = 'status_' + status;
-  var msg = gv(k);
+  var msg = getString(k, gv);
   if (!msg || msg.length === 0) {
-    msg = gv('error_internal');
+    msg = getString('error_internal', gv);
   }
   return msg;
 }
@@ -165,7 +178,11 @@ function error(err, gv, ae) {
   }
 }
 exports.error = error;
-function getModelName(form) {
+function getName(d, n) {
+  return (n && n.length > 0 ? n : d);
+}
+exports.getName = getName;
+function getModelName(form, name) {
   if (form) {
     var a = form.getAttribute('model-name');
     if (a && a.length > 0) {
@@ -179,30 +196,75 @@ function getModelName(form) {
       return b;
     }
   }
+  if (name && name.length > 0) {
+    return name;
+  }
   return '';
 }
 exports.getModelName = getModelName;
 exports.scrollToFocus = function (e, isUseTimeOut) {
   try {
     var element = e.target;
-    var container_1 = element.form.childNodes[1];
-    var elementRect_1 = element.getBoundingClientRect();
-    var absoluteElementTop = elementRect_1.top + window.pageYOffset;
-    var middle_1 = absoluteElementTop - (window.innerHeight / 2);
-    var scrollTop_1 = container_1.scrollTop;
-    var timeOut = isUseTimeOut ? 300 : 0;
-    var isChrome_1 = navigator.userAgent.search('Chrome') > 0;
-    setTimeout(function () {
-      if (isChrome_1) {
-        var scrollPosition = scrollTop_1 === 0 ? (elementRect_1.top + 64) : (scrollTop_1 + middle_1);
-        container_1.scrollTo(0, Math.abs(scrollPosition));
-      }
-      else {
-        container_1.scrollTo(0, Math.abs(scrollTop_1 + middle_1));
-      }
-    }, timeOut);
+    var form = element.form;
+    if (form) {
+      var container_1 = form.childNodes[1];
+      var elementRect_1 = element.getBoundingClientRect();
+      var absoluteElementTop = elementRect_1.top + window.pageYOffset;
+      var middle_1 = absoluteElementTop - (window.innerHeight / 2);
+      var scrollTop_1 = container_1.scrollTop;
+      var timeOut = isUseTimeOut ? 300 : 0;
+      var isChrome_1 = navigator.userAgent.search('Chrome') > 0;
+      setTimeout(function () {
+        if (isChrome_1) {
+          var scrollPosition = scrollTop_1 === 0 ? (elementRect_1.top + 64) : (scrollTop_1 + middle_1);
+          container_1.scrollTo(0, Math.abs(scrollPosition));
+        }
+        else {
+          container_1.scrollTo(0, Math.abs(scrollTop_1 + middle_1));
+        }
+      }, timeOut);
+    }
   }
   catch (e) {
     console.log(e);
   }
 };
+function showLoading(s) {
+  if (s) {
+    s.showLoading();
+  }
+}
+exports.showLoading = showLoading;
+function hideLoading(s) {
+  if (s) {
+    s.hideLoading();
+  }
+}
+exports.hideLoading = hideLoading;
+function getRemoveError(u, rmErr) {
+  if (rmErr) {
+    return rmErr;
+  }
+  return (u && u.ui ? u.ui.removeError : undefined);
+}
+exports.getRemoveError = getRemoveError;
+function removeFormError(u, f) {
+  if (f && u && u.ui) {
+    u.ui.removeFormError(f);
+  }
+}
+exports.removeFormError = removeFormError;
+function getValidateForm(u, vf) {
+  if (vf) {
+    return vf;
+  }
+  return (u && u.ui ? u.ui.validateForm : undefined);
+}
+exports.getValidateForm = getValidateForm;
+function getDecodeFromForm(u, d) {
+  if (d) {
+    return d;
+  }
+  return (u && u.ui ? u.ui.decodeFromForm : undefined);
+}
+exports.getDecodeFromForm = getDecodeFromForm;

package/lib/diff.js

@@ -33,6 +33,9 @@ function formatDiffModel(obj, formatFields) {
 exports.formatDiffModel = formatDiffModel;
 function getDataFields(form) {
   var results = [];
+  if (!form) {
+    return results;
+  }
   var attributeValue = form.getAttribute('data-field');
   if (attributeValue && attributeValue.length > 0) {
     results.push(form);

package/lib/edit.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("./core");
 function build(attributes, name) {
   if (!attributes) {
-    return null;
+    return undefined;
   }
   if (core_1.resource.cache && name && name.length > 0) {
     var meta = core_1.resource._cache[name];
@@ -49,40 +49,42 @@ function createModel(attributes) {
   for (var _i = 0, attrs_1 = attrs; _i < attrs_1.length; _i++) {
     var k = attrs_1[_i];
     var attr = attributes[k];
-    switch (attr.type) {
-      case 'string':
-      case 'text':
-        obj[attr.name] = '';
-        break;
-      case 'integer':
-      case 'number':
-        obj[attr.name] = 0;
-        break;
-      case 'array':
-        obj[attr.name] = [];
-        break;
-      case 'boolean':
-        obj[attr.name] = false;
-        break;
-      case 'date':
-        obj[attr.name] = new Date();
-        break;
-      case 'object':
-        if (attr.typeof) {
-          var object = createModel(attr.typeof);
-          obj[attr.name] = object;
+    if (attr.name) {
+      switch (attr.type) {
+        case 'string':
+        case 'text':
+          obj[attr.name] = '';
           break;
-        }
-        else {
-          obj[attr.name] = {};
+        case 'integer':
+        case 'number':
+          obj[attr.name] = 0;
           break;
-        }
-      case 'ObjectId':
-        obj[attr.name] = null;
-        break;
-      default:
-        obj[attr.name] = '';
-        break;
+        case 'array':
+          obj[attr.name] = [];
+          break;
+        case 'boolean':
+          obj[attr.name] = false;
+          break;
+        case 'date':
+          obj[attr.name] = new Date();
+          break;
+        case 'object':
+          if (attr.typeof) {
+            var object = createModel(attr.typeof);
+            obj[attr.name] = object;
+            break;
+          }
+          else {
+            obj[attr.name] = {};
+            break;
+          }
+        case 'ObjectId':
+          obj[attr.name] = null;
+          break;
+        default:
+          obj[attr.name] = '';
+          break;
+      }
     }
   }
   return obj;

package/lib/formutil.js

@@ -71,13 +71,16 @@ function focusFirstElement(form) {
 }
 exports.focusFirstElement = focusFirstElement;
 function focusFirstError(form, className) {
+  if (!form) {
+    return;
+  }
   var len = form.length;
   if (className && className.length > 0) {
     for (var i = 0; i < len; i++) {
       var ctrl = form[i];
       var parent_1 = ctrl.parentElement;
       if (ctrl.classList.contains(className)
-        || parent_1.classList.contains(className)) {
+        || parent_1 && parent_1.classList.contains(className)) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;
@@ -90,7 +93,7 @@ function focusFirstError(form, className) {
       var parent_2 = ctrl.parentElement;
       if (ctrl.classList.contains('invalid')
         || ctrl.classList.contains('.ng-invalid')
-        || parent_2.classList.contains('invalid')) {
+        || parent_2 && parent_2.classList.contains('invalid')) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;

package/lib/index.js

@@ -3,6 +3,7 @@ function __export(m) {
   for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
 Object.defineProperty(exports, "__esModule", { value: true });
+var React = require("react");
 __export(require("./formutil"));
 __export(require("./util"));
 __export(require("./core"));
@@ -17,3 +18,9 @@ __export(require("./update"));
 __export(require("./useView"));
 __export(require("./useEdit"));
 __export(require("./useSearch"));
+__export(require("./useMessage"));
+exports.withDefaultProps = function (Component) {
+  return function (props) {
+    return React.createElement(Component, { props: props, history: props.history });
+  };
+};

package/lib/merge.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 function useMergeState(initialState) {
-  var _a = react_1.useState(initialState), state = _a[0], _setState = _a[1];
+  var _a = react_1.useState(initialState ? initialState : {}), state = _a[0], _setState = _a[1];
   var callbackRef = react_1.useRef();
   var isFirstCallbackCall = react_1.useRef(true);
   var setState = react_1.useCallback(function (newState, callback) {

package/lib/state.js

@@ -29,7 +29,12 @@ function localeOf(lc, glc) {
   var l = lc;
   if (!l) {
     if (glc) {
-      l = glc();
+      if (typeof glc === 'function') {
+        l = glc();
+      }
+      else {
+        l = glc;
+      }
     }
     if (!l) {
       l = exports.enLocale;
@@ -62,14 +67,16 @@ function handleProps(e, props, ctrl, modelName, tloc, prepareData) {
       var field = (dataField ? dataField : ctrl.name);
       var propsDataForm = props[modelName];
       var form = ctrl.form;
-      var formName = form.name;
-      if (field.indexOf('.') < 0 && field.indexOf('[') < 0) {
-        var data = props.shouldBeCustomized ? prepareData((_a = {}, _a[ctrl.name] = res.value, _a)) : (_b = {}, _b[ctrl.name] = res.value, _b);
-        props.setGlobalState((_c = {}, _c[formName] = __assign(__assign({}, propsDataForm), data), _c));
-      }
-      else {
-        reflectx_1.setValue(propsDataForm, field, ctrl.value);
-        props.setGlobalState((_d = {}, _d[formName] = __assign({}, propsDataForm), _d));
+      if (form) {
+        var formName = form.name;
+        if (field.indexOf('.') < 0 && field.indexOf('[') < 0) {
+          var data = props.shouldBeCustomized && prepareData ? prepareData((_a = {}, _a[ctrl.name] = res.value, _a)) : (_b = {}, _b[ctrl.name] = res.value, _b);
+          props.setGlobalState((_c = {}, _c[formName] = __assign(__assign({}, propsDataForm), data), _c));
+        }
+        else {
+          reflectx_1.setValue(propsDataForm, field, ctrl.value);
+          props.setGlobalState((_d = {}, _d[formName] = __assign({}, propsDataForm), _d));
+        }
       }
     }
   }
@@ -175,7 +182,7 @@ function buildFlatState(e, state, l) {
       return objSet;
     }
     else {
-      return null;
+      return undefined;
     }
   }
 }

package/lib/update.js

@@ -3,7 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("./core");
 var merge_1 = require("./merge");
 var state_1 = require("./state");
-exports.useUpdate = function (initialState, getLocale, removeErr, getName) {
+var m = 'model';
+var _getModelName = function (f2) {
+  return core_1.getModelName(f2, m);
+};
+exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
+  return exports.useUpdateWithProps(undefined, initialState, getName, getLocale, removeErr);
+};
+function prepareData(data) {
+}
+exports.useUpdateWithProps = function (props, initialState, getName, getLocale, removeErr, prepareCustomData) {
+  if (!prepareCustomData) {
+    prepareCustomData = prepareData;
+  }
   var _a = merge_1.useMergeState(initialState), state = _a[0], setState = _a[1];
   var updatePhoneState = function (event) {
     var re = /^[0-9\b]+$/;
@@ -24,70 +36,28 @@ exports.useUpdate = function (initialState, getLocale, removeErr, getName) {
       updateState(event);
     }
   };
-  var _getModelName = function (f2) {
-    if (f2) {
-      var a = core_1.getModelName(f2);
-      if (a && a.length > 0) {
-        return a;
-      }
-    }
-    return 'model';
-  };
-  var getModelName = getName ? getName : _getModelName;
+  var getModelName = (typeof getName === 'function' ? getName : _getModelName);
   var updateState = function (e, callback, lc) {
     var ctrl = e.currentTarget;
-    var modelName = getModelName(ctrl.form);
-    var l = state_1.localeOf(lc, getLocale);
-    state_1.handleEvent(e, removeErr);
-    var objSet = state_1.buildState(e, state, ctrl, modelName, l);
-    if (objSet) {
-      if (callback) {
-        setState(objSet, callback);
+    var mn = m;
+    if (getName) {
+      if (typeof getName === 'string') {
+        mn = getName;
       }
       else {
-        setState(objSet);
+        mn = getName(ctrl.form);
       }
     }
-  };
-  var updateFlatState = function (e, callback, lc) {
-    var objSet = state_1.buildFlatState(e, state, lc);
-    if (objSet) {
-      if (callback) {
-        setState(objSet, callback);
-      }
-      else {
-        setState(objSet);
-      }
+    else {
+      mn = _getModelName(ctrl.form);
     }
-  };
-  return {
-    getModelName: getModelName,
-    updateState: updateState,
-    updatePhoneState: updatePhoneState,
-    updateFlatState: updateFlatState,
-    getLocale: getLocale,
-    setState: setState,
-    state: state
-  };
-};
-function prepareData(data) {
-}
-exports.useUpdateWithProps = function (props, initialState, gl, removeErr, getName, prepareCustomData) {
-  if (!prepareCustomData) {
-    prepareCustomData = prepareData;
-  }
-  var baseProps = exports.useUpdate(initialState, gl, removeErr, getName);
-  var getModelName = baseProps.getModelName, updatePhoneState = baseProps.updatePhoneState, updateFlatState = baseProps.updateFlatState, getLocale = baseProps.getLocale, state = baseProps.state, setState = baseProps.setState;
-  var updateState = function (e, callback, lc) {
-    var ctrl = e.currentTarget;
-    var modelName = getModelName(ctrl.form);
-    var l = state_1.localeOf(lc, gl);
+    var l = state_1.localeOf(lc, getLocale);
     state_1.handleEvent(e, removeErr);
-    if (props.setGlobalState) {
-      state_1.handleProps(e, props, ctrl, modelName, l, prepareCustomData);
+    if (props && props.setGlobalState) {
+      state_1.handleProps(e, props, ctrl, mn, l, prepareCustomData);
     }
     else {
-      var objSet = state_1.buildState(e, state, ctrl, modelName, l);
+      var objSet = state_1.buildState(e, state, ctrl, mn, l);
       if (objSet) {
         if (callback) {
           setState(objSet, callback);
@@ -98,6 +68,17 @@ exports.useUpdateWithProps = function (props, initialState, gl, removeErr, getNa
       }
     }
   };
+  var updateFlatState = function (e, callback, lc) {
+    var objSet = state_1.buildFlatState(e, state, lc);
+    if (objSet) {
+      if (callback) {
+        setState(objSet, callback);
+      }
+      else {
+        setState(objSet);
+      }
+    }
+  };
   return {
     getModelName: getModelName,
     updateState: updateState,