Skip to content

fix(ObjectPage): support height change of pinned header #7787

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

Merged
merged 3 commits into from
Sep 29, 2025
Merged

fix(ObjectPage): support height change of pinned header #7787

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b6a8f38
fix(ObjectPage): support height change of pinned header
Lukas742 Sep 29, 2025
03e8768
cleanup
Lukas742 Sep 29, 2025
f3ff5bb
Merge branch 'main' into fix/at-pinned-header-height
Lukas742 Sep 29, 2025
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
22 changes: 8 additions & 14 deletions packages/main/src/internal/useObserveHeights.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,9 @@ export const useObserveHeights = (

// top header
useEffect(() => {
const headerContentResizeObserver = new ResizeObserver(([header]) => {
// Firefox implements `borderBoxSize` as a single content rect, rather than an array
const borderBoxSize = Array.isArray(header.borderBoxSize) ? header.borderBoxSize[0] : header.borderBoxSize;
// Safari doesn't implement `borderBoxSize`
setTopHeaderHeight(borderBoxSize?.blockSize ?? header.target.getBoundingClientRect().height);
const headerContentResizeObserver = new ResizeObserver(([entry]) => {
const { blockSize } = entry.borderBoxSize[0];
setTopHeaderHeight(blockSize);
});
if (topHeaderRef?.current) {
headerContentResizeObserver.observe(topHeaderRef.current);
Expand All @@ -82,14 +80,10 @@ export const useObserveHeights = (

// header content
useEffect(() => {
const headerContentResizeObserver = new ResizeObserver(([headerContent]) => {
if (isIntersecting) {
// Firefox implements `borderBoxSize` as a single content rect, rather than an array
const borderBoxSize = Array.isArray(headerContent.borderBoxSize)
? headerContent.borderBoxSize[0]
: headerContent.borderBoxSize;
// Safari doesn't implement `borderBoxSize`
setHeaderContentHeight(borderBoxSize?.blockSize ?? headerContent.target.getBoundingClientRect().height);
const headerContentResizeObserver = new ResizeObserver(([entry]) => {
if (isIntersecting || fixedHeader) {
const { blockSize } = entry.borderBoxSize[0];
setHeaderContentHeight(blockSize);
}
});

Expand All @@ -99,7 +93,7 @@ export const useObserveHeights = (
return () => {
headerContentResizeObserver.disconnect();
};
}, [isIntersecting]);
}, [isIntersecting, fixedHeader]);
const totalHeaderHeight = noHeader ? 0 : topHeaderHeight + headerContentHeight;

return { topHeaderHeight, headerContentHeight, totalHeaderHeight, headerCollapsed };
Expand Down
Loading