Remove style aliases to avoid lint disable

facebook · Nov 5, 2018 · 3a34223 · 3a34223
1 parent 3456d10
commit 3a34223
Showing 1 changed file with 44 additions and 32 deletions.
diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
@@ -21,32 +21,31 @@ const ClippableView = requireNativeComponent('ClippableView');
 
 class ClippingSample1 extends React.Component {
   render() {
-    const styles = sample1Styles;
     return (
       <View>
         <ClippableView
           clippableViewID="outer"
-          style={styles.outer}
+          style={sample1Styles.outer}
           removeClippedSubviews={true}>
           <ClippableView
             clippableViewID="inner1"
-            style={[styles.inner, styles.inner1]}
+            style={[sample1Styles.inner, sample1Styles.inner1]}
           />
           <ClippableView
             clippableViewID="inner2"
-            style={[styles.inner, styles.inner2]}
+            style={[sample1Styles.inner, sample1Styles.inner2]}
           />
           <ClippableView
             clippableViewID="inner3"
-            style={[styles.inner, styles.inner3]}
+            style={[sample1Styles.inner, sample1Styles.inner3]}
           />
           <ClippableView
             clippableViewID="inner4"
-            style={[styles.inner, styles.inner4]}
+            style={[sample1Styles.inner, sample1Styles.inner4]}
           />
           <ClippableView
             clippableViewID="inner5"
-            style={[styles.inner, styles.inner5]}
+            style={[sample1Styles.inner, sample1Styles.inner5]}
           />
         </ClippableView>
       </View>
@@ -87,36 +86,34 @@ const sample1Styles = StyleSheet.create({
     top: 50,
   },
 });
-/* eslint-enable */
 
 class ClippingSample2 extends React.Component {
   render() {
-    const styles = sample2Styles;
     return (
       <View>
         <ClippableView
           clippableViewID="outer"
-          style={styles.outer}
+          style={sample2Styles.outer}
           removeClippedSubviews={true}>
           <ClippableView
             clippableViewID="complexInner"
-            style={styles.complexInner}
+            style={sample2Styles.complexInner}
             removeClippedSubviews={true}>
             <ClippableView
               clippableViewID="inner1"
-              style={[styles.inner, styles.inner1]}
+              style={[sample2Styles.inner, sample2Styles.inner1]}
             />
             <ClippableView
               clippableViewID="inner2"
-              style={[styles.inner, styles.inner2]}
+              style={[sample2Styles.inner, sample2Styles.inner2]}
             />
             <ClippableView
               clippableViewID="inner3"
-              style={[styles.inner, styles.inner3]}
+              style={[sample2Styles.inner, sample2Styles.inner3]}
             />
             <ClippableView
               clippableViewID="inner4"
-              style={[styles.inner, styles.inner4]}
+              style={[sample2Styles.inner, sample2Styles.inner4]}
             />
           </ClippableView>
         </ClippableView>
@@ -162,21 +159,24 @@ const sample2Styles = StyleSheet.create({
     bottom: 10,
   },
 });
-/* eslint-enable */
 
 class UpdatingSample1 extends React.Component {
   render() {
-    const styles = updating1Styles;
     const inner1Styles = [
-      styles.inner1,
+      updating1Styles.inner1,
       {height: this.props.update1 ? 200 : 100},
     ];
-    const inner2Styles = [styles.inner2, {top: this.props.update2 ? 200 : 50}];
+
+    const inner2Styles = [
+      updating1Styles.inner2,
+      {top: this.props.update2 ? 200 : 50},
+    ];
+
     return (
       <View>
         <ClippableView
           clippableViewID="outer"
-          style={styles.outer}
+          style={updating1Styles.outer}
           removeClippedSubviews={true}>
           <ClippableView clippableViewID="inner1" style={inner1Styles} />
           <ClippableView clippableViewID="inner2" style={inner2Styles} />
@@ -209,19 +209,24 @@ const updating1Styles = StyleSheet.create({
     backgroundColor: 'green',
   },
 });
-/* eslint-enable */
 
 class UpdatingSample2 extends React.Component {
   render() {
-    const styles = updating2Styles;
-    const outerStyles = [styles.outer, {height: this.props.update ? 200 : 100}];
+    const outerStyles = [
+      updating2Styles.outer,
+      {height: this.props.update ? 200 : 100},
+    ];
+
     return (
       <View>
         <ClippableView
           clippableViewID="outer"
           style={outerStyles}
           removeClippedSubviews={true}>
-          <ClippableView clippableViewID="inner" style={styles.inner} />
+          <ClippableView
+            clippableViewID="inner"
+            style={updating2Styles.inner}
+          />
         </ClippableView>
       </View>
     );
@@ -242,35 +247,43 @@ const updating2Styles = StyleSheet.create({
     backgroundColor: 'green',
   },
 });
-/* eslint-enable */
 
 class ScrollViewTest extends React.Component {
   render() {
-    const styles = scrollTestStyles;
     const children = [];
     for (let i = 0; i < 4; i++) {
       children[i] = (
-        <ClippableView key={i} style={styles.row} clippableViewID={'' + i} />
+        <ClippableView
+          key={i}
+          style={scrollTestStyles.row}
+          clippableViewID={'' + i}
+        />
       );
     }
     for (let i = 4; i < 6; i++) {
       const viewID = 'C' + (i - 4);
       children[i] = (
         <ClippableView
           key={i}
-          style={styles.complex}
+          style={scrollTestStyles.complex}
           clippableViewID={viewID}
           removeClippedSubviews={true}>
-          <ClippableView style={styles.inner} clippableViewID={viewID + '.1'} />
-          <ClippableView style={styles.inner} clippableViewID={viewID + '.2'} />
+          <ClippableView
+            style={scrollTestStyles.inner}
+            clippableViewID={viewID + '.1'}
+          />
+          <ClippableView
+            style={scrollTestStyles.inner}
+            clippableViewID={viewID + '.2'}
+          />
         </ClippableView>
       );
     }
 
     return (
       <ScrollView
         removeClippedSubviews={true}
-        style={styles.scrollView}
+        style={scrollTestStyles.scrollView}
         testID="scroll_view">
         {children}
       </ScrollView>
@@ -306,7 +319,6 @@ const scrollTestStyles = StyleSheet.create({
     borderWidth: 1,
   },
 });
-/* eslint-enable */
 
 let appInstance = null;