From e85acc68688bc06d78987d07684cb1cf3940ceb1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 1 Apr 2022 12:21:23 +0200
Subject: [PATCH] MOBILE-4015 course: Fix keep scroll when refresh

---
 src/core/features/course/pages/contents/contents.html | 4 ++--
 src/core/features/course/pages/contents/contents.ts   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/features/course/pages/contents/contents.html b/src/core/features/course/pages/contents/contents.html
index 2d0eeb1db..81b1e7dc0 100644
--- a/src/core/features/course/pages/contents/contents.html
+++ b/src/core/features/course/pages/contents/contents.html
@@ -1,9 +1,9 @@
 <ion-content>
-    <ion-refresher slot="fixed" [disabled]="!dataLoaded || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
+    <ion-refresher slot="fixed" [disabled]="!dataLoaded || updatingData || !displayRefresher" (ionRefresh)="doRefresh($event.target)">
         <ion-refresher-content pullingText="{{ 'core.pulltorefresh' | translate }}"></ion-refresher-content>
     </ion-refresher>
 
-    <core-loading [hideUntil]="dataLoaded">
+    <core-loading [hideUntil]="dataLoaded && !updatingData">
         <core-course-format [course]="course" [sections]="sections" [initialSectionId]="sectionId" [initialSectionNumber]="sectionNumber"
             [moduleId]="moduleId" class="core-course-format-{{course.format}}" *ngIf="dataLoaded">
         </core-course-format>
diff --git a/src/core/features/course/pages/contents/contents.ts b/src/core/features/course/pages/contents/contents.ts
index 42a653ace..b190f4ec0 100644
--- a/src/core/features/course/pages/contents/contents.ts
+++ b/src/core/features/course/pages/contents/contents.ts
@@ -59,6 +59,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
     sectionId?: number;
     sectionNumber?: number;
     dataLoaded = false;
+    updatingData = false;
     downloadCourseEnabled = false;
     moduleId?: number;
     displayEnableDownload = false;
@@ -355,7 +356,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
         const scrollTop = scrollElement?.scrollTop || 0;
         const scrollLeft = scrollElement?.scrollLeft || 0;
 
-        this.dataLoaded = false;
+        this.updatingData = true;
         this.content?.scrollToTop(0); // Scroll top so the spinner is seen.
 
         try {
@@ -367,7 +368,7 @@ export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshCon
 
             await this.formatComponent?.doRefresh(undefined, undefined, true);
         } finally {
-            this.dataLoaded = true;
+            this.updatingData = false;
 
             // Wait for new content height to be calculated and scroll without animation.
             setTimeout(() => {