react-hook-core 0.1.0 → 0.1.1

package/package.json

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

package/src/components.ts

@@ -3,7 +3,7 @@ import {RouteComponentProps} from 'react-router';
 import {clone, diff, makeDiff} from 'reflectx';
 import {addParametersIntoUrl, append, buildMessage, changePage, changePageSize, formatResultsByComponent, getFieldsFromForm, getModel, handleAppend, handleSortEvent, initFilter, mergeFilter as mergeFilter2, more, reset, Searchable, showPaging, validate} from 'search-core';
 import {BaseDiffState, createDiffStatus, createEditStatus, DiffApprService, DiffParameter, DiffState, DiffStatusConfig, hideLoading, showLoading} from './core';
-import {Attributes, buildId, EditStatusConfig, error, ErrorMessage, Filter, getCurrencyCode, getModelName as getModelName2, HistoryProps, initForm, LoadingService, Locale, message, messageByHttpStatus, ModelHistoryProps, ModelProps, removePhoneFormat, ResourceService, SearchParameter, SearchResult, SearchService, SearchState, StringMap, UIService, ViewParameter, ViewService} from './core';
+import {Attributes, buildId, EditStatusConfig, error, ErrorMessage, Filter, getCurrencyCode, getModelName as getModelName2, initForm, LoadingService, Locale, message, messageByHttpStatus, 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 {focusFirstError, readOnly} from './formutil';
@@ -133,7 +133,7 @@ export class ViewComponent<T, ID, P extends RouteComponentProps, S> extends Reac
   }
 }
 
