Skip to content

Commit 6d61f24

Browse files
authored
fix(DynamicPage): always show focused element when Tabbing in content (#6003)
Closes #6000
1 parent 5c7f5f1 commit 6d61f24

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

packages/main/src/components/DynamicPage/DynamicPage.module.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
--_ui5wcr_DynamicPage_title_fontsize: var(--sapObjectHeader_Title_FontSize);
1414
}
1515

16+
.dynamicPage:has([data-component-name='DynamicPageFooter']) {
17+
/* bar height + padding */
18+
scroll-padding-block-end: calc(var(--_ui5_bar_base_height) + 1rem);
19+
}
20+
1621
.headerCollapsed {
1722
--_ui5wcr_DynamicPage_header_display: none;
1823
--_ui5wcr_DynamicPage_title_fontsize: var(--sapObjectHeader_Title_SnappedFontSize);

packages/main/src/components/DynamicPage/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -319,12 +319,6 @@ const DynamicPage = forwardRef<HTMLDivElement, DynamicPagePropTypes>((props, ref
319319
}
320320
};
321321

322-
const dynamicPageStyles = { ...style };
323-
if (headerCollapsed === true && headerContent) {
324-
scrollTimeout.current = performance.now() + 200;
325-
dynamicPageStyles[DynamicPageCssVariables.titleFontSize] = ThemingParameters.sapObjectHeader_Title_SnappedFontSize;
326-
}
327-
328322
useEffect(() => {
329323
if (typeof onToggleHeaderContent === 'function' && isToggledRef.current) {
330324
onToggleHeaderContent(headerCollapsed !== true);
@@ -336,6 +330,12 @@ const DynamicPage = forwardRef<HTMLDivElement, DynamicPagePropTypes>((props, ref
336330
? (headerContentRef?.current?.offsetHeight ?? 0) + topHeaderHeight
337331
: topHeaderHeight;
338332

333+
const dynamicPageStyles = { ...style, scrollPaddingBlockStart: `calc(${top}px + 0.5rem)` };
334+
if (headerCollapsed === true && headerContent) {
335+
scrollTimeout.current = performance.now() + 200;
336+
dynamicPageStyles[DynamicPageCssVariables.titleFontSize] = ThemingParameters.sapObjectHeader_Title_SnappedFontSize;
337+
}
338+
339339
return (
340340
<div
341341
ref={componentRef}

0 commit comments

Comments
 (0)