Skip to content
This repository has been archived by the owner on Feb 4, 2021. It is now read-only.

Upgrade to use separate proptypes library for react 16 #172

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/Avatar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Image, Text} from "react-native";
import Icon from './Icon';
import { getColor } from './helpers';
Expand Down
3 changes: 2 additions & 1 deletion lib/Button.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {ActivityIndicator, View, Text, TouchableNativeFeedback, Platform} from "react-native";
import Ripple from './polyfill/Ripple';
import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
Expand Down
5 changes: 3 additions & 2 deletions lib/Card/Actions.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, View} from "react-native";

export default class Actions extends Component {
Expand Down Expand Up @@ -34,4 +35,4 @@ const styles = StyleSheet.create({
actions: {
flexDirection: 'row'
}
});
});
3 changes: 2 additions & 1 deletion lib/Card/Body.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, View} from "react-native";

export default class Body extends Component {
Expand Down
5 changes: 3 additions & 2 deletions lib/Card/Media.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, Image, View} from "react-native";

export default class Media extends Component {
Expand Down Expand Up @@ -50,4 +51,4 @@ const styles = StyleSheet.create({
paddingLeft: 16,
paddingRight: 16
}
});
});
3 changes: 2 additions & 1 deletion lib/Card/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, TouchableNativeFeedback} from "react-native";
import Ripple from '../polyfill/Ripple';
import { getColor, isCompatible } from '../helpers';
Expand Down
3 changes: 2 additions & 1 deletion lib/Checkbox.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, Text, View, TouchableHighlight} from "react-native";
import { TYPO, PRIMARY, COLOR, PRIMARY_COLORS, THEME_NAME } from './config';
import Icon from './Icon';
Expand Down
3 changes: 2 additions & 1 deletion lib/CheckboxGroup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View} from "react-native";
import Checkbox from './Checkbox';
import { THEME_NAME, PRIMARY, PRIMARY_COLORS } from './config';
Expand Down
5 changes: 3 additions & 2 deletions lib/Divider.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View} from "react-native";
import { THEME_NAME } from './config';

Expand Down Expand Up @@ -36,4 +37,4 @@ const styles = {
divider: {
height: 1
}
};
};
3 changes: 2 additions & 1 deletion lib/Drawer/Header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Image} from "react-native";

export default class Header extends Component {
Expand Down
3 changes: 2 additions & 1 deletion lib/Drawer/Section.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Text, TouchableNativeFeedback} from "react-native";
import Icon from '../Icon';
import Ripple from '../polyfill/Ripple';
Expand Down
3 changes: 2 additions & 1 deletion lib/Drawer/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {ScrollView} from "react-native";
import { THEME_NAME, PRIMARY_COLORS } from '../config';
import { getColor } from '../helpers';
Expand Down
3 changes: 2 additions & 1 deletion lib/Icon.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View} from "react-native";
import { getColor } from './helpers';
import VectorIconComponent from './VectorIconComponent';
Expand Down
3 changes: 2 additions & 1 deletion lib/IconToggle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {Text, View, Animated} from "react-native";
import { getColor } from './helpers';

Expand Down
5 changes: 3 additions & 2 deletions lib/List.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, View, Text, TouchableWithoutFeedback} from "react-native";
import { TYPO } from './config';

Expand Down Expand Up @@ -175,4 +176,4 @@ const styles = StyleSheet.create({
alignSelf: 'flex-end',
alignItems: 'flex-end'
}
});
});
3 changes: 2 additions & 1 deletion lib/RadioButton.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, Text, View, TouchableHighlight} from "react-native";
import Icon from './Icon';
import IconToggle from './IconToggle';
Expand Down
3 changes: 2 additions & 1 deletion lib/RadioButtonGroup.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View} from "react-native";
import RadioButton from './RadioButton';
import { PRIMARY, PRIMARY_COLORS, THEME_NAME } from './config';
Expand Down
4 changes: 2 additions & 2 deletions lib/Ripple.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Text, TouchableNativeFeedback} from "react-native";
import { default as PolyfillRipple } from './polyfill/Ripple';
import { isCompatible } from './helpers';
Expand Down Expand Up @@ -49,4 +50,3 @@ export default class Ripple extends Component {
}

}

5 changes: 3 additions & 2 deletions lib/Subheader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {StyleSheet, View, Text} from "react-native";
import { TYPO, THEME_NAME } from './config';
import { getColor } from './helpers';
Expand Down Expand Up @@ -48,4 +49,4 @@ const styles = StyleSheet.create({
padding: 16
},
text: TYPO.paperFontBody1
});
});
3 changes: 2 additions & 1 deletion lib/Toolbar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Text} from "react-native";
import { TYPO, PRIMARY, THEME_NAME, PRIMARY_COLORS } from './config';
import { getColor } from './helpers';
Expand Down
3 changes: 2 additions & 1 deletion lib/polyfill/Ripple.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component, PropTypes} from "react";
import React, {Component} from "react";
import PropTypes from 'prop-types';
import {View, Animated, TouchableOpacity, Platform} from "react-native";

import elevationPolyfill from './Elevation';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"homepage": "https://github.com/react-native-material-design/react-native-material-design",
"dependencies": {
"react-native-material-design-styles": "git+https://github.com/react-native-material-design/react-native-material-design-styles.git",
"react-native-vector-icons": "^2.0.1"
"react-native-vector-icons": "^4.4.2"
},
"devDependencies": {
"babel-eslint": "^4.1.6",
Expand Down