Merge pull request #808 from deckgo/clean-slide-slots

fix: missing clean footer and header and correct regexp
deckgo · Jul 23, 2020 · d89d865 · d89d865
2 parents 39f0ab8 + 2b7d80c
commit d89d865
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx b/studio/src/app/handlers/editor/events/deck/deck-events.handler.tsx
@@ -767,14 +767,23 @@ export class DeckEventsHandler {
 
       let result: string = await cleanContent(content);
 
-      if (!slide.hasAttribute('custom-background')) {
-        result = result.replace(/<div slot="background">(.*?)<\/div>/g, '');
-      }
+      result = await this.cleanSlideCustomSlots(slide, result, 'background');
+      result = await this.cleanSlideCustomSlots(slide, result, 'header');
+      result = await this.cleanSlideCustomSlots(slide, result, 'footer');
 
       resolve(result);
     });
   }
 
+  private async cleanSlideCustomSlots(slide: HTMLElement, content: string, customAttribute: 'background' | 'header' | 'footer'): Promise<string> {
+    if (!slide.hasAttribute(`custom-${customAttribute}`)) {
+      const regex: RegExp = new RegExp(`<div slot="${customAttribute}"(.*?)<\/div>`, 'g');
+      content = content.replace(regex, '');
+    }
+
+    return content;
+  }
+
   private filterSlideContentSlots(slide: HTMLElement): Promise<string> {
     return new Promise<string>((resolve) => {
       if (!slide || !document) {