react-hook-core 0.4.15 → 0.4.16

package/lib/common.js

@@ -28,3 +28,60 @@ function error(err, resource, ae) {
   }
 }
 exports.error = error
+function showLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.showLoading()
+    }
+  }
+}
+exports.showLoading = showLoading
+function hideLoading(loading) {
+  if (loading) {
+    if (typeof loading === "function") {
+      loading()
+    } else {
+      loading.hideLoading()
+    }
+  }
+}
+exports.hideLoading = hideLoading
+function initForm(form, initMat) {
+  if (form) {
+    setTimeout(function () {
+      if (initMat) {
+        initMat(form)
+      }
+      focusFirstElement(form)
+    }, 100)
+  }
+  return form
+}
+exports.initForm = initForm
+function focusFirstElement(form) {
+  var i = 0
+  var len = form.length
+  for (i = 0; i < len; i++) {
+    var ctrl = form[i]
+    if (!(ctrl.readOnly || ctrl.disabled)) {
+      var nodeName = ctrl.nodeName
+      var type = ctrl.getAttribute("type")
+      if (type) {
+        var 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()
+        return
+      }
+    }
+  }
+}
+exports.focusFirstElement = focusFirstElement

package/lib/index.js

@@ -10,7 +10,6 @@ __export(require("./core"))
 __export(require("./diff"))
 __export(require("./edit"))
 __export(require("./formutil"))
-__export(require("./input"))
 __export(require("./reflect"))
 __export(require("./route"))
 __export(require("./search"))

package/lib/useEdit.js

@@ -20,7 +20,6 @@ var common_1 = require("./common")
 var core_1 = require("./core")
 var edit_1 = require("./edit")
 var formutil_1 = require("./formutil")
-var input_1 = require("./input")
 var reflect_1 = require("./reflect")
 var state_1 = require("./state")
 var update_1 = require("./update")
@@ -113,13 +112,13 @@ function handleVersion(obj, version) {
   }
 }
 exports.handleVersion = handleVersion
-exports.useEdit = function (refForm, initialState, service, p2, p) {
+exports.useEdit = function (refForm, initialState, service, resource, p2, p) {
   var params = react_router_1.useParams()
-  var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p)
+  var baseProps = exports.useCoreEdit(refForm, initialState, service, resource, p2, p)
   react_1.useEffect(function () {
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      input_1.initForm(baseProps.refForm.current, registerEvents)
+      common_1.initForm(baseProps.refForm.current, registerEvents)
     }
     var n = baseProps.getModelName(refForm.current)
     var obj = {}
@@ -144,19 +143,19 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
         baseProps.load(id, p ? p.callback : undefined)
       } catch (error) {
         p2.showError(error)
-        input_1.hideLoading(p2.loading)
+        common_1.hideLoading(p2.loading)
       }
     }
   }, [])
   return __assign({}, baseProps)
 }
-exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
+exports.useEditProps = function (props, refForm, initialState, service, resource, p2, p) {
   var params = react_router_1.useParams()
-  var baseProps = exports.useCoreEdit(refForm, initialState, service, p2, p, props)
+  var baseProps = exports.useCoreEdit(refForm, initialState, service, resource, p2, p, props)
   react_1.useEffect(function () {
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      input_1.initForm(baseProps.refForm.current, registerEvents)
+      common_1.initForm(baseProps.refForm.current, registerEvents)
     }
     var n = baseProps.getModelName(refForm.current)
     var obj = {}
@@ -182,13 +181,13 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
   }, [])
   return __assign({}, baseProps)
 }
