From 34ccf9c4c92da83b359baab8f7a8c7288cc635c8 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Mon, 3 Aug 2020 17:18:50 +0200
Subject: [PATCH] Improve collapsible components to match linter

---
 .../Collapsible/CollapsibleComponent.js       | 84 ++++++++++---------
 .../Collapsible/CollapsibleFlatList.js        | 36 ++++----
 .../Collapsible/CollapsibleScrollView.js      | 36 ++++----
 .../Collapsible/CollapsibleSectionList.js     | 36 ++++----
 4 files changed, 100 insertions(+), 92 deletions(-)

diff --git a/src/components/Collapsible/CollapsibleComponent.js b/src/components/Collapsible/CollapsibleComponent.js
index d982b6a..c9be36f 100644
--- a/src/components/Collapsible/CollapsibleComponent.js
+++ b/src/components/Collapsible/CollapsibleComponent.js
@@ -1,51 +1,59 @@
 // @flow
 
 import * as React from 'react';
-import {withCollapsible} from "../../utils/withCollapsible";
-import {Collapsible} from "react-navigation-collapsible";
-import CustomTabBar from "../Tabbar/CustomTabBar";
+import {Collapsible} from 'react-navigation-collapsible';
+import {withCollapsible} from '../../utils/withCollapsible';
+import CustomTabBar from '../Tabbar/CustomTabBar';
 
