From 0e46e2b74c4c3db8e521be5cf08efe100dede49a Mon Sep 17 00:00:00 2001
From: ryosei-f <ryosei-f@weseek.co.jp>
Date: Thu, 12 Dec 2024 09:04:29 +0000
Subject: [PATCH] Resolve conflicts

---
 .../PagePathNavSticky.module.scss             |  2 ++
 .../components/PagePresentationModal.tsx      |  3 ++-
 .../PagePathNav/PagePathNav.module.scss       |  7 +++--
 .../Common/PagePathNav/PagePathNavLayout.tsx  | 26 ++++++++++++++++---
 .../PagePathNavTitle.module.scss              |  4 +++
 apps/app/src/pages/[[...path]].page.tsx       |  2 +-
 apps/app/src/stores-universal/context.tsx     |  1 +
 apps/app/src/stores/renderer.tsx              |  5 ++++
 8 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/apps/app/src/client/components/PagePathNavSticky/PagePathNavSticky.module.scss b/apps/app/src/client/components/PagePathNavSticky/PagePathNavSticky.module.scss
index 2948618afcb..9dd96f4284d 100644
--- a/apps/app/src/client/components/PagePathNavSticky/PagePathNavSticky.module.scss
+++ b/apps/app/src/client/components/PagePathNavSticky/PagePathNavSticky.module.scss
@@ -1,6 +1,8 @@
 @use '@growi/core-styles/scss/bootstrap/init' as bs;
 
 .grw-page-path-nav-sticky :global {
+  // width: 100%;
+
   .sticky-inner-wrapper {
     z-index: bs.$zindex-sticky;
   }
diff --git a/apps/app/src/client/components/PagePresentationModal.tsx b/apps/app/src/client/components/PagePresentationModal.tsx
index 7796841113c..51468e781eb 100644
--- a/apps/app/src/client/components/PagePresentationModal.tsx
+++ b/apps/app/src/client/components/PagePresentationModal.tsx
@@ -67,7 +67,8 @@ const PagePresentationModal = (): JSX.Element => {
   if (!isOpen) {
     return <></>;
   }
-
+  console.log(isEnabledMarp, 'Marp');
+  console.log(rendererOptions, 'renderOption');
   return (
     <Modal
       isOpen={isOpen}
diff --git a/apps/app/src/components/Common/PagePathNav/PagePathNav.module.scss b/apps/app/src/components/Common/PagePathNav/PagePathNav.module.scss
index c11a6ea9e82..35c0a52fe6c 100644
--- a/apps/app/src/components/Common/PagePathNav/PagePathNav.module.scss
+++ b/apps/app/src/components/Common/PagePathNav/PagePathNav.module.scss
@@ -4,7 +4,8 @@
 
 .grw-page-path-nav-layout :global {
   .grw-page-path-nav-copydropdown {
-    display: none;
+    visibility: hidden; /* 通常時は非表示（スペースは維持） */
+    // display: none;
     @include bs.media-breakpoint-down(md) {
       display: block;
     }
@@ -15,7 +16,9 @@
   &:global {
     &:hover {
       .grw-page-path-nav-copydropdown {
-        display: block;
+        visibility: visible; /* ホバー時に表示 */
+        // opacity: 1;
+        // display: block;
       }
     }
   }
diff --git a/apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx b/apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx
index 9dd8696cc6b..0a86eb5dc20 100644
--- a/apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx
+++ b/apps/app/src/components/Common/PagePathNav/PagePathNavLayout.tsx
@@ -1,4 +1,5 @@
-import type { ReactNode } from 'react';
+// import type { ReactNode } from 'react';
+import React, { useState } from 'react';
 
 import dynamic from 'next/dynamic';
 
@@ -19,8 +20,8 @@ export type PagePathNavLayoutProps = {
 }
 
 type Props = PagePathNavLayoutProps & {
-  formerLink?: ReactNode,
-  latterLink?: ReactNode,
+  formerLink?: React.ReactNode,
+  latterLink?: React.ReactNode,
 }
 
 const CopyDropdown = dynamic(() => import('~/client/components/Common/CopyDropdown').then(mod => mod.CopyDropdown), { ssr: false });
@@ -40,6 +41,19 @@ export const PagePathNavLayout = (props: Props): JSX.Element => {
 
   const copyDropdownId = `copydropdown-${pageId}`;
 
+  const [, setIsHovered] = useState(false);
+  const [hideTimeout, setHideTimeout] = useState<NodeJS.Timeout | null>(null);
+
+  const handleMouseEnter = () => {
+    if (hideTimeout) clearTimeout(hideTimeout); // 非表示タイマーをリセット
+    setIsHovered(true); // ボタンを表示
+  };
+
+  const handleMouseLeave = () => {
+    const timeout = setTimeout(() => setIsHovered(false), 3000); // 3秒後にボタンを非表示
+    setHideTimeout(timeout);
+  };
+
   return (
     <div
       className={`${className} ${moduleClass}`}
@@ -55,7 +69,11 @@ export const PagePathNavLayout = (props: Props): JSX.Element => {
             { isWipPage && (
               <span className="badge text-bg-secondary ms-1 me-1">WIP</span>
             )}
-            <span className=" grw-page-path-nav-copydropdown">
+            <span
+              className=" grw-page-path-nav-copydropdown"
+              onMouseEnter={handleMouseEnter}
+              onMouseLeave={handleMouseLeave}
+            >
               <CopyDropdown pageId={pageId} pagePath={pagePath} dropdownToggleId={copyDropdownId} dropdownToggleClassName="p-2">
                 <span className="material-symbols-outlined">content_paste</span>
               </CopyDropdown>
diff --git a/apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.module.scss b/apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.module.scss
index 3c62f47ea35..4d4fc899da1 100644
--- a/apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.module.scss
+++ b/apps/app/src/components/Common/PagePathNavTitle/PagePathNavTitle.module.scss
@@ -3,3 +3,7 @@
 .grw-page-path-nav-title :global {
   min-height: 75px;
 }
+
+.grw-page-path-nav-title:hover {
+  background-color: rgba(0, 0, 0, 0.05); /* ホバー範囲を視覚的に確認したい場合の背景 */
+}
diff --git a/apps/app/src/pages/[[...path]].page.tsx b/apps/app/src/pages/[[...path]].page.tsx
index d26fb5e22d1..e8e4b7c4d9c 100644
--- a/apps/app/src/pages/[[...path]].page.tsx
+++ b/apps/app/src/pages/[[...path]].page.tsx
@@ -237,7 +237,7 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
   useDefaultIndentSize(props.adminPreferredIndentSize);
   useIsIndentSizeForced(props.isIndentSizeForced);
   useDisableLinkSharing(props.disableLinkSharing);
-  useRendererConfig(props.rendererConfig);
+  // useRendererConfig(props.rendererConfig);
   useIsEnabledMarp(props.rendererConfig.isEnabledMarp);
   // useRendererSettings(props.rendererSettingsStr != null ? JSON.parse(props.rendererSettingsStr) : undefined);
   // useGrowiRendererConfig(props.growiRendererConfigStr != null ? JSON.parse(props.growiRendererConfigStr) : undefined);
diff --git a/apps/app/src/stores-universal/context.tsx b/apps/app/src/stores-universal/context.tsx
index a62586dacc7..e29ada8d300 100644
--- a/apps/app/src/stores-universal/context.tsx
+++ b/apps/app/src/stores-universal/context.tsx
@@ -147,6 +147,7 @@ export const useIsEnabledStaleNotification = (initialData?: boolean): SWRRespons
 };
 
 export const useRendererConfig = (initialData?: RendererConfig): SWRResponse<RendererConfig, any> => {
+  console.log(initialData, 'undifined or null');
   return useContextSWR('growiRendererConfig', initialData);
 };
 
diff --git a/apps/app/src/stores/renderer.tsx b/apps/app/src/stores/renderer.tsx
index bd4a4776bd3..97dd1cfa748 100644
--- a/apps/app/src/stores/renderer.tsx
+++ b/apps/app/src/stores/renderer.tsx
@@ -171,6 +171,11 @@ export const useCustomSidebarOptions = (config?: SWRConfiguration): SWRResponse<
 export const usePresentationViewOptions = (): SWRResponse<RendererOptions, Error> => {
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: rendererConfig } = useRendererConfig();
+  console.log(rendererConfig, 'rendererconfig');
+  if (!rendererConfig) {
+    console.log('RendererConfig is missing.');
+  }
+
 
   const isAllDataValid = currentPagePath != null && rendererConfig != null;