react-hook-core 0.0.1 → 0.1.3

package/src/update.ts

@@ -1,8 +1,20 @@
-import {getModelName as getModelName2, Locale, ModelProps, removePhoneFormat} from './core';
+import {getModelName as getModelName2, Locale, removePhoneFormat} from './core';
 import {useMergeState} from './merge';
 import {buildFlatState, buildState, handleEvent, handleProps, localeOf} from './state';
 
-export const useUpdate = <T>(initialState: T, getLocale?: () => Locale, removeErr?: (ctrl: HTMLInputElement) => void, getName?: (f?: HTMLFormElement) => string) => {
+const m = 'model';
+const _getModelName = (f2?: HTMLFormElement|null): string => {
+  return getModelName2(f2, m);
+};
+export const useUpdate = <T>(initialState: T, getName?: ((f?: HTMLFormElement|null) => string) | string, getLocale?: (() => Locale) | Locale, removeErr?: (ctrl: HTMLInputElement) => void) => {
+  return useUpdateWithProps<T, any>(undefined, initialState, getName, getLocale, removeErr);
+};
+function prepareData(data: any): void {
+}
+export const useUpdateWithProps = <T, P>(props: P|undefined, initialState: T, getName?: ((f?: HTMLFormElement|null) => string) | string, getLocale?: (() => Locale) | Locale, removeErr?: (ctrl: HTMLInputElement) => void, prepareCustomData?: (d: any) => void) => {
+  if (!prepareCustomData) {
+    prepareCustomData = prepareData;
+  }
   const [state, setState] = useMergeState<T>(initialState);
 
   const updatePhoneState = (event: any) => {
@@ -23,31 +35,35 @@ export const useUpdate = <T>(initialState: T, getLocale?: () => Locale, removeEr
       updateState(event);
     }
   };
-  const _getModelName = (f2?: HTMLFormElement) => {
-    if (f2) {
-      const a = getModelName2(f2);
-      if (a && a.length > 0) {
-        return a;
-      }
-    }
-    return 'model';
-  };
-  const getModelName = getName ? getName : _getModelName;
+  const getModelName: (f2?: HTMLFormElement|null) => string = (typeof getName === 'function' ? getName : _getModelName);
+
   const updateState = (e: any, callback?: () => void, lc?: Locale) => {
     const ctrl = e.currentTarget as HTMLInputElement;
-    const modelName = getModelName(ctrl.form);
+    let mn: string = m;
+    if (getName) {
+      if (typeof getName === 'string') {
+        mn = getName;
+      } else {
+        mn = getName(ctrl.form);
+      }
+    } else {
+      mn = _getModelName(ctrl.form);
+    }
     const l = localeOf(lc, getLocale);
     handleEvent(e, removeErr);
-    const objSet = buildState(e, state, ctrl, modelName, l);
-    if (objSet) {
-      if (callback) {
-        setState(objSet, callback);
-      } else {
-        setState(objSet);
+    if (props && (props as any).setGlobalState) {
+      handleProps<P>(e, props, ctrl, mn, l, prepareCustomData);
+    } else {
+      const objSet = buildState(e, state, ctrl, mn, l);
+      if (objSet) {
+        if (callback) {
+          setState(objSet, callback);
+        } else {
+          setState(objSet);
+        }
       }
     }
   };
-
   const updateFlatState = (e: any, callback?: () => void, lc?: Locale) => {
     const objSet = buildFlatState(e, state, lc);
     if (objSet) {
@@ -58,45 +74,6 @@ export const useUpdate = <T>(initialState: T, getLocale?: () => Locale, removeEr
       }
     }
   };
-
-  return {
-    getModelName,
-    updateState,
-    updatePhoneState,
-    updateFlatState,
-    getLocale,
-    setState,
-    state
-  };
-};
-function prepareData(data: any): void {
-}
-export const useUpdateWithProps = <T, P extends ModelProps>(props: P, initialState: T, gl?: () => Locale, removeErr?: (ctrl: HTMLInputElement) => void, getName?: (f?: HTMLFormElement) => string, prepareCustomData?: (d: any) => void) => {
-  if (!prepareCustomData) {
-    prepareCustomData = prepareData;
-  }
-  const baseProps = useUpdate<T>(initialState, gl, removeErr, getName);
-  const {getModelName, updatePhoneState, updateFlatState, getLocale, state, setState} = baseProps;
-
-  const updateState = (e: any, callback?: () => void, lc?: Locale) => {
-    const ctrl = e.currentTarget as HTMLInputElement;
-    const modelName = getModelName(ctrl.form);
-    const l = localeOf(lc, gl);
-    handleEvent(e, removeErr);
-    if (props.setGlobalState) {
-      handleProps<P>(e, props, ctrl, modelName, l, prepareCustomData);
-    } else {
-      const objSet = buildState(e, state, ctrl, modelName, l);
-      if (objSet) {
-        if (callback) {
-          setState(objSet, callback);
-        } else {
-          setState(objSet);
-        }
-      }
-    }
-  };
-
   return {
     getModelName,
     updateState,