Mao 4 лет назад
Родитель
Сommit
16c286358e

+ 3 - 1
packages/app/src/components/Navbar/GrowiNavbar.tsx

@@ -85,6 +85,8 @@ const GrowiNavbar = (props) => {
 
   const { data: isDeviceSmallerThanMd } = useIsDeviceSmallerThanMd();
 
+  const isNotSearchPage = document.getElementById('search-page') == null;
+
   return (
     <>
       {/* Brand Logo  */}
@@ -105,7 +107,7 @@ const GrowiNavbar = (props) => {
         <Confidential confidential={crowi.confidential}></Confidential>
       </ul>
 
-      { isSearchServiceConfigured && !isDeviceSmallerThanMd && (
+      { isSearchServiceConfigured && !isDeviceSmallerThanMd && isNotSearchPage && (
         <div className="grw-global-search grw-global-search-top position-absolute">
           <GlobalSearch />
         </div>

+ 13 - 8
packages/app/src/components/Navbar/GrowiNavbarBottom.jsx

@@ -17,6 +17,8 @@ const GrowiNavbarBottom = (props) => {
     additionalClasses.push('grw-navbar-bottom-drawer-opened');
   }
 
+  const isNotSearchPage = document.getElementById('search-page') == null;
+
   return (
     <div className="d-md-none d-edit-none fixed-bottom">
 
@@ -41,14 +43,17 @@ const GrowiNavbarBottom = (props) => {
             </a>
           </li>
           <li className="nav-item mx-auto">
-            <a
-              role="button"
-              className="nav-link btn-lg"
-              data-target="#grw-global-search-collapse"
-              data-toggle="collapse"
-            >
-              <i className="icon-magnifier"></i>
-            </a>
+            {isNotSearchPage
+            && (
+              <a
+                role="button"
+                className="nav-link btn-lg"
+                data-target="#grw-global-search-collapse"
+                data-toggle="collapse"
+              >
+                <i className="icon-magnifier"></i>
+              </a>
+            )}
           </li>
           <li className="nav-item">
             <a