@tarojs/components-rn 3.5.0-canary.0 → 3.5.0-canary.1

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.
@@ -32,7 +32,7 @@ import { TouchableWithoutFeedback, Text, View, Image, Animated, Easing } from 'r
32
32
  import styles from './styles';
33
33
  import { extracteTextStyle, noop } from '../../utils';
34
34
  const Loading = (props) => {
35
- const { type = 'primary' } = props;
35
+ const { type = 'primary', hasSibling } = props;
36
36
  const rotate = React.useRef(new Animated.Value(0)).current;
37
37
  React.useEffect(() => {
38
38
  const animation = Animated.loop(Animated.timing(rotate, {
@@ -51,7 +51,11 @@ const Loading = (props) => {
51
51
  inputRange: [0, 1],
52
52
  outputRange: ['0deg', '360deg']
53
53
  });
54
- return (React.createElement(Animated.View, { style: [styles.loading, { transform: [{ rotate: rotateDeg }] }] },
54
+ const loadingStyle = Object.assign(Object.assign({}, styles.loading), { transform: [{ rotate: rotateDeg }] });
55
+ if (!hasSibling) {
56
+ loadingStyle.marginRight = 0;
57
+ }
58
+ return (React.createElement(Animated.View, { style: loadingStyle },
55
59
  React.createElement(Image, { source: type === 'warn' ? require('../../assets/loading-warn.png') : require('../../assets/loading.png'), style: styles.loadingImg })));
56
60
  };
57
61
  class _Button extends React.Component {
@@ -135,7 +139,7 @@ class _Button extends React.Component {
135
139
  style,
136
140
  this.state.isHover && hoverStyle
137
141
  ] },
138
- loading && React.createElement(Loading, { type: type }),
142
+ loading && React.createElement(Loading, { hasSibling: !!React.Children.count(children), type: type }),
139
143
  Array.isArray(children) ? (children.map((c, i) => (React.createElement(Text, { key: i, style: [styles.btnText, !isDefaultSize && styles.btnTextMini, { color: textColor }, textHoverStyle] }, c)))) : (['string', 'number'].indexOf(typeof children) > -1) ? (React.createElement(Text, { style: [styles.btnText, !isDefaultSize && styles.btnTextMini, { color: textColor }, textHoverStyle] }, children)) : (children))));
140
144
  }
141
145
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
@@ -15,6 +15,8 @@
15
15
  */
16
16
  import * as React from 'react';
17
17
  import { Image, StyleSheet } from 'react-native';
18
+ // @ts-ignore
19
+ import { SvgCssUri, WithLocalSvg } from 'react-native-svg';
18
20
  import { noop, omit } from '../../utils';
19
21
  import ClickableSimplified from '../ClickableSimplified';
20
22
  const resizeModeMap = {
@@ -116,8 +118,19 @@ export class _Image extends React.Component {
116
118
  }
117
119
  }
118
120
  render() {
119
- const { style, src, mode = 'scaleToFill' } = this.props;
121
+ const { style, src, mode = 'scaleToFill', svg = false } = this.props;
120
122
  const flattenStyle = StyleSheet.flatten(style) || {};
123
+ const defaultWidth = flattenStyle.width || 300;
124
+ const defaultHeight = flattenStyle.height || 225;
125
+ // remote svg image support, svg 图片暂不支持 mode
126
+ const remoteSvgReg = /(https?:\/\/.*\.(?:svg|svgx))/i;
127
+ if (typeof src === 'string' && remoteSvgReg.test(src)) {
128
+ return (React.createElement(SvgCssUri, { uri: src, width: defaultWidth, height: defaultHeight }));
129
+ }
130
+ // local svg image support, svg 图片暂不支持 mode
131
+ if (svg) {
132
+ return (React.createElement(WithLocalSvg, { asset: src, width: defaultWidth, height: defaultHeight }));
133
+ }
121
134
  // The parameter passed to require mpxTransformust be a string literal
122
135
  const source = typeof src === 'string' ? { uri: src } : src;
123
136
  const isWidthFix = mode === 'widthFix';
@@ -135,7 +148,7 @@ export class _Image extends React.Component {
135
148
  }
136
149
  }
137
150
  else {
138
- return flattenStyle.height || 225;
151
+ return defaultHeight;
139
152
  }
140
153
  })();
