Web: Common: Fixed styles for body list without scroll.

# Conflicts: # packages/asc-web-common/components/PageLayout/sub-components/section-body.js
ONLYOFFICE · Nov 3, 2021 · 44f2a1c · 44f2a1c
1 parent 4127fae
commit 44f2a1c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/packages/asc-web-common/components/PageLayout/sub-components/section-body.js b/packages/asc-web-common/components/PageLayout/sub-components/section-body.js
@@ -12,12 +12,21 @@ import { tablet, desktop } from "@appserver/components/utils/device";
 
 const commonStyles = css`
   flex-grow: 1;
-  height: 100%;
+  ${(props) => !props.withScroll && `height: 100%;`}
   border-left: none;
 
   -webkit-user-select: none;
 
+  .section-wrapper {
+    ${(props) => !props.withScroll && `display: flex; height: 100%;`}
+  }
+
   .section-wrapper-content {
+    ${(props) =>
+      !props.withScroll &&
+      ` height: 100%;
+    box-sizing: border-box;
+`}
     flex: 1 0 auto;
     padding: 17px 7px 16px 24px;
     outline: none;
@@ -56,7 +65,16 @@ const StyledSectionBody = styled.div`
     props.withScroll &&
     `
     margin-left: -24px;
-  `}
+  `} 
+
+  .additional-scroll-height {
+    ${(props) =>
+      !props.withScroll &&
+      !props.pinned &&
+      `  height: 64px;
+  
+`}
+  }
 `;
 
 const StyledDropZoneBody = styled(DragAndDrop)`
@@ -154,7 +172,7 @@ class SectionBody extends React.Component {
         ) : (
           <div className="section-wrapper">
             {children}
-            <StyledSpacer pinned={pinned} />
+            {/* <StyledSpacer pinned={pinned} /> */}
           </div>
         )}
       </StyledDropZoneBody>
@@ -186,7 +204,7 @@ class SectionBody extends React.Component {
         ) : (
           <div className="section-wrapper">
             {children}
-            <StyledSpacer pinned={pinned} />
+            {/* <StyledSpacer pinned={pinned} /> */}
           </div>
         )}
       </StyledSectionBody>

diff --git a/packages/asc-web-components/scrollbar/custom-scrollbars-virtual-list.js b/packages/asc-web-components/scrollbar/custom-scrollbars-virtual-list.js
@@ -32,6 +32,7 @@ export class CustomScrollbars extends React.Component {
         className={className}
       >
         {children}
+        <div className="additional-scroll-height"></div>
       </Scrollbar>
     );
   }

diff --git a/products/ASC.Files/Client/src/pages/VersionHistory/index.js b/products/ASC.Files/Client/src/pages/VersionHistory/index.js
@@ -45,12 +45,12 @@ class PureVersionHistory extends React.Component {
 
     return (
       <PageLayout
-        withBodyScroll={true}
         withBodyAutoFocus={true}
         headerBorderBottom={true}
         showSecondaryProgressBar={showProgressBar}
         secondaryProgressBarIcon="file"
         showSecondaryButtonAlert={false}
+        withBodyScroll={false}
       >
         <PageLayout.ArticleHeader>
           <ArticleHeaderContent />