From 2fe2470b3a0c1479f2db7a98657ff20fcf8ed9ca Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Mon, 2 Jul 2018 11:55:46 +0200
Subject: [PATCH] Remove <Defer /> component

This reduce amount of blinks - but not prevent them completely in dev
So still need investigate
---
 src/components/OperationsList/index.js | 104 ++++++++++++-------------
 src/components/base/Defer.js           |  40 ----------
 src/components/base/Modal/index.js     |   3 +-
 3 files changed, 50 insertions(+), 97 deletions(-)
 delete mode 100644 src/components/base/Defer.js

diff --git a/src/components/OperationsList/index.js b/src/components/OperationsList/index.js
index 5f177c89..4e3678d3 100644
--- a/src/components/OperationsList/index.js
+++ b/src/components/OperationsList/index.js
@@ -24,7 +24,6 @@ import IconAngleDown from 'icons/AngleDown'
 
 import Box, { Card } from 'components/base/Box'
 import Text from 'components/base/Text'
-import Defer from 'components/base/Defer'
 import Track from 'analytics/Track'
 
 import SectionTitle from './SectionTitle'
@@ -100,61 +99,56 @@ export class OperationsList extends PureComponent<Props, State> {
     const accountsMap = accounts ? keyBy(accounts, 'id') : { [account.id]: account }
 
     return (
-      <Defer>
-        <Box flow={4}>
-          {title && (
-            <Text color="dark" ff="Museo Sans" fontSize={6}>
-              {title}
+      <Box flow={4}>
+        {title && (
+          <Text color="dark" ff="Museo Sans" fontSize={6}>
+            {title}
+          </Text>
+        )}
+        {groupedOperations.sections.map(group => (
+          <Box flow={2} key={group.day.toISOString()}>
+            <SectionTitle day={group.day} />
+            <Card p={0}>
+              {group.data.map(operation => {
+                const account = accountsMap[operation.accountId]
+                if (!account) {
+                  return null
+                }
+                return (
+                  <OperationC
+                    operation={operation}
+                    account={account}
+                    key={`${account.id}_${operation.id}`}
+                    onOperationClick={this.handleClickOperation}
+                    t={t}
+                    withAccount={withAccount}
+                  />
+                )
+              })}
+            </Card>
+          </Box>
+        ))}
+        {groupedOperations.completed ? (
+          <Track
+            onMount
+            event="OperationsListEndReached"
+            totalSections={groupedOperations.sections.length}
+            totalOperations={groupedOperations.sections.reduce((sum, s) => sum + s.data.length, 0)}
+          />
+        ) : null}
+        {!groupedOperations.completed ? (
+          <ShowMore onClick={this.fetchMoreOperations}>
+            <span>{t('app:common.showMore')}</span>
+            <IconAngleDown size={12} />
+          </ShowMore>
+        ) : (
+          <Box p={6} align="center">
+            <Text ff="Open Sans" fontSize={3}>
+              {t('app:operationList.noMoreOperations')}
             </Text>
-          )}
-          {groupedOperations.sections.map(group => (
-            <Box flow={2} key={group.day.toISOString()}>
-              <SectionTitle day={group.day} />
-              <Card p={0}>
-                {group.data.map(operation => {
-                  const account = accountsMap[operation.accountId]
-                  if (!account) {
-                    return null
-                  }
-                  return (
-                    <OperationC
-                      operation={operation}
-                      account={account}
-                      key={`${account.id}_${operation.id}`}
-                      onOperationClick={this.handleClickOperation}
-                      t={t}
-                      withAccount={withAccount}
-                    />
-                  )
-                })}
-              </Card>
-            </Box>
-          ))}
-          {groupedOperations.completed ? (
-            <Track
-              onMount
-              event="OperationsListEndReached"
-              totalSections={groupedOperations.sections.length}
-              totalOperations={groupedOperations.sections.reduce(
-                (sum, s) => sum + s.data.length,
-                0,
-              )}
-            />
-          ) : null}
-          {!groupedOperations.completed ? (
-            <ShowMore onClick={this.fetchMoreOperations}>
-              <span>{t('app:common.showMore')}</span>
-              <IconAngleDown size={12} />
-            </ShowMore>
-          ) : (
-            <Box p={6} align="center">
-              <Text ff="Open Sans" fontSize={3}>
-                {t('app:operationList.noMoreOperations')}
-              </Text>
-            </Box>
-          )}
-        </Box>
-      </Defer>
+          </Box>
+        )}
+      </Box>
     )
   }
 }
diff --git a/src/components/base/Defer.js b/src/components/base/Defer.js
deleted file mode 100644
index 2044e054..00000000
--- a/src/components/base/Defer.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// @flow
-
-import { PureComponent } from 'react'
-
-type Props = {
-  children: any,
-}
-
-type State = {
-  shouldRender: boolean,
-}
-
-class Defer extends PureComponent<Props, State> {
-  state = {
-    shouldRender: false,
-  }
-
-  componentDidMount() {
-    this._mounted = true
-
-    window.requestAnimationFrame(() =>
-      window.requestAnimationFrame(() => this._mounted && this.setState({ shouldRender: true })),
-    )
-  }
-
-  componentWillUnmount() {
-    this._mounted = false
-  }
-
-  _mounted = false
-
-  render() {
-    const { children } = this.props
-    const { shouldRender } = this.state
-
-    return shouldRender ? children : null
-  }
-}
-
-export default Defer
diff --git a/src/components/base/Modal/index.js b/src/components/base/Modal/index.js
index 6d1f19d6..472f1ee3 100644
--- a/src/components/base/Modal/index.js
+++ b/src/components/base/Modal/index.js
@@ -19,7 +19,6 @@ import { closeModal, isModalOpened, getModalData } from 'reducers/modals'
 
 import Box from 'components/base/Box'
 import GrowScroll from 'components/base/GrowScroll'
-import Defer from 'components/base/Defer'
 
 export { default as ModalBody } from './ModalBody'
 export { default as ConfirmModal } from './ConfirmModal'
@@ -126,7 +125,7 @@ class Pure extends Component<any> {
   render() {
     const { data, onClose, render } = this.props
 
-    return <Defer>{render({ data, onClose })}</Defer>
+    return render({ data, onClose })
   }
 }