Skip to content

fix(ObjectPage): fix scroll-to/selection behavior #6879

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 2 commits into from
Jan 31, 2025
Merged

fix(ObjectPage): fix scroll-to/selection behavior #6879

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2056feb
fix(ObjectPage): fix scroll-to/selection behavior
Lukas742 Jan 29, 2025
8c58848
Merge branch 'main' into fix/op-custom-header-scroll
Lukas742 Jan 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
70 changes: 48 additions & 22 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 @@ -233,6 +233,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
const objectPageContentRef = useRef<HTMLDivElement>(null);
const selectionScrollTimeout = useRef(null);
const isToggledRef = useRef(false);
const isInitial = useRef(true);
const [headerCollapsedInternal, setHeaderCollapsedInternal] = useState<undefined | boolean>(undefined);
const [scrolledHeaderExpanded, setScrolledHeaderExpanded] = useState(false);
const scrollTimeout = useRef(0);
Expand Down Expand Up @@ -366,7 +367,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
};

// section was selected by clicking on the tab bar buttons
const handleOnSectionSelected = (targetEvent, newSelectionSectionId, index, section) => {
const handleOnSectionSelected = (targetEvent, newSelectionSectionId, index: number | string, section) => {
isProgrammaticallyScrolled.current = true;
debouncedOnSectionChange.cancel();
setSelectedSubSectionId(undefined);
Expand Down Expand Up @@ -458,42 +459,67 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
}, [props.selectedSubSectionId, isMounted]);

const tabContainerContainerRef = useRef(null);
const isHeaderPinnedAndExpanded = headerPinned && !headerCollapsed;
useEffect(() => {
const objectPage = objectPageRef.current;
const sectionNodes = objectPage.querySelectorAll<HTMLDivElement>('[id^="ObjectPageSection"]');
const lastSectionNode = sectionNodes[sectionNodes.length - 1];
const tabContainerContainer = tabContainerContainerRef.current;

const observer = new ResizeObserver(([sectionElement]) => {
if (!objectPage || !tabContainerContainer) {
return;
}

const footerElement = objectPage.querySelector<HTMLDivElement>('[data-component-name="ObjectPageFooter"]');
const topHeaderElement = objectPage.querySelector('[data-component-name="ObjectPageTopHeader"]');

const calculateSpacer = ([lastSectionNodeEntry]: ResizeObserverEntry[]) => {
const lastSectionNode = lastSectionNodeEntry?.target;

if (!lastSectionNode) {
setSectionSpacer(0);
return;
}

const subSections = lastSectionNode.querySelectorAll<HTMLDivElement>('[id^="ObjectPageSubSection"]');
const lastSubSection = subSections[subSections.length - 1];
const lastSubSectionOrSection = lastSubSection ?? sectionElement.target;
const lastSubSectionOrSection = lastSubSection ?? lastSectionNode;

if ((currentTabModeSection && !lastSubSection) || (sectionNodes.length === 1 && !lastSubSection)) {
setSectionSpacer(0);
} else if (tabContainerContainer) {
const footerHeight =
objectPage.querySelector<HTMLDivElement | undefined>('[data-component-name="ObjectPageFooter"]')
?.offsetHeight ?? 0;

setSectionSpacer(
objectPage.getBoundingClientRect().bottom -
tabContainerContainer.getBoundingClientRect().bottom -
lastSubSectionOrSection.getBoundingClientRect().height -
footerHeight -
// section padding
8
);
return;
}
});

if (objectPage && lastSectionNode) {
// batching DOM-reads together minimizes reflow
const footerHeight = footerElement?.offsetHeight ?? 0;
const objectPageRect = objectPage.getBoundingClientRect();
const tabContainerContainerRect = tabContainerContainer.getBoundingClientRect();
const lastSubSectionOrSectionRect = lastSubSectionOrSection.getBoundingClientRect();

let stickyHeaderBottom = 0;
if (!isHeaderPinnedAndExpanded) {
const topHeaderBottom = topHeaderElement?.getBoundingClientRect().bottom ?? 0;
stickyHeaderBottom = topHeaderBottom + tabContainerContainerRect.height;
} else {
stickyHeaderBottom = tabContainerContainerRect.bottom;
}

const spacer = Math.ceil(
objectPageRect.bottom - stickyHeaderBottom - lastSubSectionOrSectionRect.height - footerHeight // section padding (8px) not included, so that the intersection observer is triggered correctly
);
setSectionSpacer(Math.max(spacer, 0));
};

const observer = new ResizeObserver(calculateSpacer);
const sectionNodes = objectPage.querySelectorAll<HTMLDivElement>('[id^="ObjectPageSection"]');
const lastSectionNode = sectionNodes[sectionNodes.length - 1];

if (lastSectionNode) {
observer.observe(lastSectionNode, { box: 'border-box' });
}

return () => {
observer.disconnect();
};
}, [headerCollapsed, topHeaderHeight, headerContentHeight, currentTabModeSection, children, mode]);
}, [topHeaderHeight, headerContentHeight, currentTabModeSection, children, mode, isHeaderPinnedAndExpanded]);

const onToggleHeaderContentVisibility = useCallback((e) => {
isToggledRef.current = true;
Expand Down Expand Up @@ -592,7 +618,6 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref

const snappedHeaderInObjPage = titleArea && titleArea.props.snappedContent && headerCollapsed === true && !!image;

const isInitial = useRef(true);
useEffect(() => {
if (!isInitial.current) {
scrollTimeout.current = performance.now() + 200;
Expand Down Expand Up @@ -646,6 +671,7 @@ const ObjectPage = forwardRef<ObjectPageDomRef, ObjectPagePropTypes>((props, ref
}
event.preventDefault();
const { sectionId, index, isSubTab, parentId } = event.detail.tab.dataset;

if (isSubTab !== undefined) {
handleOnSubSectionSelected(enrichEventWithDetails(event, { sectionId: parentId, subSectionId: sectionId }));
} else {
Expand Down
Loading