@sheinx/hooks 3.1.14 → 3.1.16

package/cjs/components/use-upload/use-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAyLkB,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BpC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAuL+B,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BjD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/cjs/components/use-upload/use-upload.js

@@ -172,10 +172,9 @@ var useUpload = function useUpload(props) {
       });
     });
   };
-  var getCurrent = (0, _usePersistFn.default)(function () {
-    return {
-      filesState: filesState
-    };
+  var latestState = (0, _useLatestObj.default)({
+    filesState: filesState,
+    value: value
   });
   var uploadFile = function uploadFile(id, file, data) {
     var request = props.request || _xhr.default;
@@ -196,8 +195,7 @@ var useUpload = function useUpload(props) {
           throttle = false;
         }, 16);
         var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
-        var _getCurrent = getCurrent(),
-          filesState = _getCurrent.filesState;
+        var filesState = latestState.filesState;
         var newFiles = _objectSpread({}, filesState);
         if (!newFiles[id]) return;
         newFiles[id].process = percent;
@@ -234,7 +232,7 @@ var useUpload = function useUpload(props) {
             });
           });
           // add value
-          var values = (0, _immer.produce)(value, function (draft) {
+          var values = (0, _immer.produce)(latestState.value, function (draft) {
             draft.push(result);
           });
           props.onChange(values);
@@ -287,7 +285,7 @@ var useUpload = function useUpload(props) {
       reader.readAsDataURL(blob);
     });
   };
-  var addFiles = /*#__PURE__*/function () {
+  var addFiles = (0, _usePersistFn.default)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(files) {
       var fileList, newFiles, resetLength, list, _loop, _ret, i;
       return _regeneratorRuntime().wrap(function _callee2$(_context3) {
@@ -426,11 +424,11 @@ var useUpload = function useUpload(props) {
         }
       }, _callee2);
     }));