-exports.useEditOneProps = function (p) {
-  return exports.useEditProps(p.props, p.refForm, p.initialState, p.service, p, p)
+exports.useEditOneProps = function (resource, p) {
+  return exports.useEditProps(p.props, p.refForm, p.initialState, p.service, resource, p, p)
 }
-exports.useEditOne = function (p) {
-  return exports.useEdit(p.refForm, p.initialState, p.service, p, p)
+exports.useEditOne = function (resource, p) {
+  return exports.useEdit(p.refForm, p.initialState, p.service, resource, p, p)
 }
-exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
+exports.useCoreEdit = function (refForm, initialState, service, resource, p1, p, props) {
   var navigate = react_router_1.useNavigate()
   var _a = react_1.useState(),
     running = _a[0],
@@ -228,7 +227,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (form) {
       formutil_1.setReadOnly(form)
     }
-    var resource = p1.resource.resource()
     p1.showError(
       resource.error_404,
       function () {
@@ -260,7 +258,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       if (objKeys.length === 0) {
         navigate(-1)
       } else {
-        var resource = p1.resource.resource()
         p1.confirm(
           resource.msg_confirm_back,
           function () {
@@ -296,7 +293,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     }
   }
   var _onSave = function (isBack) {
-    var resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
         p1.showError(resource.error_permission_add, undefined, resource.error_permission)
@@ -384,7 +380,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   }
   var succeed = p && p.succeed ? p.succeed : _succeed
   var _fail = function (result) {
-    var resource = p1.resource.resource()
     var f = refForm.current
     var u = p1.ui
     if (u && f) {
@@ -411,9 +406,8 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var fail = p && p.fail ? p.fail : _fail
   var _handleError = function (err) {
     if (err) {
-      var resource = p1.resource.resource()
       setRunning(false)
-      input_1.hideLoading(p1.loading)
+      common_1.hideLoading(p1.loading)
       var errHeader = resource.error
       var errMsg = resource.error_internal
       var data = err && err.response ? err.response : err
@@ -428,8 +422,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var handleError = p && p.handleError ? p.handleError : _handleError
   var _postSave = function (r, origin, version, isPatch, backOnSave) {
     setRunning(false)
-    var resource = p1.resource.resource()
-    input_1.hideLoading(p1.loading)
+    common_1.hideLoading(p1.loading)
     var x = r
     var successMsg = resource.msg_save_success
     var newMod = flag.newMode
@@ -467,13 +460,12 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   }
   var postSave = p && p.postSave ? p.postSave : _postSave
   var _handleDuplicateKey = function (result) {
-    var resource = p1.resource.resource()
     p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   var handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
   var _doSave = function (obj, body, version, isBack) {
     setRunning(true)
-    input_1.showLoading(p1.loading)
+    common_1.showLoading(p1.loading)
     var isBackO = isBack != null && isBack !== undefined ? isBack : false
     var patchable = p ? p.patchable : true
     if (flag.newMode === false) {
@@ -506,7 +498,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     var id = _id
     if (id != null && id !== "") {
       setRunning(true)
-      input_1.showLoading(p1.loading)
+      common_1.showLoading(p1.loading)
       service
         .load(id)
         .then(function (obj) {
@@ -521,12 +513,11 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
             }
           }
           setRunning(false)
-          input_1.hideLoading(p1.loading)
+          common_1.hideLoading(p1.loading)
         })
         .catch(function (err) {
           var _a, _b, _c
           var data = err && err.response ? err.response : err
-          var resource = p1.resource.resource()
           var title = resource.error
           var msg = resource.error_internal
           if (data && data.status === 422) {
@@ -549,7 +540,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
             }
           }
           setRunning(false)
-          input_1.hideLoading(p1.loading)
+          common_1.hideLoading(p1.loading)
         })
     } else {
       var obj = createModel()
@@ -566,7 +557,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     back: back,
     refForm: refForm,
     ui: p1.ui,
-    resource: p1.resource.resource(),
     flag: flag,
     running: running,
     setRunning: setRunning,

package/lib/useSearch.js

@@ -24,7 +24,6 @@ Object.defineProperty(exports, "__esModule", { value: true })
 var react_1 = require("react")
 var common_1 = require("./common")
 var core_1 = require("./core")
-var input_1 = require("./input")
 var reflect_1 = require("./reflect")
 var route_1 = require("./route")
 var search_1 = require("./search")
@@ -277,8 +276,8 @@ function mergeParam(p) {
   }
 }
 exports.mergeParam = mergeParam
-exports.useSearch = function (refForm, initialState, service, p2, p) {
-  var baseProps = exports.useCoreSearch(refForm, initialState, service, p2, p)
+exports.useSearch = function (refForm, initialState, service, resource, p2, p) {
+  var baseProps = exports.useCoreSearch(refForm, initialState, service, resource, p2, p)
   react_1.useEffect(function () {
     var load = baseProps.load,
       setState = baseProps.setState,
@@ -286,7 +285,7 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
       searchError = baseProps.searchError
     if (refForm) {
       var registerEvents = p2.ui ? p2.ui.registerEvents : undefined
-      input_1.initForm(refForm.current, registerEvents)
+      common_1.initForm(refForm.current, registerEvents)
     }
     if (p && p.initialize) {
       p.initialize(load, setState, component)
@@ -302,17 +301,17 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
   }, [])
   return __assign({}, baseProps)
 }
-exports.useSearchOneProps = function (p) {
-  return exports.useSearch(p.refForm, p.initialState, p.service, p, p)
+exports.useSearchOneProps = function (resource, p) {
+  return exports.useSearch(p.refForm, p.initialState, p.service, resource, p, p)
 }
-exports.useSearchOne = function (p) {
-  return exports.useCoreSearch(p.refForm, p.initialState, p.service, p, p)
+exports.useSearchOne = function (resource, p) {
+  return exports.useCoreSearch(p.refForm, p.initialState, p.service, resource, p, p)
 }
 function getName(d, n) {
   return n && n.length > 0 ? n : d
 }
 exports.getName = getName
-exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
+exports.useCoreSearch = function (refForm, initialState, service, resource, p1, p2) {
   var p = mergeParam(p2)
   var _a = react_1.useState(),
     running = _a[0],
@@ -401,7 +400,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
         return
       }
       setRunning(true)
-      input_1.showLoading(p1.loading)
+      common_1.showLoading(p1.loading)
       if (p && !p.ignoreUrlParam) {
         search_1.addParametersIntoUrl(s, isFirstLoad)
       }
@@ -503,9 +502,8 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   }
   var searchError = function (err) {
     setComponent({ page: component.tmpPageIndex })
-    var resource = p1.resource.resource()
     common_1.error(err, resource, p1.showError)
-    input_1.hideLoading(p1.loading)
+    common_1.hideLoading(p1.loading)
   }
   var appendList = p && p.appendList ? p.appendList : appendListOfState
   var setList = p && p.setList ? p.setList : setListOfState
@@ -536,12 +534,12 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
       setList(results, setState)
       setComponent({ tmpPageIndex: s.page })
       if (s.limit) {
-        var m1 = search_1.buildMessage(p1.resource.resource(), sr.list, s.limit, s.page, sr.total)
+        var m1 = search_1.buildMessage(resource, sr.list, s.limit, s.page, sr.total)
         p1.showMessage(m1)
       }
     }
     setRunning(false)
-    input_1.hideLoading(p1.loading)
+    common_1.hideLoading(p1.loading)
     if (component.triggerSearch) {
       setComponent({ triggerSearch: false })
       resetAndSearch()
@@ -571,7 +569,6 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     running: running,
     setRunning: setRunning,
     getCurrencyCode: getCurrencyCode,
-    resource: p1.resource.resource(),
     setComponent: setComponent,
     component: component,
     showMessage: p1.showMessage,

package/package.json

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

package/src/common.ts

@@ -1,4 +1,4 @@
-import { StringMap } from "./core"
+import { LoadingService, StringMap } from "./core"
 
 export function messageByHttpStatus(status: number, resource: StringMap): string {
   const k = "error_" + status
@@ -26,3 +26,63 @@ 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

@@ -20,10 +20,6 @@ export class resources {
 export interface StringMap {
   [key: string]: string
 }
-export interface ResourceService {
-  resource(): StringMap
-}
-
 export interface Locale {
   id?: string
   countryCode: string

package/src/diff.ts

@@ -1,12 +1,10 @@
-import { LoadingService, ResourceService } from "./core"
+import { LoadingService } from "./core"
 import { clone } from "./reflect"
 
 export interface DiffParameter {
-  resource: ResourceService
   showMessage: (msg: string, option?: string) => void
   showError: (m: string, header?: string, detail?: string, callback?: () => void) => void
   loading?: LoadingService
-  // status?: DiffStatusConfig;
 }
 export interface BaseDiffState {
   disabled: boolean

package/src/index.ts

@@ -5,7 +5,6 @@ export * from "./core"
 export * from "./diff"
 export * from "./edit"
 export * from "./formutil"
-export * from "./input"
 export * from "./reflect"
 export * from "./route"
 export * from "./search"

package/src/useEdit.ts

@@ -1,10 +1,9 @@
 import { useEffect, useState } from "react"
 import { Params, useNavigate, useParams } from "react-router"
-import { messageByHttpStatus } from "./common"
-import { Attribute, Attributes, ErrorMessage, LoadingService, Locale, resources, ResourceService, UIService } from "./core"
+import { hideLoading, initForm, messageByHttpStatus, showLoading } from "./common"
+import { Attribute, Attributes, ErrorMessage, LoadingService, Locale, resources, StringMap, UIService } from "./core"
 import { createModel as createModel2 } from "./edit"
 import { focusFirstError, setReadOnly } from "./formutil"
-import { hideLoading, initForm, showLoading } from "./input"
 import { clone, makeDiff } from "./reflect"
 import { localeOf } from "./state"
 import { DispatchWithCallback, getModelName as getModelName2, useMergeState, useUpdate } from "./update"
@@ -50,14 +49,12 @@ export function buildId<ID>(p: Readonly<Params<string>>, keys?: string[]): ID |
 }
 
 export interface EditParameter {
-  resource: ResourceService
   showMessage: (msg: string, option?: string) => void
   showError: (m: string, callback?: () => void, header?: string) => void
   confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void
   ui?: UIService
   getLocale?: (profile?: string) => Locale
   loading?: LoadingService
-  // status?: EditStatusConfig;
 }
 export interface GenericService<T, ID, R> {
   metadata?(): Attributes | undefined
@@ -162,7 +159,7 @@ export interface HookBaseEditParameter<T, ID, S> extends BaseEditComponentParam<
   refForm: any
   initialState: S
   service: GenericService<T, ID, number | T | ErrorMessage[]>
-  resource: ResourceService
+  // resource: ResourceService
   showMessage: (msg: string) => void
   showError: (m: string, callback?: () => void, header?: string) => void
   getLocale?: () => Locale
@@ -196,12 +193,12 @@ export const useEdit = <T, ID, S>(
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number | T | ErrorMessage[]>,
-
+  resource: StringMap,
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>,
 ) => {
   const params = useParams()
-  const baseProps = useCoreEdit(refForm, initialState, service, p2, p)
+  const baseProps = useCoreEdit(refForm, initialState, service, resource, p2, p)
   useEffect(() => {
     if (refForm) {
       const registerEvents = p2.ui ? p2.ui.registerEvents : undefined
@@ -242,11 +239,12 @@ export const useEditProps = <T, ID, S, P>(
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number | T | ErrorMessage[]>,
+  resource: StringMap,
   p2: EditParameter,
   p?: EditComponentParam<T, ID, S>,
 ) => {
   const params = useParams()
-  const baseProps = useCoreEdit<T, ID, S, P>(refForm, initialState, service, p2, p, props)
+  const baseProps = useCoreEdit<T, ID, S, P>(refForm, initialState, service, resource, p2, p, props)
   useEffect(() => {
     if (refForm) {
       const registerEvents = p2.ui ? p2.ui.registerEvents : undefined
@@ -277,16 +275,17 @@ export const useEditProps = <T, ID, S, P>(
   }, [])
   return { ...baseProps }
 }
-export const useEditOneProps = <T, ID, S, P>(p: HookPropsEditParameter<T, ID, S, P>) => {
-  return useEditProps(p.props, p.refForm, p.initialState, p.service, p, p)
+export const useEditOneProps = <T, ID, S, P>(resource: StringMap, p: HookPropsEditParameter<T, ID, S, P>) => {
+  return useEditProps(p.props, p.refForm, p.initialState, p.service, resource, p, p)
 }
-export const useEditOne = <T, ID, S>(p: HookBaseEditParameter<T, ID, S>) => {
-  return useEdit(p.refForm, p.initialState, p.service, p, p)
+export const useEditOne = <T, ID, S>(resource: StringMap, p: HookBaseEditParameter<T, ID, S>) => {
+  return useEdit(p.refForm, p.initialState, p.service, resource, p, p)
 }
 export const useCoreEdit = <T, ID, S, P>(
   refForm: any,
   initialState: S,
   service: GenericService<T, ID, number | T | ErrorMessage[]>,
+  resource: StringMap,
   p1: EditParameter,
   p?: BaseEditComponentParam<T, ID>,
   props?: P,
@@ -339,7 +338,6 @@ export const useCoreEdit = <T, ID, S, P>(
     if (form) {
       setReadOnly(form)
     }
-    const resource = p1.resource.resource()
     p1.showError(resource.error_404, () => window.history.back, resource.error)
   }
   const handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
@@ -367,7 +365,6 @@ export const useCoreEdit = <T, ID, S, P>(
       if (objKeys.length === 0) {
         navigate(-1)
       } else {
-        const resource = p1.resource.resource()
         p1.confirm(
           resource.msg_confirm_back,
           () => {
@@ -405,7 +402,6 @@ export const useCoreEdit = <T, ID, S, P>(
   }
 
   const _onSave = (isBack?: boolean) => {
-    const resource = p1.resource.resource()
     if (p && p.readOnly) {
       if (flag.newMode === true) {
         p1.showError(resource.error_permission_add, undefined, resource.error_permission)
@@ -497,7 +493,6 @@ export const useCoreEdit = <T, ID, S, P>(
   const succeed = p && p.succeed ? p.succeed : _succeed
 
   const _fail = (result: ErrorMessage[]) => {
-    const resource = p1.resource.resource()
     const f = refForm.current
     const u = p1.ui
     if (u && f) {
@@ -525,7 +520,6 @@ export const useCoreEdit = <T, ID, S, P>(
 
   const _handleError = function (err: any) {
     if (err) {
-      const resource = p1.resource.resource()
       setRunning(false)
       hideLoading(p1.loading)
       const errHeader = resource.error
@@ -543,7 +537,6 @@ export const useCoreEdit = <T, ID, S, P>(
 
   const _postSave = (r: number | T | ErrorMessage[], origin: T, version?: string, isPatch?: boolean, backOnSave?: boolean) => {
     setRunning(false)
-    const resource = p1.resource.resource()
     hideLoading(p1.loading)
     const x: any = r
     const successMsg = resource.msg_save_success
@@ -583,7 +576,6 @@ export const useCoreEdit = <T, ID, S, P>(
   const postSave = p && p.postSave ? p.postSave : _postSave
 
   const _handleDuplicateKey = (result?: T) => {
-    const resource = p1.resource.resource()
     p1.showError(resource.error_duplicate_key, undefined, resource.error)
   }
   const handleDuplicateKey = p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey
@@ -640,7 +632,6 @@ export const useCoreEdit = <T, ID, S, P>(
         })
         .catch((err: any) => {
           const data = err && err.response ? err.response : err
-          const resource = p1.resource.resource()
           const title = resource.error
           let msg = resource.error_internal
           if (data && data.status === 422) {
@@ -682,7 +673,6 @@ export const useCoreEdit = <T, ID, S, P>(
     back,
     refForm,
     ui: p1.ui,
-    resource: p1.resource.resource(),
     flag,
     running,
     setRunning,

package/src/useMessage.ts

@@ -1,11 +1,5 @@
 import * as React from "react"
-
-interface ErrorMessage {
-  field: string
-  code: string
-  param?: string | number | Date
-  message?: string
-}
+import { ErrorMessage } from "./core"
 
 export interface MessageState {
   message?: string

package/src/useSearch.ts

@@ -1,7 +1,6 @@
 import { useEffect, useState } from "react"
-import { error } from "./common"
-import { LoadingService, Locale, pageSizes, resources, ResourceService, UIService } from "./core"
-import { hideLoading, initForm, showLoading } from "./input"
+import { error, hideLoading, initForm, showLoading } from "./common"
+import { LoadingService, Locale, pageSizes, resources, StringMap, UIService } from "./core"
 import { clone } from "./reflect"
 import { buildFromUrl } from "./route"
 import {
@@ -36,7 +35,6 @@ interface Searchable extends Pagination, Sortable {
   excluding?: string[] | number[]
 }
 export interface SearchParameter {
-  resource: ResourceService
   showMessage: (msg: string, option?: string) => void
   showError: (m: string, callback?: () => void, h?: string) => void
   ui?: UIService
@@ -325,7 +323,7 @@ export interface HookBaseSearchParameter<T, S extends Filter, ST extends SearchC
   refForm: any
   initialState: ST
   service: ((s: S, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>
-  resource: ResourceService
+  // resource: ResourceService
   showMessage: (msg: string) => void
   showError: (m: string, callback?: () => void, header?: string) => void
   getLocale?: () => Locale
@@ -411,10 +409,11 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
   refForm: any,
   initialState: ST,
   service: ((s: S, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
+  resource: StringMap,
   p2: SearchParameter,
   p?: InitSearchComponentParam<T, S, ST>,
 ) => {
-  const baseProps = useCoreSearch(refForm, initialState, service, p2, p)
+  const baseProps = useCoreSearch(refForm, initialState, service, resource, p2, p)
 
   useEffect(() => {
     const { load, setState, component, searchError } = baseProps
@@ -437,11 +436,14 @@ export const useSearch = <T, S extends Filter, ST extends SearchComponentState<T
   }, [])
   return { ...baseProps }
 }
-export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponentState<T, S>, P>(p: HookPropsSearchParameter<T, S, ST, P>) => {
-  return useSearch(p.refForm, p.initialState, p.service, p, p)
+export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponentState<T, S>, P>(
+  resource: StringMap,
+  p: HookPropsSearchParameter<T, S, ST, P>,
+) => {
+  return useSearch(p.refForm, p.initialState, p.service, resource, p, p)
 }
-export const useSearchOne = <T, S extends Filter, ST extends SearchComponentState<T, S>>(p: HookBaseSearchParameter<T, S, ST>) => {
-  return useCoreSearch(p.refForm, p.initialState, p.service, p, p)
+export const useSearchOne = <T, S extends Filter, ST extends SearchComponentState<T, S>>(resource: StringMap, p: HookBaseSearchParameter<T, S, ST>) => {
+  return useCoreSearch(p.refForm, p.initialState, p.service, resource, p, p)
 }
 
 export function getName(d: string, n?: string): string {
@@ -451,6 +453,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   refForm: any,
   initialState: ST,
   service: ((s: S, limit?: number, offset?: number | string, fields?: string[]) => Promise<SearchResult<T>>) | SearchService<T, S>,
+  resource: StringMap,
   p1: SearchParameter,
   p2?: SearchComponentParam<T, S>,
 ) => {
@@ -655,7 +658,6 @@ export const useCoreSearch = <T, S extends Filter, ST>(
 
   const searchError = (err: any): void => {
     setComponent({ page: component.tmpPageIndex })
-    const resource = p1.resource.resource()
     error(err, resource, p1.showError)
     hideLoading(p1.loading)
   }
@@ -688,7 +690,7 @@ export const useCoreSearch = <T, S extends Filter, ST>(
       setList(results, setState as any)
       setComponent({ tmpPageIndex: s.page })
       if (s.limit) {
-        const m1 = buildMessage(p1.resource.resource(), sr.list, s.limit, s.page, sr.total)
+        const m1 = buildMessage(resource, sr.list, s.limit, s.page, sr.total)
         p1.showMessage(m1)
       }
     }
@@ -726,7 +728,6 @@ export const useCoreSearch = <T, S extends Filter, ST>(
     running,
     setRunning,
     getCurrencyCode,
-    resource: p1.resource.resource(),
     setComponent,
     component,
     showMessage: p1.showMessage,

package/tsconfig.json

@@ -13,18 +13,8 @@
     "declaration": false,
     "experimentalDecorators": false,
     "removeComments": true,
-    "lib": [
-      "dom",
-      "es6",
-      "es7",
-      "es2017",
-      "es2022"
-    ]
+    "lib": ["dom", "es6", "es7", "es2017"]
   },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["src/**/*.ts"],
+  "exclude": ["node_modules"]
 }

package/lib/input.js

@@ -1,118 +0,0 @@
-"use strict"
-Object.defineProperty(exports, "__esModule", { value: true })
-function getResource(p) {
-  var x = p
-  if (x.value && x.format && typeof x.value === "function") {
-    return x
-  } else {
-    return x.resource
-  }
-}
-exports.getResource = getResource
-function getAutoSearch(p) {
-  var x = p
-  if (x.value && x.format && typeof x.value === "function") {
-    return true
-  }
-  return x.auto
-}
-exports.getAutoSearch = getAutoSearch
-function getUIService(p, ui0) {
-  if (ui0) {
-    return ui0
-  }
-  return p.ui
-}
-exports.getUIService = getUIService
-function getLoadingFunc(p, ui0) {
-  if (ui0) {
-    return ui0
-  }
-  return p.loading
-}
-exports.getLoadingFunc = getLoadingFunc
-function getMsgFunc(p, showMsg) {
-  if (showMsg) {
-    return showMsg
-  }
-  return p.showMessage
-}
-exports.getMsgFunc = getMsgFunc
-function getConfirmFunc(p, cf) {
-  if (cf) {
-    return cf
-  }
-  return p.confirm
-}
-exports.getConfirmFunc = getConfirmFunc
-function getLocaleFunc(p, getLoc) {
-  if (getLoc) {
-    return getLoc
-  }
-  return p.getLocale
-}
-exports.getLocaleFunc = getLocaleFunc
-function getErrorFunc(p, showErr) {
-  if (showErr) {
-    return showErr
-  }
-  return p.showError
-}
-exports.getErrorFunc = getErrorFunc
-function showLoading(loading) {
-  if (loading) {
-    if (typeof loading === "function") {
-      loading()
-    } else {
-      loading.showLoading()
-    }
-  }
-}
-exports.showLoading = showLoading
-function hideLoading(loading) {
-  if (loading) {
-    if (typeof loading === "function") {
-      loading()
-    } else {
-      loading.hideLoading()
-    }
-  }
-}
-exports.hideLoading = hideLoading
-function initForm(form, initMat) {
-  if (form) {
-    setTimeout(function () {
-      if (initMat) {
-        initMat(form)
-      }
-      focusFirstElement(form)
-    }, 100)
-  }
-  return form
-}
-exports.initForm = initForm
-function focusFirstElement(form) {
-  var i = 0
-  var len = form.length
-  for (i = 0; i < len; i++) {
-    var ctrl = form[i]
-    if (!(ctrl.readOnly || ctrl.disabled)) {
-      var nodeName = ctrl.nodeName
-      var type = ctrl.getAttribute("type")
-      if (type) {
-        var 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()
-        return
-      }
-    }
-  }
-}
-exports.focusFirstElement = focusFirstElement

package/src/input.ts

@@ -1,143 +0,0 @@
-import { LoadingService, Locale, ResourceService, UIService } from "./core"
-
-interface ResourceInput {
-  resource: ResourceService
-}
-export function getResource(p: ResourceService | ResourceInput): ResourceService {
-  const x: any = p
-  if (x.value && x.format && typeof x.value === "function") {
-    return x
-  } else {
-    return x.resource
-  }
-}
-interface ShortSearchParameter {
-  auto?: boolean
-}
-export function getAutoSearch(p: ResourceService | ShortSearchParameter): boolean {
-  const x: any = p
-  if (x.value && x.format && typeof x.value === "function") {
-    return true
-  }
-  return x.auto
-}
-interface UIInput {
-  ui?: UIService
-}
-export function getUIService(p: ResourceService | UIInput, ui0?: UIService): UIService {
-  if (ui0) {
-    return ui0
-  }
-  return (p as any).ui
-}
-interface LoadingInput {
-  loading?: LoadingService
-}
-export function getLoadingFunc(p: ResourceService | LoadingInput, ui0?: LoadingService): LoadingService {
-  if (ui0) {
-    return ui0
-  }
-  return (p as any).loading
-}
-interface ShowMessageInput {
-  showMessage: (msg: string, option?: string) => void
-}
-export function getMsgFunc(p: ResourceService | ShowMessageInput, showMsg?: (msg: string, option?: string) => void): (msg: string) => void {
-  if (showMsg) {
-    return showMsg
-  }
-  return (p as any).showMessage
-}
-interface ConfirmInput {
-  confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void
-}
-export function getConfirmFunc(
-  p: ResourceService | ConfirmInput,
-  cf?: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void,
-): (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void {
-  if (cf) {
-    return cf
-  }
-  return (p as any).confirm
-}
-interface GetLocaleInput {
-  getLocale?: (profile?: string) => Locale
-}
-export function getLocaleFunc(p: ResourceService | GetLocaleInput, getLoc?: () => Locale): () => Locale {
-  if (getLoc) {
-    return getLoc
-  }
-  return (p as any).getLocale
-}
-interface ShowErrorInput {
-  showError: (m: string, callback?: () => void, header?: string) => void
-}
-export function getErrorFunc(
-  p: ResourceService | ShowErrorInput,
-  showErr?: (m: string, callback?: () => void, header?: string) => void,
-): (m: string, callback?: () => void, header?: string) => void {
-  if (showErr) {
-    return showErr
-  }
-  return (p as any).showError
-}
-
-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
-      }
-    }
-  }
-}