Skip to content

Commit db8ce73

Browse files
philatcdhepter
authored andcommitted
Fix: Current release breaks web view in react native (peacechen#158)
1 parent 2e55539 commit db8ce73

1 file changed

Lines changed: 18 additions & 21 deletions

File tree

index.js

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ import {
1212
ScrollView,
1313
TouchableOpacity,
1414
TouchableWithoutFeedback,
15-
ViewPropTypes as RNViewPropTypes,
1615
} from 'react-native';
1716

1817
import styles from './style';
1918

20-
const ViewPropTypes = RNViewPropTypes || View.propTypes;
21-
2219
let componentIndex = 0;
2320

2421
const propTypes = {
@@ -39,25 +36,25 @@ const propTypes = {
3936
initValue: PropTypes.string,
4037
listType: PropTypes.oneOf(['SCROLLVIEW', 'FLATLIST']),
4138
animationType: PropTypes.oneOf(['none', 'slide', 'fade']),
42-
style: ViewPropTypes.style,
43-
selectStyle: ViewPropTypes.style,
44-
selectTextStyle: Text.propTypes.style,
45-
optionStyle: ViewPropTypes.style,
46-
optionTextStyle: Text.propTypes.style,
47-
optionContainerStyle: ViewPropTypes.style,
48-
sectionStyle: ViewPropTypes.style,
49-
childrenContainerStyle: ViewPropTypes.style,
50-
touchableStyle: ViewPropTypes.style,
39+
style: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
40+
selectStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
41+
selectTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
42+
optionStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
43+
optionTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
44+
optionContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
45+
sectionStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
46+
childrenContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
47+
touchableStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
5148
touchableActiveOpacity: PropTypes.number,
52-
sectionTextStyle: Text.propTypes.style,
53-
selectedItemTextStyle: Text.propTypes.style,
54-
cancelContainerStyle: ViewPropTypes.style,
55-
cancelStyle: ViewPropTypes.style,
56-
cancelTextStyle: Text.propTypes.style,
57-
overlayStyle: ViewPropTypes.style,
58-
initValueTextStyle: Text.propTypes.style,
59-
searchStyle: ViewPropTypes.style,
60-
searchTextStyle: Text.propTypes.style,
49+
sectionTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
50+
selectedItemTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
51+
cancelContainerStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
52+
cancelStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
53+
cancelTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
54+
overlayStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
55+
initValueTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
56+
searchStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
57+
searchTextStyle: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
6158
cancelText: PropTypes.string,
6259
searchText: PropTypes.string,
6360
disabled: PropTypes.bool,

0 commit comments

Comments
 (0)