react-hook-core 0.4.6 → 0.4.7

package/lib/useView.js

@@ -1,126 +1,133 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
+"use strict"
+var __assign =
+  (this && this.__assign) ||
+  function () {
+    __assign =
+      Object.assign ||
+      function (t) {
         for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
+          s = arguments[i]
+          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p]
         }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = require("react");
-var react_router_1 = require("react-router");
-var core_1 = require("./core");
-var formutil_1 = require("./formutil");
-var merge_1 = require("./merge");
+        return t
+      }
+    return __assign.apply(this, arguments)
+  }
+Object.defineProperty(exports, "__esModule", { value: true })
+var react_1 = require("react")
+var react_router_1 = require("react-router")
+var core_1 = require("./core")
+var error_1 = require("./error")
+var formutil_1 = require("./formutil")
+var merge_1 = require("./merge")
 exports.useViewOne = function (p) {
-    return exports.useCoreView(p.refForm, p.initialState, p.service, p, p);
-};
+  return exports.useCoreView(p.refForm, p.initialState, p.service, p, p)
+}
 exports.useView = function (refForm, initialState, service, p1, p) {
-    var baseProps = exports.useCoreView(refForm, initialState, service, p1, p);
-    var _a = merge_1.useMergeState(initialState), setState = _a[1];
-    var params = react_router_1.useParams();
-    react_1.useEffect(function () {
-        if (baseProps.refForm) {
-            core_1.initForm(baseProps.refForm.current);
-        }
-        var id = core_1.buildId(params, p ? p.keys : undefined);
-        if (id) {
-            if (p && p.initialize) {
-                p.initialize(id, baseProps.load, setState, p.callback);
+  var baseProps = exports.useCoreView(refForm, initialState, service, p1, p)
+  var _a = merge_1.useMergeState(initialState),
+    setState = _a[1]
+  var params = react_router_1.useParams()
+  react_1.useEffect(function () {
+    if (baseProps.refForm) {
+      core_1.initForm(baseProps.refForm.current)
+    }
+    var id = core_1.buildId(params, p ? p.keys : undefined)
+    if (id) {
+      if (p && p.initialize) {
+        p.initialize(id, baseProps.load, setState, p.callback)
+      } else {
+        baseProps.load(id, p ? p.callback : undefined)
+      }
+    }
+  }, [])
+  return __assign({}, baseProps)
+}
+exports.useCoreView = function (refForm, initialState, service, p1, p) {
+  var _a = merge_1.useMergeState(initialState),
+    state = _a[0],
+    setState = _a[1]
+  var _b = react_1.useState(),
+    running = _b[0],
+    setRunning = _b[1]
+  var navigate = react_router_1.useNavigate()
+  var back = function (event) {
+    if (event) {
+      event.preventDefault()
+    }
+    navigate(-1)
+  }
+  var getModelName = function (f) {
+    if (p && p.name) {
+      return p.name
+    }
+    return core_1.getModelName(f, "model")
+  }
+  var showModel = function (model) {
+    var n = getModelName(refForm.current)
+    var objSet = {}
+    objSet[n] = model
+    setState(objSet)
+  }
+  var _handleNotFound = function (form) {
+    var msg = error_1.message(p1.resource.value, "error_not_found", "error")
+    if (form) {
+      formutil_1.setReadOnly(form)
+    }
+    p1.showError(msg.message, msg.title)
+  }
+  var handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
+  var _load = function (_id, callback) {
+    var id = _id
+    if (id != null && id !== "") {
+      setRunning(true)
+      core_1.showLoading(p1.loading)
+      var fn = typeof service === "function" ? service : service.load
+      fn(id)
+        .then(function (obj) {
+          if (!obj) {
+            handleNotFound(refForm.current)
+          } else {
+            if (callback) {
+              callback(obj, showModel)
+            } else {
+              showModel(obj)
             }
-            else {
-                baseProps.load(id, p ? p.callback : undefined);
+          }
+          setRunning(false)
+          core_1.hideLoading(p1.loading)
+        })
+        .catch(function (err) {
+          var data = err && err.response ? err.response : err
+          var r = p1.resource
+          var title = r.value("error")
+          var msg = r.value("error_internal")
+          if (data && data.status === 404) {
+            handleNotFound(refForm.current)
+          } else {
+            if (data && data.status) {
+              msg = error_1.messageByHttpStatus(data.status, r.value)
             }
-        }
-    }, []);
-    return __assign({}, baseProps);
-};
-exports.useCoreView = function (refForm, initialState, service, p1, p) {
-    var _a = merge_1.useMergeState(initialState), state = _a[0], setState = _a[1];
-    var _b = react_1.useState(), running = _b[0], setRunning = _b[1];
-    var navigate = react_router_1.useNavigate();
-    var back = function (event) {
-        if (event) {
-            event.preventDefault();
-        }
-        navigate(-1);
-    };
-    var getModelName = function (f) {
-        if (p && p.name) {
-            return p.name;
-        }
-        return core_1.getModelName(f, 'model');
-    };
-    var showModel = function (model) {
-        var n = getModelName(refForm.current);
-        var objSet = {};
-        objSet[n] = model;
-        setState(objSet);
-    };
-    var _handleNotFound = function (form) {
-        var msg = core_1.message(p1.resource.value, 'error_not_found', 'error');
-        if (form) {
-            formutil_1.setReadOnly(form);
-        }
-        p1.showError(msg.message, msg.title);
-    };
-    var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
-    var _load = function (_id, callback) {
-        var id = _id;
-        if (id != null && id !== '') {
-            setRunning(true);
-            core_1.showLoading(p1.loading);
-            var fn = (typeof service === 'function' ? service : service.load);
-            fn(id).then(function (obj) {
-                if (!obj) {
-                    handleNotFound(refForm.current);
-                }
-                else {
-                    if (callback) {
-                        callback(obj, showModel);
-                    }
-                    else {
-                        showModel(obj);
-                    }
-                }
-                setRunning(false);
-                core_1.hideLoading(p1.loading);
-            }).catch(function (err) {
-                var data = (err && err.response) ? err.response : err;
-                var r = p1.resource;
-                var title = r.value('error');
-                var msg = r.value('error_internal');
-                if (data && data.status === 404) {
-                    handleNotFound(refForm.current);
-                }
-                else {
-                    if (data && data.status) {
-                        msg = core_1.messageByHttpStatus(data.status, r.value);
-                    }
-                    formutil_1.setReadOnly(refForm.current);
-                    p1.showError(msg, title);
-                }
-                setRunning(false);
-                core_1.hideLoading(p1.loading);
-            });
-        }
-    };
-    var load = (p && p.load ? p.load : _load);
-    return {
-        state: state,
-        setState: setState,
-        refForm: refForm,
-        resource: p1.resource.resource(),
-        running: running,
-        setRunning: setRunning,
-        showModel: showModel,
-        getModelName: getModelName,
-        handleNotFound: handleNotFound,
-        load: load,
-        back: back
-    };
-};
+            formutil_1.setReadOnly(refForm.current)
+            p1.showError(msg, title)
+          }
+          setRunning(false)
+          core_1.hideLoading(p1.loading)
+        })
+    }
+  }
+  var load = p && p.load ? p.load : _load
+  return {
+    state: state,
+    setState: setState,
+    refForm: refForm,
+    resource: p1.resource.resource(),
+    running: running,
+    setRunning: setRunning,
+    showModel: showModel,
+    getModelName: getModelName,
+    handleNotFound: handleNotFound,
+    load: load,
+    back: back,
+  }
+}

package/lib/util.js

@@ -1,122 +1,111 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var state_1 = require("./state");
-var r1 = / |,|\$|€|£|¥|'|٬|،| /g;
-var r2 = / |\.|\$|€|£|¥|'|٬|،| /g;
+"use strict"
+Object.defineProperty(exports, "__esModule", { value: true })
+var state_1 = require("./state")
+var r1 = / |,|\$|€|£|¥|'|٬|،| /g
+var r2 = / |\.|\$|€|£|¥|'|٬|،| /g
 function valueOf(ctrl, locale, eventType) {
-  if (ctrl.type === 'checkbox') {
-    var ctrlOnValue = ctrl.getAttribute('data-on-value');
-    var ctrlOffValue = ctrl.getAttribute('data-off-value');
+  if (ctrl.type === "checkbox") {
+    var ctrlOnValue = ctrl.getAttribute("data-on-value")
+    var ctrlOffValue = ctrl.getAttribute("data-off-value")
     if (ctrlOnValue && ctrlOffValue) {
-      var onValue = ctrlOnValue ? ctrlOnValue : true;
-      var offValue = ctrlOffValue ? ctrlOffValue : false;
-      return ctrl.checked === true ? { mustChange: true, value: onValue } : { mustChange: true, value: offValue };
+      var onValue = ctrlOnValue ? ctrlOnValue : true
+      var offValue = ctrlOffValue ? ctrlOffValue : false
+      return ctrl.checked === true ? { mustChange: true, value: onValue } : { mustChange: true, value: offValue }
+    } else {
+      return ctrl.checked === true ? { mustChange: true, value: true } : { mustChange: true, value: false }
     }
-    else {
-      return ctrl.checked === true ? { mustChange: true, value: true } : { mustChange: true, value: false };
-    }
-  }
-  else {
-    var datatype = ctrl.getAttribute('data-type');
-    if (datatype === 'number' || datatype === 'int') {
-      var v = void 0;
-      if (locale && locale.decimalSeparator !== '.') {
-        v = ctrl.value.replace(r2, '');
+  } else {
+    var datatype = ctrl.getAttribute("data-type")
+    if (datatype === "number" || datatype === "int") {
+      var v = void 0
+      if (locale && locale.decimalSeparator !== ".") {
+        v = ctrl.value.replace(r2, "")
         if (v.indexOf(locale.decimalSeparator) >= 0) {
-          v = v.replace(locale.decimalSeparator, '.');
+          v = v.replace(locale.decimalSeparator, ".")
         }
+      } else {
+        v = ctrl.value.replace(r1, "")
       }
-      else {
-        v = ctrl.value.replace(r1, '');
-      }
-      return isNaN(v) ? { mustChange: false } : { mustChange: true, value: parseFloat(v) };
-    }
-    else if (datatype === 'currency' || datatype === 'string-currency') {
-      var ml = ctrl.getAttribute('maxlength');
-      var nm = (ml != null && !isNaN(ml) ? parseInt(ml, 10) : undefined);
-      var res = getStringCurrency(ctrl.value, datatype, locale, nm, eventType === 'blur');
-      return res;
-    }
-    else {
-      return { mustChange: true, value: ctrl.value };
+      return isNaN(v) ? { mustChange: false } : { mustChange: true, value: parseFloat(v) }
+    } else if (datatype === "currency" || datatype === "string-currency") {
+      var ml = ctrl.getAttribute("maxlength")
+      var nm = ml != null && !isNaN(ml) ? parseInt(ml, 10) : undefined
+      var res = getStringCurrency(ctrl.value, datatype, locale, nm, eventType === "blur")
+      return res
+    } else {
+      return { mustChange: true, value: ctrl.value }
     }
   }
 }
-exports.valueOf = valueOf;
+exports.valueOf = valueOf
 function getStringCurrency(value, datatype, locale, maxLength, isOnBlur) {
-  if (locale && locale.decimalSeparator !== '.') {
-    value = value.replace(r2, '');
+  if (locale && locale.decimalSeparator !== ".") {
+    value = value.replace(r2, "")
     if (value.indexOf(locale.decimalSeparator) >= 0) {
-      value = value.replace(locale.decimalSeparator, '.');
+      value = value.replace(locale.decimalSeparator, ".")
     }
+  } else {
+    value = value.replace(r1, "")
   }
-  else {
-    value = value.replace(r1, '');
-  }
-  if (value === '') {
-    return { mustChange: true, value: '' };
+  if (value === "") {
+    return { mustChange: true, value: "" }
   }
-  value = extractNumber(value, '.');
+  value = extractNumber(value, ".")
   if (value.length === 0) {
-    return { mustChange: false };
-  }
-  else if (value.length > 0 && value.charAt(0) === '0') {
-    return { mustChange: true, value: value.substring(1) };
+    return { mustChange: false }
+  } else if (value.length > 0 && value.charAt(0) === "0") {
+    return { mustChange: true, value: value.substring(1) }
   }
   if (!locale) {
-    locale = state_1.enLocale;
+    locale = state_1.enLocale
   }
-  var decimalDigits = locale ? locale.decimalDigits : 2;
-  var groupDigits = 3;
-  var decimalSeparator = locale.decimalSeparator;
-  var groupSeparator = locale.groupSeparator;
+  var decimalDigits = locale ? locale.decimalDigits : 2
+  var groupDigits = 3
+  var decimalSeparator = locale.decimalSeparator
+  var groupSeparator = locale.groupSeparator
   if (isOnBlur) {
-    var number = Number(value.replace(/^0+/, ''));
+    var number = Number(value.replace(/^0+/, ""))
     if (number === 0) {
-      return { mustChange: true, value: '' };
-    }
-    else {
-      value = number.toFixed(decimalDigits);
+      return { mustChange: true, value: "" }
+    } else {
+      value = number.toFixed(decimalDigits)
     }
   }
-  var dotPosition = value.indexOf('.');
-  var beforeDot = dotPosition >= 0 ? value.substr(0, dotPosition) : value;
-  if (datatype === 'string-currency' || isOnBlur) {
-    beforeDot = beforeDot.replace(new RegExp('\\B(?=(\\d{' + groupDigits + '})+(?!\\d))', 'g'), groupSeparator);
+  var dotPosition = value.indexOf(".")
+  var beforeDot = dotPosition >= 0 ? value.substr(0, dotPosition) : value
+  if (datatype === "string-currency" || isOnBlur) {
+    beforeDot = beforeDot.replace(new RegExp("\\B(?=(\\d{" + groupDigits + "})+(?!\\d))", "g"), groupSeparator)
   }
-  var afterDot;
+  var afterDot
   if (dotPosition > 0) {
-    afterDot = value.substr(dotPosition + 1);
+    afterDot = value.substr(dotPosition + 1)
     if (afterDot.length > decimalDigits) {
-      afterDot = afterDot.substr(0, decimalDigits);
+      afterDot = afterDot.substr(0, decimalDigits)
     }
   }
   if (maxLength && beforeDot.length > maxLength - (decimalDigits + 1)) {
-    return { mustChange: false };
+    return { mustChange: false }
   }
-  value = dotPosition >= 0 ? beforeDot + decimalSeparator + afterDot : beforeDot;
-  return maxLength && value.length > maxLength ? { mustChange: false } : { mustChange: true, value: value };
+  value = dotPosition >= 0 ? beforeDot + decimalSeparator + afterDot : beforeDot
+  return maxLength && value.length > maxLength ? { mustChange: false } : { mustChange: true, value: value }
 }
 function extractNumber(str, decimalSeparator) {
-  var arrs = [];
-  var d = false;
+  var arrs = []
+  var d = false
   for (var i = 0; i < str.length; i++) {
-    var ch = str.charAt(i);
-    if (ch >= '0' && ch <= '9') {
-      arrs.push(ch);
-    }
-    else if (ch === decimalSeparator) {
+    var ch = str.charAt(i)
+    if (ch >= "0" && ch <= "9") {
+      arrs.push(ch)
+    } else if (ch === decimalSeparator) {
       if (d) {
-        return arrs.join('');
+        return arrs.join("")
+      } else {
+        d = true
+        arrs.push(ch)
       }
-      else {
-        d = true;
-        arrs.push(ch);
-      }
-    }
-    else {
-      return arrs.join('');
+    } else {
+      return arrs.join("")
     }
   }
-  return arrs.join('');
+  return arrs.join("")
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/com.ts

@@ -1,42 +1,56 @@
-import * as React from 'react';
-import { Locale, pageSizes } from './core';
+import * as React from "react"
+import { Locale, pageSizes } from "./core"
 
 export interface PageSizeProps {
-  id?: string;
-  name?: string;
-  size?: number;
-  sizes?: number[];
-  onChange?: React.ChangeEventHandler<HTMLSelectElement>;
+  id?: string
+  name?: string
+  size?: number
+  sizes?: number[]
+  onChange?: React.ChangeEventHandler<HTMLSelectElement>
 }
 export function PageSizeSelect(p: PageSizeProps) {
-  const g = p.sizes;
-  const s = (!g || g.length === 0 ? pageSizes : g);
-  const opts = s.map(pgSize => React.createElement('option', { key: pgSize, value: pgSize }, pgSize));
-  return React.createElement('select', { id: p.id, name: p.name, defaultValue: p.size, onChange: p.onChange }, opts);
+  const g = p.sizes
+  const s = !g || g.length === 0 ? pageSizes : g
+  const opts = s.map((pgSize) => React.createElement("option", { key: pgSize, value: pgSize }, pgSize))
+  return React.createElement("select", { id: p.id, name: p.name, defaultValue: p.size, onChange: p.onChange }, opts)
 }
 export interface Props {
-  id?: string;
-  name?: string;
-  size?: number;
-  sizes?: number[];
-  className?: string;
-  maxLength?: number;
-  value?: string;
-  placeholder?: string;
-  pageSizeChanged?: (event: any) => void;
-  search?: React.MouseEventHandler<HTMLElement>;
-  toggle?: React.MouseEventHandler<HTMLElement>;
-  clear?: React.MouseEventHandler<HTMLButtonElement>;
-  onChange?: (e: any, callback?: (() => void) | undefined, lc?: Locale | undefined) => void;
+  id?: string
+  name?: string
+  size?: number
+  sizes?: number[]
+  className?: string
+  maxLength?: number
+  value?: string
+  placeholder?: string
+  pageSizeChanged?: (event: any) => void
+  search?: React.MouseEventHandler<HTMLElement>
+  toggle?: React.MouseEventHandler<HTMLElement>
+  clear?: React.MouseEventHandler<HTMLButtonElement>
+  onChange?: (e: any, callback?: (() => void) | undefined, lc?: Locale | undefined) => void
 }
 export function Search(p: Props) {
-  return (React.createElement(React.Fragment, null,
-    React.createElement("label", { className: p.className },
+  return React.createElement(
+    React.Fragment,
+    null,
+    React.createElement(
+      "label",
+      { className: p.className },
       p.pageSizeChanged && React.createElement(PageSizeSelect, { size: p.size, sizes: p.sizes, onChange: p.pageSizeChanged, name: p.name, id: p.id }),
-      React.createElement("input", { type: 'text', id: 'q', name: 'q', value: p.value || '', onChange: p.onChange, maxLength: p.maxLength, placeholder: p.placeholder }),
-      p.clear && React.createElement("button", { type: 'button', hidden: !p.value, className: 'btn-remove-text', onClick: p.clear }),
-      p.toggle && React.createElement("button", { type: 'button', className: 'btn-filter', onClick: p.toggle }),
-      p.search && React.createElement("button", { type: 'submit', className: 'btn-search', onClick: p.search }))));
+      React.createElement("input", {
+        type: "text",
+        id: "q",
+        name: "q",
+        value: p.value || "",
+        onChange: p.onChange,
+        maxLength: p.maxLength,
+        placeholder: p.placeholder,
+      }),
+      p.clear && React.createElement("button", { type: "button", hidden: !p.value, className: "btn-remove-text", onClick: p.clear }),
+      p.toggle && React.createElement("button", { type: "button", className: "btn-filter", onClick: p.toggle }),
+      p.search && React.createElement("button", { type: "submit", className: "btn-search", onClick: p.search }),
+    ),
+  )
   /*
   return (
     <>