perf(client): don't use setTimeout when the page number is 0

hiroppy · Jul 7, 2019 · 08e4ee2 · 08e4ee2
1 parent 97dddb1
commit 08e4ee2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/client/src/components/AppContainer.js b/packages/client/src/components/AppContainer.js
@@ -10,6 +10,7 @@ export const AppContainer = ({ slides: originalSlides, hash }) => {
   const isLive = params.get('isLive');
   let index = parsedUrl.hash.match(/^#slide=(.+?)$/);
   index = index !== null ? index[1] - 1 : 0;
+  const isJumpPage = index !== 0;
 
   const setCommentsListComponent = async () => {
     const { CommentsList } = await import(/* webpackChunkName: 'live' */ './CommentsList');
@@ -140,6 +141,7 @@ export const AppContainer = ({ slides: originalSlides, hash }) => {
         <ContentComponent
           hash={hash}
           slides={slides}
+          isJumpPage={isJumpPage}
           terminate={terminate}
           currentIndex={currentIndex}
           onChangeSlideIndex={onChangeSlideIndex}

diff --git a/packages/client/src/components/ContentView/Base.js b/packages/client/src/components/ContentView/Base.js
@@ -20,7 +20,7 @@ async function setupMermaid() {
 }
 
 export const Base = memo(
-  ({ slides, onChangeSlideIndex, hash }) => {
+  ({ slides, onChangeSlideIndex, hash, isJumpPage }) => {
     // for SSR
     if (process.env.NODE_ENV !== 'production') {
       useEffect(() => {
@@ -36,7 +36,12 @@ export const Base = memo(
     // delay Event Loop one round
     // but on Node.js this line is an error, so put it in useEffect
     if (!process.env.SSR) {
-      setTimeout(setupSlides, 0);
+      // 0 page
+      if (process.env.NODE_ENV === 'production' && !isJumpPage) {
+        setupSlides();
+      } else {
+        setTimeout(setupSlides, 0);
+      }
     }
 
     useEffect(() => {