Cover all chrome/edge/safari cases

__tests__/outlook-outlook.test.ts

@@ -18,7 +18,7 @@ const getTestCasesDirs = (testCasesPath: string) => {
     return fs.statSync(testCasesPath + "/" + file).isDirectory();
   });
 };
-
+console.debug = () => {}
 const getNormalizedHtml = (
   testCasePath: string
 ): {
@@ -61,7 +61,7 @@ describe("Outlook emails HTML normalization", () => {
       try {
         normalizedHtmls = getNormalizedHtml(testCasePath);
       } catch (e) {
-        console.log("Invalid test case: " + dirName);
+        console.log(`Invalid test case: ${casesName}/${dirName}`);
         return;
       }
 
@@ -75,7 +75,9 @@ describe("Outlook emails HTML normalization", () => {
 
   describe("Emails Chrome", describeTestCases("chrome"));
   describe("Emails Edge", describeTestCases("edge"));
-  //describe("Emails Gmail", describeTestCases("gmail"));
+  describe("Emails Safari", describeTestCases("safari"));
+  // describe("Emails MacOS", describeTestCases("macos"));
+  // describe("Emails Windows", describeTestCases("windows"));
 
   // it("Emails Edge", () => {
   // })

src/HTMLNormalizer/strategies/common.ts

 const DUMMY_QR_CODE_ID = "dummyQrCode";
 
-export const ELEMENT_TYPES_TO_REMOVE = { br: true, hr: true };
+export const ELEMENT_TYPES_TO_REMOVE = { br: true, hr: true, use: true, svg: true };
 
 export const ATTRIBUTES_TO_KEEP = {
   alt: true,

src/HTMLNormalizer/strategies/outlook.ts

@@ -32,11 +32,31 @@ export const amendOutlookNodes = (document: HTMLDocument): void => {
   /**
    * Remove quoted text
    */
-  const appendOnSendNode = document.querySelector(
+
+  // Quoted text in web apps
+  const appendOnSend = document.querySelector(
     "[id*='appendonsend']"
   ) as Node;
-  if (appendOnSendNode) {
-    let child = appendOnSendNode;
+
+  if (appendOnSend) {
+    let child = appendOnSend;
+    while (child) {
+      const nextSibling = child.nextSibling;
+      child.parentNode.removeChild(child);
+      child = nextSibling as Node;
+    }
+  }
+
+  // Quoted text in desktop apps
+  const mailOriginal = document.querySelector("[name*='_MailOriginal']") as Node;
+  if (mailOriginal) {
+    const separatorCandidate = mailOriginal.parentNode as Node;
+
+    // while (!(separatorCandidate.parentNode as Element).classList.contains("WordSection1")) {
+    //   separatorCandidate = separatorCandidate.parentNode;
+    // }
+
+    let child = separatorCandidate;
     while (child) {
       const nextSibling = child.nextSibling;
       child.parentNode.removeChild(child);
@@ -47,20 +67,20 @@ export const amendOutlookNodes = (document: HTMLDocument): void => {
   /**
    * Get rid of attachments panes
    */
-  const attachmentsPanesConatiner = document.getElementById(
+  const attachmentsPanesContainer = document.getElementById(
     "OwaReferenceAttachments"
   );
   const attachmentsPanesContainerEnd = document.getElementById(
     "OwaReferenceAttachmentsEnd"
   );
 
-  if (attachmentsPanesConatiner) {
-    const as = attachmentsPanesConatiner.getElementsByTagName("a");
+  if (attachmentsPanesContainer) {
+    const as = attachmentsPanesContainer.getElementsByTagName("a");
     Array.from(as).forEach((a) => {
-      cloneAnchorFromPane(a, attachmentsPanesConatiner as HTMLElement);
+      cloneAnchorFromPane(a, attachmentsPanesContainer as HTMLElement);
     });
 
-    attachmentsPanesConatiner.parentNode.removeChild(attachmentsPanesConatiner);
+    attachmentsPanesContainer.parentNode.removeChild(attachmentsPanesContainer);
   }
 
   attachmentsPanesContainerEnd &&