react-hook-core 0.4.7 → 0.4.9

package/lib/useSearch.js

@@ -24,12 +24,40 @@ Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
 var core_1 = require("./core")
 var error_1 = require("./error")
+var input_1 = require("./input")
 var merge_1 = require("./merge")
 var reflect_1 = require("./reflect")
 var route_1 = require("./route")
 var search_1 = require("./search")
 var state_1 = require("./state")
 var update_1 = require("./update")
+function showPaging(com, list, pageSize, total) {
+  com.total = total
+  var pageTotal = search_1.getPageTotal(pageSize, total)
+  com.pages = pageTotal
+  com.showPaging = !total || com.pages <= 1 || (list && list.length >= total) ? false : true
+}
+exports.showPaging = showPaging
+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 getRemoveError(u, rmErr) {
+  if (rmErr) {
+    return rmErr
+  }
+  return u && u.ui ? u.ui.removeError : undefined
+}
+exports.getRemoveError = getRemoveError
 function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName)
   var obj = obj2 ? obj2 : {}
@@ -259,7 +287,7 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
       searchError = baseProps.searchError
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      core_1.initForm(refForm.current, registerEvents)
+      input_1.initForm(refForm.current, registerEvents)
     }
     if (p && p.initialize) {
       p.initialize(load, setState, component)
@@ -281,16 +309,20 @@ exports.useSearchOneProps = function (p) {
 exports.useSearchOne = function (p) {
   return exports.useCoreSearch(p.refForm, p.initialState, p.service, p, p)
 }
+function getName(d, n) {
+  return n && n.length > 0 ? n : d
+}
+exports.getName = getName
 exports.useCoreSearch = function (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", p && p.name ? p.name : undefined)
+    return getName("filter", p && p.name ? p.name : undefined)
   }
   var getModelName = p && p.getModelName ? p.getModelName : _getModelName
-  var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1))
+  var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale, getRemoveError(p1))
   var state = baseProps.state,
     setState = baseProps.setState
   var _b = react_1.useState(false),
@@ -359,7 +391,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   }
   var load = p && p.load ? p.load : _load
   var doSearch = function (se, isFirstLoad) {
-    core_1.removeFormError(p1, refForm.current)
+    removeFormError(p1, refForm.current)
     var s = getFilter(se)
     if (isFirstLoad) {
       setState(state)
@@ -370,7 +402,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
         return
       }
       setRunning(true)
-      core_1.showLoading(p1.loading)
+      input_1.showLoading(p1.loading)
       if (p && !p.ignoreUrlParam) {
         search_1.addParametersIntoUrl(s, isFirstLoad)
       }
@@ -383,7 +415,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     })
   }
   var _validateSearch = function (se, callback) {
-    validate(se, callback, refForm.current, p1.getLocale ? p1.getLocale() : undefined, core_1.getValidateForm(p1))
+    validate(se, callback, refForm.current, p1.getLocale ? p1.getLocale() : undefined, getValidateForm(p1))
   }
   var validateSearch = p && p.validateSearch ? p.validateSearch : _validateSearch
   var pageSizeChanged = function (event) {
@@ -473,7 +505,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var searchError = function (err) {
     setComponent({ page: component.tmpPageIndex })
     error_1.error(err, p1.resource.value, p1.showError)
-    core_1.hideLoading(p1.loading)
+    input_1.hideLoading(p1.loading)
   }
   var appendList = p && p.appendList ? p.appendList : appendListOfState
   var setList = p && p.setList ? p.setList : setListOfState
@@ -500,7 +532,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
         setList(results, setState)
       }
     } else {
-      search_1.showPaging(component, sr.list, s.limit, sr.total)
+      showPaging(component, sr.list, s.limit, sr.total)
       setList(results, setState)
       setComponent({ tmpPageIndex: s.page })
       if (s.limit) {
@@ -509,7 +541,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
       }
     }
     setRunning(false)
-    core_1.hideLoading(p1.loading)
+    input_1.hideLoading(p1.loading)
     if (component.triggerSearch) {
       setComponent({ triggerSearch: false })
       resetAndSearch()

package/lib/util.js

@@ -72,15 +72,15 @@ function getStringCurrency(value, datatype, locale, maxLength, isOnBlur) {
     }
   }
   var dotPosition = value.indexOf(".")
