@tarojs/components-rn 3.6.22-nightly.7 → 3.6.22-nightly.9

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.
package/LICENSE CHANGED
@@ -165,3 +165,10 @@ MIT (weui):
165
165
  The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
166
166
  `/packages/taro-components/src/components/*.scss`
167
167
  See `/LICENSE.txt` for details of the license.
168
+
169
+ ==================
170
+
171
+ Apache-2.0 (intersection-observer):
172
+ The following files embed [intersection-observer](https://github.com/GoogleChromeLabs/intersection-observer) Apache-2.0:
173
+ `/packages/taro-api/src/polyfill/intersection-observer.ts`
174
+ See `/LICENSE.txt` for details of the license.
@@ -43,7 +43,7 @@ const defaultProps = {
43
43
  selectionEnd: -1
44
44
  };
45
45
  const _Input = (props) => {
46
- var _a;
46
+ var _a, _b;
47
47
  const { style, value, type = defaultProps.type, password, placeholder, disabled, maxlength = defaultProps.maxlength, confirmType, confirmHold, cursor, selectionStart = defaultProps.selectionStart, selectionEnd = defaultProps.selectionEnd, _multiline, _autoHeight, autoFocus, focus, placeholderStyle } = props;
48
48
  const [returnValue, setReturnValue] = React.useState();
49
49
  /** 用于保存输入框值 */
@@ -167,10 +167,10 @@ const _Input = (props) => {
167
167
  return { start: cursor, end: cursor };
168
168
  }
169
169
  })();
170
- const defaultValue = type === 'number' && value ? value + '' : value;
170
+ const defaultValue = (_a = props.defaultValue) !== null && _a !== void 0 ? _a : (type === 'number' && value ? value + '' : value);
171
171
  // fix: https://reactnative.dev/docs/textinput#multiline
172
172
  const textAlignVertical = _multiline ? 'top' : 'auto';
