From ba10b763a16d57664bfa9e6e81ef14b5a07f9c93 Mon Sep 17 00:00:00 2001
From: Marcus Notheis <marcus.notheis@sap.com>
Date: Thu, 7 Jan 2021 15:33:41 +0100
Subject: [PATCH 1/2] fix(DynamicPage): don't render unnecessary scrollbar

fixes #1074
---
 packages/main/src/components/DynamicPage/DynamicPage.jss.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/main/src/components/DynamicPage/DynamicPage.jss.ts b/packages/main/src/components/DynamicPage/DynamicPage.jss.ts
index 572b0eaff89..ae9ea360d43 100644
--- a/packages/main/src/components/DynamicPage/DynamicPage.jss.ts
+++ b/packages/main/src/components/DynamicPage/DynamicPage.jss.ts
@@ -38,7 +38,7 @@ const styles = {
     paddingTop: '1rem !important',
     boxSizing: 'border-box',
     width: '100%',
-    height: '100%',
+    height: 'auto',
     fontFamily: ThemingParameters.sapFontFamily,
     zIndex: 0
   },

From f131d17adf12f637328b8fff5e45a3a48fc029c1 Mon Sep 17 00:00:00 2001
From: Marcus Notheis <marcus.notheis@sap.com>
Date: Thu, 7 Jan 2021 15:37:10 +0100
Subject: [PATCH 2/2] fix(DynamicPage): only show actions separator if needed

---
 packages/main/src/components/DynamicPageTitle/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/main/src/components/DynamicPageTitle/index.tsx b/packages/main/src/components/DynamicPageTitle/index.tsx
index cfe942905ee..d80a539c538 100644
--- a/packages/main/src/components/DynamicPageTitle/index.tsx
+++ b/packages/main/src/components/DynamicPageTitle/index.tsx
@@ -9,7 +9,7 @@ import { ToolbarDesign } from '@ui5/webcomponents-react/lib/ToolbarDesign';
 import { ToolbarSeparator } from '@ui5/webcomponents-react/lib/ToolbarSeparator';
 import { ToolbarSpacer } from '@ui5/webcomponents-react/lib/ToolbarSpacer';
 import { ToolbarStyle } from '@ui5/webcomponents-react/lib/ToolbarStyle';
-import React, { FC, forwardRef, ReactElement, ReactNode, ReactNodeArray, Ref } from 'react';
+import React, { Children, FC, forwardRef, ReactElement, ReactNode, ReactNodeArray, Ref } from 'react';
 import { CommonProps } from '../../interfaces/CommonProps';
 import { DynamicPageTitleStyles } from './DynamicPageTitle.jss';
 
@@ -102,7 +102,7 @@ const DynamicPageTitle: FC<DynamicPageTitleProps> = forwardRef((props: InternalP
         <Toolbar design={ToolbarDesign.Auto} toolbarStyle={ToolbarStyle.Clear}>
           <ToolbarSpacer />
           {actions}
-          <ToolbarSeparator />
+          {Children.count(actions) > 0 && Children.count(navigationActions) > 0 && <ToolbarSeparator />}
           {navigationActions}
         </Toolbar>
       </FlexBox>