@tarojs/components-rn 4.0.0-beta.1 → 4.0.0-beta.3

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
@@ -158,3 +158,17 @@ MIT (stencil-vue2-output-target):
158
158
  The following files embed [stencil-vue2-output-target](https://github.com/diondree/stencil-vue2-output-target) MIT:
159
159
  `/packages/taro-components-library-vue2/src/vue-component-lib/utils.ts`
160
160
  See `/LICENSE` for details of the license.
161
+
162
+ ==================
163
+
164
+ MIT (weui):
165
+ The following files embed [stencil-vue2-output-target](https://github.com/Tencent/weui) MIT:
166
+ `/packages/taro-components/src/components/*.scss`
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.
@@ -15,8 +15,9 @@
15
15
  */
16
16
  import * as React from 'react';
17
17
  import { Image, StyleSheet } from 'react-native';
18
- import { noop, omit } from '../../utils';
19
- import ClickableSimplified from '../ClickableSimplified';
18
+ import { omit } from '../../utils';
19
+ import { useCallback, useEffect, useRef, useState } from 'react';
20
+ import useClickable from '../hooks/useClickable';
20
21
  // fix: https://github.com/facebook/metro/issues/836
21
22
  // 保证 react-native-svg 是最后一个依赖
22
23
  const omitProp = (props) => {
@@ -39,147 +40,123 @@ try {
39
40
  WithLocalSvg = svg.WithLocalSvg;
40
41
  }
41
42
  catch (e) { }
42
- export class _Image extends React.Component {
43
- constructor() {
44
- super(...arguments);
45
- this.hasLayout = false;
46
- this.state = {
47
- ratio: 0,
48
- layoutWidth: 0
49
- };
50
- this.onError = () => {
51
- const { onError = noop } = this.props;
52
- onError({
53
- detail: { errMsg: 'something wrong' }
54
- });
55
- };
56
- this.onLoad = () => {
57
- const { src, onLoad } = this.props;
58
- if (!onLoad)
59
- return;
60
- if (typeof src === 'string') {
61
- Image.getSize(src, (width, height) => {
62
- onLoad({
63
- detail: { width, height }
64
- });
65
- }, () => {
66
- onLoad({
67
- detail: { width: 0, height: 0 }
68
- });
69
- });
70
- }
71
- else {
72
- const iras = Image.resolveAssetSource(typeof src === 'string' ? { uri: src } : src);
73
- const { width, height } = iras || { width: 0, height: 0 };
43
+ const _Image = (props = {
44
+ src: '',
45
+ mode: 'scaleToFill'
46
+ }) => {
47
+ const ref = useRef({
48
+ hasLayout: false
49
+ });
50
+ const [ratio, setRatio] = useState(0);
51
+ const [layoutWidth, setLayoutWidth] = useState(0);
52
+ const newProps = useClickable(props);
53
+ const { style, src, mode = 'scaleToFill', svg = false, onLoad, onError } = newProps;
54
+ const _onError = useCallback(() => {
55
+ if (!onError)
56
+ return;
57
+ onError({
58
+ detail: { errMsg: 'something wrong' }
59
+ });
60
+ }, [onError]);
61
+ const _onLoad = useCallback(() => {
62
+ if (!onLoad)
63
+ return;
64
+ if (typeof src === 'string') {
65
+ Image.getSize(src, (width, height) => {
74
66
  onLoad({
75
67
  detail: { width, height }
76
68
  });
77
- }
78
- };
79
- this.onLayout = (event) => {
80
- const { mode, style } = this.props;
81
- const { width: layoutWidth } = event.nativeEvent.layout;
82
- const flattenStyle = StyleSheet.flatten(style) || {};
83
- if (mode === 'widthFix' && typeof flattenStyle.width === 'string') {
84
- if (this.hasLayout)
85
- return;
86
- this.setState({
87
- layoutWidth
88
- });
89
- }
90
- if (this.state.ratio) {
91
- this.hasLayout = true;
92
- }
93
- };
94
- this.loadImg = (props) => {
95
- const { mode, src } = props;
96
- if (mode !== 'widthFix')
97
- return;
98
- if (typeof src === 'string') {
99
- Image.getSize(props.src, (width, height) => {
100
- if (this.hasLayout)
101
- return;
102
- this.setState({
103
- ratio: height / width
104
- });
105
- });
106
- }
107
- else {
108
- const source = typeof props.src === 'string' ? { uri: props.src } : props.src;
109
- const { width, height } = Image.resolveAssetSource(source) || {};
110
- if (this.hasLayout && !!this.state.ratio)
111
- return;
112
- this.setState({
113
- ratio: height / width
69
+ }, () => {
70
+ onLoad({
71
+ detail: { width: 0, height: 0 }
114
72
  });
115
- }
116
- };
117
- }
118
- componentDidMount() {
119
- this.loadImg(this.props);
120
- }
121
- shouldComponentUpdate(nextProps) {
122
- if (nextProps.src !== this.props.src) {
123
- this.hasLayout = false;
73
+ });
124
74
  }
125
- return true;
126
- }
127
- componentDidUpdate(prevProps) {
128
- if (prevProps.src !== this.props.src) {
129
- this.loadImg(this.props);
75
+ else {
76
+ const iras = Image.resolveAssetSource(typeof src === 'string' ? { uri: src } : src);
77
+ const { width, height } = iras || { width: 0, height: 0 };
78
+ onLoad({
79
+ detail: { width, height }
80
+ });
130
81
  }
131
- }
132
- render() {
133
- const { style, src, mode = 'scaleToFill', svg = false } = this.props;
82
+ }, [onLoad]);
83
+ const onLayout = (event) => {
84
+ const { width: layoutWidth } = event.nativeEvent.layout;
134
85
  const flattenStyle = StyleSheet.flatten(style) || {};
135
- const defaultWidth = flattenStyle.width || 300;
136
- const defaultHeight = flattenStyle.height || 225;
137
- // remote svg image support, svg 图片暂不支持 mode
138
- const remoteSvgReg = /(https?:\/\/.*\.(?:svg|svgx))/i;
139
- if (SvgCssUri && typeof src === 'string' && remoteSvgReg.test(src)) {
140
- return (React.createElement(SvgCssUri, { uri: src, width: defaultWidth, height: defaultHeight }));
86
+ if (mode === 'widthFix' && typeof flattenStyle.width === 'string') {
87
+ if (ref.current.hasLayout)
88
+ return;
89
+ setLayoutWidth(layoutWidth);
141
90
  }
142
- // The parameter passed to require mpxTransformust be a string literal
143
- const source = typeof src === 'string' ? { uri: src } : src;
144
- // local svg image support, svg 图片暂不支持 mode
145
- if (WithLocalSvg && svg) {
146
- return (React.createElement(WithLocalSvg, { asset: source, width: defaultWidth, height: defaultHeight }));
91
+ if (ratio) {
92
+ ref.current.hasLayout = true;
93
+ }
94
+ };
95
+ const loadImg = useCallback((props) => {
96
+ if (mode !== 'widthFix')
97
+ return;
98
+ if (typeof src === 'string') {
99
+ Image.getSize(props.src, (width, height) => {
100
+ if (ref.current.hasLayout)
101
+ return;
102
+ setRatio(height / width);
103
+ });
104
+ }
105
+ else {
106
+ const source = typeof props.src === 'string' ? { uri: props.src } : props.src;
107
+ const { width, height } = Image.resolveAssetSource(source) || {};
108
+ if (ref.current.hasLayout && !!ratio)
109
+ return;
110
+ setRatio(height / width);
147
111
  }
148
- const isWidthFix = mode === 'widthFix';
149
- const rMode = (resizeModeMap[mode] || (isWidthFix ? undefined : 'stretch'));
150
- const imageHeight = (() => {
151
- if (isWidthFix) {
152
- if (typeof flattenStyle.width === 'string') {
153
- return this.state.layoutWidth * this.state.ratio;
154
- }
155
- else if (typeof flattenStyle.width === 'number') {
156
- return flattenStyle.width * this.state.ratio;
157
- }
158
- else {
159
- return 300 * this.state.ratio;
160
- }
112
+ }, [mode, src, ref]);
113
+ useEffect(() => {
114
+ ref.current.hasLayout = false;
115
+ loadImg(props);
116
+ }, [props.src, ref]);
117
+ const flattenStyle = StyleSheet.flatten(style) || {};
118
+ const defaultWidth = flattenStyle.width || 300;
119
+ const defaultHeight = flattenStyle.height || 225;
120
+ // remote svg image support, svg 图片暂不支持 mode
121
+ const remoteSvgReg = /(https?:\/\/.*\.(?:svg|svgx))/i;
122
+ if (SvgCssUri && typeof src === 'string' && remoteSvgReg.test(src)) {
123
+ return (React.createElement(SvgCssUri, { uri: src, width: defaultWidth, height: defaultHeight }));
124
+ }
125
+ // The parameter passed to require mpxTransformust be a string literal
126
+ const source = typeof src === 'string' ? { uri: src } : src;
127
+ // local svg image support, svg 图片暂不支持 mode
128
+ if (WithLocalSvg && svg) {
129
+ return (React.createElement(WithLocalSvg, { asset: source, width: defaultWidth, height: defaultHeight }));
130
+ }
131
+ const isWidthFix = mode === 'widthFix';
132
+ const rMode = (resizeModeMap[mode] || (isWidthFix ? undefined : 'stretch'));
133
+ const imageHeight = (() => {
134
+ if (isWidthFix) {
135
+ if (typeof flattenStyle.width === 'string') {
136
+ return layoutWidth * ratio;
137
+ }
138
+ else if (typeof flattenStyle.width === 'number') {
139
+ return flattenStyle.width * ratio;
161
140
  }
162
141
  else {
163
- return defaultHeight;
142
+ return 300 * ratio;
164
143
  }
165
- })();
166
- const restImageProps = omitProp(this.props);
167
- return (React.createElement(Image, Object.assign({ testID: 'image', source: source, resizeMode: rMode, onError: this.onError, onLoad: this.onLoad, onLayout: this.onLayout, style: [
168
- {
169
- width: 300
170
- },
171
- style,
172
- {
173
- height: imageHeight
174
- }
175
- ] }, restImageProps)));
176
- }
177
- }
178
- _Image.defaultProps = {
179
- src: '',
180
- mode: 'scaleToFill'
144
+ }
145
+ else {
146
+ return defaultHeight;
147
+ }
148
+ })();
149
+ const restImageProps = omitProp(newProps);
150
+ return (React.createElement(Image, Object.assign({ testID: 'image', source: source, resizeMode: rMode, onError: _onError, onLoad: _onLoad, onLayout: onLayout, style: [
151
+ {
152
+ width: 300
153
+ },
154
+ style,
155
+ {
156
+ height: imageHeight
157
+ }
158
+ ] }, restImageProps)));
181
159
  };
182
- // export { _Image }
183
- export default ClickableSimplified(_Image);
184
- // export default _Image
160
+ export { _Image };
161
+ export default _Image;
185
162
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Image/index.tsx"],"names":[],"mappings":"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"}
@@ -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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"}
@@ -8,54 +8,68 @@ function formatTimeStr(time = '') {
8
8
  day = ~~day || 1;
9
9
  return new Date(year, month - 1, day);
10
10
  }
11
+ function dateToString(date, fields = 'day') {
12
+ const yyyy = date.getFullYear() + '';
13
+ const MM = ('0' + (date.getMonth() + 1)).slice(-2);
14
+ const dd = ('0' + date.getDate()).slice(-2);
15
+ let ret = yyyy;
16
+ if (fields === 'month' || fields === 'day') {
17
+ ret += `-${MM}`;
18
+ if (fields === 'day') {
19
+ ret += `-${dd}`;
20
+ }
21
+ }
22
+ return ret;
23
+ }
11
24
  export default class DateSelector extends React.Component {
12
25
  constructor() {
13
26
  super(...arguments);
14
27
  this.state = {
15
- pValue: null,
16
- value: new Date(),
28
+ pValue: '',
29
+ value: '',
30
+ isInOnChangeUpdate: false,
17
31
  };
18
32
  this.dismissByOk = false;
19
33
  this.onChange = (date) => {
20
34
  const { fields = 'day', onChange = noop } = this.props;
21
- const yyyy = date.getFullYear() + '';
22
- const MM = ('0' + (date.getMonth() + 1)).slice(-2);
23
- const dd = ('0' + date.getDate()).slice(-2);
24
- let ret = yyyy;
25
- if (fields === 'month' || fields === 'day') {
26
- ret += `-${MM}`;
27
- if (fields === 'day') {
28
- ret += `-${dd}`;
29
- }
30
- }
35
+ const ret = dateToString(date, fields);
36
+ this.setState({
37
+ isInOnChangeUpdate: true,
38
+ value: ret,
39
+ });
31
40
  onChange({
32
41
  detail: {
33
42
  value: ret
34
43
  }
35
44
  });
36
45
  };
37
- this.onValueChange = (vals) => {
38
- this.setState({
39
- value: new Date(vals[0], ~~vals[1], vals[2] || 1)
40
- });
41
- };
42
46
  this.onDismiss = () => {
43
47
  const { onCancel = noop } = this.props;
44
48
  onCancel();
45
49
  };
46
50
  }
47
51
  static getDerivedStateFromProps(nextProps, lastState) {
48
- if (nextProps.value && nextProps.value !== lastState.pValue) {
49
- const now = new Date();
50
- if (!nextProps.value || typeof nextProps.value !== 'string') {
52
+ var _a;
53
+ // eslint-disable-next-line eqeqeq
54
+ const isControlled = nextProps.value != undefined;
55
+ if (isControlled) {
56
+ if (nextProps.value !== lastState.pValue) {
51
57
  return {
52
- value: now,
53
- pValue: now
58
+ value: nextProps.value,
59
+ pValue: nextProps.value,
54
60
  };
55
61
  }
62
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
63
+ return {
64
+ value: nextProps.value,
65
+ isInOnChangeUpdate: false
66
+ };
67
+ }
68
+ }
69
+ else if (nextProps.value !== lastState.pValue) {
56
70
  return {
57
- value: formatTimeStr(nextProps.value),
58
- pValue: nextProps.value
71
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : dateToString(new Date()),
72
+ pValue: nextProps.value,
59
73
  };
60
74
  }
61
75
  return null;
@@ -70,11 +84,10 @@ export default class DateSelector extends React.Component {
70
84
  else if (fields === 'month') {
71
85
  mode = 'month';
72
86
  }
73
- 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 }, children));
87
+ return (React.createElement(AntDatePicker, { mode: mode, value: formatTimeStr(value), minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onDismiss: this.onDismiss, disabled: disabled }, children));
74
88
  }
75
89
  }
76
90
  DateSelector.defaultProps = {
77
- value: new Date(),
78
91
  fields: 'day',
79
92
  };
80
93
  //# 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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"}
@@ -53,6 +53,7 @@ function getIndexByValues(range = [], value = []) {
53
53
  return 0;
54
54
  });
55
55
  }
56
+ // Todo: 支持 defaultValue
56
57
  export default class MultiSelector extends React.Component {
57
58
  constructor() {
58
59
  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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"}
@@ -31,13 +31,15 @@ function formateRegionData(clObj = [], customItem, depth = 2) {
31
31
  return obj;
32
32
  }
33
33
  export default class RegionSelector extends React.Component {
34
- constructor(props) {
35
- super(props);
34
+ constructor() {
35
+ super(...arguments);
36
36
  this.state = {
37
37
  value: [],
38
- pValue: []
38
+ pValue: [],
39
+ isInOnChangeUpdate: false,
39
40
  };
40
41
  this.dismissByOk = false;
42
+ this.regionData = formateRegionData(this.props.regionData || regionData, this.props.customItem);
41
43
  this.onChange = (value) => {
42
44
  const { onChange = noop } = this.props;
43
45
  // 通过 value 查找 code
@@ -56,11 +58,9 @@ export default class RegionSelector extends React.Component {
56
58
  const detail = { value, code };
57
59
  if (postcode[2])
58
60
  detail.postcode = postcode[2];
61
+ this.setState({ value, isInOnChangeUpdate: true });
59
62
  onChange({ detail });
60
63
  };
61
- this.onPickerChange = (value) => {
62
- this.setState({ value });
63
- };
64
64
  this.onOk = () => {
65
65
  this.dismissByOk = true;
66
66
  };
@@ -71,13 +71,32 @@ export default class RegionSelector extends React.Component {
71
71
  }
72
72
  this.dismissByOk = false;
73
73
  };
74
- this.regionData = formateRegionData(props.regionData || regionData, props.customItem);
75
74
  }
76
75
  static getDerivedStateFromProps(nextProps, lastState) {
77
- if (nextProps.value !== lastState.pValue) {
76
+ var _a;
77
+ // eslint-disable-next-line eqeqeq
78
+ const isControlled = nextProps.value != undefined;
79
+ if (isControlled) {
80
+ if (nextProps.value !== lastState.pValue) {
81
+ // 受控更新
82
+ return {
83
+ pValue: nextProps.value,
84
+ value: nextProps.value
85
+ };
86
+ }
87
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
88
+ // 受控还原
89
+ return {
90
+ value: nextProps.value,
91
+ isInOnChangeUpdate: false
92
+ };
93
+ }
94
+ }
95
+ else if (nextProps.value !== lastState.pValue) {
96
+ // 初次更新才设置 defaultValue
78
97
  return {
79
- value: nextProps.value,
80
- pValue: nextProps.value
98
+ pValue: nextProps.value,
99
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : []
81
100
  };
82
101
  }
83
102
  return null;
@@ -87,10 +106,7 @@ export default class RegionSelector extends React.Component {
87
106
  const { value, } = this.state;
88
107
  return (
89
108
  // @ts-ignore
90
- React.createElement(AntPicker, { data: this.regionData, value: value, onChange: this.onChange, onPickerChange: this.onPickerChange, onOk: this.onOk, onVisibleChange: this.onVisibleChange, disabled: disabled }, children));
109
+ React.createElement(AntPicker, { data: this.regionData, value: value, onChange: this.onChange, onOk: this.onOk, onVisibleChange: this.onVisibleChange, disabled: disabled }, children));
91
110
  }
92
111
  }
93
- RegionSelector.defaultProps = {
94
- value: [],
95
- };
96
112
  //# 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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"}
@@ -21,12 +21,14 @@ export default class Selector extends React.Component {
21
21
  range: [],
22
22
  value: 0,
23
23
  pValue: '',
24
+ isInOnChangeUpdate: false
24
25
  };
25
26
  this.dismissByOk = false;
26
27
  this.onChange = () => {
27
28
  const { onChange = noop } = this.props;
28
29
  const { value } = this.state;
29
30
  onChange({ detail: { value } });
31
+ this.setState({ isInOnChangeUpdate: true });
30
32
  };
31
33
  this.onPickerChange = (value) => {
32
34
  const { range } = this.state;
@@ -51,6 +53,7 @@ export default class Selector extends React.Component {
51
53
  };
52
54
  }
53
55
  static getDerivedStateFromProps(nextProps, lastState) {
56
+ var _a;
54
57
  let ret = null;
55
58
  if (nextProps.range !== lastState.pRange) {
56
59
  ret = {
@@ -60,10 +63,27 @@ export default class Selector extends React.Component {
60
63
  })
61
64
  };
62
65
  }
63
- if (nextProps.value !== lastState.pValue) {
64
- ret = ret || {};
65
- ret.value = nextProps.value;
66
+ // eslint-disable-next-line eqeqeq
67
+ const isControlled = nextProps.value != undefined;
68
+ if (isControlled) {
69
+ if (nextProps.value !== lastState.pValue) {
70
+ // 受控更新
71
+ ret || (ret = {});
72
+ ret.value = nextProps.value;
73
+ ret.pValue = nextProps.value;
74
+ }
75
+ else if (lastState.isInOnChangeUpdate && nextProps.value !== lastState.value) {
76
+ // 受控还原
77
+ ret || (ret = {});
78
+ ret.isInOnChangeUpdate = false;
79
+ ret.value = nextProps.value;
80
+ }
81
+ }
82
+ else if (lastState.pValue !== nextProps.value) {
83
+ // 初次更新才设置 defaultValue
84
+ ret || (ret = {});
66
85
  ret.pValue = nextProps.value;
86
+ ret.value = (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : 0;
67
87
  }
68
88
  return ret;
69
89
  }
@@ -76,6 +96,5 @@ export default class Selector extends React.Component {
76
96
  }
77
97
  Selector.defaultProps = {
78
98
  range: [],
79
- value: 0,
80
99
  };
81
100
  //# 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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"}
@@ -13,20 +13,18 @@ export default class TimeSelector extends React.Component {
13
13
  constructor() {
14
14
  super(...arguments);
15
15
  this.state = {
16
- pValue: null,
17
- value: new Date()
16
+ pValue: '',
17
+ value: '',
18
+ isInOnChangeUpdate: false,
18
19
  };
19
20
  this.onChange = (date) => {
20
21
  const { onChange = noop } = this.props;
21
22
  const hh = ('0' + date.getHours()).slice(-2);
22
23
  const mm = ('0' + date.getMinutes()).slice(-2);
23
- onChange({ detail: { value: `${hh}:${mm}` } });
24
- };
25
- this.onValueChange = (vals) => {
26
- const now = new Date();
27
- now.setHours(+vals[0], +vals[1]);
28
- console.log('11', this.state);
29
- this.setState({ value: now });
24
+ const value = `${hh}:${mm}`;
25
+ this.setState({ value });
26
+ onChange({ detail: { value } });
27
+ this.setState({ isInOnChangeUpdate: true });
30
28
  };
31
29
  this.onDismiss = () => {
32
30
  const { onCancel = noop } = this.props;
@@ -34,17 +32,31 @@ export default class TimeSelector extends React.Component {
34
32
  };
35
33
  }
36
34
  static getDerivedStateFromProps(nextProps, lastState) {
37
- if (nextProps.value && nextProps.value !== lastState.pValue) {
38
- const now = new Date();
39
- if (!nextProps.value || typeof nextProps.value !== 'string') {
35
+ var _a;
36
+ const nextIncomingValue = nextProps.value;
37
+ // eslint-disable-next-line eqeqeq
38
+ const isControlled = nextIncomingValue != undefined;
39
+ if (isControlled) {
40
+ if (nextIncomingValue !== lastState.pValue) {
41
+ // 受控更新
40
42
  return {
41
- value: now,
42
- pValue: now
43
+ pValue: nextIncomingValue,
44
+ value: nextIncomingValue,
43
45
  };
44
46
  }
47
+ else if (lastState.isInOnChangeUpdate && nextIncomingValue !== lastState.value) {
48
+ // 受控还原
49
+ return {
50
+ value: nextIncomingValue,
51
+ isInOnChangeUpdate: false,
52
+ };
53
+ }
54
+ }
55
+ else if (nextIncomingValue !== lastState.pValue) {
56
+ // 初次更新才设置 defaultValue
45
57
  return {
46
- value: formatTimeStr(nextProps.value),
47
- pValue: nextProps.value
58
+ pValue: nextIncomingValue,
59
+ value: (_a = nextProps.defaultValue) !== null && _a !== void 0 ? _a : '00:00'
48
60
  };
49
61
  }
50
62
  return null;
@@ -52,11 +64,10 @@ export default class TimeSelector extends React.Component {
52
64
  render() {
53
65
  const { children, start, end, disabled } = this.props;
54
66
  const { value } = this.state;
55
- 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 }, children));
67
+ return (React.createElement(AntDatePicker, { mode: 'time', value: formatTimeStr(value), minDate: formatTimeStr(start), maxDate: formatTimeStr(end), onChange: this.onChange, onDismiss: this.onDismiss, disabled: disabled }, children));
56
68
  }
57
69
  }
58
70
  TimeSelector.defaultProps = {
59
- value: new Date(),
60
71
  start: '00:00',
61
72
  end: '23:59'
62
73
  };
@@ -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 = () => {
29
30
  var _a;
@@ -46,6 +47,34 @@ class _Switch extends React.Component {
46
47
  this.onCheckedChange(item.checked);
47
48
  };
48
49
  }
50
+ static getDerivedStateFromProps(nextProps, lastState) {
51
+ var _a;
52
+ // eslint-disable-next-line eqeqeq
53
+ const isControlled = nextProps.checked != undefined;
54
+ if (isControlled) {
55
+ if (nextProps.checked !== lastState.pChecked) {
56
+ // 受控更新
57
+ return {
58
+ checked: nextProps.checked,
59
+ pChecked: nextProps.checked,
60
+ };
61
+ }
62
+ else if (nextProps.checked !== lastState.checked) {
63
+ // 受控还原
64
+ return {
65
+ checked: nextProps.checked
66
+ };
67
+ }
68
+ }
69
+ else if (lastState.pChecked !== nextProps.checked) {
70
+ // 初次更新才设置 defaultChecked
71
+ return {
72
+ pChecked: nextProps.checked,
73
+ checked: (_a = nextProps.defaultChecked) !== null && _a !== void 0 ? _a : false,
74
+ };
75
+ }
76
+ return null;
77
+ }
49
78
  render() {
50
79
  const { style, type, color, disabled } = this.props;
51
80
  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,GACP,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,GAAS,EAAE;;YAChC,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,KAAI,MAAA,IAAI,CAAC,oBAAoB,oDAAI,CAAA,CAAA;aACtC;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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"}
@@ -7,19 +7,40 @@
7
7
  import * as React from 'react';
8
8
  import { View, Text, } from 'react-native';
9
9
  import { extracteTextStyle, omit } from '../../utils';
10
- import ClickableSimplified, { clickableHandlers } from '../ClickableSimplified';
10
+ import useClickable, { clickableHandlers } from '../hooks/useClickable';
11
11
  const stringToText = (child, props) => {
12
12
  // TODO: 实现小程序中效果
13
- return (typeof child === 'string' || typeof child === 'number')
14
- ? React.createElement(Text, Object.assign({}, omit(props, clickableHandlers)), child) : child;
13
+ if (typeof child === 'string' || typeof child === 'number') {
14
+ // textNode节点
15
+ return React.createElement(Text, Object.assign({}, omit(props, clickableHandlers)), child);
16
+ }
17
+ return child;
18
+ };
19
+ // 兼容View中没用Text包裹的文字 防止报错 直接继承props在安卓中文字会消失???
20
+ const renderChildren = (children, props) => {
21
+ let textStyle = null;
22
+ if (Array.isArray(children)) {
23
+ return children.map((child, i) => {
24
+ if ((typeof child === 'string' || typeof child === 'number') && !textStyle) {
25
+ // 存在textNode,解析textStyle
26
+ textStyle = extracteTextStyle(props.style);
27
+ }
28
+ return stringToText(child, Object.assign(Object.assign({ key: i }, props), { style: textStyle }));
29
+ });
30
+ }
31
+ else {
32
+ if ((typeof children === 'string' || typeof children === 'number') && !textStyle) {
33
+ // 存在textNode,解析textStyle
34
+ textStyle = extracteTextStyle(props.style);
35
+ }
36
+ return stringToText(children, Object.assign(Object.assign({}, props), { style: textStyle }));
37
+ }
15
38
  };
16
39
  const _View = React.forwardRef((props, ref) => {
17
- const textStyle = extracteTextStyle(props.style);
18
- // 兼容View中没用Text包裹的文字 防止报错 直接继承props在安卓中文字会消失???
19
- const child = Array.isArray(props.children) ? props.children.map((c, i) => stringToText(c, Object.assign(Object.assign({ key: i }, props), { style: textStyle }))) : stringToText(props.children, Object.assign(Object.assign({}, props), { style: textStyle }));
20
- return (React.createElement(View, Object.assign({ ref: ref, style: props.style }, props), child));
40
+ const clickable = useClickable(props); // 性能优化:从HOC替换成hooks,减少一层组件实例
41
+ return (React.createElement(View, Object.assign({ ref: ref }, clickable), renderChildren(props.children, props)));
21
42
  });
22
43
  _View.displayName = '_View';
23
44
  export { _View };
24
- export default ClickableSimplified(_View);
45
+ export default _View;
25
46
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/View/index.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,IAAI,EACJ,IAAI,GACL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,mBAAmB,EAAE,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG/E,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;IAC9C,iBAAiB;IACjB,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;QAC7D,CAAC,CAAC,oBAAC,IAAI,oBAAK,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAQ,CAAC,CAAC,CAAC,KAAK,CAAA;AACtE,CAAC,CAAA;AAED,MAAM,KAAK,GAA2E,KAAK,CAAC,UAAU,CAAC,CAAC,KAAiB,EAAE,GAA4B,EAAE,EAAE;IACzJ,MAAM,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAChD,gDAAgD;IAChD,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,CAAS,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,gCAAI,GAAG,EAAE,CAAC,IAAK,KAAK,KAAE,KAAK,EAAE,SAAS,IAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,kCAAO,KAAK,KAAE,KAAK,EAAE,SAAS,IAAG,CAAA;IAC/M,OAAO,CACL,oBAAC,IAAI,kBACH,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,CAAC,KAAK,IACd,KAAK,GAER,KAAK,CACD,CACR,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAE3B,OAAO,EAAE,KAAK,EAAE,CAAA;AAChB,eAAe,mBAAmB,CAAC,KAAK,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/View/index.tsx"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,IAAI,EACJ,IAAI,GAGL,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAErD,OAAO,YAAY,EAAE,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAGvE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;IAC9C,iBAAiB;IACjB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC1D,aAAa;QACb,OAAO,oBAAC,IAAI,oBAAK,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAQ,CAAA;KAChE;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,gDAAgD;AAChD,MAAM,cAAc,GAAG,CAAC,QAAyB,EAAE,KAAU,EAAE,EAAE;IAC/D,IAAI,SAAS,GAAgC,IAAI,CAAA;IACjD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE;gBAC5E,yBAAyB;gBACvB,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;aAC3C;YACD,OAAO,YAAY,CAAC,KAAK,gCAAI,GAAG,EAAE,CAAC,IAAK,KAAK,KAAE,KAAK,EAAE,SAAS,IAAG,CAAA;QACpE,CAAC,CAAC,CAAA;KACH;SAAM;QACL,IAAI,CAAC,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE;YAChF,yBAAyB;YACzB,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;SAC3C;QACD,OAAO,YAAY,CAAC,QAAQ,kCAAO,KAAK,KAAE,KAAK,EAAE,SAAS,IAAG,CAAA;KAC9D;AACH,CAAC,CAAA;AAED,MAAM,KAAK,GAA4F,KAAK,CAAC,UAAU,CAAC,CAAC,KAAkC,EAAE,GAA4B,EAAE,EAAE;IAC3L,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAA,CAAC,6BAA6B;IACnE,OAAO,CACL,oBAAC,IAAI,kBACH,GAAG,EAAE,GAAG,IACJ,SAAS,GAEZ,cAAc,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CACjC,CACR,CAAA;AACH,CAAC,CAAC,CAAA;AAEF,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAE3B,OAAO,EAAE,KAAK,EAAE,CAAA;AAChB,eAAe,KAAK,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=PropsType.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PropsType.js","sourceRoot":"","sources":["../../../src/components/hooks/PropsType.tsx"],"names":[],"mappings":""}
@@ -0,0 +1,154 @@
1
+ import { useEffect, useRef, useState } from 'react';
2
+ import { PanResponder } from 'react-native';
3
+ import { omit } from '../../utils';
4
+ export const clickableHandlers = [
5
+ 'onStartShouldSetResponder',
6
+ 'onMoveShouldSetResponder',
7
+ 'onResponderEnd',
8
+ 'onResponderGrant',
9
+ 'onResponderReject',
10
+ 'onResponderMove',
11
+ 'onResponderRelease',
12
+ 'onResponderStart',
13
+ 'onResponderStart',
14
+ 'onResponderTerminationRequest',
15
+ 'onResponderTerminate',
16
+ 'onMoveShouldSetResponderCapture',
17
+ ];
18
+ const getWxAppEvent = (event) => {
19
+ const nativeEvent = event.nativeEvent;
20
+ const { timestamp, target, pageX, pageY, touches = [], changedTouches = [] } = nativeEvent;
21
+ return {
22
+ type: 'tap',
23
+ timeStamp: timestamp,
24
+ target: {
25
+ id: target,
26
+ dataset: {}
27
+ },
28
+ currentTarget: {
29
+ id: target,
30
+ dataset: {}
31
+ },
32
+ detail: {
33
+ x: pageX,
34
+ y: pageY
35
+ },
36
+ touches: touches.map((item) => {
37
+ return {
38
+ identifier: item.identifier,
39
+ pageX: item.pageX,
40
+ pageY: item.pageY,
41
+ clientX: item.locationX,
42
+ clientY: item.locationY
43
+ };
44
+ }),
45
+ changedTouches: changedTouches.map((item) => {
46
+ return {
47
+ identifier: item.identifier,
48
+ pageX: item.pageX,
49
+ pageY: item.pageY,
50
+ clientX: item.locationX,
51
+ clientY: item.locationY
52
+ };
53
+ })
54
+ };
55
+ };
56
+ const useClickable = (props) => {
57
+ const { style, hoverStyle,
58
+ // hoverStopPropagation,
59
+ onClick, onLongPress, onTouchStart,
60
+ // onTouchMove,
61
+ // onTouchCancel,
62
+ onTouchEnd, } = props;
63
+ if (!hoverStyle &&
64
+ // !hoverStopPropagation &&
65
+ !onClick &&
66
+ !onLongPress &&
67
+ !onTouchStart &&
68
+ // !onTouchMove &&
69
+ // !onTouchCancel &&
70
+ !onTouchEnd) {
71
+ return props;
72
+ }
73
+ const [isHover, setIsHover] = useState(false);
74
+ const ref = useRef({
75
+ startTimestamp: 0
76
+ });
77
+ useEffect(() => {
78
+ return () => {
79
+ ref.current.startTimer && clearTimeout(ref.current.startTimer);
80
+ ref.current.stayTimer && clearTimeout(ref.current.stayTimer);
81
+ };
82
+ }, [ref]);
83
+ const setStartTimer = () => {
84
+ const { hoverStyle, hoverStartTime } = props;
85
+ if (hoverStyle) {
86
+ ref.current.startTimer && clearTimeout(ref.current.startTimer);
87
+ ref.current.startTimer = setTimeout(() => {
88
+ setIsHover(true);
89
+ }, hoverStartTime);
90
+ }
91
+ };
92
+ const setStayTimer = () => {
93
+ const { hoverStyle, hoverStayTime } = props;
94
+ if (hoverStyle) {
95
+ ref.current.stayTimer && clearTimeout(ref.current.stayTimer);
96
+ ref.current.stayTimer = setTimeout(() => {
97
+ isHover && setIsHover(false);
98
+ }, hoverStayTime);
99
+ }
100
+ };
101
+ const panResponder = useRef(PanResponder.create({
102
+ onStartShouldSetPanResponder: () => {
103
+ const { hoverStyle, onClick, onLongPress, onTouchStart,
104
+ // onTouchMove,
105
+ // onTouchCancel,
106
+ onTouchEnd } = props;
107
+ return !!(hoverStyle || onClick || onLongPress || onTouchStart || onTouchEnd);
108
+ },
109
+ onShouldBlockNativeResponder: () => false,
110
+ onPanResponderGrant: (evt) => {
111
+ const { onTouchStart } = props;
112
+ onTouchStart && onTouchStart(getWxAppEvent(evt));
113
+ ref.current.startTimestamp = evt.nativeEvent.timestamp;
114
+ setStartTimer();
115
+ },
116
+ onPanResponderTerminationRequest: () => true,
117
+ onPanResponderRelease: (evt, gestureState) => {
118
+ const { onClick, onLongPress, onTouchEnd } = props;
119
+ onTouchEnd && onTouchEnd(getWxAppEvent(evt));
120
+ const endTimestamp = evt.nativeEvent.timestamp;
121
+ const gapTime = endTimestamp - ref.current.startTimestamp;
122
+ // 1 =>3, 修复部分android机型(三星折叠屏尤为明显),单击时dx,dy为>1,而被误判为move的情况。
123
+ const hasMove = Math.abs(gestureState.dx) >= 3 || Math.abs(gestureState.dy) >= 3;
124
+ if (!hasMove) {
125
+ if (gapTime <= 350) {
126
+ onClick && onClick(getWxAppEvent(evt));
127
+ }
128
+ else {
129
+ onLongPress && onLongPress(getWxAppEvent(evt));
130
+ }
131
+ }
132
+ setStayTimer();
133
+ },
134
+ onPanResponderTerminate: () => {
135
+ // const { onTouchCancel } = this.props
136
+ // onTouchCancel && onTouchCancel(this.getWxAppEvent(evt))
137
+ setStayTimer();
138
+ }
139
+ })).current;
140
+ return Object.assign(Object.assign(Object.assign({}, omit(props, [
141
+ 'style',
142
+ 'hoverStyle',
143
+ 'hoverStartTime',
144
+ 'hoverStayTime',
145
+ 'onClick',
146
+ 'onLongPress',
147
+ 'onTouchStart',
148
+ // 'onTouchMove',
149
+ // 'onTouchCancel',
150
+ 'onTouchEnd'
151
+ ])), panResponder.panHandlers), { style: [{ backgroundColor: 'transparent' }, style, isHover && hoverStyle] });
152
+ };
153
+ export default useClickable;
154
+ //# sourceMappingURL=useClickable.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"useClickable.js","sourceRoot":"","sources":["../../../src/components/hooks/useClickable.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": "4.0.0-beta.1",
3
+ "version": "4.0.0-beta.3",
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.2.0",
28
28
  "react-native-webview": "~13.6.3",
29
- "@tarojs/router-rn": "4.0.0-beta.1"
29
+ "@tarojs/router-rn": "4.0.0-beta.3"
30
30
  },
31
31
  "devDependencies": {
32
32
  "@babel/core": "^7.14.5",
@@ -41,7 +41,6 @@
41
41
  "jest-cli": "^29.3.1",
42
42
  "jest-environment-node": "^29.5.0",
43
43
  "jest-expo": "^50.0.0",
44
- "metro-babel-register": "^0.76.5",
45
44
  "react": "18.2.0",
46
45
  "react-native": "^0.73.1",
47
46
  "react-native-gesture-handler": "~2.14.0",
@@ -65,7 +64,7 @@
65
64
  "dev": "pnpm run assets && tsc --watch",
66
65
  "lint": "eslint .",
67
66
  "test": "jest --silent",
68
- "test:ci": "jest --ci --silent --coverage false",
67
+ "test:ci": "jest --ci -i --coverage --silent",
69
68
  "test:dev": "jest --watch",
70
69
  "test:coverage": "jest --coverage"
71
70
  }