Yohei Shiina 4 лет назад
Родитель
Сommit
f85b3be2d8

+ 1 - 7
packages/app/src/client/base.jsx

@@ -30,15 +30,13 @@ appContainer.initApp();
 
 logger.info('AppContainer has been initialized');
 
-const isSearchPage = document.getElementById('search-page') != null;
-
 /**
  * define components
  *  key: id of element
  *  value: React Element
  */
 const componentMappings = {
-
+  'grw-navbar': <GrowiNavbar />,
   'grw-navbar-bottom-container': <GrowiNavbarBottom />,
 
   'page-create-modal': <PageCreateModal />,
@@ -46,9 +44,5 @@ const componentMappings = {
   'grw-hotkeys-manager': <HotkeysManager />,
 
 };
-// hide GrowiNavBar when SearchPage is shown
-if (!isSearchPage) {
-  Object.assign(componentMappings, { 'grw-navbar': <GrowiNavbar /> });
-}
 
 export { appContainer, componentMappings };

+ 1 - 0
packages/app/src/components/SearchPage.jsx

@@ -58,6 +58,7 @@ class SearchPage extends React.Component {
   }
 
   componentDidMount() {
+    $('body').addClass('on-search');
     const keyword = this.state.searchingKeyword;
     if (keyword !== '') {
       this.search({ keyword });

+ 6 - 0
packages/app/src/styles/_on-search.scss

@@ -0,0 +1,6 @@
+body.on-search {
+  .grw-navbar {
+    position: fixed !important;
+    width: 100vw;
+  }
+}

+ 1 - 0
packages/app/src/styles/style-app.scss

@@ -62,6 +62,7 @@
 @import 'page-history';
 @import 'recent-changes';
 @import 'search';
+@import 'on-search';
 @import 'shortcuts';
 @import 'sidebar';
 @import 'sidebar-wiki';