react-hook-core 0.1.21 → 0.1.23

package/lib/components.js

@@ -476,8 +476,8 @@ var BaseSearchComponent = (function (_super) {
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
         limit = s.firstLimit;
       }
-      com.nextPageToken = sr.nextPageToken;
-      search_1.handleAppend(com, sr.list, limit, sr.nextPageToken);
+      com.nextPageToken = sr.next;
+      search_1.handleAppend(com, sr.list, limit, sr.next);
       if (com.append && (s.page && s.page > 1)) {
         com.appendList(results);
       }
@@ -999,11 +999,9 @@ var EditComponent = (function (_super) {
     var com = this;
     var m = obj;
     var fn = this.newMode ? this.service.insert : this.service.update;
-    var isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
-        isPatch = true;
         fn = this.service.patch;
       }
     }

package/lib/index.js

@@ -21,21 +21,6 @@ __export(require("./components"));
 __export(require("./search"));
 __export(require("./reflect"));
 __export(require("./com"));
-exports.useCallbackState = function (initialValue) {
-  var _a = react_1.useState(initialValue), state = _a[0], _setState = _a[1];
-  var callbackQueue = react_1.useRef([]);
-  react_1.useEffect(function () {
-    callbackQueue.current.forEach(function (cb) { return cb(state); });
-    callbackQueue.current = [];
-  }, [state]);
-  var setState = function (newValue, callback) {
-    _setState(newValue);
-    if (callback && typeof callback === "function") {
-      callbackQueue.current.push(callback);
-    }
-  };
-  return [state, setState];
-};
 function checked(s, v) {
   if (s) {
     if (Array.isArray(s)) {
@@ -67,6 +52,49 @@ exports.Loading = function (props) {
     return (React.createElement('div', { className: 'loader-wrapper' }, React.createElement('div', { className: 'loader-sign', style: loadingStyle }, React.createElement('div', { className: 'loader' }))));
   }
 };
+exports.NumberInput = function (props) {
+  var _a;
+  var _b = react_1.useState(undefined), state = _b[0], setState = _b[1];
+  react_1.useEffect(function () {
+    setState(props.value);
+  }, [props.value]);
+  var onChange = function (e) {
+    var v1 = e.target.value;
+    setState(v1);
+    if (props.onChange) {
+      props.onChange(e);
+    }
+    if (props.onChangeNumber) {
+      props.onChangeNumber(parseFloat(v1));
+    }
+  };
+  var ip = (_a = {
+    value: state,
+    className: props === null || props === void 0 ? void 0 : props.className,
+    name: props === null || props === void 0 ? void 0 : props.name,
+    onChange: onChange,
+    disabled: props === null || props === void 0 ? void 0 : props.disabled
+  },
+    _a['data-field'] = props['data-field'],
+    _a.min = props === null || props === void 0 ? void 0 : props.min,
+    _a.max = props === null || props === void 0 ? void 0 : props.max,
+    _a.type = props === null || props === void 0 ? void 0 : props.type,
+    _a.onBlur = function (e) {
+      if (props.allowZero && e.target.value === '0') {
+        setState('0');
+        return;
+      }
+      if (props.locale && props.currencyOnBlur) {
+        props.currencyOnBlur(e, props.locale, props.currencyCode, props.symbol);
+      }
+      setTimeout(function () {
+        var v2 = e.target.value;
+        setState(v2);
+      }, 50);
+    },
+    _a);
+  return React.createElement("input", { className: ip.className, type: ip.type, name: ip.name, onChange: ip.onChange, disabled: ip.disabled, "data-field": ip['data-field'], min: ip.min, max: ip.max, value: state });
+};
 function formatDate(date, format) {
   if (!date) {
     return '';

package/lib/state.js

@@ -91,7 +91,6 @@ function buildState(e, state, ctrl, modelName, tloc) {
       var dataField = ctrl.getAttribute('data-field');
       var field = (dataField ? dataField : ctrl.name);
       var model = Object.assign({}, ex);
-      var dType = 'array';
       if (type && type.toLowerCase() === 'checkbox') {
         var value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {

package/lib/useEdit.js

@@ -365,7 +365,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var _doSave = function (obj, body, version, isBack) {
     setRunning(true);
     core_1.showLoading(p1.loading);
-    var isBackO = (isBack == null || isBack === undefined ? true : isBack);
+    var isBackO = (isBack != null && isBack !== undefined ? isBack : false);
     var patchable = (p ? p.patchable : true);
     if (flag.newMode === false) {
       if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
@@ -408,7 +408,6 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var r = p1.resource;
         var title = r.value('error');
         var msg = r.value('error_internal');
-        var st = core_1.createEditStatus(p ? p.status : undefined);
         if (data && data.status === 422) {
           fail((_a = err.response) === null || _a === void 0 ? void 0 : _a.data);
           var obj = (_c = (_b = err.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.value;

package/lib/useSearch.js

@@ -319,7 +319,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var appendList = (p && p.appendList ? p.appendList : appendListOfState);
   var setList = (p && p.setList ? p.setList : setListOfState);
   var _showResults = function (s, sr, lc) {
-    if (sr == undefined) {
+    if (sr === undefined) {
       return;
     }
     var results = (sr === null || sr === void 0 ? void 0 : sr.list) || [];
@@ -328,13 +328,13 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     }
     var am = component.appendMode;
     var pi = (s.page && s.page >= 1 ? s.page : 1);
-    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.nextPageToken });
+    setComponent({ total: sr.total, pageIndex: pi, nextPageToken: sr.next });
     if (am) {
       var limit = s.limit;
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
         limit = s.firstLimit;
       }
-      search_1.handleAppend(component, sr.list, limit, sr.nextPageToken);
+      search_1.handleAppend(component, sr.list, limit, sr.next);
       if (component.append && (s.page && s.page > 1)) {
         appendList(results, component.list, setState);
       }

package/package.json

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

package/src/components.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import {BaseDiffState, createDiffStatus, createEditStatus, DiffApprService, DiffParameter, DiffState, DiffStatusConfig, handleToggle, hideLoading, showLoading} from './core';
 import {Attributes, EditStatusConfig, error, ErrorMessage, Filter, getCurrencyCode, getModelName as getModelName2, initForm, LoadingService, Locale, message, messageByHttpStatus, PageChange, pageSizes, removePhoneFormat, ResourceService, SearchParameter, SearchResult, SearchService, SearchState, StringMap, UIService, ViewParameter, ViewService} from './core';
 import {formatDiffModel, getDataFields} from './diff';
-import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel, ResultInfo} from './edit';
+import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel} from './edit';
 import {focusFirstError, readOnly} from './formutil';
 import {getAutoSearch, getConfirmFunc, getDiffStatusFunc, getEditStatusFunc, getErrorFunc, getLoadingFunc, getLocaleFunc, getMsgFunc, getResource, getUIService} from './input';
 import {clone, diff, makeDiff} from './reflect';
@@ -421,7 +421,7 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
       lc = enLocale;
     }
     const fields = this.getFields();
-    const obj3 = getModel<T, F>(this.state, name, this, fields, this.excluding);
+    const obj3 = getModel<F>(this.state, name, this, fields, this.excluding);
     return obj3;
   }
   getFields(): string[]|undefined {
@@ -526,8 +526,8 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
       if ((!s.page || s.page <= 1) && s.firstLimit && s.firstLimit > 0) {
         limit = s.firstLimit;
       }
-      com.nextPageToken = sr.nextPageToken;
-      handleAppend(com, sr.list, limit, sr.nextPageToken);
+      com.nextPageToken = sr.next;
+      handleAppend(com, sr.list, limit, sr.next);
       if (com.append && (s.page && s.page > 1)) {
         com.appendList(results);
       } else {
@@ -1063,11 +1063,9 @@ export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
     const com = this;
     let m: T|Partial<T> = obj;
     let fn = this.newMode ? this.service.insert : this.service.update;
-    let isPatch = false;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
         m = body;
-        isPatch = true;
         fn = this.service.patch;
       }
     }

package/src/core.ts

@@ -87,7 +87,7 @@ export interface Filter {
 export interface SearchResult<T> {
   total?: number;
   list: T[];
-  nextPageToken?: string;
+  next?: string;
   last?: boolean;
 }
 export interface SearchState<T, S extends Filter> {

package/src/index.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { useEffect, useRef, useState } from 'react';
+import { ChangeEvent, ChangeEventHandler, FocusEvent, useEffect, useState } from 'react';
 export * from './formutil';
 export * from './util';
 export * from './core';
@@ -16,7 +16,7 @@ export * from './components';
 export * from './search';
 export * from './reflect';
 export * from './com';
-
+/*
 type CallBackType<T> = (updatedValue: T) => void;
 type SetStateType<T> = T | ((prev: T) => T);
 type RetType = <T>(initialValue: T | (() => T)) => [T, (newValue: SetStateType<T>, callback?: CallBackType<T>) => void];
@@ -38,7 +38,7 @@ export const useCallbackState: RetType = <T>(initialValue: T | (() => T)) => {
   };
   return [state, setState];
 };
-
+*/
 export function checked(s: string[]|string|undefined, v: string): boolean|undefined {
   if (s) {
     if (Array.isArray(s)) {
@@ -77,6 +77,76 @@ export const Loading = (props: LoadingProps) => {
     );*/
   }
 };
+interface Locale {
+  decimalSeparator: string;
+  groupSeparator: string;
+  currencyCode: string;
+  currencySymbol: string;
+  currencyPattern: number;
+}
+interface InputProps {
+  name?: string;
+  className?: string;
+  value?: string;
+  ['data-field']?: string;
+  defaultValue?: string;
+  onChangeNumber?: (value: number) => void;
+  onChange?: ChangeEventHandler<HTMLInputElement>;
+  currencyOnBlur?: (event: Event|any, locale: Locale, currencyCode?: string, includingCurrencySymbol?: boolean) => void;
+  currencyCode?: string;
+  symbol?: boolean;
+  readOnly?: boolean;
+  locale?: Locale;
+  type?: string;
+  disabled?: boolean;
+  required?: boolean;
+  typeOutput?: string;
+  min?: string|number;
+  max?: string|number;
+  allowZero?: boolean;
+}
+export const NumberInput = (props: InputProps) => {
+  const [state, setState] = useState<string|undefined>(undefined);
+  useEffect(() => {
+    setState(props.value);
+  }, [props.value]);
+  const onChange = (e: ChangeEvent<HTMLInputElement>) => {
+    const v1 = e.target.value;
+    setState(v1);
+    if (props.onChange) {
+      props.onChange(e);
+    }
+    if (props.onChangeNumber) {
+      props.onChangeNumber(parseFloat(v1));
+    }
+  };
+  const ip = {
+    value: state,
+    className: props?.className,
+    name: props?.name,
+    onChange,
+    disabled: props?.disabled,
+    ['data-field']: props['data-field'],
+    min: props?.min,
+    max: props?.max,
+    type: props?.type,
+    onBlur: (e: FocusEvent<HTMLInputElement>) => {
+      if (props.allowZero && e.target.value === '0') {
+        setState('0');
+        return;
+      }
+      if (props.locale && props.currencyOnBlur) {
+        props.currencyOnBlur(e, props.locale, props.currencyCode, props.symbol);
+      }
+      setTimeout(() => {
+        const v2 = e.target.value;
+        setState(v2);
+      }, 50);
+    },
+  };
+  // return <input className={ip.className} type={ip.type} name={ip.name} onChange={ip.onChange} disabled={ip.disabled} data-field={ip['data-field']} min={ip.min} max={ip.max} value={state} />;
+  return React.createElement("input", { className: ip.className, type: ip.type, name: ip.name, onChange: ip.onChange, disabled: ip.disabled, "data-field": ip['data-field'], min: ip.min, max: ip.max, value: state });
+};
 export type OnClick = React.MouseEvent<HTMLElement, MouseEvent>;
 export function formatDate(date: Date | null | undefined, format: string): string {
   if (!date) {

package/src/search.ts

@@ -579,7 +579,7 @@ export function toggleSortStyle(target: HTMLElement): string {
   }
   return field;
 }
-export function getModel<T, S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
+export function getModel<S extends Filter>(state: any, modelName: string, searchable: Searchable, fields?: string[], excluding?: string[]|number[]): S {
   let obj2 = getModelFromState(state, modelName);
 
   const obj: any = obj2 ? obj2 : {};

package/src/state.ts

@@ -75,7 +75,6 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
       const dataField = ctrl.getAttribute('data-field');
       const field = (dataField ? dataField : ctrl.name);
       const model = Object.assign({}, ex);
-      const dType= 'array'
       if (type && type.toLowerCase() === 'checkbox') {
         let value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {