react-hook-core 0.5.0 → 0.5.2

package/lib/edit.js

@@ -1,5 +1,46 @@
 "use strict"
 Object.defineProperty(exports, "__esModule", { value: true })
+function isSuccessful(x) {
+  if (Array.isArray(x)) {
+    return false
+  } else if (typeof x === "object") {
+    return true
+  } else if (typeof x === "number" && x > 0) {
+    return true
+  }
+  return false
+}
+exports.isSuccessful = isSuccessful
+function afterSaved(res, form, resource, showFormError, alertSuccess, alertError, navigate) {
+  if (Array.isArray(res)) {
+    showFormError(form, res)
+  } else if (isSuccessful(res)) {
+    alertSuccess(resource.msg_save_success, function () {
+      if (navigate) {
+        navigate(-1)
+      }
+    })
+  } else if (res === 0) {
+    alertError(resource.error_not_found)
+  } else {
+    alertError(resource.error_conflict)
+  }
+}
+exports.afterSaved = afterSaved
+function afterCreated(res, form, successMessage, duplicateMessage, showFormError, alertSuccess, alertError, navigate) {
+  if (Array.isArray(res)) {
+    showFormError(form, res)
+  } else if (isSuccessful(res)) {
+    alertSuccess(successMessage, function () {
+      if (navigate) {
+        navigate(-1)
+      }
+    })
+  } else {
+    alertError(duplicateMessage)
+  }
+}
+exports.afterCreated = afterCreated
 function createModel(attributes) {
   var obj = {}
   if (!attributes) {
@@ -49,30 +90,3 @@ function createModel(attributes) {
   return obj
 }
 exports.createModel = createModel
-function isSuccessful(x) {
-  if (Array.isArray(x)) {
-    return false
-  } else if (typeof x === "object") {
-    return true
-  } else if (typeof x === "number" && x > 0) {
-    return true
-  }
-  return false
-}
-exports.isSuccessful = isSuccessful
-function afterSaved(res, form, resource, showFormError, alertSuccess, alertError, navigate) {
-  if (Array.isArray(res)) {
-    showFormError(form, res)
-  } else if (isSuccessful(res)) {
-    alertSuccess(resource.msg_save_success, function () {
-      if (navigate) {
-        navigate(-1)
-      }
-    })
-  } else if (res === 0) {
-    alertError(resource.error_not_found)
-  } else {
-    alertError(resource.error_conflict)
-  }
-}
-exports.afterSaved = afterSaved

package/lib/index.js

@@ -9,15 +9,11 @@ __export(require("./com"))
 __export(require("./core"))
 __export(require("./diff"))
 __export(require("./edit"))
-__export(require("./formutil"))
 __export(require("./reflect"))
 __export(require("./route"))
 __export(require("./search"))
 __export(require("./state"))
-__export(require("./update"))
-__export(require("./useEdit"))
 __export(require("./useMessage"))
-__export(require("./useSearch"))
 __export(require("./util"))
 function checked(s, v) {
   if (s) {

package/lib/reflect.js

@@ -40,15 +40,6 @@ function clone(obj) {
   return x
 }
 exports.clone = clone
-function isEmptyObject(obj) {
-  for (var key in obj) {
-    if (obj.hasOwnProperty(key)) {
-      return false
-    }
-  }
-  return true
-}
-exports.isEmptyObject = isEmptyObject
 function diff(obj1, obj2) {
   var fields = []
   var key1s = Object.keys(obj1)
@@ -82,6 +73,17 @@ function diff(obj1, obj2) {
   return fields
 }
 exports.diff = diff
+function notIn(s1, s2) {
+  var r = []
+  for (var _i = 0, s2_1 = s2; _i < s2_1.length; _i++) {
+    var s = s2_1[_i]
+    if (s1.indexOf(s) < 0) {
+      r.push(s)
+    }
+  }
+  return r
+}
+exports.notIn = notIn
 function makeDiff(o1, o2, keys, version) {
   var obj1 = o1
   var obj2 = o2
@@ -113,17 +115,15 @@ function hasDiff(o1, o2, keys, version) {
   return !isEmptyObject(diff)
 }
 exports.hasDiff = hasDiff
-function notIn(s1, s2) {
-  var r = []
-  for (var _i = 0, s2_1 = s2; _i < s2_1.length; _i++) {
-    var s = s2_1[_i]
-    if (s1.indexOf(s) < 0) {
-      r.push(s)
+function isEmptyObject(obj) {
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      return false
     }
   }
-  return r
+  return true
 }
-exports.notIn = notIn
+exports.isEmptyObject = isEmptyObject
 function equal(obj1, obj2) {
   if (obj1 == null && obj2 == null) {
     return true
@@ -208,7 +208,7 @@ function getDiffArray(list, name, v) {
   if (list) {
     for (var _i = 0, list_2 = list; _i < list_2.length; _i++) {
       var obj = list_2[_i]
-      if (obj[name] !== true) {
+      if (obj[name] !== v) {
         arrs.push(obj)
       }
     }
@@ -216,27 +216,6 @@ function getDiffArray(list, name, v) {
   return arrs
 }
 exports.getDiffArray = getDiffArray
-function setAll(list, name, v) {
-  if (list) {
-    for (var _i = 0, list_3 = list; _i < list_3.length; _i++) {
-      var obj = list_3[_i]
-      obj[name] = v
-    }
-  }
-}
-exports.setAll = setAll
-function equalAll(list, name, v) {
-  if (list) {
-    for (var _i = 0, list_4 = list; _i < list_4.length; _i++) {
-      var obj = list_4[_i]
-      if (obj[name] !== v) {
-        return false
-      }
-    }
-  }
-  return true
-}
-exports.equalAll = equalAll
 function getDirectValue(obj, key) {
   if (obj && obj.hasOwnProperty(key)) {
     return obj[key]

package/lib/route.js

@@ -2,6 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 var query_string_1 = require("query-string")
 var reflect_1 = require("./reflect")
+function onBack(e, navigate, confirm, resource, o1, o2, keys, version) {
+  e.preventDefault()
+  goBack(navigate, confirm, resource, o1, o2, keys, version)
+}
+exports.onBack = onBack
 function goBack(navigate, confirm, resource, o1, o2, keys, version) {
   if (!reflect_1.hasDiff(o1, o2, keys, version)) {
     navigate(-1)

package/lib/search.js

@@ -354,8 +354,8 @@ function handleToggle(target, off) {
   return on
 }
 exports.handleToggle = handleToggle
-function getNumber(event) {
-  return parseInt(event.currentTarget.value, 10)
+function getNumber(e) {
+  return parseInt(e.currentTarget.value, 10)
 }
 exports.getNumber = getNumber
 function setSortFilter(state, filter, setState, setFilter, search) {
@@ -396,9 +396,9 @@ function onClearQ(filter, setFilter, search) {
   }
 }
 exports.onClearQ = onClearQ
-function onPageSizeChanged(event, search, filter, setFilter) {
+function onPageSizeChanged(e, search, filter, setFilter) {
   filter.page = 1
-  filter.limit = getNumber(event)
+  filter.limit = getNumber(e)
   if (setFilter) {
     setFilter(filter)
   }
@@ -416,8 +416,8 @@ function onPageChanged(data, search, filter, setFilter) {
   search()
 }
 exports.onPageChanged = onPageChanged
-function onSearch(event, search, filter, state, setFilter, setState) {
-  event.preventDefault()
+function onSearch(e, search, filter, state, setFilter, setState) {
+  e.preventDefault()
   removeSortStatus(state.sortTarget)
   filter.page = 1
   state.sortTarget = undefined
@@ -431,8 +431,8 @@ function onSearch(event, search, filter, state, setFilter, setState) {
   search()
 }
 exports.onSearch = onSearch
-function onSort(event, search, state, setState) {
-  var target = getSortElement(event.target)
+function onSort(e, search, state, setState) {
+  var target = getSortElement(e.target)
   var sort = handleSort(target, state.sortTarget, state.sortField, state.sortType)
   state.sortField = sort.field
   state.sortType = sort.type

package/lib/state.js

@@ -16,7 +16,6 @@ var __assign =
 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) {
@@ -129,158 +128,6 @@ function updateState(e, o, setObj, callback, formatStr) {
   }
 }
 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()
-      } else {
-        l = glc
-      }
-    }
-    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)
-        }
-        return objSet
-      } 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
-        }
-      }
-    } else {
-      return buildFlatState(e, state, tloc)
-    }
-  } else {
-    buildFlatState(e, state, tloc)
-  }
-}
-exports.buildState = buildState
 function valueOfCheckbox(ctrl) {
   var ctrlOnValue = ctrl.getAttribute("data-on-value")
   var ctrlOffValue = ctrl.getAttribute("data-off-value")
@@ -293,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.5.0",
+  "version": "0.5.2",
   "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/core.ts

@@ -52,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/diff.ts

@@ -1,23 +1,15 @@
-import { LoadingService } from "./core"
 import { clone } from "./reflect"
 
-export interface DiffParameter {
-  showMessage: (msg: string, option?: string) => void
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void
-  loading?: LoadingService
-}
-export interface BaseDiffState {
-  disabled: boolean
-}
 export interface DiffModel<T, ID> {
   id?: ID
   origin?: T
   value: T
 }
 export interface ApprService<ID> {
-  approve(id: ID, ctx?: any): Promise<number | string>
-  reject(id: ID, ctx?: any): Promise<number | string>
+  approve(id: ID, note?: string): Promise<number>
+  reject(id: ID, note?: string): Promise<number>
 }
+
 export interface DiffService<T, ID> {
   keys(): string[]
   diff(id: ID, ctx?: any): Promise<DiffModel<T, ID>>

package/src/edit.ts

@@ -1,6 +1,64 @@
 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 afterCreated<T>(
+  res: Result<T>,
+  form: HTMLFormElement | undefined | null,
+  successMessage: string,
+  duplicateMessage: string,
+  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(successMessage, () => {
+      if (navigate) {
+        navigate(-1)
+      }
+    })
+  } else {
+    alertError(duplicateMessage)
+  }
+}
+
 export function createModel<T>(attributes?: Attributes): T {
   const obj: any = {}
   if (!attributes) {
@@ -48,39 +106,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,15 +4,11 @@ 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>
@@ -98,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,