reiji-h 2 лет назад
Родитель
Сommit
939104f243
1 измененных файлов с 6 добавлено и 4 удалено
  1. 6 4
      apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

+ 6 - 4
apps/app/src/components/Common/PagePathNav/PagePathNav.tsx

@@ -5,6 +5,7 @@ import React, {
 
 
 import { DevidedPagePath } from '@growi/core/dist/models';
 import { DevidedPagePath } from '@growi/core/dist/models';
 import { pagePathUtils } from '@growi/core/dist/utils';
 import { pagePathUtils } from '@growi/core/dist/utils';
+import { useRect } from '@growi/ui/dist/utils';
 import dynamic from 'next/dynamic';
 import dynamic from 'next/dynamic';
 import Sticky from 'react-stickynode';
 import Sticky from 'react-stickynode';
 
 
@@ -115,16 +116,17 @@ export const PagePathNavSticky = (props: PagePathNavStickyProps): JSX.Element =>
   const { data: sidebarWidth } = useCurrentProductNavWidth();
   const { data: sidebarWidth } = useCurrentProductNavWidth();
   const { data: sidebarMode } = useSidebarMode();
   const { data: sidebarMode } = useSidebarMode();
   const pagePathNavRef = useRef<HTMLDivElement>(null);
   const pagePathNavRef = useRef<HTMLDivElement>(null);
+  const [pagePathNavRect] = useRect(pagePathNavRef);
 
 
   const navMaxWidth: CSSProperties | undefined = useMemo(() => {
   const navMaxWidth: CSSProperties | undefined = useMemo(() => {
-    if (pageControlsX == null || pagePathNavRef.current == null || sidebarWidth == null || sidebarMode == null) {
+    if (pageControlsX == null || pagePathNavRef.current == null || sidebarWidth == null || sidebarMode == null || pagePathNavRect == null) {
       return;
       return;
     }
     }
     // console.log('sideBarMode: ', sidebarMode, pagePathNavRef.current.getBoundingClientRect().x);
     // console.log('sideBarMode: ', sidebarMode, pagePathNavRef.current.getBoundingClientRect().x);
-    console.log(' sideBarWidth: ', sidebarWidth, ' pageControsX: ', pageControlsX, ' pagePathNavRef current x: ',
-      pagePathNavRef.current.getBoundingClientRect().x);
+    console.log(' sideBarWidth: ', sidebarWidth, ' pageControsX: ', pageControlsX, ' pagePathNavRef.x: ',
+      pagePathNavRef.current.getBoundingClientRect().x, ' pagePathNavRect.x: ', pagePathNavRect.x);
     return { maxWidth: `calc(${pageControlsX}px - ${pagePathNavRef.current.getBoundingClientRect().x}px - 10px)` };
     return { maxWidth: `calc(${pageControlsX}px - ${pagePathNavRef.current.getBoundingClientRect().x}px - 10px)` };
-  }, [pageControlsX, pagePathNavRef, sidebarWidth, sidebarMode]);
+  }, [pageControlsX, pagePathNavRef, sidebarWidth, sidebarMode, pagePathNavRect]);
 
 
   return (
   return (
     // Controlling pointer-events
     // Controlling pointer-events