173
- const placeholderTextColor = props.placeholderTextColor || ((_a = parseStyles(placeholderStyle)) === null || _a === void 0 ? void 0 : _a.color);
173
+ const placeholderTextColor = props.placeholderTextColor || ((_b = parseStyles(placeholderStyle)) === null || _b === void 0 ? void 0 : _b.color);
174
174
  const inputProps = omit(props, [
175
175
  'style',
176
176
  'value',
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Input/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Input/index.tsx"],"names":[],"mappings":"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"}
@@ -10,54 +10,68 @@ function formatTimeStr(time = '') {
10
10
  day = ~~day || 1;
11
11
  return new Date(year, month - 1, day);
12
12
  }
13
+ function dateToString(date, fields = 'day') {
14
+ const yyyy = date.getFullYear() + '';
15
+ const MM = ('0' + (date.getMonth() + 1)).slice(-2);
16
+ const dd = ('0' + date.getDate()).slice(-2);
17
+ let ret = yyyy;
18
+ if (fields === 'month' || fields === 'day') {
19
+ ret += `-${MM}`;
20
+ if (fields === 'day') {
21
+ ret += `-${dd}`;
22
+ }
23
+ }
24
+ return ret;
25
+ }
13
26
  export default class DateSelector extends React.Component {
14
27
  constructor() {
15
28
  super(...arguments);
16
29
  this.state = {
17
- pValue: null,
18
- value: new Date(),
30
+ pValue: '',
31
+ value: '',
32
+ isInOnChangeUpdate: false,
19
33
  };
20
34
  this.dismissByOk = false;
21
35
  this.onChange = (date) => {
22
36
  const { fields = 'day', onChange = noop } = this.props;
23
- const yyyy = date.getFullYear() + '';
24
- const MM = ('0' + (date.getMonth() + 1)).slice(-2);
25
- const dd = ('0' + date.getDate()).slice(-2);
26
- let ret = yyyy;
27
- if (fields === 'month' || fields === 'day') {
28
- ret += `-${MM}`;
29
- if (fields === 'day') {
30
- ret += `-${dd}`;
31
- }
32
- }
37
+ const ret = dateToString(date, fields);
38
+ this.setState({
39
+ isInOnChangeUpdate: true,
40
+ value: ret,
41
+ });
33
42
  onChange({
34
43
  detail: {
35
44
  value: ret
36
45
  }
37
46
  });
38
47
  };
39
- this.onValueChange = (vals) => {
40
- this.setState({
41
- value: new Date(vals[0], ~~vals[1], vals[2] || 1)
42
- });
43
- };
44
48
  this.onDismiss = () => {
45
49
  const { onCancel = noop } = this.props;
46
50
  onCancel();
47
51
  };
48
52
  }
49
53
  static getDerivedStateFromProps(nextProps, lastState) {
50
- if (nextProps.value && nextProps.value !== lastState.pValue) {
51
- const now = new Date();
52
- if (!nextProps.value || typeof nextProps.value !== 'string') {
54
+ var _a;
55
+ // eslint-disable-next-line eqeqeq
56
+ const isControlled = nextProps.value != undefined;
57
+ if (isControlled) {
58
+ if (nextProps.value !== lastState.pValue) {
53
59
  return {
54
- value: now,
55
- pValue: now
60
+ value: nextProps.value,
61
+ pValue: nextProps.value,
56
62
  };
57
63
  }
64
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
65
+ return {
66
+ value: nextProps.value,
67
+ isInOnChangeUpdate: false
68
+ };
69
+ }
70
+ }
71
+ else if (nextProps.value !== lastState.pValue) {
58
72
  return {
59
- value: formatTimeStr(nextProps.value),
60
- pValue: nextProps.value
73
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : dateToString(new Date()),
74
+ pValue: nextProps.value,
61
75
  };
62
76
  }
63
77
  return null;
@@ -72,13 +86,12 @@ export default class DateSelector extends React.Component {
72
86
  else if (fields === 'month') {
73
87
  mode = 'month';
74
88
  }
75
- return (React.createElement(AntDatePicker, { mode: mode, value: value, minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onValueChange: this.onValueChange, onDismiss: this.onDismiss, disabled: disabled },
89
+ return (React.createElement(AntDatePicker, { mode: mode, value: formatTimeStr(value), minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onDismiss: this.onDismiss, disabled: disabled },
76
90
  React.createElement(TouchableWithoutFeedback, null,
77
91
  React.createElement(View, null, children))));
78
92
  }
79
93
  }
80
94
  DateSelector.defaultProps = {
81
- value: new Date(),
82
95
  fields: 'day',
83
96
  };
84
97
  //# sourceMappingURL=date.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.tsx"],"names":[],"mappings":"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"}
@@ -54,6 +54,7 @@ function getIndexByValues(range = [], value = []) {
54
54
  return 0;
55
55
  });
56
56
  }
57
+ // Todo: 支持 defaultValue
57
58
  export default class MultiSelector extends React.Component {
58
59
  constructor() {
59
60
  super(...arguments);
@@ -1 +1 @@
1
- {"version":3,"file":"multiSelector.js","sourceRoot":"","sources":["../../../src/components/Picker/multiSelector.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"multiSelector.js","sourceRoot":"","sources":["../../../src/components/Picker/multiSelector.tsx"],"names":[],"mappings":"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"}
@@ -32,13 +32,15 @@ function formateRegionData(clObj = [], customItem, depth = 2) {
32
32
  return obj;
33
33
  }
34
34
  export default class RegionSelector extends React.Component {
35
- constructor(props) {
36
- super(props);
35
+ constructor() {
36
+ super(...arguments);
37
37
  this.state = {
38
38
  value: [],
39
- pValue: []
39
+ pValue: [],
40
+ isInOnChangeUpdate: false,
40
41
  };
41
42
  this.dismissByOk = false;
43
+ this.regionData = formateRegionData(this.props.regionData || regionData, this.props.customItem);
42
44
  this.onChange = (value) => {
43
45
  const { onChange = noop } = this.props;
44
46
  // 通过 value 查找 code
@@ -57,11 +59,9 @@ export default class RegionSelector extends React.Component {
57
59
  const detail = { value, code };
58
60
  if (postcode[2])
59
61
  detail.postcode = postcode[2];
62
+ this.setState({ value, isInOnChangeUpdate: true });
60
63
  onChange({ detail });
61
64
  };
62
- this.onPickerChange = (value) => {
63
- this.setState({ value });
64
- };
65
65
  this.onOk = () => {
66
66
  this.dismissByOk = true;
67
67
  };
@@ -72,13 +72,32 @@ export default class RegionSelector extends React.Component {
72
72
  }
73
73
  this.dismissByOk = false;
74
74
  };
75
- this.regionData = formateRegionData(props.regionData || regionData, props.customItem);
76
75
  }
77
76
  static getDerivedStateFromProps(nextProps, lastState) {
78
- if (nextProps.value !== lastState.pValue) {
77
+ var _a;
78
+ // eslint-disable-next-line eqeqeq
79
+ const isControlled = nextProps.value != undefined;
80
+ if (isControlled) {
81
+ if (nextProps.value !== lastState.pValue) {
82
+ // 受控更新
83
+ return {
84
+ pValue: nextProps.value,
85
+ value: nextProps.value
86
+ };
87
+ }
88
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
89
+ // 受控还原
90
+ return {
91
+ value: nextProps.value,
92
+ isInOnChangeUpdate: false
93
+ };
94
+ }
95
+ }
96
+ else if (nextProps.value !== lastState.pValue) {
97
+ // 初次更新才设置 defaultValue
79
98
  return {
80
- value: nextProps.value,
81
- pValue: nextProps.value
99
+ pValue: nextProps.value,
100
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : []
82
101
  };
83
102
  }
84
103
  return null;
@@ -88,11 +107,8 @@ export default class RegionSelector extends React.Component {
88
107
  const { value, } = this.state;
89
108
  return (
90
109
  // @ts-ignore
91
- React.createElement(AntPicker, { data: this.regionData, value: value, onChange: this.onChange, onPickerChange: this.onPickerChange, onOk: this.onOk, onVisibleChange: this.onVisibleChange, disabled: disabled },
110
+ React.createElement(AntPicker, { data: this.regionData, value: value, onChange: this.onChange, onOk: this.onOk, onVisibleChange: this.onVisibleChange, disabled: disabled },
92
111
  React.createElement(TouchableWithoutFeedback, null, children)));
93
112
  }
94
113
  }
95
- RegionSelector.defaultProps = {
96
- value: [],
97
- };
98
114
  //# sourceMappingURL=region.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"region.js","sourceRoot":"","sources":["../../../src/components/Picker/region.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"region.js","sourceRoot":"","sources":["../../../src/components/Picker/region.tsx"],"names":[],"mappings":"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"}
@@ -22,12 +22,14 @@ export default class Selector extends React.Component {
22
22
  range: [],
23
23
  value: 0,
24
24
  pValue: '',
25
+ isInOnChangeUpdate: false
25
26
  };
26
27
  this.dismissByOk = false;
27
28
  this.onChange = () => {
28
29
  const { onChange = noop } = this.props;
29
30
  const { value } = this.state;
30
31
  onChange({ detail: { value } });
32
+ this.setState({ isInOnChangeUpdate: true });
31
33
  };
32
34
  this.onPickerChange = (value) => {
33
35
  const { range } = this.state;
@@ -52,6 +54,7 @@ export default class Selector extends React.Component {
52
54
  };
53
55
  }
54
56
  static getDerivedStateFromProps(nextProps, lastState) {
57
+ var _a;
55
58
  let ret = null;
56
59
  if (nextProps.range !== lastState.pRange) {
57
60
  ret = {
@@ -61,10 +64,27 @@ export default class Selector extends React.Component {
61
64
  })
62
65
  };
63
66
  }
64
- if (nextProps.value !== lastState.pValue) {
65
- ret = ret || {};
66
- ret.value = nextProps.value;
67
+ // eslint-disable-next-line eqeqeq
68
+ const isControlled = nextProps.value != undefined;
69
+ if (isControlled) {
70
+ if (nextProps.value !== lastState.pValue) {
71
+ // 受控更新
72
+ ret || (ret = {});
73
+ ret.value = nextProps.value;
74
+ ret.pValue = nextProps.value;
75
+ }
76
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
77
+ // 受控还原
78
+ ret || (ret = {});
79
+ ret.isInOnChangeUpdate = false;
80
+ ret.value = nextProps.value;
81
+ }
82
+ }
83
+ else if (lastState.pValue !== nextProps.value) {
84
+ // 初次更新才设置 defaultValue
85
+ ret || (ret = {});
67
86
  ret.pValue = nextProps.value;
87
+ ret.value = (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : 0;
68
88
  }
69
89
  return ret;
70
90
  }
@@ -80,6 +100,5 @@ export default class Selector extends React.Component {
80
100
  }
81
101
  Selector.defaultProps = {
82
102
  range: [],
83
- value: 0,
84
103
  };
85
104
  //# sourceMappingURL=selector.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"selector.js","sourceRoot":"","sources":["../../../src/components/Picker/selector.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"selector.js","sourceRoot":"","sources":["../../../src/components/Picker/selector.tsx"],"names":[],"mappings":"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"}
@@ -14,20 +14,18 @@ export default class TimeSelector extends React.Component {
14
14
  constructor() {
15
15
  super(...arguments);
16
16
  this.state = {
17
- pValue: null,
18
- value: new Date()
17
+ pValue: '',
18
+ value: '',
19
+ isInOnChangeUpdate: false,
19
20
  };
20
21
  this.onChange = (date) => {
21
22
  const { onChange = noop } = this.props;
22
23
  const hh = ('0' + date.getHours()).slice(-2);
23
24
  const mm = ('0' + date.getMinutes()).slice(-2);
24
- onChange({ detail: { value: `${hh}:${mm}` } });
25
- };
26
- this.onValueChange = (vals) => {
27
- const now = new Date();
28
- now.setHours(+vals[0], +vals[1]);
29
- console.log('11', this.state);
30
- this.setState({ value: now });
25
+ const value = `${hh}:${mm}`;
26
+ this.setState({ value });
27
+ onChange({ detail: { value } });
28
+ this.setState({ isInOnChangeUpdate: true });
31
29
  };
32
30
  this.onDismiss = () => {
33
31
  const { onCancel = noop } = this.props;
@@ -35,17 +33,31 @@ export default class TimeSelector extends React.Component {
35
33
  };
36
34
  }
37
35
  static getDerivedStateFromProps(nextProps, lastState) {
38
- if (nextProps.value && nextProps.value !== lastState.pValue) {
39
- const now = new Date();
40
- if (!nextProps.value || typeof nextProps.value !== 'string') {
36
+ var _a;
37
+ const nextIncomingValue = nextProps.value;
38
+ // eslint-disable-next-line eqeqeq
39
+ const isControlled = nextIncomingValue != undefined;
40
+ if (isControlled) {
41
+ if (nextIncomingValue !== lastState.pValue) {
42
+ // 受控更新
41
43
  return {
42
- value: now,
43
- pValue: now
44
+ pValue: nextIncomingValue,
45
+ value: nextIncomingValue,
44
46
  };
45
47
  }
48
+ else if (lastState.isInOnChangeUpdate && nextIncomingValue !== lastState.value) {
49
+ // 受控还原
50
+ return {
51
+ value: nextIncomingValue,
52
+ isInOnChangeUpdate: false,
53
+ };
54
+ }
55
+ }
56
+ else if (nextIncomingValue !== lastState.pValue) {
57
+ // 初次更新才设置 defaultValue
46
58
  return {
47
- value: formatTimeStr(nextProps.value),
48
- pValue: nextProps.value
59
+ pValue: nextIncomingValue,
60
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : '00:00'
49
61
  };
50
62
  }
51
63
  return null;
@@ -53,12 +65,11 @@ export default class TimeSelector extends React.Component {
53
65
  render() {
54
66
  const { children, start, end, disabled } = this.props;
55
67
  const { value } = this.state;
56
- return (React.createElement(AntDatePicker, { mode: 'time', value: value, minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onValueChange: this.onValueChange, onDismiss: this.onDismiss, disabled: disabled },
68
+ return (React.createElement(AntDatePicker, { mode: 'time', value: formatTimeStr(value), minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onDismiss: this.onDismiss, disabled: disabled },
57
69
  React.createElement(TouchableWithoutFeedback, null, children)));
58
70
  }
59
71
  }
60
72
  TimeSelector.defaultProps = {
61
- value: new Date(),
62
73
  start: '00:00',
63
74
  end: '23:59'
64
75
  };
@@ -1 +1 @@
1
- {"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/components/Picker/time.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"time.js","sourceRoot":"","sources":["../../../src/components/Picker/time.tsx"],"names":[],"mappings":"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"}
@@ -23,9 +23,26 @@ import { noop } from '../../utils';
23
23
  import styles from './styles';
24
24
  class _Slider extends React.Component {
25
25
  constructor() {
26
+ var _a;
26
27
  super(...arguments);
28
+ this._timer = null;
29
+ // eslint-disable-next-line eqeqeq
30
+ this._isControlled = this.props.value != undefined;
27
31
  this.state = {
28
- currentValue: this.props.value
32
+ currentValue: (_a = this.props.defaultValue) !== null && _a !== void 0 ? _a : (this.props.value || 0)
33
+ };
34
+ this.ensureControlledValue = () => {
35
+ if (!this._isControlled)
36
+ return;
37
+ this._timer && clearTimeout(this._timer);
38
+ this._timer = setTimeout(() => {
39
+ const controlledValue = this.props.value;
40
+ if (controlledValue !== this.state.currentValue) {
41
+ this.setState({
42
+ currentValue: controlledValue || 0
43
+ });
44
+ }
45
+ }, 50);
29
46
  };
30
47
  this.onSlidingComplete = (value) => {
31
48
  const { onChange = noop } = this.props;
@@ -38,11 +55,13 @@ class _Slider extends React.Component {
38
55
  };
39
56
  }
40
57
  componentDidUpdate(prevProps) {
41
- if (prevProps.value !== this.props.value) {
58
+ const controlledValue = this.props.value;
59
+ if (prevProps.value !== controlledValue) {
42
60
  this.setState({
43
- currentValue: this.props.value
61
+ currentValue: controlledValue || 0
44
62
  });
45
63
  }
64
+ this.ensureControlledValue();
46
65
  }
47
66
  render() {
48
67
  const { style, min, max, step, disabled, activeColor, backgroundColor, blockColor, showValue } = this.props;
@@ -57,7 +76,6 @@ _Slider.defaultProps = {
57
76
  min: 0,
58
77
  max: 100,
59
78
  step: 1,
60
- value: 0,
61
79
  activeColor: '#1aad19',
62
80
  backgroundColor: '#e9e9e9',
63
81
  blockColor: '#fff'
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Slider/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,MAAM,MAAM,gCAAgC,CAAA;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAClC,OAAO,MAAM,MAAM,UAAU,CAAA;AAG7B,MAAM,OAAQ,SAAQ,KAAK,CAAC,SAAmC;IAA/D;;QAYE,UAAK,GAAgB;YACnB,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;SAC/B,CAAA;QAUD,sBAAiB,GAAG,CAAC,KAAa,EAAQ,EAAE;YAC1C,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACtC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QACjC,CAAC,CAAA;QAED,kBAAa,GAAG,CAAC,KAAa,EAAQ,EAAE;YACtC,MAAM,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACxC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;YACjC,IAAI,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAA;QACxC,CAAC,CAAA;IAwBH,CAAC;IAzCC,kBAAkB,CAAC,SAAsB;QACvC,IAAI,SAAS,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACxC,IAAI,CAAC,QAAQ,CAAC;gBACZ,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;aAC/B,CAAC,CAAA;SACH;IACH,CAAC;IAaD,MAAM;QACJ,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAC3G,wBAAwB;QACxB,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,OAAO;YACzB,oBAAC,MAAM,IACL,YAAY,EAAE,GAAG,EACjB,YAAY,EAAE,GAAG,EACjB,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,CAAC,CAAC,QAAQ,EACpB,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY,EAC9B,qBAAqB,EAAE,WAAW,EAClC,qBAAqB,EAAE,eAAe,EACtC,cAAc,EAAE,UAAU,EAC1B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EACzC,aAAa,EAAE,IAAI,CAAC,aAAa,EACjC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,KAAgC,CAAC,GACrD;YACD,SAAS,IAAI,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,IAAI,IAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAQ,CACnE,CACR,CAAA;IACH,CAAC;;AAvDM,mBAAW,GAAG,SAAS,CAAA;AACvB,oBAAY,GAAG;IACpB,GAAG,EAAE,CAAC;IACN,GAAG,EAAE,GAAG;IACR,IAAI,EAAE,CAAC;IACP,KAAK,EAAE,CAAC;IACR,WAAW,EAAE,SAAS;IACtB,eAAe,EAAE,SAAS;IAC1B,UAAU,EAAE,MAAM;CACnB,CAAA;AAiDH,eAAe,OAAO,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Slider/index.tsx"],"names":[],"mappings":"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"}
@@ -23,7 +23,8 @@ class _Switch extends React.Component {
23
23
  // $touchable: Checkbox | Switch | null
24
24
  this.$touchable = React.createRef();
25
25
  this.state = {
26
- checked: !!this.props.checked
26
+ checked: !!this.props.checked,
27
+ pChecked: false,
27
28
  };
28
29
  this._simulateNativePress = (evt) => {
29
30
  const { type } = this.props;
@@ -45,6 +46,34 @@ class _Switch extends React.Component {
45
46
  this.onCheckedChange(item.checked);
46
47
  };
47
48
  }
49
+ static getDerivedStateFromProps(nextProps, lastState) {
50
+ var _a;
51
+ // eslint-disable-next-line eqeqeq
52
+ const isControlled = nextProps.checked != undefined;
53
+ if (isControlled) {
54
+ if (nextProps.checked !== lastState.pChecked) {
55
+ // 受控更新
56
+ return {
57
+ checked: nextProps.checked,
58
+ pChecked: nextProps.checked,
59
+ };
60
+ }
61
+ else if (nextProps.checked !== lastState.checked) {
62
+ // 受控还原
63
+ return {
64
+ checked: nextProps.checked
65
+ };
66
+ }
67
+ }
68
+ else if (lastState.pChecked !== nextProps.checked) {
69
+ // 初次更新才设置 defaultChecked
70
+ return {
71
+ pChecked: nextProps.checked,
72
+ checked: (_a = nextProps.defaultChecked) !== null && _a !== void 0 ? _a : false,
73
+ };
74
+ }
75
+ return null;
76
+ }
48
77
  render() {
49
78
  const { style, type, color, disabled } = this.props;
50
79
  if (type === 'checkbox') {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Switch/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,MAAM,EAEP,MAAM,cAAc,CAAA;AACrB,OAAO,QAAQ,MAAM,aAAa,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAGlC,MAAM,OAAQ,SAAQ,KAAK,CAAC,SAAmC;IAA/D;;QAQE,uCAAuC;QACvC,eAAU,GAAG,KAAK,CAAC,SAAS,EAAqB,CAAA;QAEjD,UAAK,GAAgB;YACnB,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO;SAC9B,CAAA;QAED,yBAAoB,GAAG,CAAC,GAA0B,EAAQ,EAAE;YAC1D,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YAC3B,IAAI,IAAI,KAAK,UAAU,EAAE;gBACvB,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,OAAmB,CAAA;gBAChD,IAAI,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAA;aACvC;iBAAM;gBACL,8BAA8B;gBAC9B,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;aAChD;QACH,CAAC,CAAA;QAED,oBAAe,GAAG,CAAC,SAAkB,EAAQ,EAAE;YAC7C,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACtC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAC1C,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;QACvC,CAAC,CAAA;QAED,qBAAgB,GAAG,CAAC,IAA0B,EAAQ,EAAE;YACtD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC,CAAA;IAiCH,CAAC;IA/BC,MAAM;QACJ,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,KAAK,EACL,QAAQ,EACT,GAAG,IAAI,CAAC,KAAK,CAAA;QAEd,IAAI,IAAI,KAAK,UAAU,EAAE;YACvB,OAAO,CACL,oBAAC,QAAQ,IACP,QAAQ,EAAE,IAAI,CAAC,gBAAgB,EAC/B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAC3B,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,IAAI,CAAC,UAAuC,GACjD,CACH,CAAA;SACF;QAED,OAAO,CACL,oBAAC,MAAM,IACL,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EACzB,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,EAC1D,UAAU,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,EAC7C,mBAAmB,EAAC,SAAS,EAC7B,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,IAAI,CAAC,UAAqC,GAC/C,CACH,CAAA;IACH,CAAC;;AAjEM,mBAAW,GAAG,SAAS,CAAA;AACvB,oBAAY,GAAG;IACpB,IAAI,EAAE,QAAQ;IACd,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,KAAK;CAChB,CAAA;AA+DH,eAAe,OAAO,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Switch/index.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/components-rn",
3
- "version": "3.6.22-nightly.7",
3
+ "version": "3.6.22-nightly.9",
4
4
  "description": "多端解决方案基础组件(RN)",
5
5
  "main": "./dist/index.js",
6
6
  "files": [
@@ -26,7 +26,7 @@
26
26
  "react-native-maps": "^1.3.2",
27
27
  "react-native-pager-view": "~6.0.1",
28
28
  "react-native-webview": "~11.23.0",
29
- "@tarojs/router-rn": "3.6.22-nightly.7"
29
+ "@tarojs/router-rn": "3.6.22-nightly.9"
30
30
  },
31
31
  "devDependencies": {
32
32
  "@babel/core": "^7.14.5",
@@ -66,7 +66,7 @@
66
66
  "dev": "pnpm run assets && tsc --watch",
67
67
  "lint": "eslint .",
68
68
  "test": "jest --silent",
69
- "test:ci": "jest --ci --silent --coverage false",
69
+ "test:ci": "jest --ci -i --coverage --silent",
70
70
  "test:dev": "jest --watch",
71
71
  "test:coverage": "jest --coverage"
72
72
  }