fix(client): fix view

hiroppy · Jan 20, 2021 · 0afcae8 · 0afcae8
1 parent 74b7c75
commit 0afcae8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
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, isJumpPage }) => {
+  ({ slides, onChangeSlideIndex, hash, isJumpPage, showIndex }) => {
     // for SSR
     if (process.env.NODE_ENV !== 'production') {
       useEffect(() => {
@@ -60,7 +60,7 @@ export const Base = memo(
 
     function setupSlides() {
       if (!window.slide) {
-        window.slide = setupWebSlides({});
+        window.slide = setupWebSlides({ showIndex });
 
         // for presenter:view
         window.slide.el.addEventListener('ws:slide-change', (e) => {

diff --git a/packages/client/src/components/ContentView/Host.js b/packages/client/src/components/ContentView/Host.js
@@ -44,7 +44,7 @@ const Host = memo(({ slides, currentIndex, terminate, onChangeSlideIndex }) => {
   if (!presentationController) {
     const { origin, pathname } = new URL(window.location);
 
-    slideUrl = `${origin}/${pathname}?sidebar=false&isLive=false#slide=`;
+    slideUrl = `${origin}${pathname}?sidebar=false&isLive=false#slide=`;
     presentationController = new PresentationController();
   }
 

diff --git a/packages/client/src/hooks/useContentComponent.js b/packages/client/src/hooks/useContentComponent.js
@@ -2,7 +2,8 @@ import { useEffect, useState } from 'react';
 import { Base } from '../components/ContentView/Base';
 
 export function useContentComponent(mode) {
-  const [ContentComponent, setContentComponent] = useState(Base);
+  // need to set the default value for SSR
+  const [ContentComponent, setContentComponent] = useState(mode === 'common' ? Base : null);
 
   useEffect(() => {
     (async () => {
@@ -16,6 +17,8 @@ export function useContentComponent(mode) {
         const { default: Comp } = await import('../components/ContentView/Host');
 
         setContentComponent(Comp);
+      } else {
+        setContentComponent(null);
       }
     })();
   }, [mode]);

diff --git a/packages/client/src/presentationMode/Controller.js b/packages/client/src/presentationMode/Controller.js
@@ -41,7 +41,10 @@ export class Controller {
   }
 
   async reconnect(id) {
-    if (this.apiType === 'presentation') return this.presentationRequest.reconnect(id);
+    if (this.apiType === 'presentation') {
+      return this.presentationRequest.reconnect(id);
+    }
+
     return Promise.resolve();
   }