-export class BaseComponent<P extends ModelProps, S> extends React.Component<P, S> {
+export class BaseComponent<P, S> extends React.Component<P, S> {
   constructor(props: P,
       protected getLocale?: () => Locale,
       private removeErr?: (ctrl: HTMLInputElement) => void) {
@@ -213,8 +213,8 @@ export class BaseComponent<P extends ModelProps, S> extends React.Component<P, S
     const l = localeOf(lc, this.getLocale);
     const props = this.props;
     handleEvent(e, this.removeErr);
-    if (props.setGlobalState) {
-      handleProps(e, props, ctrl, modelName, l, this.prepareCustomData);
+    if ((props as any).setGlobalState) {
+      handleProps(e, props as any, ctrl, modelName, l, this.prepareCustomData);
     } else {
       const objSet: any = buildState(e, this.state, ctrl, modelName, l);
       if (objSet) {
@@ -238,10 +238,10 @@ export class BaseComponent<P extends ModelProps, S> extends React.Component<P, S
     }
   }
 }
-export interface MessageOnlyState extends ModelProps {
+export interface MessageOnlyState {
   message?: string;
 }
-export class MessageComponent<P extends MessageOnlyState, S extends MessageOnlyState> extends BaseComponent<P, S> {
+export class MessageComponent<S extends MessageOnlyState, P> extends BaseComponent<P, S> {
   constructor(props: P,
     getLocale?: () => Locale,
     removeErr?: (ctrl: HTMLInputElement) => void) {
@@ -291,7 +291,7 @@ export class MessageComponent<P extends MessageOnlyState, S extends MessageOnlyS
     this.setState({ message: '' });
   }
 }
-export class BaseSearchComponent<T, S extends Filter, P extends ModelHistoryProps, I extends SearchState<T, S>> extends BaseComponent<P, I> implements Searchable {
+export class BaseSearchComponent<T, S extends Filter, P extends RouteComponentProps, I extends SearchState<T, S>> extends BaseComponent<P, I> implements Searchable {
   constructor(props: P,
       protected resourceService: ResourceService,
       protected showMessage: (msg: string) => void,
@@ -616,7 +616,7 @@ export class BaseSearchComponent<T, S extends Filter, P extends ModelHistoryProp
     this.doSearch();
   }
 }
-export class SearchComponent<T, S extends Filter, P extends ModelHistoryProps, I extends SearchState<T, S>> extends BaseSearchComponent<T, S, P, I> {
+export class SearchComponent<T, S extends Filter, P extends RouteComponentProps, I extends SearchState<T, S>> extends BaseSearchComponent<T, S, P, I> {
   constructor(props: P, sv: ((s: S, ctx?: any) => Promise<SearchResult<T>>) | SearchService<T, S>,
       param: ResourceService|SearchParameter,
       showMessage?: (msg: string, option?: string) => void,
@@ -702,7 +702,7 @@ export class SearchComponent<T, S extends Filter, P extends ModelHistoryProps, I
   }
 }
 
-export abstract class BaseEditComponent<T, P extends ModelHistoryProps, S> extends BaseComponent<P, S> {
+export abstract class BaseEditComponent<T, P extends RouteComponentProps, S> extends BaseComponent<P, S> {
   constructor(props: P,
       protected resourceService: ResourceService,
       protected showMessage: (msg: string) => void,
@@ -1098,7 +1098,7 @@ export class EditComponent<T, ID, P extends RouteComponentProps, S> extends Base
   }
 }
 
-export class BaseDiffApprComponent<T, ID, P extends HistoryProps, S extends BaseDiffState> extends React.Component<P, S & any> {
+export class BaseDiffApprComponent<T, ID, P extends RouteComponentProps, S extends BaseDiffState> extends React.Component<P, S & any> {
   constructor(props: P, protected keys: string[], protected resourceService: ResourceService,
       protected showMessage: (msg: string, option?: string) => void,
       protected showError: (m: string, title?: string, detail?: string, callback?: () => void) => void,

package/src/core.ts

@@ -1,13 +1,6 @@
-import * as H from 'history';
 import {RouteComponentProps} from 'react-router';
-import {match} from 'react-router-dom';
 import {focusFirstElement} from './formutil';
 
-export interface HistoryProps {
-  location: H.Location;
-  history: H.History;
-  match?: match;
-}
 export interface ModelMap {
   [key: string]: any;
 }
@@ -99,9 +92,6 @@ export interface SearchState<T, S extends Filter> {
 export interface SearchService<T, S extends Filter> {
   keys?(): string[];
   search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>>;
-}
-export interface ModelHistoryProps extends HistoryProps, ModelProps {
-
 }
 export interface ViewParameter {
   resource: ResourceService;

package/src/index.ts

@@ -18,5 +18,5 @@ export * from './useMessage';
 
 export const withDefaultProps = (Component: any) => (props: RouteComponentProps) => {
   // return <Component props={props} history={props.history} />;
-  return React.createElement(Component, { props: props, history: props.history });
+  return React.createElement(Component, { props, history: props.history });
 };

package/src/update.ts

@@ -1,4 +1,4 @@
-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';
 

package/src/useEdit.ts

@@ -1,7 +1,7 @@
 import {useEffect, useState} from 'react';
 import {RouteComponentProps} from 'react-router';
 import {clone, makeDiff} from 'reflectx';
-import {Attributes, buildId, createEditStatus, EditStatusConfig, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ModelProps, ResourceService, showLoading, UIService} from './core';
+import {Attributes, buildId, createEditStatus, EditStatusConfig, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, message, messageByHttpStatus, ResourceService, showLoading, UIService} from './core';
 import {build, createModel as createModel2, EditParameter, GenericService, handleStatus, handleVersion, initPropertyNullInModel, ResultInfo} from './edit';
 import {focusFirstError, readOnly as setReadOnly} from './formutil';
 import {DispatchWithCallback, useMergeState} from './merge';

package/src/useSearch.ts

@@ -1,8 +1,9 @@
 import {useEffect, useState} from 'react';
+import {RouteComponentProps} from 'react-router';
 import {useHistory, useRouteMatch} from 'react-router-dom';
 import {clone} from 'reflectx';
 import {addParametersIntoUrl, append, buildMessage, Filter, formatResults, getFieldsFromForm, getModel, handleAppend, handleSort, initFilter, mergeFilter as mergeFilter2, Pagination, removeSortStatus, showPaging, Sortable, validate} from 'search-core';
-import {error, getDecodeFromForm, getName, getRemoveError, getValidateForm, hideLoading, initForm, LoadingService, Locale, ModelProps, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading, UIService} from './core';
+import {error, getDecodeFromForm, getName, getRemoveError, getValidateForm, hideLoading, initForm, Locale, removeFormError, ResourceService, SearchParameter, SearchResult, SearchService, showLoading} from './core';
 import {DispatchWithCallback, useMergeState} from './merge';
 import {buildFromUrl} from './route';
 import {enLocale} from './state';
@@ -52,7 +53,7 @@ export interface InitSearchComponentParam<T, M extends Filter, S> extends Search
   createFilter?: () => M;
   initialize?: (ld: (s: M, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<S>>, com?: SearchComponentState<T, M>) => void;
 }
-export interface HookPropsSearchParameter<T, S extends Filter, ST, P extends ModelProps> extends HookPropsBaseSearchParameter<T, S, ST, P> {
+export interface HookPropsSearchParameter<T, S extends Filter, ST, P extends RouteComponentProps> extends HookPropsBaseSearchParameter<T, S, ST, P> {
   createFilter?: () => S;
   initialize?: (ld: (s: S, auto?: boolean) => void, setState2: DispatchWithCallback<Partial<ST>>, com?: SearchComponentState<T, S>) => void;
 }
@@ -173,7 +174,7 @@ 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>) => {
+export const useSearchOneProps = <T, S extends Filter, ST extends SearchComponentState<T, S>, P extends RouteComponentProps>(p: HookPropsSearchParameter<T, S, ST, P>) => {
   return useSearch(p.refForm, p.initialState, p.search, p, p);
 };
 export const useSearchOne = <T, S extends Filter, ST extends SearchComponentState<T, S>>(p: HookBaseSearchParameter<T, S, ST>) => {