react-hook-core 0.1.17 → 0.1.19

package/lib/index.js

@@ -4,6 +4,7 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var React = require("react");
+var react_1 = require("react");
 __export(require("./formutil"));
 __export(require("./util"));
 __export(require("./core"));
@@ -20,6 +21,21 @@ __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)) {

package/lib/route.js

@@ -50,6 +50,7 @@ function parseToModel(dest, src) {
   if (typeof dest !== 'object' || typeof src !== 'object') {
     return dest;
   }
+  dest = convertToObject(dest);
   for (var key in src) {
     if (!Object.hasOwn(dest, key))
       continue;

package/lib/search.js

@@ -566,7 +566,6 @@ exports.toggleSortStyle = toggleSortStyle;
 function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName);
   var obj = obj2 ? obj2 : {};
-  console.log("getModel optimizeFilter", searchable);
   var obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
   return obj3;

package/lib/useEdit.js

@@ -142,7 +142,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     if (form) {
       formutil_1.readOnly(form);
     }
-    p1.showError(msg.message, msg.title);
+    p1.showError(msg.message, msg.title, undefined, function () { return window.history.back; });
   };
   var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
   var _getModel = function () {
@@ -299,10 +299,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var unmappedErrors = u.showFormError(f, errors);
         formutil_1.focusFirstError(f);
         if (!result.message) {
-          if (errors && errors.length === 1) {
-            result.message = errors[0].message;
-          }
-          else {
+          if (errors && errors.length > 0) {
             if (p1.ui && p1.ui.buildErrorMessage) {
               result.message = p1.ui.buildErrorMessage(unmappedErrors);
             }
@@ -426,21 +423,32 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         setRunning(false);
         core_1.hideLoading(p1.loading);
       }).catch(function (err) {
+        var _a, _b, _c;
         var data = (err && err.response) ? err.response : err;
         var r = p1.resource;
         var title = r.value('error');
         var msg = r.value('error_internal');
-        if (data && data.status === 404) {
-          handleNotFound(refForm.current);
+        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;
+          if (obj) {
+            callback ? callback(obj, showModel) : showModel(obj);
+          }
         }
         else {
-          if (data.status && !isNaN(data.status)) {
-            msg = core_1.messageByHttpStatus(data.status, r.value);
+          if (data && data.status === 404) {
+            handleNotFound(refForm.current);
           }
-          if (data && (data.status === 401 || data.status === 403)) {
-            formutil_1.readOnly(refForm.current);
+          else {
+            if (data.status && !isNaN(data.status)) {
+              msg = core_1.messageByHttpStatus(data.status, r.value);
+            }
+            if (data && (data.status === 401 || data.status === 403)) {
+              formutil_1.readOnly(refForm.current);
+            }
+            p1.showError(msg, title);
           }
-          p1.showError(msg, title);
         }
         setRunning(false);
         core_1.hideLoading(p1.loading);

package/lib/useSearch.js

@@ -44,7 +44,7 @@ exports.callSearch = function (se, search3, showResults3, searchError3, lc, next
   delete se['firstLimit'];
   search3(s, limit, next, fields).then(function (sr) {
     showResults3(s, sr, lc);
-  }).catch(function (err) { return searchError3(err); });
+  }).catch(function (err) { return err && searchError3(err); });
 };
 var appendListOfState = function (results, list, setState2) {
   var arr = search_1.append(list, results);
@@ -319,7 +319,10 @@ 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) {
-    var results = sr.list;
+    if (sr == undefined) {
+      return;
+    }
+    var results = (sr === null || sr === void 0 ? void 0 : sr.list) || [];
     if (results && results.length > 0) {
       search_1.formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }

package/package.json

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

package/src/index.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 export * from './formutil';
 export * from './util';
 export * from './core';
@@ -16,6 +17,28 @@ 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];
+
+export const useCallbackState: RetType = <T>(initialValue: T | (() => T)) => {
+  const [state, _setState] = useState<T>(initialValue);
+  const callbackQueue = useRef<CallBackType<T>[]>([]);
+
+  useEffect(() => {
+    callbackQueue.current.forEach((cb) => cb(state));
+    callbackQueue.current = [];
+  }, [state]);
+
+  const setState = (newValue: SetStateType<T>, callback?: CallBackType<T>) => {
+    _setState(newValue);
+    if (callback && typeof callback === "function") {
+      callbackQueue.current.push(callback);
+    }
+  };
+  return [state, setState];
+};
+
 export function checked(s: string[]|string|undefined, v: string): boolean|undefined {
   if (s) {
     if (Array.isArray(s)) {

package/src/route.ts

@@ -51,6 +51,7 @@ function parseToModel(dest: any, src: any) {
   if (typeof dest !== 'object' || typeof src !== 'object') {
     return dest;
   }
+  dest = convertToObject(dest)
   for (let key in src) {
     if (!Object.hasOwn(dest, key)) continue;
     if (src.hasOwnProperty(key)) {

package/src/search.ts

@@ -583,7 +583,6 @@ export function getModel<T, S extends Filter>(state: any, modelName: string, sea
   let obj2 = getModelFromState(state, modelName);
 
   const obj: any = obj2 ? obj2 : {};
-  console.log("getModel optimizeFilter", searchable)
   const obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
   return obj3;

package/src/useEdit.ts

@@ -219,7 +219,7 @@ export const useCoreEdit = <T, ID, S, P>(
     if (form) {
       setReadOnly(form);
     }
-    p1.showError(msg.message, msg.title);
+    p1.showError(msg.message, msg.title, undefined, () => window.history.back);
   };
   const handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
 
@@ -371,9 +371,7 @@ export const useCoreEdit = <T, ID, S, P>(
         const unmappedErrors = u.showFormError(f, errors);
         focusFirstError(f);
         if (!result.message) {
-          if (errors && errors.length === 1) {
-            result.message = errors[0].message;
-          } else {
+          if (errors && errors.length > 0) {
             if (p1.ui && p1.ui.buildErrorMessage) {
               result.message = p1.ui.buildErrorMessage(unmappedErrors);
             } else {
@@ -492,16 +490,25 @@ export const useCoreEdit = <T, ID, S, P>(
         const r = p1.resource;
         const title = r.value('error');
         let msg = r.value('error_internal');
-        if (data && data.status === 404) {
-          handleNotFound(refForm.current);
-        } else {
-          if (data.status && !isNaN(data.status)) {
-            msg = messageByHttpStatus(data.status, r.value);
-          }
-          if (data && (data.status === 401 || data.status === 403)) {
-            setReadOnly(refForm.current);
+        const st = createEditStatus(p ? p.status : undefined);
+        if (data && data.status === 422) {
+          fail(err.response?.data);
+          const obj = err.response?.data?.value;
+          if (obj) {
+            callback ? callback(obj as T, showModel) : showModel(obj as T);
           }
-          p1.showError(msg, title);
+        } else {
+          if (data && data.status === 404) {
+            handleNotFound(refForm.current);
+          } else {
+            if (data.status && !isNaN(data.status)) {
+              msg = messageByHttpStatus(data.status, r.value);
+            }
+            if (data && (data.status === 401 || data.status === 403)) {
+              setReadOnly(refForm.current);
+            }
+            p1.showError(msg, title);
+          } 
         }
         setRunning(false);
         hideLoading(p1.loading);

package/src/useSearch.ts

@@ -44,7 +44,7 @@ export const callSearch = <T, S extends Filter>(se: S, search3: (s: S, limit?: n
   delete se['firstLimit'];
   search3(s, limit, next, fields).then(sr => {
     showResults3(s, sr, lc);
-  }).catch(err => searchError3(err));
+  }).catch(err => err && searchError3(err));
 };
 const appendListOfState = <T, S extends Filter>(results: T[], list: T[]|undefined, setState2: DispatchWithCallback<Partial<SearchComponentState<T, S>>>) => {
   const arr = append(list, results);
@@ -437,7 +437,10 @@ export const useCoreSearch = <T, S extends Filter, ST>(
   const appendList = (p && p.appendList ? p.appendList : appendListOfState);
   const setList = (p && p.setList ? p.setList : setListOfState);
   const _showResults = (s: S, sr: SearchResult<T>, lc: Locale) => {
-    const results = sr.list;
+    if (sr == undefined) {
+      return;
+    }
+    const results = sr?.list || [];
     if (results && results.length > 0) {
       formatResults(results, component.pageIndex, component.pageSize, component.pageSize, p ? p.sequenceNo : undefined, p ? p.format : undefined, lc);
     }