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

Clarify scroll preservation behaviour based on UI layout sorting order

Kabiru Mwenja12a5f55b8887
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 93dd0e50bfd..33e7c1dc3cb 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
@@ -102,8 +102,8 @@ export default class LazyPageController extends BaseController {
const insertTargetId = this.insertTargetIdValue;
if (scrollContainer && insertTargetId && stream.target.includes(insertTargetId)) {
- const isPrepend = stream.action === 'prepend';
- void DomHelpers.keepScroll(scrollContainer, isPrepend, () => {
+ const isPrepending = this.indexOutlet.sortingAscending; // Newest at the bottom sorting order
+ void DomHelpers.keepScroll(scrollContainer, isPrepending, () => {
event.detail.render(stream);
return Promise.resolve();
});
diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/services/dom_helpers.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/services/dom_helpers.ts
index b5cf04a90a1..485ed60ee74 100644
--- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/services/dom_helpers.ts
+++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/services/dom_helpers.ts
@@ -62,10 +62,10 @@ export namespace DomHelpers {
* jump to a different part of the content.
*
* @param {HTMLElement} container - The scrollable container
- * @param {boolean} top - Whether content is being added at the top (prepend)
- * true: adjust scroll for prepended content
- * false: maintain position for appended content
- * @param {Function} fn - Async function that performs the DOM manipulation
+ * @param {boolean} isPrepending - Whether content is being added at the top (prepend)
+ * true: adjust scroll for prepended content
+ * false: maintain position for appended content
+ * @param {Function} renderFn - Async function that performs the DOM manipulation
*
* Algorithm:
* - Capture current scroll position and total height BEFORE DOM changes
@@ -75,15 +75,15 @@ export namespace DomHelpers {
* For prepend: scrollTop + heightDifference (push view down by added content height)
* For append: maintain original scrollTop (new content below doesn't affect view)
*/
- export async function keepScroll(container:HTMLElement, top:boolean, fn:() => Promise<void>) {
+ export async function keepScroll(container:HTMLElement, isPrepending:boolean, renderFn:() => Promise<void>) {
pauseInertiaScroll(container);
const scrollTop = container.scrollTop;
const scrollHeight = container.scrollHeight;
- await fn();
+ await renderFn();
- if (top) {
+ if (isPrepending) {
container.scrollTop = scrollTop + (container.scrollHeight - scrollHeight);
} else {
container.scrollTop = scrollTop;