Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.

# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js

packages/asc-web-common/components/PageLayout/index.js

@@ -210,6 +210,7 @@ class PageLayout extends React.Component {
       isBackdropVisible,
       isArticlePinned,
       isDesktop,
+      isLoadingContent,
     } = this.props;
     let articleHeaderContent = null;
     let articleMainButtonContent = null;
@@ -377,6 +378,7 @@ class PageLayout extends React.Component {
                           autoFocus={isMobile || isTabletView ? false : true}
                           pinned={isArticlePinned}
                           viewAs={viewAs}
+                          isLoadingContent={isLoadingContent}
                         >
                           {isSectionFilterAvailable && (
                             <SubSectionFilter className="section-body_filter">

packages/asc-web-common/components/PageLayout/sub-components/section-body.js

@@ -27,8 +27,12 @@ const commonStyles = css`
       ` height: 100%;
     box-sizing: border-box;
 `}
-    flex: 1 0 auto;
     padding: 17px 7px 16px 24px;
+    ${(props) =>
+      !props.isLoadingContent &&
+      css`
+        flex: 1 0 auto;
+
         outline: none;
             ${(props) =>
       props.viewAs == "tile" &&
@@ -37,6 +41,17 @@ const commonStyles = css`
         padding-left: 20px;
       `}
 
+        .section-wrapper {
+          display: flex;
+          flex-direction: column;
+          min-height: 100%;
+        }
+
+        .people-row-container,
+        .files-row-container {
+          margin-top: -22px;
+        }
+      `}
     @media ${tablet} {
       padding: 16px 0 16px 24px;
     }
@@ -132,8 +147,9 @@ class SectionBody extends React.Component {
       viewAs,
       withScroll,
       isLoaded,
+      isLoadingContent,
     } = this.props;
-
+    console.log("isLoaded", isLoaded);
     const focusProps = autoFocus
       ? {
           ref: this.focusRef,
@@ -172,7 +188,7 @@ class SectionBody extends React.Component {
         ) : (
           <div className="section-wrapper">
             {children}
-            {/* <StyledSpacer pinned={pinned} /> */}
+            <StyledSpacer pinned={pinned} />
           </div>
         )}
       </StyledDropZoneBody>
@@ -182,6 +198,7 @@ class SectionBody extends React.Component {
         withScroll={withScroll}
         pinned={pinned}
         isLoaded={isLoaded}
+        isLoadingContent={isLoadingContent}
       >
         {withScroll ? (
           !isMobile ? (
@@ -203,7 +220,7 @@ class SectionBody extends React.Component {
           )
         ) : (
           <div className="section-wrapper">
-            {children}
+            <div className="section-wrapper-content">{children}</div>
             {/* <StyledSpacer pinned={pinned} /> */}
           </div>
         )}
@@ -227,6 +244,7 @@ SectionBody.propTypes = {
   ]),
   viewAs: PropTypes.string,
   isLoaded: PropTypes.bool,
+  isLoadingContent: PropTypes.bool,
 };
 
 SectionBody.defaultProps = {
@@ -234,6 +252,7 @@ SectionBody.defaultProps = {
   pinned: false,
   uploadFiles: false,
   withScroll: true,
+  isLoadingContent: false,
 };
 
 export default inject(({ auth }) => {

products/ASC.Files/Client/src/components/panels/StyledPanels.js

@@ -109,9 +109,12 @@ const StyledVersionHistoryPanel = styled.div`
   }
   .version-history-panel-body {
     padding: ${(props) => (props.isLoading ? "16px 0" : null)};
-    margin: 0 16px;
+    margin-left: 16px;
     border-top: 1px solid #eceef1;
 
+    height: calc(100% - 53px);
+    box-sizing: border-box;
+
     .version-comment-wrapper {
       margin-left: 79px;
     }
@@ -170,8 +173,11 @@ const StyledContent = styled.div`
   box-sizing: border-box;
   position: relative;
   width: 100%;
+  height: 100%;
   background-color: #fff;
 
+  .version-history-panel-body {
+  }
   .header_aside-panel-header {
     max-width: 500px;
     margin: 0 0 0 16px;

products/ASC.Files/Client/src/components/panels/VersionHistoryPanel/index.js

@@ -51,7 +51,7 @@ class PureVersionHistoryPanel extends React.Component {
           zIndex={zIndex}
           isAside={true}
         />
-        <Aside className="version-history-aside-panel">
+        <Aside className="version-history-aside-panel" withoutBodyScroll>
           <StyledContent>
             <StyledHeaderContent className="version-history-panel-header">
               {versions && !isLoading ? (