Просмотр исходного кода

move condition up to switch TabContent display

yohei0125 3 лет назад
Родитель
Сommit
35ca727a0c
1 измененных файлов с 5 добавлено и 7 удалено
  1. 5 7
      packages/app/src/components/Page/DisplaySwitcher.tsx

+ 5 - 7
packages/app/src/components/Page/DisplaySwitcher.tsx

@@ -36,7 +36,7 @@ const DisplaySwitcher = (): JSX.Element => {
   // get element for smoothScroll
   // get element for smoothScroll
   const getCommentListDom = useMemo(() => { return document.getElementById('page-comments-list') }, []);
   const getCommentListDom = useMemo(() => { return document.getElementById('page-comments-list') }, []);
 
 
-  const { data: isEmptyPageInNotFoundContext } = useIsEmptyPageInNotFoundContext();
+  const { data: isEmptyPage } = useIsEmptyPageInNotFoundContext();
   const { data: currentPageId } = useCurrentPageId();
   const { data: currentPageId } = useCurrentPageId();
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: isSharedUser } = useIsSharedUser();
   const { data: isSharedUser } = useIsSharedUser();
@@ -60,7 +60,7 @@ const DisplaySwitcher = (): JSX.Element => {
         <TabPane tabId={EditorMode.View}>
         <TabPane tabId={EditorMode.View}>
           <div className="d-flex flex-column flex-lg-row-reverse">
           <div className="d-flex flex-column flex-lg-row-reverse">
 
 
-            { isPageExist && (
+            { isPageExist && !isEmptyPage && (
               <div className="grw-side-contents-container">
               <div className="grw-side-contents-container">
                 <div className="grw-side-contents-sticky-container">
                 <div className="grw-side-contents-sticky-container">
 
 
@@ -97,11 +97,9 @@ const DisplaySwitcher = (): JSX.Element => {
                   ) }
                   ) }
 
 
                   <div className="d-none d-lg-block">
                   <div className="d-none d-lg-block">
-                    {!isEmptyPageInNotFoundContext && (
-                      <div id="revision-toc" className="revision-toc">
-                        <TableOfContents />
-                      </div>
-                    )}
+                    <div id="revision-toc" className="revision-toc">
+                      <TableOfContents />
+                    </div>
                     <ContentLinkButtons />
                     <ContentLinkButtons />
                   </div>
                   </div>