Skip to content

fix(ObjectPage): re-expand header on tab switch in IconTabBar mode #8817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DougDK wants to merge 1 commit into
base: main
Choose a base branch
from
+32 −3
Open

fix(ObjectPage): re-expand header on tab switch in IconTabBar mode #8817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions packages/main/src/components/ObjectPage/ObjectPage.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,36 @@ describe('ObjectPage', () => {
cy.findByText('Custom Header Section Two').should('not.be.visible');
cy.findByText('Subsection1').should('be.visible');
});

it('IconTabBar: header re-expands after tab switch when header was collapsed by scrolling', () => {
cy.viewport(1440, 900);
cy.mount(
<ObjectPage
data-testid="op"
titleArea={DPTitle}
headerArea={DPContent}
mode={ObjectPageMode.IconTabBar}
style={{ height: '100vh', scrollBehavior: 'auto' }}
>
<ObjectPageSection key="s1" id="s1" titleText="Section 1">
<div style={{ height: '2000px', background: 'lightblue' }}>section 1 content</div>
</ObjectPageSection>
<ObjectPageSection key="s2" id="s2" titleText="Section 2">
<div style={{ height: '2000px', background: 'lightyellow' }}>section 2 content</div>
</ObjectPageSection>
</ObjectPage>,
);
cy.wait(50);

// scroll down far enough to collapse the header
cy.findByTestId('op').scrollTo(0, 800);
cy.get('[data-component-name="ObjectPageHeaderContent"]').should('not.be.visible');

// switch tabs — header should re-expand and scroll should reset to top
cy.get('[ui5-tabcontainer]').findUi5TabByText('Section 2').click();
cy.wait(600);
cy.get('[data-component-name="ObjectPageHeaderContent"]').should('be.visible');
});
});

const DPTitle = (
Expand Down
5 changes: 2 additions & 3 deletions packages/main/src/components/ObjectPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,9 +322,9 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
}
return newSelectionSectionId;
});
// Reset scroll for section swap; scrollTimeout preserves current header collapsed/expanded state.
if (mode === ObjectPageMode.IconTabBar) {
scrollTimeout.current = performance.now() + 500;
setHeaderCollapsedInternal(false);
objectPageRef.current?.scrollTo({ top: 0 });
}
setTabSelectId(newSelectionSectionId);
Expand Down Expand Up @@ -897,8 +897,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
style={{
height:
((headerCollapsed && !headerPinned) || scrolledHeaderExpanded) &&
!toggledCollapsedHeaderWasVisible &&
!(mode === ObjectPageMode.IconTabBar && scrollTimeout.current >= performance.now())
!toggledCollapsedHeaderWasVisible
? `${headerContentHeight}px`
: 0,
}}
Expand Down