fix(infinite-scroll): prevent locking sibling min height while it's already locked, prevent useless setTimeout from being set up while preserve rerender scroll property isn't set

Author: ShaneK

core/src/components/infinite-scroll/infinite-scroll.tsx

@@ -16,6 +16,7 @@ export class InfiniteScroll implements ComponentInterface {
   private thrPx = 0;
   private thrPc = 0;
   private scrollEl?: HTMLElement;
+  private minHeightLocked = false;
 
   /**
    * didFire exists so that ionInfinite
@@ -141,13 +142,14 @@ export class InfiniteScroll implements ComponentInterface {
 
     if (distanceFromInfinite < 0) {
       if (!this.didFire) {
+        if (this.preserveRerenderScrollPosition) {
+          // Lock the min height of the siblings of the infinite scroll
+          // if we are preserving the rerender scroll position
+          this.lockSiblingMinHeight(true);
+        }
+
         this.isLoading = true;
         this.didFire = true;
-
-        // Lock the min height of the siblings of the infinite scroll
-        // if we are preserving the rerender scroll position
-        this.lockSiblingMinHeight(true);
-
         this.ionInfinite.emit();
         return 3;
       }
@@ -166,19 +168,20 @@ export class InfiniteScroll implements ComponentInterface {
    * has been previously set by the user when we restore after complete is called.
    */
   private lockSiblingMinHeight(lock: boolean) {
-    if (!this.preserveRerenderScrollPosition) {
-      return;
-    }
-
-    // Loop through all the siblings of the infinite scroll, but ignore the infinite scroll itself
     const siblings = this.el.parentElement?.children || [];
     for (const sibling of siblings) {
+      // Loop through all the siblings of the infinite scroll, but ignore ourself
       if (sibling !== this.el && sibling instanceof HTMLElement) {
         if (lock) {
           const elementHeight = sibling.getBoundingClientRect().height;
-          const previousMinHeight = sibling.style.minHeight;
-          if (previousMinHeight) {
-            sibling.style.setProperty('--ion-previous-min-height', previousMinHeight);
+          if (this.minHeightLocked) {
+            // The previous min height is from us locking it before, so we can disregard it
+            // We still need to lock the min height if we're already locked, though, because
+            // the user could have triggered a new load before we've finished the previous one.
+            const previousMinHeight = sibling.style.minHeight;
+            if (previousMinHeight) {
+              sibling.style.setProperty('--ion-previous-min-height', previousMinHeight);
+            }
           }
           sibling.style.minHeight = `${elementHeight}px`;
         } else {
@@ -188,6 +191,8 @@ export class InfiniteScroll implements ComponentInterface {
         }
       }
     }
+
+    this.minHeightLocked = lock;
   }
 
   /**
@@ -257,9 +262,11 @@ export class InfiniteScroll implements ComponentInterface {
 
     // Unlock the min height of the siblings of the infinite scroll
     // if we are preserving the rerender scroll position
-    setTimeout(() => {
-      this.lockSiblingMinHeight(false);
-    }, 100);
+    if (this.preserveRerenderScrollPosition) {
+      setTimeout(() => {
+        this.lockSiblingMinHeight(false);
+      }, 100);
+    }
   }
 
   private canStart(): boolean {

core/src/components/infinite-scroll/test/preserve-rerender-scroll-position/infinite-scroll.e2e.ts

@@ -1,6 +1,8 @@
 import { expect } from '@playwright/test';
 import { configs, test } from '@utils/test/playwright';
 
+test.setTimeout(100000);
+
 configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
   test.describe(title('infinite-scroll: preserve rerender scroll position'), () => {
     test('should load more items when scrolled to the bottom', async ({ page }) => {
@@ -13,7 +15,7 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
       expect(await items.count()).toBe(30);
 
       let previousScrollTop = 0;
-      for (let i = 0; i < 10; i++) {
+      for (let i = 0; i < 20; i++) {
         await content.evaluate((el: HTMLIonContentElement) => el.scrollToBottom(0));
         const currentScrollTop = await innerScroll.evaluate((el: HTMLIonContentElement) => el.scrollTop);
         expect(currentScrollTop).toBeGreaterThan(previousScrollTop);
@@ -28,7 +30,9 @@ configs({ modes: ['md'], directions: ['ltr'] }).forEach(({ title, config }) => {
         // Timeout to allow the browser to catch up.
         // For some reason, without this, the scroll top gets reset to 0. Adding this
         // prevents that, which implies it's an issue with Playwright, not the feature.
-        await new Promise((resolve) => setTimeout(resolve, 100));
+        // For some reason, this delay needs to be longer than the time required to
+        // reset the minimum height in infinite scroll.
+        await new Promise((resolve) => setTimeout(resolve, 1001));
       }
     });
   });