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,9 +168,10 @@ 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) {
+    if (this.minHeightLocked === lock) {
       return;
     }
+    this.minHeightLocked = lock;
 
     // Loop through all the siblings of the infinite scroll, but ignore the infinite scroll itself
     const siblings = this.el.parentElement?.children || [];
@@ -257,9 +260,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 {