141
154
  const restImageProps = omit(this.props, ['source', 'src', 'resizeMode', 'onLoad', 'onError', 'onLayout', 'style']);
@@ -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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"}
@@ -157,6 +157,8 @@ class _Input extends React.Component {
157
157
  }
158
158
  })();
159
159
  value = type === 'number' && value ? value + '' : value;
160
+ // fix: https://reactnative.dev/docs/textinput#multiline
161
+ const textAlignVertical = _multiline ? 'top' : 'auto';
160
162
  return (React.createElement(TextInput, Object.assign({}, omit(this.props, [
161
163
  'style',
162
164
  'value',
@@ -180,7 +182,9 @@ class _Input extends React.Component {
180
182
  '_onLineChange'
181
183
  ]), { defaultValue: value, keyboardType: keyboardType, secureTextEntry: !!password, placeholder: placeholder, editable: !disabled, maxLength: maxlength === -1 ? undefined : maxlength,
182
184
  // returnKeyLabel={confirmType}
183
- returnKeyType: confirmType, blurOnSubmit: !_multiline && !confirmHold, autoFocus: !!autoFocus || !!focus, selection: selection, onChangeText: this.onChangeText, value: this.state.returnValue, onFocus: this.onFocus, onBlur: this.onBlur, onKeyPress: this.onKeyPress, onSubmitEditing: this.onSubmitEditing, multiline: !!_multiline, onContentSizeChange: this.onContentSizeChange, underlineColorAndroid: "rgba(0,0,0,0)", style: [style, _multiline && _autoHeight && { height: Math.max(35, this.state.height) }] })));
185
+ returnKeyType: confirmType, blurOnSubmit: !_multiline && !confirmHold, autoFocus: !!autoFocus || !!focus, selection: selection, onChangeText: this.onChangeText, value: this.state.returnValue, onFocus: this.onFocus, onBlur: this.onBlur, onKeyPress: this.onKeyPress, onSubmitEditing: this.onSubmitEditing, multiline: !!_multiline, textAlignVertical: textAlignVertical, onContentSizeChange: this.onContentSizeChange, underlineColorAndroid: "rgba(0,0,0,0)", style: [{
186
+ padding: 0,
187
+ }, style, _multiline && _autoHeight && { height: Math.max(35, this.state.height) }] })));
184
188
  }
185
189
  }