-  var beforeDot = dotPosition >= 0 ? value.substr(0, dotPosition) : value
+  var beforeDot = dotPosition >= 0 ? value.substring(0, dotPosition) : value
   if (datatype === "string-currency" || isOnBlur) {
     beforeDot = beforeDot.replace(new RegExp("\\B(?=(\\d{" + groupDigits + "})+(?!\\d))", "g"), groupSeparator)
   }
   var afterDot
   if (dotPosition > 0) {
-    afterDot = value.substr(dotPosition + 1)
+    afterDot = value.substring(dotPosition + 1)
     if (afterDot.length > decimalDigits) {
-      afterDot = afterDot.substr(0, decimalDigits)
+      afterDot = afterDot.substring(0, decimalDigits)
     }
   }
   if (maxLength && beforeDot.length > maxLength - (decimalDigits + 1)) {

package/package.json

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

package/src/core.ts

@@ -1,11 +1,9 @@
-import { Params } from "react-router"
-import { focusFirstElement } from "./formutil"
-
 export interface LoadingService {
   showLoading(firstTime?: boolean): void
   hideLoading(): void
 }
 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
@@ -18,31 +16,13 @@ export class resources {
   static limits = pageSizes
   static pageMaxSize = 7
 }
-export const size = pageSizes
 
-export function getCurrencyCode(form?: HTMLFormElement | null): string | undefined {
-  if (form) {
-    const x = form.getAttribute("currency-code")
-    if (x) {
-      return x
-    }
-  }
-  return undefined
-}
-export function removePhoneFormat(phone: string): string {
-  if (phone) {
-    return phone.replace(resources.phone, "")
-  } else {
-    return phone
-  }
-}
 export interface StringMap {
   [key: string]: string
 }
 export interface ResourceService {
   resource(): StringMap
   value(key: string, param?: any): string
-  format(f: string, ...args: any[]): string
 }
 
 export interface Locale {
@@ -98,13 +78,7 @@ export type DataType =
   | "dates"
   | "datetimes"
   | "times"
-/*
-export interface Metadata {
-  name?: string;
-  attributes: Attributes;
-  source?: string;
-}
-*/
+
 export interface Attribute {
   name?: string
   type?: DataType
@@ -115,219 +89,3 @@ export interface Attribute {
 export interface Attributes {
   [key: string]: Attribute
 }
-
-export function buildKeys(attributes: Attributes): string[] {
-  if (!attributes) {
-    return []
-  }
-  const ks = Object.keys(attributes)
-  const ps = []
-  for (const k of ks) {
-    const attr: Attribute = attributes[k]
-    if (attr.key === true) {
-      ps.push(k)
-    }
-  }
-  return ps
-}
-type Readonly<T> = {
-  readonly [P in keyof T]: T[P]
-}
-export function buildId<ID>(p: Readonly<Params<string>>, keys?: string[]): ID | null {
-  if (!keys || keys.length === 0 || keys.length === 1) {
-    if (keys && keys.length === 1) {
-      if (p[keys[0]]) {
-        return p[keys[0]] as any
-      }
-    }
-    return p["id"] as any
-  }
-  const id: any = {}
-  for (const key of keys) {
-    let v = p[key]
-    if (!v) {
-      v = p[key]
-      if (!v) {
-        return null
-      }
-    }
-    id[key] = v
-  }
-  return id
-}
-export const datetimeToString = (inputDate: Date) => {
-  const date = new Date(inputDate)
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, "0")
-  const day = String(date.getDate()).padStart(2, "0")
-  const hours = String(date.getHours()).padStart(2, "0")
-  const minutes = String(date.getMinutes()).padStart(2, "0")
-  const seconds = String(date.getSeconds()).padStart(2, "0")
-  return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`
-}
-
-export const dateToString = (inputDate: Date) => {
-  const year = inputDate.getFullYear()
-  const month = String(inputDate.getMonth() + 1).padStart(2, "0")
-  const day = String(inputDate.getDate()).padStart(2, "0")
-  return `${year}-${month}-${day}`
-}
-/*
-export function formatFax(value: string) {
-  return formatter.formatFax(value);
-}
-
-export function formatPhone(value: string) {
-  return formatter.formatPhone(value);
-}
-export function formatNumber(num: string|number, scale?: number, locale?: Locale): string {
-  if (!scale) {
-    scale = 2;
-  }
-  if (!locale) {
-    locale = storage.getLocale();
-  }
-  let c: number;
-  if (!num) {
-    return '';
-  } else if (typeof num === 'number') {
-    c = num;
-  } else {
-    const x: any = num;
-    if (isNaN(x)) {
-      return '';
-    } else {
-      c = parseFloat(x);
-    }
-  }
-  return storage.locale().formatNumber(c, scale, locale);
-}
-
-export function formatCurrency(currency: string|number, locale?: Locale, currencyCode?: string) {
-  if (!currencyCode) {
-    currencyCode = 'USD';
-  }
-  if (!locale) {
-    locale = storage.getLocale();
-  }
-  let c: number;
-  if (!currency) {
-    return '';
-  } else if (typeof currency === 'number') {
-    c = currency;
-  } else {
-    let x: any = currency;
-    x = x.replace(locale.decimalSeparator, '.');
-    if (isNaN(x)) {
-      return '';
-    } else {
-      c = parseFloat(x);
-    }
-  }
-  return storage.locale().formatCurrency(c, currencyCode, locale);
-}
-*/
-
-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 getName(d: string, n?: string): string {
-  return n && n.length > 0 ? n : d
-}
-export function getModelName(form?: HTMLFormElement | null, name?: string): string {
-  if (form) {
-    const a = form.getAttribute("model-name")
-    if (a && a.length > 0) {
-      return a
-    }
-    const b = form.name
-    if (b) {
-      if (b.endsWith("Form")) {
-        return b.substr(0, b.length - 4)
-      }
-      return b
-    }
-  }
-  if (name && name.length > 0) {
-    return name
-  }
-  return ""
-}
-
-export const scrollToFocus = (e: any, isUseTimeOut?: boolean) => {
-  try {
-    const element = e.target as HTMLInputElement
-    const form = element.form
-    if (form) {
-      const container = form.childNodes[1] as HTMLElement
-      const elementRect = element.getBoundingClientRect()
-      const absoluteElementTop = elementRect.top + window.pageYOffset
-      const middle = absoluteElementTop - window.innerHeight / 2
-      const scrollTop = container.scrollTop
-      const timeOut = isUseTimeOut ? 300 : 0
-      const isChrome = navigator.userAgent.search("Chrome") > 0
-      setTimeout(() => {
-        if (isChrome) {
-          const scrollPosition = scrollTop === 0 ? elementRect.top + 64 : scrollTop + middle
-          container.scrollTo(0, Math.abs(scrollPosition))
-        } else {
-          container.scrollTo(0, Math.abs(scrollTop + middle))
-        }
-      }, timeOut)
-    }
-  } catch (e) {
-    console.log(e)
-  }
-}
-export interface LoadingParameter {
-  loading?: LoadingService
-}
-export function showLoading(s?: LoadingService): void {
-  if (s) {
-    s.showLoading()
-  }
-}
-export function hideLoading(s?: LoadingService): void {
-  if (s) {
-    s.hideLoading()
-  }
-}
-export interface UIParameter {
-  ui?: UIService
-}
-export function getRemoveError(u?: UIParameter, rmErr?: (el: HTMLInputElement) => void): ((el: HTMLInputElement) => void) | undefined {
-  if (rmErr) {
-    return rmErr
-  }
-  return u && u.ui ? u.ui.removeError : undefined
-}
-export function removeFormError(u?: UIParameter, f?: HTMLFormElement): void {
-  if (f && u && u.ui) {
-    u.ui.removeFormError(f)
-  }
-}
-export function getValidateForm(
-  u?: UIParameter,
-  vf?: (form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean,
-): ((form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean) | undefined {
-  if (vf) {
-    return vf
-  }
-  return u && u.ui ? u.ui.validateForm : undefined
-}
-/*
-export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any): ((form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any) | undefined {
-  if (d) {
-    return d;
-  }
-  return (u && u.ui ? u.ui.decodeFromForm : undefined);
-}
-*/

package/src/edit.ts

@@ -48,31 +48,7 @@ export function createModel<T>(attributes?: Attributes): T {
   }
   return obj
 }
-/*
-export function initPropertyNullInModel<T>(obj: T, m?: Attributes): T {
-  if (!m) {
-    const x: any = {};
-    return x;
-  }
-  const model = createModel(m);
-  for (const key of Object.keys(model as any)) {
-    if (obj && !(obj as any).hasOwnProperty(key)) {
-      (obj as any)[key] = (model as any)[key];
-    }
-  }
-  return obj;
-}
-export function handleStatus(x: number|string, st: EditStatusConfig, gv: (k: string, p?: any) => string, se: (m: string, title?: string, detail?: string, callback?: () => void) => void): void {
-  const title = gv('error');
-  if (x === st.version_error) {
-    se(gv('error_version'), title);
-  } else if (x === st.data_corrupt) {
-    se(gv('error_data_corrupt'), title);
-  } else {
-    se(gv('error_internal'), title);
-  }
-}
-*/
+
 export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
   if (Array.isArray(x)) {
     return false
@@ -83,6 +59,7 @@ export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
   }
   return false
 }
+
 type Result<T> = number | T | ErrorMessage[]
 export function afterSaved<T>(
   res: Result<T>,

package/src/formutil.ts

@@ -40,33 +40,6 @@ export function setReadOnly(form?: HTMLFormElement | null, ...args: string[]): v
     }
   }
 }
-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
-      }
-    }
-  }
-}
 export function focusFirstError(form?: HTMLFormElement | null, className?: string): void {
   if (!form) {
     return

package/src/index.ts

@@ -203,3 +203,29 @@ export function datetimeToString(date?: Date | string): string | undefined {
 export function getNumber(event: ChangeEvent<HTMLSelectElement | HTMLInputElement>): number {
   return parseInt(event.currentTarget.value, 10)
 }
+
+export const scrollToFocus = (e: any, isUseTimeOut?: boolean) => {
+  try {
+    const element = e.target as HTMLInputElement
+    const form = element.form
+    if (form) {
+      const container = form.childNodes[1] as HTMLElement
+      const elementRect = element.getBoundingClientRect()
+      const absoluteElementTop = elementRect.top + window.pageYOffset
+      const middle = absoluteElementTop - window.innerHeight / 2
+      const scrollTop = container.scrollTop
+      const timeOut = isUseTimeOut ? 300 : 0
+      const isChrome = navigator.userAgent.search("Chrome") > 0
+      setTimeout(() => {
+        if (isChrome) {
+          const scrollPosition = scrollTop === 0 ? elementRect.top + 64 : scrollTop + middle
+          container.scrollTo(0, Math.abs(scrollPosition))
+        } else {
+          container.scrollTo(0, Math.abs(scrollTop + middle))
+        }
+      }, timeOut)
+    }
+  } catch (e) {
+    console.log(e)
+  }
+}

package/src/input.ts

@@ -81,23 +81,55 @@ export function getErrorFunc(
   }
   return (p as any).showError
 }
-/*
-export interface EditStatusParameter {
-  status?: EditStatusConfig;
-}
-export function getEditStatusFunc(p: ResourceService|EditStatusParameter, status?: EditStatusConfig): EditStatusConfig {
-  if (status) {
-    return status;
+
+export function showLoading(s?: LoadingService): void {
+  if (s) {
+    s.showLoading()
   }
-  return (p as any).status;
 }
-export interface DiffStatusParameter {
-  status?: DiffStatusConfig;
+export function hideLoading(s?: LoadingService): void {
+  if (s) {
+    s.hideLoading()
+  }
 }
-export function getDiffStatusFunc(p: ResourceService|DiffStatusParameter, status?: DiffStatusConfig): DiffStatusConfig {
-  if (status) {
-    return status;
+
+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
+      }
+    }
   }
-  return (p as any).status;
 }
-*/

package/src/reflect.ts

@@ -1,6 +1,3 @@
-import { NavigateFunction } from "react-router-dom"
-import { StringMap } from "./core"
-
 export function clone(obj: any): any {
   if (!obj) {
     return obj
@@ -143,22 +140,6 @@ export function hasDiff<T>(o1: T, o2: T, keys?: string[], version?: string): boo
   return !isEmptyObject(diff)
 }
 
-export function goBack<T>(
-  navigate: NavigateFunction,
-  confirm: (msg: string, yesCallback?: () => void) => void,
-  resource: StringMap,
-  o1: T,
-  o2: T,
-  keys?: string[],
-  version?: string,
-) {
-  if (!hasDiff(o1, o2, keys, version)) {
-    navigate(-1)
-  } else {
-    confirm(resource.msg_confirm_back, () => navigate(-1))
-  }
-}
-
 export function notIn(s1: string[], s2: string[]): string[] {
   const r = []
   for (const s of s2) {

package/src/route.ts

@@ -1,6 +1,25 @@
 import * as qs from "query-string"
+import { NavigateFunction } from "react-router-dom"
+import { StringMap } from "./core"
+import { hasDiff } from "./reflect"
 import { Filter } from "./search"
 
+export function goBack<T>(
+  navigate: NavigateFunction,
+  confirm: (msg: string, yesCallback?: () => void) => void,
+  resource: StringMap,
+  o1: T,
+  o2: T,
+  keys?: string[],
+  version?: string,
+) {
+  if (!hasDiff(o1, o2, keys, version)) {
+    navigate(-1)
+  } else {
+    confirm(resource.msg_confirm_back, () => navigate(-1))
+  }
+}
+
 export function buildFromUrl<S extends Filter>(modelT?: S): S {
   return buildParameters<S>(window.location.search, modelT)
 }