Просмотр исходного кода

subtract height of search control from 100vh

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

+ 1 - 9
packages/app/src/components/SearchPage/SearchPageLayout.tsx

@@ -23,20 +23,12 @@ const SearchPageLayout: FC<Props> = (props: Props) => {
     SearchResultList, SearchControl, SearchResultContent, searchResultMeta, searchingKeyword,
     SearchResultList, SearchControl, SearchResultContent, searchResultMeta, searchingKeyword,
   } = props;
   } = props;
 
 
-  const calcScrollTargetElmHeight = () => {
-    const scrolltarget = document.getElementById('search-result-list-scroll');
-    if (scrolltarget == null) return;
-    return window.innerHeight - scrolltarget.getBoundingClientRect().top;
-  };
-
-  const searchResultListHeight = calcScrollTargetElmHeight();
-
   return (
   return (
     <div className="content-main">
     <div className="content-main">
       <div className="search-result row" id="search-result">
       <div className="search-result row" id="search-result">
         <div className="col-lg-6 page-list border boder-gray search-result-list px-0" id="search-result-list">
         <div className="col-lg-6 page-list border boder-gray search-result-list px-0" id="search-result-list">
           <nav><SearchControl></SearchControl></nav>
           <nav><SearchControl></SearchControl></nav>
-          <div id="search-result-list-scroll" className="search-result-list-scroll" style={{ height: searchResultListHeight }}>
+          <div className="search-result-list-scroll">
             <div className="d-flex align-items-center justify-content-between mt-1 mb-3">
             <div className="d-flex align-items-center justify-content-between mt-1 mb-3">
               <div className="search-result-meta text-nowrap mr-3">
               <div className="search-result-meta text-nowrap mr-3">
                 <span className="font-weight-light">{t('search_result.result_meta')} </span>
                 <span className="font-weight-light">{t('search_result.result_meta')} </span>

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

@@ -174,6 +174,7 @@
     top: 0px;
     top: 0px;
 
 
     .search-result-list-scroll {
     .search-result-list-scroll {
+      height: calc(100vh - 125px); // subtract the height of SearchControl component
       overflow-y: scroll;
       overflow-y: scroll;
     }
     }
     .nav.nav-pills {
     .nav.nav-pills {