Skip to content

some fixes required to align with React 15.5 and React-Native 0.44 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+11 −11
Open

some fixes required to align with React 15.5 and React-Native 0.44 #90

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a702da6
fix PropTypes import for React 15.5
ktownsend-cbre Apr 25, 2018
51fb41a
View.propTypes.style moved to ViewPropTypes.style in React-Native
ktownsend-cbre May 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict';

import React,{
PropTypes
} from 'react';
import React from 'react';
import PropTypes from 'prop-types';

import {
View,
Expand All @@ -12,7 +11,8 @@ import {
Text,
ScrollView,
TouchableOpacity,
Platform
Platform,
ViewPropTypes
} from 'react-native';

import styles from './style';
Expand All @@ -24,15 +24,15 @@ const propTypes = {
data: PropTypes.array,
onChange: PropTypes.func,
initValue: PropTypes.string,
style: View.propTypes.style,
selectStyle: View.propTypes.style,
optionStyle: View.propTypes.style,
style: ViewPropTypes.style,
selectStyle: ViewPropTypes.style,
optionStyle: ViewPropTypes.style,
optionTextStyle: Text.propTypes.style,
sectionStyle: View.propTypes.style,
sectionStyle: ViewPropTypes.style,
sectionTextStyle: Text.propTypes.style,
cancelStyle: View.propTypes.style,
cancelStyle: ViewPropTypes.style,
cancelTextStyle: Text.propTypes.style,
overlayStyle: View.propTypes.style,
overlayStyle: ViewPropTypes.style,
cancelText: PropTypes.string
};

Expand Down Expand Up @@ -131,7 +131,7 @@ export default class ModalPicker extends BaseComponent {
return (
<View style={[styles.overlayStyle, this.props.overlayStyle]} key={'modalPicker'+(componentIndex++)}>
<View style={styles.optionContainer}>
<ScrollView keyboardShouldPersistTaps>
<ScrollView keyboardShouldPersistTaps="always">
<View style={{paddingHorizontal:10}}>
{options}
</View>
Expand Down