فهرست منبع

Merge pull request #6669 from weseek/fix/update-PagePathHierarchicalLink-for-hydration-error

fix: Update PagePathHierarchicalLink for hydration error
ryoji-s 3 سال پیش
والد
کامیت
4aaf14118d
2فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 4 3
      packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx
  2. 1 2
      packages/app/src/components/PagePathNav.tsx

+ 4 - 3
packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -39,7 +39,6 @@ import { Skelton } from '../Skelton';
 import { GrowiSubNavigation } from './GrowiSubNavigation';
 import { GrowiSubNavigation } from './GrowiSubNavigation';
 import { SubNavButtonsProps } from './SubNavButtons';
 import { SubNavButtonsProps } from './SubNavButtons';
 
 
-
 import PageEditorModeManagerStyles from './PageEditorModeManager.module.scss';
 import PageEditorModeManagerStyles from './PageEditorModeManager.module.scss';
 
 
 
 
@@ -47,9 +46,11 @@ const PageEditorModeManager = dynamic(
   () => import('./PageEditorModeManager'),
   () => import('./PageEditorModeManager'),
   { ssr: false, loading: () => <Skelton additionalClass={`${PageEditorModeManagerStyles['grw-page-editor-mode-manager-skelton']}`} /> },
   { ssr: false, loading: () => <Skelton additionalClass={`${PageEditorModeManagerStyles['grw-page-editor-mode-manager-skelton']}`} /> },
 );
 );
+// TODO: If enable skeleton, we get hydration error when create a page from PageCreateModal
+// { ssr: false, loading: () => <Skelton additionalClass='btn-skelton py-2' /> },
 const SubNavButtons = dynamic<SubNavButtonsProps>(
 const SubNavButtons = dynamic<SubNavButtonsProps>(
   () => import('./SubNavButtons').then(mod => mod.SubNavButtons),
   () => import('./SubNavButtons').then(mod => mod.SubNavButtons),
-  { ssr: false, loading: () => <Skelton additionalClass='btn-skelton py-2' /> },
+  { ssr: false, loading: () => <></> },
 );
 );
 
 
 
 
@@ -309,10 +310,10 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
         />
         />
       );
       );
     };
     };
+
     return (
     return (
       <>
       <>
         <div className="d-flex flex-column align-items-end justify-content-center py-md-2" style={{ gap: `${isCompactMode ? '5px' : '7px'}` }}>
         <div className="d-flex flex-column align-items-end justify-content-center py-md-2" style={{ gap: `${isCompactMode ? '5px' : '7px'}` }}>
-
           { isViewMode && (
           { isViewMode && (
             <div className="h-50 w-100">
             <div className="h-50 w-100">
               { pageId != null && (
               { pageId != null && (

+ 1 - 2
packages/app/src/components/PagePathNav.tsx

@@ -7,8 +7,6 @@ import { useIsNotFound } from '~/stores/context';
 
 
 import LinkedPagePath from '../models/linked-page-path';
 import LinkedPagePath from '../models/linked-page-path';
 
 
-import PagePathHierarchicalLink from './PagePathHierarchicalLink';
-
 const { isTrashPage } = pagePathUtils;
 const { isTrashPage } = pagePathUtils;
 
 
 type Props = {
 type Props = {
@@ -19,6 +17,7 @@ type Props = {
 }
 }
 
 
 const CopyDropdown = dynamic(() => import('./Page/CopyDropdown'), { ssr: false });
 const CopyDropdown = dynamic(() => import('./Page/CopyDropdown'), { ssr: false });
+const PagePathHierarchicalLink = dynamic(() => import('./PagePathHierarchicalLink'), { ssr: false });
 
 
 const PagePathNav: FC<Props> = (props: Props) => {
 const PagePathNav: FC<Props> = (props: Props) => {
   const {
   const {