From e4452e3e575b57031de83259bbd403faa7cdce2a Mon Sep 17 00:00:00 2001 From: eug-vs Date: Fri, 14 Aug 2020 19:24:00 +0300 Subject: perf: greatly bost PollsList performance :rocket: Get rid of unnesessary re-renders of the whole list on scroll. --- package-lock.json | 2 +- package.json | 2 +- src/components/PollsList/PollsList.tsx | 44 +++++++++--------------------- src/components/PollsList/RenderItem.tsx | 47 +++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 33 deletions(-) create mode 100644 src/components/PollsList/RenderItem.tsx diff --git a/package-lock.json b/package-lock.json index 4d959da..a79494a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "which", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1c11638..afb17ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "which", - "version": "1.2.1", + "version": "1.2.2", "homepage": "https://which-ecosystem.github.io/", "dependencies": { "@material-ui/core": "^4.10.1", diff --git a/src/components/PollsList/PollsList.tsx b/src/components/PollsList/PollsList.tsx index c95bfde..62273ef 100644 --- a/src/components/PollsList/PollsList.tsx +++ b/src/components/PollsList/PollsList.tsx @@ -1,41 +1,23 @@ -import React from 'react'; +import React, { useCallback } from 'react'; import { Poll } from 'which-types'; import { WindowScroller, AutoSizer, List } from 'react-virtualized'; -import PollCard from '../PollCard/PollCard'; - +import RenderItem from './RenderItem'; interface PropTypes { polls: Poll[]; mutate: (polls: Poll[], refetch: boolean) => void; } -interface RenderPropTypes { - index: number; - key: string; - style: React.CSSProperties; -} - - const PollsList: React.FC = ({ polls, mutate }) => { - const RenderItem: React.FC = ({ index, style, key }) => { - const poll = polls[index]; - - const setPoll = (newPoll: Poll) => { - const newPolls = [...polls]; - newPolls[index] = newPoll; - - // Force-update list-size so everything re-renders - mutate([], false); - mutate(newPolls, false); - }; - - return ( - // To re-render on list resize, add this info to key -
- -
- ); - }; + const rowRenderer = useCallback(({ index, style, key }) => ( + + ), [polls, mutate]); return ( @@ -56,11 +38,11 @@ const PollsList: React.FC = ({ polls, mutate }) => { onScroll={onChildScroll} rowCount={polls.length} rowHeight={550} - rowRenderer={RenderItem} + rowRenderer={rowRenderer} scrollTop={scrollTop} width={width} containerStyle={{ pointerEvents: 'auto' }} - overscanRowCount={1} + overscanRowCount={2} /> )} diff --git a/src/components/PollsList/RenderItem.tsx b/src/components/PollsList/RenderItem.tsx new file mode 100644 index 0000000..900dae6 --- /dev/null +++ b/src/components/PollsList/RenderItem.tsx @@ -0,0 +1,47 @@ +import React, { useCallback } from 'react'; +import { Poll } from 'which-types'; +import PollCard from '../PollCard/PollCard'; + + +interface PropTypes { + polls: Poll[]; + mutate: (polls: Poll[], refetch: boolean) => void; + index: number; + style: React.CSSProperties; + key: string; +} + +const compareProps = (oldProps: PropTypes, newProps: PropTypes) => { + if (oldProps.key !== newProps.key) return false; + if (oldProps.index !== newProps.index) return false; + if (oldProps.polls !== newProps.polls) return false; + // TODO: uncomment line below to listen to style updates + // if (JSON.stringify(oldProps.style)!== JSON.stringify(newProps.style)) return false; + return true; +}; + +const RenderItem: React.FC = React.memo(({ + polls, mutate, index, style, key +}) => { + const poll = polls[index]; + + const setPoll = useCallback((newPoll: Poll) => { + const newPolls = [...polls]; + newPolls[index] = newPoll; + + // Force-update list-size so everything re-renders + mutate([], false); + mutate(newPolls, false); + }, [mutate, index, polls]); + + return ( + // To re-render on list resize, add this info to key +
+ +
+ ); +}, compareProps); + + +export default RenderItem; + -- cgit v1.2.3