mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Prettier the rest of ReactNative
Reviewed By: yungsters Differential Revision: D7974340 fbshipit-source-id: 5fe457a8a9be4bd360fc3af9acb5c1136b2be0d7
This commit is contained in:
committed by
Facebook Github Bot
parent
aba4ec0c09
commit
36fcbaa56d
@@ -4,6 +4,7 @@
|
||||
* This source code is licensed under the MIT license found in the
|
||||
* LICENSE file in the root directory of this source tree.
|
||||
*
|
||||
* @format
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
@@ -24,12 +25,30 @@ class ClippingSample1 extends React.Component {
|
||||
var styles = sample1Styles;
|
||||
return (
|
||||
<View>
|
||||
<ClippableView clippableViewID="outer" style={styles.outer} removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner1" style={[styles.inner, styles.inner1]}/>
|
||||
<ClippableView clippableViewID="inner2" style={[styles.inner, styles.inner2]}/>
|
||||
<ClippableView clippableViewID="inner3" style={[styles.inner, styles.inner3]}/>
|
||||
<ClippableView clippableViewID="inner4" style={[styles.inner, styles.inner4]}/>
|
||||
<ClippableView clippableViewID="inner5" style={[styles.inner, styles.inner5]}/>
|
||||
<ClippableView
|
||||
clippableViewID="outer"
|
||||
style={styles.outer}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView
|
||||
clippableViewID="inner1"
|
||||
style={[styles.inner, styles.inner1]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner2"
|
||||
style={[styles.inner, styles.inner2]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner3"
|
||||
style={[styles.inner, styles.inner3]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner4"
|
||||
style={[styles.inner, styles.inner4]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner5"
|
||||
style={[styles.inner, styles.inner5]}
|
||||
/>
|
||||
</ClippableView>
|
||||
</View>
|
||||
);
|
||||
@@ -75,15 +94,30 @@ class ClippingSample2 extends React.Component {
|
||||
var styles = sample2Styles;
|
||||
return (
|
||||
<View>
|
||||
<ClippableView clippableViewID="outer" style={styles.outer} removeClippedSubviews={true}>
|
||||
<ClippableView
|
||||
clippableViewID="outer"
|
||||
style={styles.outer}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView
|
||||
clippableViewID="complexInner"
|
||||
style={styles.complexInner}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner1" style={[styles.inner, styles.inner1]}/>
|
||||
<ClippableView clippableViewID="inner2" style={[styles.inner, styles.inner2]}/>
|
||||
<ClippableView clippableViewID="inner3" style={[styles.inner, styles.inner3]}/>
|
||||
<ClippableView clippableViewID="inner4" style={[styles.inner, styles.inner4]}/>
|
||||
clippableViewID="complexInner"
|
||||
style={styles.complexInner}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView
|
||||
clippableViewID="inner1"
|
||||
style={[styles.inner, styles.inner1]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner2"
|
||||
style={[styles.inner, styles.inner2]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner3"
|
||||
style={[styles.inner, styles.inner3]}
|
||||
/>
|
||||
<ClippableView
|
||||
clippableViewID="inner4"
|
||||
style={[styles.inner, styles.inner4]}
|
||||
/>
|
||||
</ClippableView>
|
||||
</ClippableView>
|
||||
</View>
|
||||
@@ -132,13 +166,19 @@ var sample2Styles = StyleSheet.create({
|
||||
class UpdatingSample1 extends React.Component {
|
||||
render() {
|
||||
var styles = updating1Styles;
|
||||
var inner1Styles = [styles.inner1, {height: this.props.update1 ? 200 : 100}];
|
||||
var inner1Styles = [
|
||||
styles.inner1,
|
||||
{height: this.props.update1 ? 200 : 100},
|
||||
];
|
||||
var inner2Styles = [styles.inner2, {top: this.props.update2 ? 200 : 50}];
|
||||
return (
|
||||
<View>
|
||||
<ClippableView clippableViewID="outer" style={styles.outer} removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner1" style={inner1Styles}/>
|
||||
<ClippableView clippableViewID="inner2" style={inner2Styles}/>
|
||||
<ClippableView
|
||||
clippableViewID="outer"
|
||||
style={styles.outer}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner1" style={inner1Styles} />
|
||||
<ClippableView clippableViewID="inner2" style={inner2Styles} />
|
||||
</ClippableView>
|
||||
</View>
|
||||
);
|
||||
@@ -166,7 +206,7 @@ var updating1Styles = StyleSheet.create({
|
||||
left: 50,
|
||||
top: 50,
|
||||
backgroundColor: 'green',
|
||||
}
|
||||
},
|
||||
});
|
||||
|
||||
class UpdatingSample2 extends React.Component {
|
||||
@@ -175,8 +215,11 @@ class UpdatingSample2 extends React.Component {
|
||||
var outerStyles = [styles.outer, {height: this.props.update ? 200 : 100}];
|
||||
return (
|
||||
<View>
|
||||
<ClippableView clippableViewID="outer" style={outerStyles} removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner" style={styles.inner}/>
|
||||
<ClippableView
|
||||
clippableViewID="outer"
|
||||
style={outerStyles}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView clippableViewID="inner" style={styles.inner} />
|
||||
</ClippableView>
|
||||
</View>
|
||||
);
|
||||
@@ -204,25 +247,28 @@ class ScrollViewTest extends React.Component {
|
||||
var children = [];
|
||||
for (var i = 0; i < 4; i++) {
|
||||
children[i] = (
|
||||
<ClippableView key={i} style={styles.row} clippableViewID={'' + i}/>
|
||||
<ClippableView key={i} style={styles.row} clippableViewID={'' + i} />
|
||||
);
|
||||
}
|
||||
for (var i = 4; i < 6; i++) {
|
||||
var viewID = 'C' + (i - 4);
|
||||
children[i] = (
|
||||
<ClippableView
|
||||
key={i}
|
||||
style={styles.complex}
|
||||
clippableViewID={viewID}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView style={styles.inner} clippableViewID={viewID + '.1'}/>
|
||||
<ClippableView style={styles.inner} clippableViewID={viewID + '.2'}/>
|
||||
key={i}
|
||||
style={styles.complex}
|
||||
clippableViewID={viewID}
|
||||
removeClippedSubviews={true}>
|
||||
<ClippableView style={styles.inner} clippableViewID={viewID + '.1'} />
|
||||
<ClippableView style={styles.inner} clippableViewID={viewID + '.2'} />
|
||||
</ClippableView>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<ScrollView removeClippedSubviews={true} style={styles.scrollView} testID="scroll_view">
|
||||
<ScrollView
|
||||
removeClippedSubviews={true}
|
||||
style={styles.scrollView}
|
||||
testID="scroll_view">
|
||||
{children}
|
||||
</ScrollView>
|
||||
);
|
||||
@@ -258,7 +304,6 @@ var scrollTestStyles = StyleSheet.create({
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
var appInstance = null;
|
||||
|
||||
class SubviewsClippingTestApp extends React.Component {
|
||||
@@ -268,42 +313,40 @@ class SubviewsClippingTestApp extends React.Component {
|
||||
appInstance = this;
|
||||
}
|
||||
|
||||
setComponent = (component) => {
|
||||
setComponent = component => {
|
||||
this.setState({component: component});
|
||||
};
|
||||
|
||||
render() {
|
||||
var component = this.state.component;
|
||||
return (
|
||||
<View>
|
||||
{component}
|
||||
</View>
|
||||
);
|
||||
return <View>{component}</View>;
|
||||
}
|
||||
}
|
||||
|
||||
var SubviewsClippingTestModule = {
|
||||
App: SubviewsClippingTestApp,
|
||||
renderClippingSample1: function() {
|
||||
appInstance.setComponent(<ClippingSample1/>);
|
||||
appInstance.setComponent(<ClippingSample1 />);
|
||||
},
|
||||
renderClippingSample2: function() {
|
||||
appInstance.setComponent(<ClippingSample2/>);
|
||||
appInstance.setComponent(<ClippingSample2 />);
|
||||
},
|
||||
renderUpdatingSample1: function(update1, update2) {
|
||||
appInstance.setComponent(<UpdatingSample1 update1={update1} update2={update2}/>);
|
||||
appInstance.setComponent(
|
||||
<UpdatingSample1 update1={update1} update2={update2} />,
|
||||
);
|
||||
},
|
||||
renderUpdatingSample2: function(update) {
|
||||
appInstance.setComponent(<UpdatingSample2 update={update}/>);
|
||||
appInstance.setComponent(<UpdatingSample2 update={update} />);
|
||||
},
|
||||
renderScrollViewTest: function() {
|
||||
appInstance.setComponent(<ScrollViewTest/>);
|
||||
appInstance.setComponent(<ScrollViewTest />);
|
||||
},
|
||||
};
|
||||
|
||||
BatchedBridge.registerCallableModule(
|
||||
'SubviewsClippingTestModule',
|
||||
SubviewsClippingTestModule
|
||||
SubviewsClippingTestModule,
|
||||
);
|
||||
|
||||
module.exports = SubviewsClippingTestModule;
|
||||
|
||||
Reference in New Issue
Block a user