react-hook-core 0.4.23 → 0.5.1

package/lib/state.js

@@ -14,8 +14,8 @@ var __assign =
     return __assign.apply(this, arguments)
   }
 Object.defineProperty(exports, "__esModule", { value: true })
+var core_1 = require("./core")
 var reflect_1 = require("./reflect")
-var util_1 = require("./util")
 function getDecimalSeparator(ele) {
   var separator = ele.getAttribute("data-decimal-separator")
   if (!separator) {
@@ -29,45 +29,56 @@ function getDecimalSeparator(ele) {
 exports.getDecimalSeparator = getDecimalSeparator
 var r1 = / |,|\$|€|£|¥|'|٬|،| /g
 var r2 = / |\.|\$|€|£|¥|'|٬|،| /g
-function updateState(e, o, setObj) {
+function updateNumber(e, o, setObj, decimalSeparator, callback, formatStr) {
   var ctrl = e.target
+  var v0 = formatStr ? formatStr(ctrl.value) : ctrl.value
+  var dataField = ctrl.getAttribute("data-field")
+  var field = dataField ? dataField : ctrl.name
+  var v = decimalSeparator === "," ? v0.replace(r2, "") : v0.replace(r1, "")
+  if (v.indexOf(",") >= 0) {
+    v = v.replace(",", ".")
+  }
+  var val = isNaN(v) ? undefined : parseInt(v)
+  reflect_1.setValue(o, field, val)
+  setObj(__assign({}, o))
+  if (callback) {
+    callback()
+  }
+}
+exports.updateNumber = updateNumber
+function formatAndUpdateState(e, o, setObj, formatStr, callback) {
+  updateState(e, o, setObj, callback, formatStr)
+}
+exports.formatAndUpdateState = formatAndUpdateState
+function updateState(e, o, setObj, callback, formatStr) {
+  var ctrl = e.target
+  var v0 = formatStr ? formatStr(ctrl.value) : ctrl.value
   var dataField = ctrl.getAttribute("data-field")
   var field = dataField ? dataField : ctrl.name
   if (ctrl.tagName === "SELECT") {
     if (ctrl.tagName === "SELECT") {
-      if (ctrl.value === "" || !ctrl.value) {
+      if (v0 === "" || !v0) {
         ctrl.removeAttribute("data-value")
       } else {
-        ctrl.setAttribute("data-value", "data-value")
+        ctrl.setAttribute("data-value", v0)
       }
     }
-    reflect_1.setValue(o, field, ctrl.value)
+    reflect_1.setValue(o, field, v0)
   } else {
     var stype = ctrl.getAttribute("type")
     var type = stype ? stype.toLowerCase() : "text"
     var model = o
-    if (type === "text") {
-      var datatype = ctrl.getAttribute("data-type")
-      if (datatype === "number" || datatype === "integer") {
-        var decimalSeparator = getDecimalSeparator(ctrl)
-        var v0 = ctrl.value
-        var v = decimalSeparator === "," ? v0.replace(r2, "") : v0.replace(r1, "")
-        var val = isNaN(v) ? undefined : parseFloat(v)
-        reflect_1.setValue(o, field, val)
-      } else {
-        reflect_1.setValue(o, field, ctrl.value)
-      }
-    } else if (type === "checkbox") {
+    if (type === "checkbox") {
       var value = model[field]
       if (ctrl.id && ctrl.name !== ctrl.id) {
         if (!value || !Array.isArray(value)) {
           value = []
         }
-        value.includes(ctrl.value)
+        value.includes(v0)
           ? (value = value.filter(function (v) {
-              return v !== ctrl.value
+              return v !== v0
             }))
-          : value.push(ctrl.value)
+          : value.push(v0)
         model[field] = value
       } else {
         var v = valueOfCheckbox(ctrl)
@@ -75,185 +86,48 @@ function updateState(e, o, setObj) {
       }
     } else if (type === "radio") {
       if (field.indexOf(".") < 0 && field.indexOf("[") < 0) {
-        model[field] = ctrl.value
+        model[field] = v0
       } else {
-        reflect_1.setValue(model, field, ctrl.value)
+        reflect_1.setValue(model, field, v0)
       }
     } else if (type === "date" || type === "datetime-local") {
-      try {
-        var selectedDate = new Date(ctrl.value)
-        reflect_1.setValue(model, field, ctrl.value && ctrl.value !== "" ? selectedDate.toISOString() : null)
-      } catch (error) {
-        console.error("Error occurred while formatting date:", error)
-      }
+      var date = new Date(v0)
+      var val = !isNaN(date.getTime()) ? date.toISOString() : null
+      reflect_1.setValue(model, field, val)
     } else if (type === "time") {
-      var objSet = {}
-      try {
-        var selectedDate = new Date(ctrl.value)
-        reflect_1.setValue(model, field, selectedDate.getTime())
-      } catch (error) {
-        console.error("Error occurred while formatting time:", error)
-      }
-      return objSet
-    } else {
-      reflect_1.setValue(o, field, ctrl.value)
-    }
-  }
-  setObj(__assign({}, o))
-}
-exports.updateState = updateState
-exports.enLocale = {
-  id: "en-US",
-  countryCode: "US",
-  dateFormat: "M/d/yyyy",
-  firstDayOfWeek: 1,
-  decimalSeparator: ".",
-  groupSeparator: ",",
-  decimalDigits: 2,
-  currencyCode: "USD",
-  currencySymbol: "$",
-  currencyPattern: 0,
-}
-function localeOf(lc, glc) {
-  var l = lc
-  if (!l) {
-    if (glc) {
-      if (typeof glc === "function") {
-        l = glc()
+      var date = new Date(v0)
+      if (!isNaN(date.getTime())) {
+        reflect_1.setValue(model, field, date.getTime())
       } else {
-        l = glc
+        reflect_1.setValue(model, field, null)
       }
-    }
-    if (!l) {
-      l = exports.enLocale
-    }
-  }
-  return l
-}
-exports.localeOf = localeOf
-function handleEvent(e, removeErr) {
-  var ctrl = e.currentTarget
-  var type = ctrl.getAttribute("type")
-  var isPreventDefault = type && (["checkbox", "radio"].indexOf(type.toLowerCase()) >= 0 ? false : true)
-  if (isPreventDefault) {
-    e.preventDefault()
-  }
-  if (removeErr && ctrl.nodeName === "SELECT" && ctrl.value && ctrl.classList.contains("invalid")) {
-    removeErr(ctrl)
-  }
-}
-exports.handleEvent = handleEvent
-function handleProps(e, props, ctrl, modelName, tloc, prepareData) {
-  var _a, _b, _c, _d
-  if (props.setGlobalState) {
-    var res = util_1.valueOf(ctrl, tloc, e.type)
-    if (res.mustChange) {
-      var dataField = ctrl.getAttribute("data-field")
-      var field = dataField ? dataField : ctrl.name
-      var propsDataForm = props[modelName]
-      var form = ctrl.form
-      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 {
-          reflect_1.setValue(propsDataForm, field, ctrl.value)
-          props.setGlobalState(((_d = {}), (_d[formName] = __assign({}, propsDataForm)), _d))
-        }
-      }
-    }
-  }
-}
-exports.handleProps = handleProps
-function buildState(e, state, ctrl, modelName, tloc) {
-  var form = ctrl.form
-  if (form) {
-    if (modelName && modelName !== "") {
-      var type = ctrl.getAttribute("type")
-      var ex = state[modelName]
-      var dataField = ctrl.getAttribute("data-field")
-      var field = dataField ? dataField : ctrl.name
-      var model = Object.assign({}, ex)
-      if (type && type.toLowerCase() === "checkbox") {
-        var value = model[field]
-        if (ctrl.id && ctrl.name !== ctrl.id) {
-          if (!value || !Array.isArray(value)) {
-            value = []
-          }
-          value.includes(ctrl.value)
-            ? (value = value.filter(function (v) {
-                return v !== ctrl.value
-              }))
-            : value.push(ctrl.value)
-          model[field] = value
-        } else {
-          var v = valueOfCheckbox(ctrl)
-          model[field] = v
-        }
-        var objSet = {}
-        objSet[modelName] = model
-        return objSet
-      } else if (type && type.toLowerCase() === "radio") {
-        if (field.indexOf(".") < 0 && field.indexOf("[") < 0) {
-          model[field] = ctrl.value
-        } else {
-          reflect_1.setValue(model, field, ctrl.value)
-        }
-        var objSet = {}
-        objSet[modelName] = model
-        return objSet
-      } else if (type && (type.toLowerCase() === "date" || type.toLowerCase() === "datetime-local")) {
-        var objSet = {}
-        try {
-          var selectedDate = new Date(ctrl.value)
-          reflect_1.setValue(model, field, ctrl.value && ctrl.value !== "" ? selectedDate.toISOString() : null)
-          objSet[modelName] = model
-          return objSet
-        } catch (error) {
-          console.error("Error occurred while formatting date:", error)
-        }
-        return objSet
-      } else if (type && type.toLowerCase() === "time") {
-        var objSet = {}
-        try {
-          var selectedDate = new Date(ctrl.value)
-          reflect_1.setValue(model, field, selectedDate.getTime())
-          objSet[modelName] = model
-          return objSet
-        } catch (error) {
-          console.error("Error occurred while formatting time:", error)
+    } else {
+      var datatype = ctrl.getAttribute("data-type")
+      if (datatype === "phone") {
+        var val = core_1.removePhoneFormat(v0)
+        reflect_1.setValue(o, field, val)
+      } else if (datatype === "fax") {
+        var val = core_1.removeFaxFormat(v0)
+        reflect_1.setValue(o, field, val)
+      } else if (datatype === "number" || datatype === "int") {
+        var decimalSeparator = getDecimalSeparator(ctrl)
+        var v = decimalSeparator === "," ? v0.replace(r2, "") : v0.replace(r1, "")
+        if (v.indexOf(",") >= 0) {
+          v = v.replace(",", ".")
         }
-        return objSet
+        var val = isNaN(v) ? undefined : parseFloat(v)
+        reflect_1.setValue(o, field, val)
       } else {
-        if (ctrl.tagName === "SELECT") {
-          if (ctrl.value === "" || !ctrl.value) {
-            ctrl.removeAttribute("data-value")
-          } else {
-            ctrl.setAttribute("data-value", "data-value")
-          }
-        }
-        var data = util_1.valueOf(ctrl, tloc, e.type)
-        if (data.mustChange) {
-          if (field.indexOf(".") < 0 && field.indexOf("[") < 0) {
-            model[field] = data.value
-          } else {
-            reflect_1.setValue(model, field, data.value)
-          }
-          var objSet = {}
-          objSet[modelName] = model
-          return objSet
-        }
+        reflect_1.setValue(o, field, v0)
       }
-    } else {
-      return buildFlatState(e, state, tloc)
     }
-  } else {
-    buildFlatState(e, state, tloc)
+  }
+  setObj(__assign({}, o))
+  if (callback) {
+    callback()
   }
 }
-exports.buildState = buildState
+exports.updateState = updateState
 function valueOfCheckbox(ctrl) {
   var ctrlOnValue = ctrl.getAttribute("data-on-value")
   var ctrlOffValue = ctrl.getAttribute("data-off-value")
@@ -266,35 +140,3 @@ function valueOfCheckbox(ctrl) {
   }
 }
 exports.valueOfCheckbox = valueOfCheckbox
-function buildFlatState(e, state, l) {
-  var _a
-  var ctrl = e.currentTarget
-  var stateName = ctrl.name
-  var objSet = {}
-  var type = ctrl.getAttribute("type")
-  if (type && type.toLowerCase() === "checkbox") {
-    if (ctrl.id && stateName === ctrl.id) {
-      var v = valueOfCheckbox(ctrl)
-      objSet[stateName] = v
-      return objSet
-    } else {
-      var value = state[stateName]
-      value.includes(ctrl.value)
-        ? (value = value.filter(function (v) {
-            return v !== ctrl.value
-          }))
-        : value.push(ctrl.value)
-      var objSet2 = ((_a = {}), (_a[ctrl.name] = value), _a)
-      return objSet2
-    }
-  } else {
-    var data = util_1.valueOf(ctrl, l, e.type)
-    if (data.mustChange) {
-      objSet[stateName] = data.value
-      return objSet
-    } else {
-      return undefined
-    }
-  }
-}
-exports.buildFlatState = buildFlatState

package/lib/util.js

@@ -1,6 +1,17 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
-var state_1 = require("./state")
+exports.enLocale = {
+  id: "en-US",
+  countryCode: "US",
+  dateFormat: "M/d/yyyy",
+  firstDayOfWeek: 1,
+  decimalSeparator: ".",
+  groupSeparator: ",",
+  decimalDigits: 2,
+  currencyCode: "USD",
+  currencySymbol: "$",
+  currencyPattern: 0,
+}
 var r1 = / |,|\$|€|£|¥|'|٬|،| /g
 var r2 = / |\.|\$|€|£|¥|'|٬|،| /g
 function valueOf(ctrl, locale, eventType) {
@@ -57,7 +68,7 @@ function getStringCurrency(value, datatype, locale, maxLength, isOnBlur) {
     return { mustChange: true, value: value.substring(1) }
   }
   if (!locale) {
-    locale = state_1.enLocale
+    locale = exports.enLocale
   }
   var decimalDigits = locale ? locale.decimalDigits : 2
   var groupDigits = 3

package/package.json

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

package/src/com.ts

@@ -23,7 +23,7 @@ export interface Props {
   maxLength?: number
   value?: string
   placeholder?: string
-  pageSizeChanged?: (event: any) => void
+  pageSizeChanged?: (e: React.ChangeEvent<HTMLSelectElement>) => void
   search?: React.MouseEventHandler<HTMLElement>
   toggle?: React.MouseEventHandler<HTMLElement>
   clear?: React.MouseEventHandler<HTMLButtonElement>

package/src/common.ts

@@ -1,4 +1,4 @@
-import { LoadingService, StringMap } from "./core"
+import { StringMap } from "./core"
 
 export function messageByHttpStatus(status: number, resource: StringMap): string {
   const k = "error_" + status
@@ -26,63 +26,3 @@ export function error(err: any, resource: StringMap, ae: (msg: string, callback?
     ae(msg, undefined, title)
   }
 }
-
-export function showLoading(loading?: LoadingService | ((firstTime?: boolean) => void)): void {
-  if (loading) {
-    if (typeof loading === "function") {
-      loading()
-    } else {
-      loading.showLoading()
-    }
-  }
-}
-export function hideLoading(loading?: LoadingService | (() => void)): void {
-  if (loading) {
-    if (typeof loading === "function") {
-      loading()
-    } else {
-      loading.hideLoading()
-    }
-  }
-}
-
-export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement | undefined {
-  if (form) {
-    setTimeout(() => {
-      if (initMat) {
-        initMat(form)
-      }
-      focusFirstElement(form)
-    }, 100)
-  }
-  return form
-}
-export function focusFirstElement(form: HTMLFormElement): void {
-  let i = 0
-  const len = form.length
-  for (i = 0; i < len; i++) {
-    const ctrl = form[i] as HTMLInputElement
-    if (!(ctrl.readOnly || ctrl.disabled)) {
-      let nodeName = ctrl.nodeName
-      const type = ctrl.getAttribute("type")
-      if (type) {
-        const t = type.toUpperCase()
-        if (t === "BUTTON" || t === "SUBMIT") {
-          ctrl.focus()
-        }
-        if (nodeName === "INPUT") {
-          nodeName = t
-        }
-      }
-      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
-        ctrl.focus()
-        /*
-        try {
-          ctrl.setSelectionRange(0, ctrl.value.length)
-        } catch (err) {}
-         */
-        return
-      }
-    }
-  }
-}

package/src/core.ts

@@ -6,7 +6,6 @@ export const pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 export const sizes = pageSizes
 // tslint:disable-next-line:class-name
 export class resources {
-  static phone = / |\-|\.|\(|\)/g
   static _cache: any = {}
   static cache = true
   static fields = "fields"
@@ -15,6 +14,20 @@ export class resources {
   static defaultLimit = 24
   static limits = pageSizes
   static pageMaxSize = 7
+  static phone = / |\-|\.|\(|\)/g
+  static fax = / |\-|\.|\(|\)/g
+  static removePhoneFormat(phone?: string | null): string {
+    return phone ? phone.replace(resources.phone, "") : ""
+  }
+  static removeFaxFormat(fax?: string | null): string {
+    return fax ? fax.replace(resources.fax, "") : ""
+  }
+}
+export function removePhoneFormat(phone?: string | null): string {
+  return resources.removePhoneFormat(phone)
+}
+export function removeFaxFormat(fax?: string | null): string {
+  return resources.removeFaxFormat(fax)
 }
 
 export interface StringMap {
@@ -39,15 +52,6 @@ export interface ErrorMessage {
   param?: string | number | Date
   message?: string
 }
-export interface UIService {
-  validateForm(form?: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean): boolean
-  removeFormError(form: HTMLFormElement): void
-  removeError(el: HTMLInputElement): void
-  showFormError(form?: HTMLFormElement, errors?: ErrorMessage[], focusFirst?: boolean): ErrorMessage[]
-  buildErrorMessage(errors: ErrorMessage[]): string
-
-  registerEvents?(form: HTMLFormElement): void
-}
 
 export type Type =
   | "ObjectId"

package/src/edit.ts

@@ -1,6 +1,42 @@
 import { NavigateFunction } from "react-router-dom"
 import { Attributes, ErrorMessage, StringMap } from "./core"
 
+export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
+  if (Array.isArray(x)) {
+    return false
+  } else if (typeof x === "object") {
+    return true
+  } else if (typeof x === "number" && x > 0) {
+    return true
+  }
+  return false
+}
+
+type Result<T> = number | T | ErrorMessage[]
+export function afterSaved<T>(
+  res: Result<T>,
+  form: HTMLFormElement | undefined | null,
+  resource: StringMap,
+  showFormError: (form?: HTMLFormElement | null, errors?: ErrorMessage[]) => ErrorMessage[],
+  alertSuccess: (msg: string, callback?: () => void) => void,
+  alertError: (msg: string) => void,
+  navigate?: NavigateFunction,
+) {
+  if (Array.isArray(res)) {
+    showFormError(form, res)
+  } else if (isSuccessful(res)) {
+    alertSuccess(resource.msg_save_success, () => {
+      if (navigate) {
+        navigate(-1)
+      }
+    })
+  } else if (res === 0) {
+    alertError(resource.error_not_found)
+  } else {
+    alertError(resource.error_conflict)
+  }
+}
+
 export function createModel<T>(attributes?: Attributes): T {
   const obj: any = {}
   if (!attributes) {
@@ -48,39 +84,3 @@ export function createModel<T>(attributes?: Attributes): T {
   }
   return obj
 }
-
-export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
-  if (Array.isArray(x)) {
-    return false
-  } else if (typeof x === "object") {
-    return true
-  } else if (typeof x === "number" && x > 0) {
-    return true
-  }
-  return false
-}
-
-type Result<T> = number | T | ErrorMessage[]
-export function afterSaved<T>(
-  res: Result<T>,
-  form: HTMLFormElement | undefined | null,
-  resource: StringMap,
-  showFormError: (form?: HTMLFormElement | null, errors?: ErrorMessage[]) => ErrorMessage[],
-  alertSuccess: (msg: string, callback?: () => void) => void,
-  alertError: (msg: string) => void,
-  navigate?: NavigateFunction,
-) {
-  if (Array.isArray(res)) {
-    showFormError(form, res)
-  } else if (isSuccessful(res)) {
-    alertSuccess(resource.msg_save_success, () => {
-      if (navigate) {
-        navigate(-1)
-      }
-    })
-  } else if (res === 0) {
-    alertError(resource.error_not_found)
-  } else {
-    alertError(resource.error_conflict)
-  }
-}

package/src/index.ts

@@ -4,16 +4,16 @@ export * from "./com"
 export * from "./core"
 export * from "./diff"
 export * from "./edit"
-export * from "./formutil"
 export * from "./reflect"
 export * from "./route"
 export * from "./search"
 export * from "./state"
-export * from "./update"
-export * from "./useEdit"
 export * from "./useMessage"
-export * from "./useSearch"
 export * from "./util"
+
+export type ButtonMouseEvent = React.MouseEvent<HTMLButtonElement, MouseEvent>
+export type SelectChangeEvent = ChangeEvent<HTMLSelectElement>
+export type InputChangeEvent = ChangeEvent<HTMLInputElement>
 /*
 type CallBackType<T> = (updatedValue: T) => void;
 type SetStateType<T> = T | ((prev: T) => T);
@@ -94,7 +94,7 @@ interface InputProps {
   defaultValue?: string
   onChangeNumber?: (value: number) => void
   onChange?: ChangeEventHandler<HTMLInputElement>
-  currencyOnBlur?: (event: Event | any, locale: Locale, currencyCode?: string, includingCurrencySymbol?: boolean) => void
+  currencyOnBlur?: (e: Event | any, locale: Locale, currencyCode?: string, includingCurrencySymbol?: boolean) => void
   currencyCode?: string
   symbol?: boolean
   readOnly?: boolean

package/src/route.ts

@@ -1,9 +1,24 @@
 import queryString from "query-string"
+import * as React from "react"
 import { NavigateFunction } from "react-router-dom"
 import { StringMap } from "./core"
 import { hasDiff } from "./reflect"
 import { Filter } from "./search"
 
+export function onBack<T>(
+  e: React.MouseEvent<HTMLElement, MouseEvent>,
+  navigate: NavigateFunction,
+  confirm: (msg: string, yesCallback?: () => void) => void,
+  resource: StringMap,
+  o1: T,
+  o2: T,
+  keys?: string[],
+  version?: string,
+) {
+  e.preventDefault()
+  goBack(navigate, confirm, resource, o1, o2, keys, version)
+}
+
 export function goBack<T>(
   navigate: NavigateFunction,
   confirm: (msg: string, yesCallback?: () => void) => void,