3 سال پیش · b2c49c39c8
--- a/packages/app/src/client/services/layout.ts
+++ b/packages/app/src/client/services/layout.ts
@@ -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;
			
 
				 
			
--- a/packages/app/src/pages/[[...path]].page.tsx
+++ b/packages/app/src/pages/[[...path]].page.tsx
@@ -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)
			
--- a/packages/app/src/pages/share/[[...path]].page.tsx
+++ b/packages/app/src/pages/share/[[...path]].page.tsx
@@ -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 ?? '';
			
 
				 
			
--- a/packages/app/src/pages/trash.page.tsx
+++ b/packages/app/src/pages/trash.page.tsx
@@ -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"