@tarojs/components-rn 3.4.0-beta.2 → 3.4.2
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/dist/components/Button/index.js +7 -3
- package/dist/components/Button/index.js.map +1 -1
- package/dist/components/ClickableSimplified/index.js +14 -0
- package/dist/components/ClickableSimplified/index.js.map +1 -1
- package/dist/components/Input/index.js +5 -1
- package/dist/components/Input/index.js.map +1 -1
- package/dist/components/Picker/date.js +4 -2
- package/dist/components/Picker/date.js.map +1 -1
- package/dist/components/Swiper/carousel.js +20 -8
- package/dist/components/Swiper/carousel.js.map +1 -1
- package/dist/components/View/index.js +4 -3
- package/dist/components/View/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -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
|
-
|
|
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":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,wBAAwB,EACxB,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,QAAQ,EACR,MAAM,EAIP,MAAM,cAAc,CAAA;AACrB,OAAO,MAAM,MAAM,UAAU,CAAA;AAC7B,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAGrD,MAAM,OAAO,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,20 @@
|
|
|
13
13
|
import * as React from 'react';
|
|
14
14
|
import { PanResponder, } from 'react-native';
|
|
15
15
|
import { omit } from '../../utils';
|
|
16
|
+
export const clickableHandlers = [
|
|
17
|
+
'onStartShouldSetResponder',
|
|
18
|
+
'onMoveShouldSetResponder',
|
|
19
|
+
'onResponderEnd',
|
|
20
|
+
'onResponderGrant',
|
|
21
|
+
'onResponderReject',
|
|
22
|
+
'onResponderMove',
|
|
23
|
+
'onResponderRelease',
|
|
24
|
+
'onResponderStart',
|
|
25
|
+
'onResponderStart',
|
|
26
|
+
'onResponderTerminationRequest',
|
|
27
|
+
'onResponderTerminate',
|
|
28
|
+
'onMoveShouldSetResponderCapture',
|
|
29
|
+
];
|
|
16
30
|
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
17
31
|
export default function (WrappedComponent) {
|
|
18
32
|
var _a;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ClickableSimplified/index.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ClickableSimplified/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: [
|
|
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":"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"}
|
|
@@ -8,7 +8,7 @@ function formatTimeStr(time = '') {
|
|
|
8
8
|
year = ~~year || 2000;
|
|
9
9
|
month = ~~month || 1;
|
|
10
10
|
day = ~~day || 1;
|
|
11
|
-
return new Date(
|
|
11
|
+
return new Date(year, month - 1, day);
|
|
12
12
|
}
|
|
13
13
|
export default class DateSelector extends React.Component {
|
|
14
14
|
constructor() {
|
|
@@ -37,7 +37,9 @@ export default class DateSelector extends React.Component {
|
|
|
37
37
|
});
|
|
38
38
|
};
|
|
39
39
|
this.onValueChange = (vals) => {
|
|
40
|
-
this.setState({
|
|
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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.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;AACvD,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,SAAS,aAAa,CAAC,IAAI,GAAG,EAAE;IAC9B,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,GAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;IACrB,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;IACpB,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;IAChB,OAAO,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"date.js","sourceRoot":"","sources":["../../../src/components/Picker/date.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;AACvD,OAAO,IAAI,MAAM,SAAS,CAAA;AAC1B,SAAS,aAAa,CAAC,IAAI,GAAG,EAAE;IAC9B,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,GAAQ,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC7C,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;IACrB,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAA;IACpB,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAA;IAChB,OAAO,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,SAA+B;IAA/E;;QAME,UAAK,GAAQ;YACX,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI,IAAI,EAAE;SAClB,CAAA;QAED,gBAAW,GAAG,KAAK,CAAA;QAmBnB,aAAQ,GAAG,CAAC,IAAU,EAAQ,EAAE;YAC9B,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,QAAQ,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;YACtD,MAAM,IAAI,GAAW,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAA;YAC5C,MAAM,EAAE,GAAW,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YAC1D,MAAM,EAAE,GAAW,CAAC,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACnD,IAAI,GAAG,GAAW,IAAI,CAAA;YACtB,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,KAAK,EAAE;gBAC1C,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;gBACf,IAAI,MAAM,KAAK,KAAK,EAAE;oBACpB,GAAG,IAAI,IAAI,EAAE,EAAE,CAAA;iBAChB;aACF;YACD,QAAQ,CAAC;gBACP,MAAM,EAAE;oBACN,KAAK,EAAE,GAAG;iBACX;aACF,CAAC,CAAA;QACJ,CAAC,CAAA;QAED,kBAAa,GAAG,CAAC,IAAW,EAAQ,EAAE;YACpC,IAAI,CAAC,QAAQ,CAAC;gBACZ,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;aAClD,CAAC,CAAA;QACJ,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;IAqCH,CAAC;IAzFC,MAAM,CAAC,wBAAwB,CAAC,SAAoB,EAAE,SAAoB;QACxE,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;IAuCD,MAAM;QACJ,MAAM,EACJ,QAAQ,EACR,KAAK,GAAG,YAAY,EACpB,GAAG,GAAG,YAAY,EAClB,MAAM,EACN,QAAQ,GACT,GAAG,IAAI,CAAC,KAAK,CAAA;QACd,MAAM,EACJ,KAAK,GACN,GAAG,IAAI,CAAC,KAAK,CAAA;QAEd,IAAI,IAAI,GAAQ,MAAM,CAAA;QACtB,IAAI,MAAM,KAAK,MAAM,EAAE;YACrB,IAAI,GAAG,MAAM,CAAA;SACd;aAAM,IAAI,MAAM,KAAK,OAAO,EAAE;YAC7B,IAAI,GAAG,OAAO,CAAA;SACf;QACD,OAAO,CACL,oBAAC,aAAa,IACZ,IAAI,EAAE,IAAI,EACV,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;gBAAC,oBAAC,IAAI,QAAE,QAAQ,CAAQ,CAA2B,CAC9D,CACjB,CAAA;IACH,CAAC;;AApGM,yBAAY,GAAG;IACpB,KAAK,EAAE,IAAI,IAAI,EAAE;IACjB,MAAM,EAAE,KAAK;CACd,CAAA"}
|
|
@@ -34,11 +34,13 @@ class Carousel extends React.Component {
|
|
|
34
34
|
}
|
|
35
35
|
const { children, autoplay, infinite, autoplayInterval } = this.props;
|
|
36
36
|
const { selectedIndex } = this.state;
|
|
37
|
-
const count = this.
|
|
37
|
+
const count = this.count;
|
|
38
38
|
if (!Array.isArray(children) || !autoplay || this.isScrolling) {
|
|
39
39
|
return;
|
|
40
40
|
}
|
|
41
41
|
clearTimeout(this.autoplayTimer);
|
|
42
|
+
if (count < 2)
|
|
43
|
+
return;
|
|
42
44
|
this.autoplayTimer = setTimeout(() => {
|
|
43
45
|
let newIndex = selectedIndex < this.getVirtualIndex(count) ? selectedIndex + 1 : 0;
|
|
44
46
|
if (selectedIndex === count - 1) {
|
|
@@ -55,11 +57,11 @@ class Carousel extends React.Component {
|
|
|
55
57
|
}, autoplayInterval);
|
|
56
58
|
};
|
|
57
59
|
this.renderDots = (index) => {
|
|
58
|
-
const {
|
|
60
|
+
const { vertical, pagination, dotStyle, dotActiveStyle, } = this.props;
|
|
59
61
|
if (!pagination) {
|
|
60
62
|
return null;
|
|
61
63
|
}
|
|
62
|
-
const count = this.
|
|
64
|
+
const count = this.count;
|
|
63
65
|
return pagination({
|
|
64
66
|
styles,
|
|
65
67
|
vertical,
|
|
@@ -69,10 +71,11 @@ class Carousel extends React.Component {
|
|
|
69
71
|
dotActiveStyle,
|
|
70
72
|
});
|
|
71
73
|
};
|
|
72
|
-
const { selectedIndex } = this.props;
|
|
74
|
+
const { selectedIndex, children } = this.props;
|
|
75
|
+
this.count = this.getChildrenCount(children);
|
|
73
76
|
this.isScrolling = false;
|
|
74
77
|
this.state = {
|
|
75
|
-
selectedIndex: this.getVirtualIndex(selectedIndex),
|
|
78
|
+
selectedIndex: this.getVirtualIndex(Math.min(selectedIndex, this.count - 1)),
|
|
76
79
|
};
|
|
77
80
|
}
|
|
78
81
|
componentDidMount() {
|
|
@@ -89,10 +92,11 @@ class Carousel extends React.Component {
|
|
|
89
92
|
}
|
|
90
93
|
// eslint-disable-next-line camelcase
|
|
91
94
|
UNSAFE_componentWillReceiveProps(props) {
|
|
92
|
-
const { selectedIndex, infinite } = props;
|
|
95
|
+
const { selectedIndex, infinite, children } = props;
|
|
96
|
+
this.count = this.getChildrenCount(children);
|
|
93
97
|
if (selectedIndex === this.props.selectedIndex && infinite === this.props.infinite)
|
|
94
98
|
return;
|
|
95
|
-
const index = this.getVirtualIndex(selectedIndex, infinite);
|
|
99
|
+
const index = this.getVirtualIndex(Math.min(selectedIndex, this.count - 1), infinite);
|
|
96
100
|
if (index !== this.state.selectedIndex) {
|
|
97
101
|
this.goTo(index);
|
|
98
102
|
}
|
|
@@ -117,6 +121,8 @@ class Carousel extends React.Component {
|
|
|
117
121
|
}
|
|
118
122
|
// infinite 默认取 props，如为 next props 需传入
|
|
119
123
|
getVirtualIndex(index, infinite) {
|
|
124
|
+
if (this.count < 2)
|
|
125
|
+
return index;
|
|
120
126
|
const infi = infinite !== null && infinite !== void 0 ? infinite : this.props.infinite;
|
|
121
127
|
if (!infi)
|
|
122
128
|
return index;
|
|
@@ -128,7 +134,7 @@ class Carousel extends React.Component {
|
|
|
128
134
|
if (!children) {
|
|
129
135
|
return (React.createElement(Text, { style: { backgroundColor: 'white' } }, "You are supposed to add children inside Carousel"));
|
|
130
136
|
}
|
|
131
|
-
const count = this.
|
|
137
|
+
const count = this.count;
|
|
132
138
|
let pages;
|
|
133
139
|
if (count > 1) {
|
|
134
140
|
const childrenArray = React.Children.toArray(children);
|
|
@@ -151,6 +157,8 @@ class Carousel extends React.Component {
|
|
|
151
157
|
initialPage: selectedIndex,
|
|
152
158
|
showPageIndicator: false,
|
|
153
159
|
onPageSelected: e => {
|
|
160
|
+
if (count < 2)
|
|
161
|
+
return;
|
|
154
162
|
const pos = e.nativeEvent.position;
|
|
155
163
|
const prevIndex = this.getIndex(this.state.selectedIndex, count);
|
|
156
164
|
this.setState({ selectedIndex: pos }, () => {
|
|
@@ -163,6 +171,8 @@ class Carousel extends React.Component {
|
|
|
163
171
|
},
|
|
164
172
|
onPageScroll: (e) => {
|
|
165
173
|
var _a, _b;
|
|
174
|
+
if (count < 2)
|
|
175
|
+
return;
|
|
166
176
|
const pos = e.nativeEvent.position;
|
|
167
177
|
if (infinite) {
|
|
168
178
|
if (pos === count + INFINITE_BUFFER) {
|
|
@@ -174,6 +184,8 @@ class Carousel extends React.Component {
|
|
|
174
184
|
}
|
|
175
185
|
},
|
|
176
186
|
onPageScrollStateChanged: e => {
|
|
187
|
+
if (count < 2)
|
|
188
|
+
return;
|
|
177
189
|
switch (e.nativeEvent.pageScrollState) {
|
|
178
190
|
case 'dragging':
|
|
179
191
|
this.autoplay(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carousel.js","sourceRoot":"","sources":["../../../src/components/Swiper/carousel.tsx"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,SAAS,MAAM,yBAAyB,CAAA;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAE/D,OAAO,iBAAiB,MAAM,cAAc,CAAA;AAE5C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,YAAY,EAAE;QACZ,QAAQ,EAAE,QAAQ;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,eAAe,GAAG,CAAC,CAAA;AAEzB,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC;IAClC,GAAG,EAAE,eAAe,GAAG,CAAC;IACxB,OAAO,EAAE,eAAe,GAAG,CAAC;CAC7B,CAAW,CAAA;AAMZ,MAAM,QAAS,SAAQ,KAAK,CAAC,SAAuC;
|
|
1
|
+
{"version":3,"file":"carousel.js","sourceRoot":"","sources":["../../../src/components/Swiper/carousel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,11 +6,12 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import * as React from 'react';
|
|
8
8
|
import { View, Text, } from 'react-native';
|
|
9
|
-
import { extracteTextStyle } from '../../utils';
|
|
10
|
-
import ClickableSimplified from '../ClickableSimplified';
|
|
9
|
+
import { extracteTextStyle, omit } from '../../utils';
|
|
10
|
+
import ClickableSimplified, { clickableHandlers } from '../ClickableSimplified';
|
|
11
11
|
const stringToText = (child, props) => {
|
|
12
12
|
// TODO: 实现小程序中效果
|
|
13
|
-
return (typeof child === 'string' || typeof child === 'number')
|
|
13
|
+
return (typeof child === 'string' || typeof child === 'number')
|
|
14
|
+
? React.createElement(Text, Object.assign({}, omit(props, clickableHandlers)), child) : child;
|
|
14
15
|
};
|
|
15
16
|
const _View = (props) => {
|
|
16
17
|
const textStyle = extracteTextStyle(props.style);
|
|
@@ -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,MAAM,aAAa,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,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,GAAyB,CAAC,KAAiB,EAAE,EAAE;IACxD,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,KAAK,EAAE,KAAK,CAAC,KAAK,IACd,KAAK,GAER,KAAK,CACD,CACR,CAAA;AACH,CAAC,CAAA;AAED,KAAK,CAAC,WAAW,GAAG,OAAO,CAAA;AAE3B,OAAO,EAAE,KAAK,EAAE,CAAA;AAChB,eAAe,mBAAmB,CAAC,KAAK,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/components-rn",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.2",
|
|
4
4
|
"description": "多端解决方案基础组件（RN）",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"unimodules-permissions-interface": "~5.3.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@tarojs/components": "3.4.
|
|
46
|
+
"@tarojs/components": "3.4.2",
|
|
47
47
|
"@types/react-native": "0.66.5",
|
|
48
48
|
"@types/sinon": "^9.0.8",
|
|
49
49
|
"cpy-cli": "^3.1.1",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"@types/react": "17.0.11",
|
|
71
71
|
"@types/node": "^14.14.41"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "26b329326c6a7da652e8d712ee33df01ab8d2d0e"
|
|
74
74
|
}
|