Inicio Explorar Ayuda
Iniciar sesión
wiki
/
weseek__growi
espejo de https://github.com/weseek/growi
2
0
Fork 0
Archivos Incidencias 0 Wiki
Explorar el Código

improve useCurrentGrowiLayoutFluidClassName

Yuki Takei hace 3 años
padre
088769df1c
commit
b2c49c39c8
Se han modificado 4 ficheros con 7 adiciones y 8 borrados
Dividir vista Mostrar estadísticas de diff
  1. 4 3
      packages/app/src/client/services/layout.ts
  2. 1 1
      packages/app/src/pages/[[...path]].page.tsx
  3. 1 1
      packages/app/src/pages/share/[[...path]].page.tsx
  4. 1 3
      packages/app/src/pages/trash.page.tsx

+ 4 - 3
packages/app/src/client/services/layout.ts
Ver fichero 

@@ -16,14 +16,15 @@ export const useEditorModeClassName = (): string => {
 
   return `${getClassNamesByEditorMode().join(' ') ?? ''}`;
 
 };
 
 
-export const useCurrentGrowiLayoutFluidClassName = (): string => {
 
+export const useCurrentGrowiLayoutFluidClassName = (initialPage?: IPage): string => {
 
   const { data: currentPage } = useSWRxCurrentPage();
 
 
   const { data: dataIsContainerFluid } = useIsContainerFluid();
 
 
-  const isContainerFluidEachPage = currentPage == null || !('expandContentWidth' in currentPage)
 
+  const page = currentPage ?? initialPage;
 
+  const isContainerFluidEachPage = page == null || !('expandContentWidth' in page)
 
     ? null
 
-    : currentPage.expandContentWidth;
 
+    : page.expandContentWidth;
 
   const isContainerFluidDefault = dataIsContainerFluid;
 
   const isContainerFluid = isContainerFluidEachPage ?? isContainerFluidDefault;

+ 1 - 1
packages/app/src/pages/[[...path]].page.tsx
Ver fichero 

@@ -268,7 +268,7 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
 
   useSetupGlobalSocket();
 
   useSetupGlobalSocketForPage(pageId);
 
 
-  const growiLayoutFluidClass = useCurrentGrowiLayoutFluidClassName();
 
+  const growiLayoutFluidClass = useCurrentGrowiLayoutFluidClassName(pageWithMeta?.data);
 
 
   const shouldRenderPutbackPageModal = pageWithMeta != null
 
     ? _isTrashPage(pageWithMeta.data.path)

+ 1 - 1
packages/app/src/pages/share/[[...path]].page.tsx
Ver fichero 

@@ -93,7 +93,7 @@ const SharedPage: NextPageWithLayout<Props> = (props: Props) => {
 
   useIsContainerFluid(props.isContainerFluid);
 
 
 
-  const growiLayoutFluidClass = useCurrentGrowiLayoutFluidClassName();
 
+  const growiLayoutFluidClass = useCurrentGrowiLayoutFluidClassName(props.shareLinkRelatedPage);
 
 
   const pagePath = props.shareLinkRelatedPage?.path ?? '';

+ 1 - 3
packages/app/src/pages/trash.page.tsx
Ver fichero 

@@ -76,8 +76,6 @@ const TrashPage: NextPageWithLayout<CommonProps> = (props: Props) => {
 
   const { data: isDrawerMode } = useDrawerMode();
 
   const { data: isGuestUser } = useIsGuestUser();
 
 
-  const growiLayoutFluidClass = useCurrentGrowiLayoutFluidClassName();
 
-
 
   const title = generateCustomTitleForPage(props, '/trash');
 
 
   return (
 
@@ -85,7 +83,7 @@ const TrashPage: NextPageWithLayout<CommonProps> = (props: Props) => {
 
       <Head>
 
         <title>{title}</title>
 
       </Head>
 
-      <div className={`dynamic-layout-root ${growiLayoutFluidClass}`}>
 
+      <div className="dynamic-layout-root">
 
         <header className="py-0 position-relative">
 
           <GrowiSubNavigation
 
             pagePath="/trash"