mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-04-23 11:57:46 +08:00
Upgrade fbsource/xplat/js to Flow v0.53.0
Reviewed By: avikchaudhuri Differential Revision: D5648819 Ninja: T20988071 fbshipit-source-id: 66e5b6747c79ae66b6eb69d40ede5e982c26174f
This commit is contained in:
committed by
Facebook Github Bot
parent
1ce7e4c1e5
commit
90eaeb019b
@@ -742,6 +742,10 @@ const ScrollView = createReactClass({
|
||||
const contentContainer =
|
||||
<ScrollContentContainerViewClass
|
||||
{...contentSizeChangeProps}
|
||||
/* $FlowFixMe(>=0.53.0 site=react_native_fb) This comment suppresses an
|
||||
* error when upgrading Flow's support for React. Common errors found
|
||||
* when upgrading Flow's React support are documented at
|
||||
* https://fburl.com/eq7bs81w */
|
||||
ref={this._setInnerViewRef}
|
||||
style={contentContainerStyle}
|
||||
removeClippedSubviews={
|
||||
@@ -814,6 +818,10 @@ const ScrollView = createReactClass({
|
||||
// On iOS the RefreshControl is a child of the ScrollView.
|
||||
// tvOS lacks native support for RefreshControl, so don't include it in that case
|
||||
return (
|
||||
/* $FlowFixMe(>=0.53.0 site=react_native_fb) This comment suppresses
|
||||
* an error when upgrading Flow's support for React. Common errors
|
||||
* found when upgrading Flow's React support are documented at
|
||||
* https://fburl.com/eq7bs81w */
|
||||
<ScrollViewClass {...props} ref={this._setScrollViewRef}>
|
||||
{Platform.isTVOS ? null : refreshControl}
|
||||
{contentContainer}
|
||||
@@ -829,6 +837,10 @@ const ScrollView = createReactClass({
|
||||
return React.cloneElement(
|
||||
refreshControl,
|
||||
{style: props.style},
|
||||
/* $FlowFixMe(>=0.53.0 site=react_native_fb) This comment suppresses
|
||||
* an error when upgrading Flow's support for React. Common errors
|
||||
* found when upgrading Flow's React support are documented at
|
||||
* https://fburl.com/eq7bs81w */
|
||||
<ScrollViewClass {...props} style={baseStyle} ref={this._setScrollViewRef}>
|
||||
{contentContainer}
|
||||
</ScrollViewClass>
|
||||
@@ -836,6 +848,10 @@ const ScrollView = createReactClass({
|
||||
}
|
||||
}
|
||||
return (
|
||||
/* $FlowFixMe(>=0.53.0 site=react_native_fb) This comment suppresses an
|
||||
* error when upgrading Flow's support for React. Common errors found
|
||||
* when upgrading Flow's React support are documented at
|
||||
* https://fburl.com/eq7bs81w */
|
||||
<ScrollViewClass {...props} ref={this._setScrollViewRef}>
|
||||
{contentContainer}
|
||||
</ScrollViewClass>
|
||||
@@ -874,12 +890,12 @@ if (Platform.OS === 'android') {
|
||||
};
|
||||
AndroidScrollView = requireNativeComponent(
|
||||
'RCTScrollView',
|
||||
(ScrollView: ReactClass<any>),
|
||||
(ScrollView: React.ComponentType<any>),
|
||||
nativeOnlyProps
|
||||
);
|
||||
AndroidHorizontalScrollView = requireNativeComponent(
|
||||
'AndroidHorizontalScrollView',
|
||||
(ScrollView: ReactClass<any>),
|
||||
(ScrollView: React.ComponentType<any>),
|
||||
nativeOnlyProps
|
||||
);
|
||||
} else if (Platform.OS === 'ios') {
|
||||
@@ -893,7 +909,7 @@ if (Platform.OS === 'android') {
|
||||
};
|
||||
RCTScrollView = requireNativeComponent(
|
||||
'RCTScrollView',
|
||||
(ScrollView: ReactClass<any>),
|
||||
(ScrollView: React.ComponentType<any>),
|
||||
nativeOnlyProps,
|
||||
);
|
||||
// $FlowFixMe (bvaughn) Update ComponentInterface in ViewPropTypes to include a string type (for Fiber host components) in a follow-up.
|
||||
|
||||
@@ -16,21 +16,18 @@ const React = require('React');
|
||||
const StyleSheet = require('StyleSheet');
|
||||
|
||||
type Props = {
|
||||
children?: React.Element<*>,
|
||||
children?: React.Element<any>,
|
||||
nextHeaderLayoutY: ?number,
|
||||
onLayout: (event: Object) => void,
|
||||
scrollAnimatedValue: Animated.Value,
|
||||
};
|
||||
|
||||
class ScrollViewStickyHeader extends React.Component {
|
||||
props: Props;
|
||||
state: {
|
||||
measured: boolean,
|
||||
layoutY: number,
|
||||
layoutHeight: number,
|
||||
nextHeaderLayoutY: ?number,
|
||||
};
|
||||
|
||||
class ScrollViewStickyHeader extends React.Component<Props, {
|
||||
measured: boolean,
|
||||
layoutY: number,
|
||||
layoutHeight: number,
|
||||
nextHeaderLayoutY: ?number,
|
||||
}> {
|
||||
constructor(props: Props, context: Object) {
|
||||
super(props, context);
|
||||
this.state = {
|
||||
|
||||
@@ -17,7 +17,7 @@ const requireNativeComponent = require('requireNativeComponent');
|
||||
|
||||
const RCTScrollView = requireNativeComponent('RCTScrollView');
|
||||
|
||||
class ScrollViewMock extends React.Component {
|
||||
class ScrollViewMock extends React.Component<$FlowFixMeProps> {
|
||||
render() {
|
||||
return (
|
||||
<RCTScrollView {...this.props}>
|
||||
|
||||
Reference in New Issue
Block a user