-    return function addFiles(_x3) {
+    return function (_x3) {
       return _ref2.apply(this, arguments);
     };
-  }();
-  var removeFile = function removeFile(id) {
+  }());
+  var removeFile = (0, _usePersistFn.default)(function (id) {
     var beforeCancel = props.beforeCancel,
       onErrorRemove = props.onErrorRemove;
     var file = filesState[id];
@@ -448,8 +446,8 @@ var useUpload = function useUpload(props) {
         onErrorRemove(file.xhr, file.blob, file);
       }
     }
-  };
-  var removeValue = function removeValue(index) {
+  });
+  var removeValue = (0, _usePersistFn.default)(function (index) {
     if (props.disabled) return;
     var recoverAble = props.recoverAble,
       beforeRemove = props.beforeRemove;
@@ -461,15 +459,15 @@ var useUpload = function useUpload(props) {
         newRecycle.push(value[index]);
       }
       setRecycleValues(newRecycle);
-      var newValue = (0, _immer.produce)(props.value, function (draft) {
+      var newValue = (0, _immer.produce)(latestState.value, function (draft) {
         draft.splice(index, 1);
       });
       props.onChange(newValue);
     }).catch(function () {});
-  };
-  var recoverValue = function recoverValue(index) {
+  });
+  var recoverValue = (0, _usePersistFn.default)(function (index) {
     if (props.disabled) return;
-    props.onChange((0, _immer.produce)(props.value, function (draft) {
+    props.onChange((0, _immer.produce)(latestState.value, function (draft) {
       draft.push(recycleValues[index]);
     }));
     setRecycleValues(function (pre) {
@@ -477,7 +475,7 @@ var useUpload = function useUpload(props) {
       newRecycle.splice(index, 1);
       return newRecycle;
     });
-  };
+  });
   var func = (0, _useLatestObj.default)({
     addFiles: addFiles,
     removeFile: removeFile,

package/cjs/utils/rule/rule.type.d.ts

@@ -105,7 +105,7 @@ export interface RuleFuncResult {
 export type RuleResult = {
     [key: string]: RuleFuncResult;
 } | RuleCommonResult;
-export type RuleResultValue = ValueOf<RuleResult>;
+export type RuleResultValue = RuleFuncResult | ValueOf<RuleCommonResult>;
 export type FormItemObjectRule = Type & RegExpParams & Range & Min & Max & Required & {
     func?: ValidFunc;
     args?: any;

package/cjs/utils/rule/rule.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}

package/esm/components/use-upload/use-upload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAyLkB,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BpC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"use-upload.d.ts","sourceRoot":"","sources":["use-upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAa,MAAM,mBAAmB,CAAC;AAgC1E,QAAA,MAAM,SAAS;;;;;;0BAuL+B,IAAI,EAAE;yBAqEb,MAAM;6BAqBF,MAAM;8BAqBL,MAAM;;CA2BjD,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/esm/components/use-upload/use-upload.js

@@ -165,10 +165,9 @@ var useUpload = function useUpload(props) {
       });
     });
   };
-  var getCurrent = usePersistFn(function () {
-    return {
-      filesState: filesState
-    };
+  var latestState = useLatestObj({
+    filesState: filesState,
+    value: value
   });
   var uploadFile = function uploadFile(id, file, data) {
     var request = props.request || xhrUpload;
@@ -189,8 +188,7 @@ var useUpload = function useUpload(props) {
           throttle = false;
         }, 16);
         var percent = typeof e.percent === 'number' ? e.percent : e.loaded / e.total * 100;
-        var _getCurrent = getCurrent(),
-          filesState = _getCurrent.filesState;
+        var filesState = latestState.filesState;
         var newFiles = _objectSpread({}, filesState);
         if (!newFiles[id]) return;
         newFiles[id].process = percent;
@@ -227,7 +225,7 @@ var useUpload = function useUpload(props) {
             });
           });
           // add value
-          var values = produce(value, function (draft) {
+          var values = produce(latestState.value, function (draft) {
             draft.push(result);
           });
           props.onChange(values);
@@ -280,7 +278,7 @@ var useUpload = function useUpload(props) {
       reader.readAsDataURL(blob);
     });
   };
-  var addFiles = /*#__PURE__*/function () {
+  var addFiles = usePersistFn( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(files) {
       var fileList, newFiles, resetLength, list, _loop, _ret, i;
       return _regeneratorRuntime().wrap(function _callee2$(_context3) {
@@ -419,11 +417,11 @@ var useUpload = function useUpload(props) {
         }
       }, _callee2);
     }));
-    return function addFiles(_x3) {
+    return function (_x3) {
       return _ref2.apply(this, arguments);
     };
-  }();
-  var removeFile = function removeFile(id) {
+  }());
+  var removeFile = usePersistFn(function (id) {
     var beforeCancel = props.beforeCancel,
       onErrorRemove = props.onErrorRemove;
     var file = filesState[id];
@@ -441,8 +439,8 @@ var useUpload = function useUpload(props) {
         onErrorRemove(file.xhr, file.blob, file);
       }
     }
-  };
-  var removeValue = function removeValue(index) {
+  });
+  var removeValue = usePersistFn(function (index) {
     if (props.disabled) return;
     var recoverAble = props.recoverAble,
       beforeRemove = props.beforeRemove;
@@ -454,15 +452,15 @@ var useUpload = function useUpload(props) {
         newRecycle.push(value[index]);
       }
       setRecycleValues(newRecycle);
-      var newValue = produce(props.value, function (draft) {
+      var newValue = produce(latestState.value, function (draft) {
         draft.splice(index, 1);
       });
       props.onChange(newValue);
     }).catch(function () {});
-  };
-  var recoverValue = function recoverValue(index) {
+  });
+  var recoverValue = usePersistFn(function (index) {
     if (props.disabled) return;
-    props.onChange(produce(props.value, function (draft) {
+    props.onChange(produce(latestState.value, function (draft) {
       draft.push(recycleValues[index]);
     }));
     setRecycleValues(function (pre) {
@@ -470,7 +468,7 @@ var useUpload = function useUpload(props) {
       newRecycle.splice(index, 1);
       return newRecycle;
     });
-  };
+  });
   var func = useLatestObj({
     addFiles: addFiles,
     removeFile: removeFile,

package/esm/utils/rule/rule.type.d.ts

@@ -105,7 +105,7 @@ export interface RuleFuncResult {
 export type RuleResult = {
     [key: string]: RuleFuncResult;
 } | RuleCommonResult;
-export type RuleResultValue = ValueOf<RuleResult>;
+export type RuleResultValue = RuleFuncResult | ValueOf<RuleCommonResult>;
 export type FormItemObjectRule = Type & RegExpParams & Range & Min & Max & Required & {
     func?: ValidFunc;
     args?: any;

package/esm/utils/rule/rule.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rule.type.d.ts","sourceRoot":"","sources":["rule.type.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.1.14",
+  "version": "3.1.16",
   "description": "",
   "keywords": [],
   "license": "MIT",