-export type CollapsibleComponentProps = {
-    children?: React.Node,
-    hasTab?: boolean,
-    onScroll?: (event: SyntheticEvent<EventTarget>) => void,
+export type CollapsibleComponentPropsType = {
+  children?: React.Node,
+  hasTab?: boolean,
+  onScroll?: (event: SyntheticEvent<EventTarget>) => void,
 };
 
-type Props = {
-    ...CollapsibleComponentProps,
-    collapsibleStack: Collapsible,
-    component: any,
-}
+type PropsType = {
+  ...CollapsibleComponentPropsType,
+  collapsibleStack: Collapsible,
+  // eslint-disable-next-line flowtype/no-weak-types
+  component: any,
+};
 
-class CollapsibleComponent extends React.Component<Props> {
+class CollapsibleComponent extends React.Component<PropsType> {
+  static defaultProps = {
+    children: null,
+    hasTab: false,
+    onScroll: null,
+  };
 
-    static defaultProps = {
-        hasTab: false,
-    }
+  onScroll = (event: SyntheticEvent<EventTarget>) => {
+    const {props} = this;
+    if (props.onScroll) props.onScroll(event);
+  };
 
-    onScroll = (event: SyntheticEvent<EventTarget>) => {
-        if (this.props.onScroll)
-            this.props.onScroll(event);
-    }
+  render(): React.Node {
+    const {props} = this;
+    const Comp = props.component;
+    const {
+      containerPaddingTop,
+      scrollIndicatorInsetTop,
+      onScrollWithListener,
+    } = props.collapsibleStack;
 
-    render() {
-        const Comp = this.props.component;
-        const {containerPaddingTop, scrollIndicatorInsetTop, onScrollWithListener} = this.props.collapsibleStack;
-        return (
-            <Comp
-                {...this.props}
-                onScroll={onScrollWithListener(this.onScroll)}
-                contentContainerStyle={{
-                    paddingTop: containerPaddingTop,
-                    paddingBottom: this.props.hasTab ? CustomTabBar.TAB_BAR_HEIGHT : 0,
-                    minHeight: '100%'
-                }}
-                scrollIndicatorInsets={{top: scrollIndicatorInsetTop}}
-            >
-                {this.props.children}
-            </Comp>
-        );
-    }
+    return (
+      <Comp
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        onScroll={onScrollWithListener(this.onScroll)}
+        contentContainerStyle={{
+          paddingTop: containerPaddingTop,
+          paddingBottom: props.hasTab ? CustomTabBar.TAB_BAR_HEIGHT : 0,
+          minHeight: '100%',
+        }}
+        scrollIndicatorInsets={{top: scrollIndicatorInsetTop}}>
+        {props.children}
+      </Comp>
+    );
+  }
 }
 
 export default withCollapsible(CollapsibleComponent);
diff --git a/src/components/Collapsible/CollapsibleFlatList.js b/src/components/Collapsible/CollapsibleFlatList.js
index 398688b..5906ff9 100644
--- a/src/components/Collapsible/CollapsibleFlatList.js
+++ b/src/components/Collapsible/CollapsibleFlatList.js
@@ -1,26 +1,26 @@
 // @flow
 
 import * as React from 'react';
-import {Animated} from "react-native";
-import type {CollapsibleComponentProps} from "./CollapsibleComponent";
-import CollapsibleComponent from "./CollapsibleComponent";
+import {Animated} from 'react-native';
+import type {CollapsibleComponentPropsType} from './CollapsibleComponent';
+import CollapsibleComponent from './CollapsibleComponent';
 
-type Props = {
-    ...CollapsibleComponentProps
-}
+type PropsType = {
+  ...CollapsibleComponentPropsType,
+};
 
-class CollapsibleFlatList extends React.Component<Props> {
-
-    render() {
-        return (
-            <CollapsibleComponent
-                {...this.props}
-                component={Animated.FlatList}
-            >
-                {this.props.children}
-            </CollapsibleComponent>
-        );
-    }
+// eslint-disable-next-line react/prefer-stateless-function
+class CollapsibleFlatList extends React.Component<PropsType> {
+  render(): React.Node {
+    const {props} = this;
+    return (
+      <CollapsibleComponent // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        component={Animated.FlatList}>
+        {props.children}
+      </CollapsibleComponent>
+    );
+  }
 }
 
 export default CollapsibleFlatList;
diff --git a/src/components/Collapsible/CollapsibleScrollView.js b/src/components/Collapsible/CollapsibleScrollView.js
index 831e925..3569ca9 100644
--- a/src/components/Collapsible/CollapsibleScrollView.js
+++ b/src/components/Collapsible/CollapsibleScrollView.js
@@ -1,26 +1,26 @@
 // @flow
 
 import * as React from 'react';
-import {Animated} from "react-native";
-import type {CollapsibleComponentProps} from "./CollapsibleComponent";
-import CollapsibleComponent from "./CollapsibleComponent";
+import {Animated} from 'react-native';
+import type {CollapsibleComponentPropsType} from './CollapsibleComponent';
+import CollapsibleComponent from './CollapsibleComponent';
 
-type Props = {
-    ...CollapsibleComponentProps
-}
+type PropsType = {
+  ...CollapsibleComponentPropsType,
+};
 
-class CollapsibleScrollView extends React.Component<Props> {
-
-    render() {
-        return (
-            <CollapsibleComponent
-                {...this.props}
-                component={Animated.ScrollView}
-            >
-                {this.props.children}
-            </CollapsibleComponent>
-        );
-    }
+// eslint-disable-next-line react/prefer-stateless-function
+class CollapsibleScrollView extends React.Component<PropsType> {
+  render(): React.Node {
+    const {props} = this;
+    return (
+      <CollapsibleComponent // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        component={Animated.ScrollView}>
+        {props.children}
+      </CollapsibleComponent>
+    );
+  }
 }
 
 export default CollapsibleScrollView;
diff --git a/src/components/Collapsible/CollapsibleSectionList.js b/src/components/Collapsible/CollapsibleSectionList.js
index cb8f6f0..8a93f14 100644
--- a/src/components/Collapsible/CollapsibleSectionList.js
+++ b/src/components/Collapsible/CollapsibleSectionList.js
@@ -1,26 +1,26 @@
 // @flow
 
 import * as React from 'react';
-import {Animated} from "react-native";
-import type {CollapsibleComponentProps} from "./CollapsibleComponent";
-import CollapsibleComponent from "./CollapsibleComponent";
+import {Animated} from 'react-native';
+import type {CollapsibleComponentPropsType} from './CollapsibleComponent';
+import CollapsibleComponent from './CollapsibleComponent';
 
-type Props = {
-    ...CollapsibleComponentProps
-}
+type PropsType = {
+  ...CollapsibleComponentPropsType,
+};
 
-class CollapsibleSectionList extends React.Component<Props> {
-
-    render() {
-        return (
-            <CollapsibleComponent
-                {...this.props}
-                component={Animated.SectionList}
-            >
-                {this.props.children}
-            </CollapsibleComponent>
-        );
-    }
+// eslint-disable-next-line react/prefer-stateless-function
+class CollapsibleSectionList extends React.Component<PropsType> {
+  render(): React.Node {
+    const {props} = this;
+    return (
+      <CollapsibleComponent // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        component={Animated.SectionList}>
+        {props.children}
+      </CollapsibleComponent>
+    );
+  }
 }
 
 export default CollapsibleSectionList;