From 03abc8e17821297bb567bd5e3f011f369524aba9 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 28 Jun 2021 17:45:57 +0200
Subject: [PATCH 1/2] MOBILE-3320 rte: Fix styles

---
 .../editor/components/rich-text-editor/rich-text-editor.scss  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
index 395112a76..454c740d9 100644
--- a/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
+++ b/src/core/features/editor/components/rich-text-editor/rich-text-editor.scss
@@ -65,7 +65,7 @@
         overflow-x: hidden;
         overflow-y: auto;
         cursor: text;
-        img {
+        ::ng-deep img {
             @include padding(null, null, null, 2px);
             max-width: 95%;
             width: auto;
@@ -78,7 +78,7 @@
         }
 
         // Make empty elements selectable (to move the cursor).
-        *:empty:after {
+        ::ng-deep *:empty:after {
             content: '\200B';
         }
     }

From cb50d9461d62d26ffba334d87269b6285d3fd796 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Mon, 28 Jun 2021 17:46:21 +0200
Subject: [PATCH 2/2] MOBILE-3320 folder: Fix refresh menu item

---
 .../folder/components/index/addon-mod-folder-index.html   | 8 ++++----
 src/addons/mod/folder/components/index/index.ts           | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/addons/mod/folder/components/index/addon-mod-folder-index.html b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
index 1cc40e3d6..17b256dea 100644
--- a/src/addons/mod/folder/components/index/addon-mod-folder-index.html
+++ b/src/addons/mod/folder/components/index/addon-mod-folder-index.html
@@ -34,8 +34,8 @@
         contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId">
     </core-course-module-description>
 
-    <ion-list *ngIf="subfolder && (subfolder!.files.length + subfolder!.folders.length > 0)">
-        <ng-container *ngFor="let folder of subfolder!.folders">
+    <ion-list *ngIf="contents && (contents!.files.length + contents!.folders.length > 0)">
+        <ng-container *ngFor="let folder of contents!.folders">
             <ion-item class="item-file" (click)="openFolder(folder)" detail="true" button>
                 <ion-icon name="fas-folder" slot="start" [attr.aria-label]="'core.folder' | translate"></ion-icon>
                 <ion-label>
@@ -43,12 +43,12 @@
                 </ion-label>
             </ion-item>
         </ng-container>
-        <ng-container *ngFor="let file of subfolder!.files">
+        <ng-container *ngFor="let file of contents!.files">
             <core-file [file]="file" [component]="component" [componentId]="componentId"></core-file>
         </ng-container>
     </ion-list>
 
-    <core-empty-box *ngIf="!subfolder || (subfolder!.files.length + subfolder!.folders.length == 0)" icon="far-folder-open"
+    <core-empty-box *ngIf="!contents || (contents!.files.length + contents!.folders.length == 0)" icon="far-folder-open"
         [message]=" 'addon.mod_folder.emptyfilelist' | translate"></core-empty-box>
 
 </core-loading>
diff --git a/src/addons/mod/folder/components/index/index.ts b/src/addons/mod/folder/components/index/index.ts
index 10150ae14..a74ee7819 100644
--- a/src/addons/mod/folder/components/index/index.ts
+++ b/src/addons/mod/folder/components/index/index.ts
@@ -42,6 +42,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
     component = AddonModFolderProvider.COMPONENT;
     canGetFolder = false;
+    contents?: AddonModFolderFolderFormattedData;
 
     constructor(@Optional() courseContentsPage?: CoreCourseContentsPage) {
         super('AddonModFolderIndexComponent', courseContentsPage);
@@ -57,6 +58,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
 
         if (this.subfolder) {
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
+            this.contents = this.subfolder;
 
             this.loaded = true;
             this.refreshIcon = CoreConstants.ICON_REFRESH;
@@ -112,7 +114,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
             this.dataRetrieved.emit(this.folderInstance || this.module);
 
             this.description = this.folderInstance ? this.folderInstance.intro : this.module.description;
-            this.subfolder = AddonModFolderHelper.formatContents(this.module.contents);
+            this.contents = AddonModFolderHelper.formatContents(this.module.contents);
         } finally {
             this.fillContextMenu(refresh);
         }