@zat-design/sisyphus-react 3.6.5-beta.9 → 3.6.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/ProForm/utils/useWatch.js +8 -18
  2. package/lib/ProForm/utils/useWatch.js +8 -18
  3. package/package.json +1 -1
package/es/ProForm/utils/useWatch.js CHANGED
@@ -1,9 +1,6 @@
1
- import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
- import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
1
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
4
2
  import { debounce } from 'lodash';
5
3
  import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
6
- import get from 'rc-util/lib/utils/get';
7
4
  import warning from 'rc-util/lib/warning';
8
5
  import { useState, useEffect, useRef, useMemo } from 'react';
9
6
  export function toArray(value) {
@@ -29,7 +26,8 @@ var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (namePath
29
26
  warning(nameStrRef.current === fullyStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
30
27
  } : function () {};
31
28
  function useWatch(dependencies, form, wait) {
32
- var _useState = useState(typeof dependencies === 'string' ? undefined : []),
29
+ var isSingle = typeof dependencies === 'string';
30
+ var _useState = useState({}),
33
31
  _useState2 = _slicedToArray(_useState, 2),
34
32
  value = _useState2[0],
35
33
  setValue = _useState2[1];
@@ -40,7 +38,7 @@ function useWatch(dependencies, form, wait) {
40
38
  valueStrRef.current = valueStr;
41
39
  var formInstance = form;
42
40
  var isValidForm = formInstance && formInstance._init;
43
- var _dependencies = typeof dependencies === 'string' ? [dependencies] : dependencies;
41
+ var _dependencies = isSingle ? [dependencies] : dependencies;
44
42
  var namePaths = _dependencies === null || _dependencies === void 0 ? void 0 : _dependencies.map(function (item) {
45
43
  return getNamePath(item);
46
44
  });
@@ -53,17 +51,13 @@ function useWatch(dependencies, form, wait) {
53
51
  getInternalHooks = formInstance.getInternalHooks;
54
52
  var _getInternalHooks = getInternalHooks(HOOK_MARK),
55
53
  registerWatch = _getInternalHooks.registerWatch;
56
- var callback = function callback(store) {
57
- var newValue = namePathsRef.current.map(function (namePath) {
58
- return get(store, namePath);
59
- });
54
+ var callback = function callback() {
55
+ var newValue = getFieldsValue(_dependencies);
60
56
  var nextValueStr = stringify(newValue);
61
57
  // Compare stringify in case it's nest object
62
58
  if (valueStrRef.current !== nextValueStr) {
63
59
  valueStrRef.current = nextValueStr;
64
- setValue(_dependencies.reduce(function (acc, key, index) {
65
- return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, newValue[index]));
66
- }, {}));
60
+ setValue(getFieldsValue(_dependencies));
67
61
  }
68
62
  };
69
63
  // 增加防抖
@@ -71,12 +65,8 @@ function useWatch(dependencies, form, wait) {
71
65
  callback = debounce(callback, wait);
72
66
  }
73
67
  var cancelRegister = registerWatch(callback);
74
- var initialValue = namePathsRef.current.map(function (namePath) {
75
- return get(getFieldsValue(), namePath);
76
- });
77
- setValue(_dependencies.reduce(function (acc, key, index) {
78
- return _objectSpread(_objectSpread({}, acc), {}, _defineProperty({}, key, initialValue[index]));
79
- }, {}));
68
+ var initialValue = getFieldsValue(_dependencies);
69
+ setValue(initialValue);
80
70
  return cancelRegister;
81
71
  },
82
72
  // We do not need re-register since namePath content is the same
package/lib/ProForm/utils/useWatch.js CHANGED
@@ -8,12 +8,9 @@ exports.default = void 0;
8
8
  exports.getNamePath = getNamePath;
9
9
  exports.stringify = stringify;
10
10
  exports.toArray = toArray;
11
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
12
- var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
13
11
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
14
12
  var _lodash = require("lodash");
15
13
  var _FieldContext = require("rc-field-form/es/FieldContext");
16
- var _get = _interopRequireDefault(require("rc-util/lib/utils/get"));
17
14
  var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
18
15
  var _react = require("react");
19
16
  function toArray(value) {
@@ -39,7 +36,8 @@ var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (namePath
39
36
  (0, _warning.default)(nameStrRef.current === fullyStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
40
37
  } : function () {};
41
38
  function useWatch(dependencies, form, wait) {
42
- var _useState = (0, _react.useState)(typeof dependencies === 'string' ? undefined : []),
39
+ var isSingle = typeof dependencies === 'string';
40
+ var _useState = (0, _react.useState)({}),
43
41
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
44
42
  value = _useState2[0],
45
43
  setValue = _useState2[1];
@@ -50,7 +48,7 @@ function useWatch(dependencies, form, wait) {
50
48
  valueStrRef.current = valueStr;
51
49
  var formInstance = form;
52
50
  var isValidForm = formInstance && formInstance._init;
53
- var _dependencies = typeof dependencies === 'string' ? [dependencies] : dependencies;
51
+ var _dependencies = isSingle ? [dependencies] : dependencies;
54
52
  var namePaths = _dependencies === null || _dependencies === void 0 ? void 0 : _dependencies.map(function (item) {
55
53
  return getNamePath(item);
56
54
  });
@@ -63,17 +61,13 @@ function useWatch(dependencies, form, wait) {
63
61
  getInternalHooks = formInstance.getInternalHooks;
64
62
  var _getInternalHooks = getInternalHooks(_FieldContext.HOOK_MARK),
65
63
  registerWatch = _getInternalHooks.registerWatch;
66
- var callback = function callback(store) {
67
- var newValue = namePathsRef.current.map(function (namePath) {
68
- return (0, _get.default)(store, namePath);
69
- });
64
+ var callback = function callback() {
65
+ var newValue = getFieldsValue(_dependencies);
70
66
  var nextValueStr = stringify(newValue);
71
67
  // Compare stringify in case it's nest object
72
68
  if (valueStrRef.current !== nextValueStr) {
73
69
  valueStrRef.current = nextValueStr;
74
- setValue(_dependencies.reduce(function (acc, key, index) {
75
- return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, acc), {}, (0, _defineProperty2.default)({}, key, newValue[index]));
76
- }, {}));
70
+ setValue(getFieldsValue(_dependencies));
77
71
  }
78
72
  };
79
73
  // 增加防抖
@@ -81,12 +75,8 @@ function useWatch(dependencies, form, wait) {
81
75
  callback = (0, _lodash.debounce)(callback, wait);
82
76
  }
83
77
  var cancelRegister = registerWatch(callback);
84
- var initialValue = namePathsRef.current.map(function (namePath) {
85
- return (0, _get.default)(getFieldsValue(), namePath);
86
- });
87
- setValue(_dependencies.reduce(function (acc, key, index) {
88
- return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, acc), {}, (0, _defineProperty2.default)({}, key, initialValue[index]));
89
- }, {}));
78
+ var initialValue = getFieldsValue(_dependencies);
79
+ setValue(initialValue);
90
80
  return cancelRegister;
91
81
  },
92
82
  // We do not need re-register since namePath content is the same
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.6.5-beta.9",
3
+ "version": "3.6.6",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",