mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-24 04:16:00 +08:00
Updates from Wed Mar 4
- [react-packager] Start converting options to query params | Amjad Masad - [ReactNative] Replace js long constants with strings | Tadeu Zagallo - React Native: Remove Unnecessary `document.body` Shim | Tim Yung - [ReactNative] Use spread operator and .propTypes for ScrollView/ListView | Christopher Chedeau
This commit is contained in:
@@ -45,9 +45,10 @@ var keyboardDismissModeConstants = {
|
||||
* view from becoming the responder.
|
||||
*/
|
||||
|
||||
var RKScrollViewPropTypes = merge(
|
||||
ScrollViewPropTypes,
|
||||
{
|
||||
var ScrollView = React.createClass({
|
||||
propTypes: {
|
||||
...ScrollViewPropTypes,
|
||||
|
||||
/**
|
||||
* When true, the scroll view bounces horizontally when it reaches the end
|
||||
* even if the content is smaller than the scroll view itself. The default
|
||||
@@ -153,16 +154,8 @@ var keyboardDismissModeConstants = {
|
||||
* The current scale of the scroll view content. The default value is 1.0.
|
||||
*/
|
||||
zoomScale: nativePropType(PropTypes.number),
|
||||
}
|
||||
);
|
||||
|
||||
var ScrollView = React.createClass({
|
||||
statics: {
|
||||
PropTypes: RKScrollViewPropTypes,
|
||||
},
|
||||
|
||||
propTypes: RKScrollViewPropTypes,
|
||||
|
||||
mixins: [ScrollResponder.Mixin],
|
||||
|
||||
getInitialState: function() {
|
||||
|
||||
Reference in New Issue
Block a user