186
190
  _Input.defaultProps = {
@@ -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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,SAAS,EACT,QAAQ,EAKT,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAGxC,MAAM,eAAe,GAA8B;IACjD,IAAI,EAAE,SAAS;IACf,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,SAAS;IACjB,KAAK,EACH,QAAQ,CAAC,MAAM,CAAC;QACd,GAAG,EAAE,aAAa;QAClB,OAAO,EAAE,SAAS;KACnB,CAAC,IAAI,EAAE;CACX,CAAA;AAED,2BAA2B;AAC3B,gBAAgB;AAChB,gBAAgB;AAChB,kBAAkB;AAClB,iBAAiB;AACjB,cAAc;AACd,IAAI;AAEJ,MAAM,MAAO,SAAQ,KAAK,CAAC,SAAiC;IAA5D;;QAkBE,UAAK,GAAe;YAClB,WAAW,EAAE,SAAS;YACtB,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,SAAS;SACjB,CAAA;QAGD,cAAS,GAAG,CAAC,CAAA;QAEb,iBAAY,GAAG,CAAC,IAAY,EAAQ,EAAE;YACpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACxC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YAClC,MAAM,OAAO,GAAG,OAAO,IAAI,QAAQ,CAAA;YACnC,IAAI,CAAC,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAA;YAC1B,IAAI,OAAO,EAAE;gBACX,MAAM,MAAM,GAAY,OAAO,CAAC;oBAC9B,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;oBACvB,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;iBACxB,CAAC,CAAA;gBACF,wBAAwB;gBACxB,yEAAyE;gBACzE,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;oBAC9B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAA;oBACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAA;iBACvC;qBAAM,IAAI,WAAW,EAAE;oBACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAA;iBAC1C;aACF;QACH,CAAC,CAAA;QAED,YAAO,GAAG,GAAS,EAAE;YACnB,MAAM,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACrC,mCAAmC;YACnC,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YAClC,IAAI,CAAC,QAAQ,GAAG,WAAW,IAAI,EAAE,CAAA;YAEjC,OAAO,CAAC;gBACN,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,WAAM,GAAG,GAAS,EAAE;YAClB,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACpC,MAAM,CAAC;gBACL,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED;;;;;;WAMG;QACH,eAAU,GAAG,CAAC,KAAuD,EAAQ,EAAE;YAC7E,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACzD,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAA;YACtC,IAAI,KAAK,CAAA;YACT,QAAQ,KAAK,OAAO,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAA;YACpC,QAAQ,KAAK,WAAW,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;YACvC,SAAS,CAAC;gBACR,KAAK;gBACL,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;YACF,IAAI,QAAQ,KAAK,OAAO;gBAAE,OAAM;YAChC,SAAS,CAAC;gBACR,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,oBAAe,GAAG,GAAS,EAAE;YAC3B,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,SAAS,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACrE,IAAI,UAAU;gBAAE,OAAM;YACtB,SAAS,CAAC;gBACR,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;YACF,SAAS,CAAC;gBACR,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;gBACtC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,EAAE;aACvC,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,wBAAmB,GAAG,CAAC,KAAgE,EAAQ,EAAE;YAC/F,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,WAAW,CAAA;YACvD,oCAAoC;YACpC,IAAI,KAAK,IAAI,MAAM,EAAE;gBACnB,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACpE,IAAI,CAAC,UAAU,IAAI,CAAC,WAAW,IAAI,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM;oBAAE,OAAM;gBACvE,IAAI,CAAC,SAAS,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBACrD,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;gBAChE,IAAI,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;aAC1B;QACH,CAAC,CAAA;IAwFH,CAAC;IApMC,MAAM,CAAC,wBAAwB,CAAC,KAAiB,EAAE,KAAiB;QAClE,OAAO,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;YAChC,CAAC,iCACI,KAAK,KACR,WAAW,EAAE,KAAK,CAAC,KAAK,IAE1B,CAAC,CAAC,IAAI,CAAA;IACV,CAAC;IAuGD,MAAM;QACJ,IAAI,EACF,KAAK,EACL,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,SAAS,EACT,WAAW,EACX,WAAW,EACX,MAAM,EACN,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACX,SAAS,EACT,KAAK,GACN,GAAG,IAAI,CAAC,KAAK,CAAA;QAEd,MAAM,YAAY,GAAwB,eAAe,CAAC,IAAI,CAAwB,CAAA;QAEtF,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;YACtB,IAAI,cAAc,IAAI,CAAC,IAAI,YAAY,IAAI,CAAC,EAAE;gBAC5C,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,YAAY,EAAE,CAAA;aACpD;iBAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBACrC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAA;aACtC;QACH,CAAC,CAAC,EAAE,CAAA;QAEJ,KAAK,GAAG,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;QAEvD,wDAAwD;QACxD,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAA;QAErD,OAAO,CACL,oBAAC,SAAS,oBACJ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACnB,OAAO;YACP,OAAO;YACP,MAAM;YACN,UAAU;YACV,aAAa;YACb,UAAU;YACV,WAAW;YACX,aAAa;YACb,aAAa;YACb,QAAQ;YACR,gBAAgB;YAChB,cAAc;YACd,SAAS;YACT,SAAS;YACT,QAAQ;YACR,WAAW;YACX,WAAW;YACX,YAAY;YACZ,aAAa;YACb,eAAe;SAChB,CAAC,IACF,YAAY,EAAE,KAAK,EACnB,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,CAAC,CAAC,QAAQ,EAC3B,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,CAAC,QAAQ,EACnB,SAAS,EAAE,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACnD,+BAA+B;YAC/B,aAAa,EAAE,WAAW,EAC1B,YAAY,EAAE,CAAC,UAAU,IAAI,CAAC,WAAW,EACzC,SAAS,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,EACjC,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,IAAI,CAAC,YAAY,EAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAC7B,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,MAAM,EAAE,IAAI,CAAC,MAAM,EACnB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,eAAe,EAAE,IAAI,CAAC,eAAe,EACrC,SAAS,EAAE,CAAC,CAAC,UAAU,EACvB,iBAAiB,EAAE,iBAAiB,EACpC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB,EAC7C,qBAAqB,EAAC,eAAe,EACrC,KAAK,EAAE,CAAC;oBACN,OAAO,EAAE,CAAC;iBACX,EAAE,KAAK,EAAE,UAAU,IAAI,WAAW,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,IACnF,CACH,CAAA;IACH,CAAC;;AA3MM,mBAAY,GAAG;IACpB,IAAI,EAAE,MAAM;IACZ,SAAS,EAAE,GAAG;IACd,WAAW,EAAE,MAAM;IACnB,cAAc,EAAE,CAAC,CAAC;IAClB,YAAY,EAAE,CAAC,CAAC;CACjB,CAAA;AAwMH,eAAe,MAAM,CAAA"}
@@ -8,14 +8,14 @@ function formatTimeStr(time = '') {
8
8
  year = ~~year || 2000;
9
9
  month = ~~month || 1;
10
10
  day = ~~day || 1;
11
- return new Date(`${year}/${month}/${day}`);
11
+ return new Date(year, month - 1, day);
12
12
  }
13
13
  export default class DateSelector extends React.Component {
14
14
  constructor() {
15
15
  super(...arguments);
16
16
  this.state = {
17
17
  pValue: null,
18
- value: 0,
18
+ value: new Date(),
19
19
  };
20
20
  this.dismissByOk = false;
21
21
  this.onChange = (date) => {
@@ -37,7 +37,9 @@ export default class DateSelector extends React.Component {
37
37
  });
38
38
  };
39
39
  this.onValueChange = (vals) => {
40
- this.setState({ value: new Date(`${vals[0]}/${~~vals[1] + 1}/${vals[2] || 1}`) });
40
+ this.setState({
41
+ value: new Date(vals[0], ~~vals[1], vals[2] || 1)
42
+ });
41
43
  };
42
44
  this.onOk = () => {
43
45
  this.dismissByOk = true;
@@ -51,7 +53,7 @@ export default class DateSelector extends React.Component {
51
53
  };
52
54
  }
53
55
  static getDerivedStateFromProps(nextProps, lastState) {
54
- if (nextProps.value !== lastState.pValue) {
56
+ if (nextProps.value && nextProps.value !== lastState.pValue) {
55
57
  const now = new Date();
56
58
  if (!nextProps.value || typeof nextProps.value !== 'string') {
57
59
  return {
@@ -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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"}
@@ -43,7 +43,7 @@ export default class TimeSelector extends React.Component {
43
43
  }
44
44
  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
45
45
  static getDerivedStateFromProps(nextProps, lastState) {
46
- if (nextProps.value !== lastState.pValue) {
46
+ if (nextProps.value && nextProps.value !== lastState.pValue) {
47
47
  const now = new Date();
48
48
  if (!nextProps.value || typeof nextProps.value !== 'string') {
49
49
  return {
@@ -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":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,aAAa,MAAM,0CAA0C,CAAA;AACpE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAElC,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAEvD,SAAS,aAAa,CAAC,IAAI,GAAG,EAAE;IAC9B,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,GAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IACzC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAA;IACb,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;IACjB,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC1B,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,SAA+B;IAA/E;;QAOE,UAAK,GAAQ;YACX,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI,IAAI,EAAE;SAClB,CAAA;QAED,gBAAW,GAAG,KAAK,CAAA;QAoBnB,aAAQ,GAAG,CAAC,IAAU,EAAQ,EAAE;YAC9B,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACtC,MAAM,EAAE,GAAW,CAAC,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACpD,MAAM,EAAE,GAAW,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACtD,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;QAChD,CAAC,CAAA;QAED,kBAAa,GAAG,CAAC,IAAc,EAAQ,EAAE;YACvC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;YACtB,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YAChC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;YAC7B,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;QAC/B,CAAC,CAAA;QAED,SAAI,GAAG,GAAS,EAAE;YAChB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAA;QACzB,CAAC,CAAA;QAED,oBAAe,GAAG,CAAC,OAAgB,EAAQ,EAAE;YAC3C,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBACjC,MAAM,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;gBACtC,QAAQ,EAAE,CAAA;aACX;YACD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAA;QAC1B,CAAC,CAAA;IAuBH,CAAC;IAjEC,6EAA6E;IAC7E,MAAM,CAAC,wBAAwB,CAAC,SAAoB,EAAE,SAAc;QAClE,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,CAAC,MAAM,EAAE;YAC3D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;YACtB,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,OAAO,SAAS,CAAC,KAAK,KAAK,QAAQ,EAAE;gBAC3D,OAAO;oBACL,KAAK,EAAE,GAAG;oBACV,MAAM,EAAE,GAAG;iBACZ,CAAA;aACF;YACD,OAAO;gBACL,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC;gBACrC,MAAM,EAAE,SAAS,CAAC,KAAK;aACxB,CAAA;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IA4BD,MAAM;QACJ,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QACrD,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QAE5B,OAAO,CACL,oBAAC,aAAa,IACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,EAC7B,OAAO,EAAE,aAAa,CAAC,GAAG,CAAC,EAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,aAAa;YACb,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,eAAe,EAAE,IAAI,CAAC,eAAe,EACrC,QAAQ,EAAE,QAAQ;YAElB,oBAAC,wBAAwB,QAAE,QAAQ,CAA4B,CACjD,CACjB,CAAA;IACH,CAAC;;AA7EM,yBAAY,GAAG;IACpB,KAAK,EAAE,IAAI,IAAI,EAAE;IACjB,KAAK,EAAE,OAAO;IACd,GAAG,EAAE,OAAO;CACb,CAAA"}
@@ -2,61 +2,23 @@
2
2
  * 注意:Carousel 组件由组件 @ant-design/react-native/lib/carousel 私有化并修改而成
3
3
  * https://github.com/ant-design/ant-design-mobile-rn/tree/master/components/carousel
4
4
  *
5
- * 依赖 @react-native-community/viewpager 实现,因此使用时需在壳工程中引入该组件
5
+ * 依赖 react-native-pager-view 实现
6
6
  *
7
7
  */
8
8
  import ViewPager from 'react-native-pager-view';
9
9
  import React from 'react';
10
- import { StyleSheet, Text, View } from 'react-native';
10
+ import { StyleSheet, Text, View, Platform } from 'react-native';
11
+ import defaultPagination from './pagination';
11
12
  const styles = StyleSheet.create({
12
13
  wrapperStyle: {
13
14
  overflow: 'hidden',
14
15
  },
15
- pagination: {
16
- position: 'absolute',
17
- alignItems: 'center',
18
- },
19
- paginationX: {
20
- bottom: 10,
21
- left: 0,
22
- right: 0,
23
- },
24
- paginationY: {
25
- right: 10,
26
- top: 0,
27
- bottom: 0,
28
- },
29
- pointStyle: {
30
- width: 8,
31
- height: 8,
32
- borderRadius: 8,
33
- backgroundColor: '#999',
34
- },
35
- pointActiveStyle: {
36
- backgroundColor: '#333',
37
- },
38
- spaceStyle: {
39
- marginHorizontal: 2.5,
40
- marginVertical: 3,
41
- },
42
16
  });
43
- const defaultPagination = (props) => {
44
- const { styles, current, vertical, count, dotStyle, dotActiveStyle } = props;
45
- const positionStyle = vertical ? 'paginationY' : 'paginationX';
46
- const flexDirection = vertical ? 'column' : 'row';
47
- const arr = [];
48
- for (let i = 0; i < count; i++) {
49
- arr.push(React.createElement(View, { key: `dot-${i}`, style: [
50
- styles.pointStyle,
51
- styles.spaceStyle,
52
- dotStyle,
53
- i === current && styles.pointActiveStyle,
54
- i === current && dotActiveStyle,
55
- ] }));
56
- }
57
- return (React.createElement(View, { style: [styles.pagination, styles[positionStyle]] },
58
- React.createElement(View, { style: { flexDirection } }, arr)));
59
- };
17
+ const INFINITE_BUFFER = 2;
18
+ const exchangePos = Platform.select({
19
+ ios: INFINITE_BUFFER - 1,
20
+ android: INFINITE_BUFFER - 2
21
+ });
60
22
  class Carousel extends React.Component {
61
23
  constructor(props) {
62
24
  super(props);
@@ -71,14 +33,16 @@ class Carousel extends React.Component {
71
33
  return;
72
34
  }
73
35
  const { children, autoplay, infinite, autoplayInterval } = this.props;
74
- const { isScrolling, selectedIndex } = this.state;
75
- const count = this.getChildrenCount(children);
76
- if (!Array.isArray(children) || !autoplay || isScrolling) {
36
+ const { selectedIndex } = this.state;
37
+ const count = this.count;
38
+ if (!Array.isArray(children) || !autoplay || this.isScrolling) {
77
39
  return;
78
40
  }
79
41
  clearTimeout(this.autoplayTimer);
42
+ if (count < 2)
43
+ return;
80
44
  this.autoplayTimer = setTimeout(() => {
81
- let newIndex = selectedIndex < count ? selectedIndex + 1 : 0;
45
+ let newIndex = selectedIndex < this.getVirtualIndex(count) ? selectedIndex + 1 : 0;
82
46
  if (selectedIndex === count - 1) {
83
47
  newIndex = 0;
84
48
  if (!infinite) {
@@ -86,15 +50,18 @@ class Carousel extends React.Component {
86
50
  return;
87
51
  }
88
52
  }
53
+ if (infinite) {
54
+ newIndex = this.getVirtualIndex(this.getIndex(newIndex, count));
55
+ }
89
56
  this.goTo(newIndex);
90
57
  }, autoplayInterval);
91
58
  };
92
59
  this.renderDots = (index) => {
93
- const { children, vertical, pagination, dotStyle, dotActiveStyle, } = this.props;
60
+ const { vertical, pagination, dotStyle, dotActiveStyle, } = this.props;
94
61
  if (!pagination) {
95
62
  return null;
96
63
  }
97
- const count = this.getChildrenCount(children);
64
+ const count = this.count;
98
65
  return pagination({
99
66
  styles,
100
67
  vertical,
@@ -104,12 +71,11 @@ class Carousel extends React.Component {
104
71
  dotActiveStyle,
105
72
  });
106
73
  };
107
- const { children, selectedIndex } = this.props;
108
- const count = this.getChildrenCount(children);
109
- const index = count > 1 ? Math.min(selectedIndex, count - 1) : 0;
74
+ const { selectedIndex, children } = this.props;
75
+ this.count = this.getChildrenCount(children);
76
+ this.isScrolling = false;
110
77
  this.state = {
111
- isScrolling: false,
112
- selectedIndex: index,
78
+ selectedIndex: this.getVirtualIndex(Math.min(selectedIndex, this.count - 1)),
113
79
  };
114
80
  }
115
81
  componentDidMount() {
@@ -126,30 +92,58 @@ class Carousel extends React.Component {
126
92
  }
127
93
  // eslint-disable-next-line camelcase
128
94
  UNSAFE_componentWillReceiveProps(props) {
129
- const { selectedIndex } = props;
130
- const index = selectedIndex;
131
- if (selectedIndex !== this.state.selectedIndex) {
95
+ const { selectedIndex, infinite, children } = props;
96
+ this.count = this.getChildrenCount(children);
97
+ if (selectedIndex === this.props.selectedIndex && infinite === this.props.infinite)
98
+ return;
99
+ const index = this.getVirtualIndex(Math.min(selectedIndex, this.count - 1), infinite);
100
+ if (index !== this.state.selectedIndex) {
132
101
  this.goTo(index);
133
102
  }
134
103
  }
135
- /**
136
- * go to index
137
- * @param index
138
- */
139
104
  goTo(index) {
140
- this.setState({ selectedIndex: index });
141
- this.viewPager.current && this.viewPager.current.setPage(index);
105
+ var _a;
106
+ (_a = this.viewPager.current) === null || _a === void 0 ? void 0 : _a.setPage(index);
107
+ }
108
+ getIndex(index, count) {
109
+ const { infinite } = this.props;
110
+ if (!infinite)
111
+ return index;
112
+ if (index < INFINITE_BUFFER) {
113
+ return count - INFINITE_BUFFER + index;
114
+ }
115
+ else if (index > count + INFINITE_BUFFER - 1) {
116
+ return index - count - INFINITE_BUFFER;
117
+ }
118
+ else {
119
+ return index - INFINITE_BUFFER;
120
+ }
121
+ }
122
+ // infinite 默认取 props,如为 next props 需传入
123
+ getVirtualIndex(index, infinite) {
124
+ if (this.count < 2)
125
+ return index;
126
+ const infi = infinite !== null && infinite !== void 0 ? infinite : this.props.infinite;
127
+ if (!infi)
128
+ return index;
129
+ return index + INFINITE_BUFFER;
142
130
  }
143
131
  render() {
144
132
  const { selectedIndex } = this.state;
145
- const { dots, children, vertical } = this.props;
133
+ const { dots, children, vertical, infinite } = this.props;
146
134
  if (!children) {
147
135
  return (React.createElement(Text, { style: { backgroundColor: 'white' } }, "You are supposed to add children inside Carousel"));
148
136
  }
149
- const count = this.getChildrenCount(children);
137
+ const count = this.count;
150
138
  let pages;
151
139
  if (count > 1) {
152
140
  const childrenArray = React.Children.toArray(children);
141
+ if (infinite) {
142
+ for (let index = 0; index < INFINITE_BUFFER; index++) {
143
+ childrenArray.push(React.cloneElement(children[index], { ref: null }));
144
+ childrenArray.unshift(React.cloneElement(children[count - index - 1], { ref: null }));
145
+ }
146
+ }
153
147
  pages = childrenArray.map((page, i) => {
154
148
  return (
155
149
  // when vertical, use the height of the first child as the height of the Carousel
@@ -163,29 +157,47 @@ class Carousel extends React.Component {
163
157
  initialPage: selectedIndex,
164
158
  showPageIndicator: false,
165
159
  onPageSelected: e => {
166
- this.setState({ selectedIndex: e.nativeEvent.position });
167
- this.autoplay();
168
- if (this.props.afterChange) {
169
- this.props.afterChange(e.nativeEvent.position);
160
+ if (count < 2)
161
+ return;
162
+ const pos = e.nativeEvent.position;
163
+ const prevIndex = this.getIndex(this.state.selectedIndex, count);
164
+ this.setState({ selectedIndex: pos }, () => {
165
+ this.autoplay();
166
+ });
167
+ const actualIndex = this.getIndex(pos, count);
168
+ if (this.props.afterChange && prevIndex !== actualIndex) {
169
+ this.props.afterChange(actualIndex);
170
+ }
171
+ },
172
+ onPageScroll: (e) => {
173
+ var _a, _b;
174
+ if (count < 2)
175
+ return;
176
+ const pos = e.nativeEvent.position;
177
+ if (infinite) {
178
+ if (pos === count + INFINITE_BUFFER) {
179
+ (_a = this.viewPager.current) === null || _a === void 0 ? void 0 : _a.setPageWithoutAnimation(INFINITE_BUFFER);
180
+ }
181
+ else if (pos === exchangePos) {
182
+ (_b = this.viewPager.current) === null || _b === void 0 ? void 0 : _b.setPageWithoutAnimation(count + exchangePos + 1);
183
+ }
170
184
  }
171
185
  },
172
186
  onPageScrollStateChanged: e => {
187
+ if (count < 2)
188
+ return;
173
189
  switch (e.nativeEvent.pageScrollState) {
174
190
  case 'dragging':
175
191
  this.autoplay(true);
176
- this.setState({ isScrolling: true });
192
+ this.isScrolling = true;
177
193
  break;
178
194
  case 'idle':
179
- this.setState({
180
- isScrolling: false,
181
- }, () => {
182
- this.autoplay();
183
- this.setState({ isScrolling: false });
184
- });
195
+ this.autoplay();
196
+ this.isScrolling = false;
185
197
  break;
186
198
  case 'settling':
187
199
  this.autoplay();
188
- this.setState({ isScrolling: false });
200
+ this.isScrolling = false;
189
201
  break;
190
202
  default:
191
203
  break;
@@ -198,7 +210,7 @@ class Carousel extends React.Component {
198
210
  orientation: vertical ? 'vertical' : 'horizontal',
199
211
  // Lib does not support dynamically transitionStyle change
200
212
  transitionStyle: "scroll", ref: this.viewPager }), pages),
201
- dots && this.renderDots(selectedIndex)));
213
+ dots && this.renderDots(this.getIndex(selectedIndex, count))));
202
214
  }
203
215
  }
204
216
  Carousel.defaultProps = {
@@ -1 +1 @@
1
- {"version":3,"file":"carousel.js","sourceRoot":"","sources":["../../../src/components/Swiper/carousel.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"carousel.js","sourceRoot":"","sources":["../../../src/components/Swiper/carousel.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,50 @@
1
+ import React from 'react';
2
+ import { View, StyleSheet } from 'react-native';
3
+ const styles = StyleSheet.create({
4
+ pagination: {
5
+ position: 'absolute',
6
+ alignItems: 'center',
7
+ justifyContent: 'center',
8
+ },
9
+ paginationX: {
10
+ bottom: 10,
11
+ left: 0,
12
+ right: 0,
13
+ },
14
+ paginationY: {
15
+ right: 10,
16
+ top: 0,
17
+ bottom: 0,
18
+ },
19
+ pointStyle: {
20
+ width: 8,
21
+ height: 8,
22
+ borderRadius: 8,
23
+ backgroundColor: '#999',
24
+ },
25
+ pointActiveStyle: {
26
+ backgroundColor: '#333',
27
+ },
28
+ spaceStyle: {
29
+ marginHorizontal: 2.5,
30
+ marginVertical: 3,
31
+ },
32
+ });
33
+ export default function defaultPagination(props) {
34
+ const { current, vertical, count, dotStyle, dotActiveStyle } = props;
35
+ const positionStyle = vertical ? 'paginationY' : 'paginationX';
36
+ const flexDirection = vertical ? 'column' : 'row';
37
+ const arr = [];
38
+ for (let i = 0; i < count; i++) {
39
+ arr.push(React.createElement(View, { key: `dot-${i}`, style: [
40
+ styles.pointStyle,
41
+ styles.spaceStyle,
42
+ dotStyle,
43
+ i === current && styles.pointActiveStyle,
44
+ i === current && dotActiveStyle,
45
+ ] }));
46
+ }
47
+ return (React.createElement(View, { style: [styles.pagination, styles[positionStyle]] },
48
+ React.createElement(View, { style: { flexDirection } }, arr)));
49
+ }
50
+ //# sourceMappingURL=pagination.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"pagination.js","sourceRoot":"","sources":["../../../src/components/Swiper/pagination.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAG/C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,UAAU,EAAE;QACV,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;KACzB;IACD,WAAW,EAAE;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,CAAC;QACP,KAAK,EAAE,CAAC;KACT;IACD,WAAW,EAAE;QACX,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,CAAC;QACN,MAAM,EAAE,CAAC;KACV;IACD,UAAU,EAAE;QACV,KAAK,EAAE,CAAC;QACR,MAAM,EAAE,CAAC;QACT,YAAY,EAAE,CAAC;QACf,eAAe,EAAE,MAAM;KACxB;IACD,gBAAgB,EAAE;QAChB,eAAe,EAAE,MAAM;KACxB;IACD,UAAU,EAAE;QACV,gBAAgB,EAAE,GAAG;QACrB,cAAc,EAAE,CAAC;KAClB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAE,KAAsB;IAC/D,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,GAAG,KAAK,CAAA;IACpE,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAA;IAC9D,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAA;IACjD,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,GAAG,CAAC,IAAI,CACN,oBAAC,IAAI,IACH,GAAG,EAAE,OAAO,CAAC,EAAE,EACf,KAAK,EAAE;gBACL,MAAM,CAAC,UAAU;gBACjB,MAAM,CAAC,UAAU;gBACjB,QAAQ;gBACR,CAAC,KAAK,OAAO,IAAI,MAAM,CAAC,gBAAgB;gBACxC,CAAC,KAAK,OAAO,IAAI,cAAc;aAChC,GACD,CACH,CAAA;KACF;IACD,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QACrD,oBAAC,IAAI,IAAC,KAAK,EAAE,EAAE,aAAa,EAAE,IAAG,GAAG,CAAQ,CACvC,CACR,CAAA;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tarojs/components-rn",
3
- "version": "3.5.0-canary.0",
3
+ "version": "3.5.0-canary.1",
4
4
  "description": "多端解决方案基础组件(RN)",
5
5
  "main": "./dist/index.js",
6
6
  "scripts": {
@@ -42,7 +42,7 @@
42
42
  "unimodules-permissions-interface": "~5.3.0"
43
43
  },
44
44
  "devDependencies": {
45
- "@tarojs/components": "3.5.0-canary.0",
45
+ "@tarojs/components": "3.5.0-canary.1",
46
46
  "@types/react-native": "0.66.5",
47
47
  "@types/sinon": "^9.0.8",
48
48
  "cpy-cli": "^3.1.1",
@@ -68,5 +68,5 @@
68
68
  "@types/react": "17.0.11",
69
69
  "@types/node": "^14.14.41"
70
70
  },
71
- "gitHead": "a0222bc41bc05b0e34413d6db3de963d777a5015"
71
+ "gitHead": "c61624d2f763e6d31e67d6cf9c564efc8b0d0887"
72
72
  }