@tarojs/components-rn 3.3.5 → 3.3.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/Button/index.js +27 -36
- package/dist/components/Button/index.js.map +1 -1
- package/dist/components/Slider/index.js +7 -7
- package/dist/components/Slider/index.js.map +1 -1
- package/dist/components/View/index.js +3 -1
- package/dist/components/View/index.js.map +1 -1
- package/dist/utils/index.js +13 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -30,35 +30,38 @@
|
|
|
30
30
|
import * as React from 'react';
|
|
31
31
|
import { TouchableWithoutFeedback, Text, View, Image, Animated, Easing } from 'react-native';
|
|
32
32
|
import styles from './styles';
|
|
33
|
-
import { noop } from '../../utils';
|
|
33
|
+
import { extracteTextStyle, noop } from '../../utils';
|
|
34
|
+
const Loading = (props) => {
|
|
35
|
+
const { type = 'primary' } = props;
|
|
36
|
+
const rotate = React.useRef(new Animated.Value(0)).current;
|
|
37
|
+
React.useEffect(() => {
|
|
38
|
+
const animation = Animated.loop(Animated.timing(rotate, {
|
|
39
|
+
toValue: 1,
|
|
40
|
+
duration: 1000,
|
|
41
|
+
easing: Easing.linear,
|
|
42
|
+
useNativeDriver: true,
|
|
43
|
+
isInteraction: false,
|
|
44
|
+
}));
|
|
45
|
+
animation.start();
|
|
46
|
+
return () => {
|
|
47
|
+
animation.stop();
|
|
48
|
+
};
|
|
49
|
+
}, []);
|
|
50
|
+
const rotateDeg = rotate.interpolate({
|
|
51
|
+
inputRange: [0, 1],
|
|
52
|
+
outputRange: ['0deg', '360deg']
|
|
53
|
+
});
|
|
54
|
+
return (React.createElement(Animated.View, { style: [styles.loading, { transform: [{ rotate: rotateDeg }] }] },
|
|
55
|
+
React.createElement(Image, { source: type === 'warn' ? require('../../assets/loading-warn.png') : require('../../assets/loading.png'), style: styles.loadingImg })));
|
|
56
|
+
};
|
|
34
57
|
class _Button extends React.Component {
|
|
35
58
|
constructor() {
|
|
36
59
|
super(...arguments);
|
|
37
60
|
this.$touchable = React.createRef();
|
|
38
61
|
this.isTouchEnd = false;
|
|
39
62
|
this.state = {
|
|
40
|
-
valve: new Animated.Value(0),
|
|
41
63
|
isHover: false
|
|
42
64
|
};
|
|
43
|
-
this.animate = () => {
|
|
44
|
-
if (!this.props.loading)
|
|
45
|
-
return;
|
|
46
|
-
Animated.sequence([
|
|
47
|
-
Animated.timing(this.state.valve, {
|
|
48
|
-
toValue: 1,
|
|
49
|
-
easing: Easing.linear,
|
|
50
|
-
duration: 1000,
|
|
51
|
-
useNativeDriver: true
|
|
52
|
-
}),
|
|
53
|
-
Animated.timing(this.state.valve, {
|
|
54
|
-
toValue: 0,
|
|
55
|
-
duration: 0,
|
|
56
|
-
useNativeDriver: true
|
|
57
|
-
})
|
|
58
|
-
]).start(() => {
|
|
59
|
-
this.animate();
|
|
60
|
-
});
|
|
61
|
-
};
|
|
62
65
|
this.onPress = () => {
|
|
63
66
|
const { disabled, onClick = noop } = this.props;
|
|
64
67
|
!disabled && onClick();
|
|
@@ -99,14 +102,6 @@ class _Button extends React.Component {
|
|
|
99
102
|
node && node.props.onPress && node.props.onPress(evt);
|
|
100
103
|
};
|
|
101
104
|
}
|
|
102
|
-
componentDidMount() {
|
|
103
|
-
this.animate();
|
|
104
|
-
}
|
|
105
|
-
componentDidUpdate(prevProps) {
|
|
106
|
-
if (!prevProps.loading && this.props.loading) {
|
|
107
|
-
this.animate();
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
105
|
render() {
|
|
111
106
|
const { style, children, size, type, plain, disabled, loading, hoverStyle, } = this.props;
|
|
112
107
|
const isDefaultSize = size === 'default';
|
|
@@ -126,10 +121,7 @@ class _Button extends React.Component {
|
|
|
126
121
|
: isDefaultType
|
|
127
122
|
? `rgba(0,0,0,${disabled ? 0.3 : 1})`
|
|
128
123
|
: `rgba(255,255,255,${disabled ? 0.6 : 1})`;
|
|
129
|
-
const
|
|
130
|
-
inputRange: [0, 1],
|
|
131
|
-
outputRange: ['0deg', '360deg']
|
|
132
|
-
});
|
|
124
|
+
const textHoverStyle = this.state.isHover ? extracteTextStyle(hoverStyle) : {};
|
|
133
125
|
return (React.createElement(TouchableWithoutFeedback, { onPress: this.onPress, onLongPress: this.onPress, onPressIn: this.onPressIn, onPressOut: this.onPressOut, ref: this.$touchable, disabled: disabled },
|
|
134
126
|
React.createElement(View, { style: [
|
|
135
127
|
styles.btn,
|
|
@@ -139,9 +131,8 @@ class _Button extends React.Component {
|
|
|
139
131
|
style,
|
|
140
132
|
this.state.isHover && hoverStyle
|
|
141
133
|
] },
|
|
142
|
-
loading &&
|
|
143
|
-
|
|
144
|
-
Array.isArray(children) ? (children.map((c, i) => (React.createElement(Text, { key: i, style: [styles.btnText, !isDefaultSize && styles.btnTextMini, { color: textColor }] }, c)))) : (['string', 'number'].indexOf(typeof children) > -1) ? (React.createElement(Text, { style: [styles.btnText, !isDefaultSize && styles.btnTextMini, { color: textColor }] }, children)) : (children))));
|
|
134
|
+
loading && React.createElement(Loading, { type: type }),
|
|
135
|
+
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))));
|
|
145
136
|
}
|
|
146
137
|
}
|
|
147
138
|
_Button.displayName = '_Button';
|
|
@@ -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,IAAI,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Button/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ class _Slider extends React.Component {
|
|
|
25
25
|
constructor() {
|
|
26
26
|
super(...arguments);
|
|
27
27
|
this.state = {
|
|
28
|
-
currentValue:
|
|
28
|
+
currentValue: this.props.value
|
|
29
29
|
};
|
|
30
30
|
this.onSlidingComplete = (value) => {
|
|
31
31
|
const { onChange = noop } = this.props;
|
|
@@ -37,12 +37,12 @@ class _Slider extends React.Component {
|
|
|
37
37
|
this.setState({ currentValue: value });
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
currentValue: props.value
|
|
44
|
-
}
|
|
45
|
-
|
|
40
|
+
componentDidUpdate(prevProps) {
|
|
41
|
+
if (prevProps.value !== this.props.value) {
|
|
42
|
+
this.setState({
|
|
43
|
+
currentValue: this.props.value
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
46
|
}
|
|
47
47
|
render() {
|
|
48
48
|
const { style, min, max, step, disabled, activeColor, backgroundColor, blockColor, showValue } = this.props;
|
|
@@ -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;;
|
|
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;;QAWE,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;;AAtDM,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"}
|
|
@@ -6,14 +6,16 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import * as React from 'react';
|
|
8
8
|
import { View, Text, } from 'react-native';
|
|
9
|
+
import { extracteTextStyle } from '../../utils';
|
|
9
10
|
import ClickableSimplified from '../ClickableSimplified';
|
|
10
11
|
const stringToText = (child, props) => {
|
|
11
12
|
// TODO: 实现小程序中效果
|
|
12
13
|
return (typeof child === 'string' || typeof child === 'number') ? React.createElement(Text, Object.assign({}, props), child) : child;
|
|
13
14
|
};
|
|
14
15
|
const _View = (props) => {
|
|
16
|
+
const textStyle = extracteTextStyle(props.style);
|
|
15
17
|
// 兼容View中没用Text包裹的文字 防止报错 直接继承props在安卓中文字会消失？？？
|
|
16
|
-
const child = Array.isArray(props.children) ? props.children.map((c, i) => stringToText(c, Object.assign(Object.assign({ key: i }, props), { style:
|
|
18
|
+
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 }));
|
|
17
19
|
return (React.createElement(View, Object.assign({ style: props.style }, props), child));
|
|
18
20
|
};
|
|
19
21
|
_View.displayName = '_View';
|
|
@@ -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,mBAAmB,MAAM,wBAAwB,CAAA;AAGxD,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;IAC9C,iBAAiB;IACjB,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAC,IAAI,oBAAK,KAAK,GAAG,KAAK,CAAQ,CAAC,CAAC,CAAC,KAAK,CAAA;AAC3G,CAAC,CAAA;AAED,MAAM,KAAK,GAAyB,CAAC,KAAiB,EAAE,EAAE;IACxD,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,
|
|
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;AAC/C,OAAO,mBAAmB,MAAM,wBAAwB,CAAA;AAGxD,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,KAAU,EAAE,EAAE;IAC9C,iBAAiB;IACjB,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,oBAAC,IAAI,oBAAK,KAAK,GAAG,KAAK,CAAQ,CAAC,CAAC,CAAC,KAAK,CAAA;AAC3G,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/dist/utils/index.js
CHANGED
|
@@ -5,6 +5,19 @@ import { StyleSheet } from 'react-native';
|
|
|
5
5
|
const WRAPPER_TYPE_STYLE_REGEX = /alignSelf|aspectRatio|border.*|bottom|direction|display|end|left|margin.*|position|right|start|top|zIndex|opacity|elevation/;
|
|
6
6
|
// const INNER_TYPE_STYLE_REGEX: RegExp = /alignContent|alignItems|flexDirection|flexWrap|height|justifyContent|.*[wW]idth|.*[hH]eight|overflow|padding.*/
|
|
7
7
|
const SYNC_TYPE_STYLE_REGEX = /flex|flexBasis|flexGrow|flexShrink/;
|
|
8
|
+
const TEXT_STYLE_REGEX = /color|font.*|text.*|letterSpacing|lineHeight|includeFontPadding|writingDirection/;
|
|
9
|
+
export const extracteTextStyle = (style) => {
|
|
10
|
+
const flattenStyle = StyleSheet.flatten(style);
|
|
11
|
+
const textStyle = {};
|
|
12
|
+
if (flattenStyle) {
|
|
13
|
+
Object.keys(flattenStyle).forEach((key) => {
|
|
14
|
+
if (TEXT_STYLE_REGEX.test(key)) {
|
|
15
|
+
textStyle[key] = flattenStyle[key];
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
return textStyle;
|
|
20
|
+
};
|
|
8
21
|
export const omit = (obj = {}, fields = []) => {
|
|
9
22
|
const shallowCopy = Object.assign({}, obj);
|
|
10
23
|
fields.forEach((key) => {
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/components-rn",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.9",
|
|
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.3.
|
|
45
|
+
"@tarojs/components": "3.3.9",
|
|
46
46
|
"@types/react-native": "0.64.10",
|
|
47
47
|
"@types/sinon": "^9.0.8",
|
|
48
48
|
"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": "dfea7ab7ac6f5abb8bb344595eadc0993d752eae"
|
|
74
74
|
}
|