Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Decouple observer setup from scroll setup

Kabiru Mwenja406d83d32e46
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/lazy-page.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/lazy-page.controller.ts
index d37714c1f68..93dd0e50bfd 100644
--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/lazy-page.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/lazy-page.controller.ts
@@ -60,6 +60,7 @@ export default class LazyPageController extends BaseController {
super.connect();
void this.initializeTurboRequestService();
+ this.startObserving();
this.setupScrollPreservation();
}
@@ -89,20 +90,18 @@ export default class LazyPageController extends BaseController {
}
private setupScrollPreservation() {
- if (!this.scrollableContainer || this.pageStreamHandler) return;
+ if (this.pageStreamHandler) return;
const { signal } = this.abortController;
const scrollContainer = this.scrollableContainer;
- this.setupIntersectionObserver({ root: scrollContainer });
-
this.pageStreamHandler = (event:TurboBeforeStreamRenderEvent) => {
event.preventDefault();
const stream = event.detail.newStream;
const insertTargetId = this.insertTargetIdValue;
- if (insertTargetId && stream.target.includes(insertTargetId)) {
+ if (scrollContainer && insertTargetId && stream.target.includes(insertTargetId)) {
const isPrepend = stream.action === 'prepend';
void DomHelpers.keepScroll(scrollContainer, isPrepend, () => {
event.detail.render(stream);
@@ -116,7 +115,9 @@ export default class LazyPageController extends BaseController {
document.addEventListener('turbo:before-stream-render', this.pageStreamHandler as EventListener, { signal });
}
- private setupIntersectionObserver({ root }:{ root:HTMLElement }) {
+ private startObserving(root = this.scrollableContainer) {
+ if (!root) return;
+
const [_observe, unobserve] = useIntersection(this, {
root,
threshold: 0.25,