Merge branch 'master' into aarav_edit

1 files changed, 9 insertions, 18 deletions

diff --git a/src/client/views/nodes/formattedText/marks_rts.ts b/src/client/views/nodes/formattedText/marks_rts.ts
index dc1e4772e..b7dae1ca3 100644
--- a/src/client/views/nodes/formattedText/marks_rts.ts
+++ b/src/client/views/nodes/formattedText/marks_rts.ts
@@ -118,6 +118,7 @@ export const marks: { [index: string]: MarkSpec } = {
             {
                 tag: 'span',
                 getAttrs: dom => {
+                    if (!dom.style.fontSize) return false;
                     return { fontSize: dom.style.fontSize ? dom.style.fontSize.toString() : '' };
                 },
             },
@@ -132,16 +133,9 @@ export const marks: { [index: string]: MarkSpec } = {
             {
                 tag: 'span',
                 getAttrs: dom => {
-                    const cstyle = getComputedStyle(dom);
-                    if (cstyle.font) {
-                        if (cstyle.font.indexOf('Times New Roman') !== -1) return { fontFamily: 'Times New Roman' };
-                        if (cstyle.font.indexOf('Arial') !== -1) return { fontFamily: 'Arial' };
-                        if (cstyle.font.indexOf('Georgia') !== -1) return { fontFamily: 'Georgia' };
-                        if (cstyle.font.indexOf('Comic Sans') !== -1) return { fontFamily: 'Comic Sans MS' };
-                        if (cstyle.font.indexOf('Tahoma') !== -1) return { fontFamily: 'Tahoma' };
-                        if (cstyle.font.indexOf('Crimson') !== -1) return { fontFamily: 'Crimson Text' };
-                    }
-                    return { fontFamily: '' };
+                    const cstyle = dom.style.fontFamily;
+                    if (!cstyle) return false;
+                    return { fontFamily: cstyle };
                 },
             },
         ],
@@ -155,6 +149,7 @@ export const marks: { [index: string]: MarkSpec } = {
             {
                 tag: 'span',
                 getAttrs: dom => {
+                    if (!dom.style.color) return false;
                     return { color: dom.getAttribute('color') };
                 },
             },
@@ -171,6 +166,7 @@ export const marks: { [index: string]: MarkSpec } = {
             {
                 tag: 'span',
                 getAttrs: dom => {
+                    if (!dom.getAttribute('background-color')) return false;
                     return { fontHighlight: dom.getAttribute('background-color') };
                 },
             },
@@ -239,13 +235,7 @@ export const marks: { [index: string]: MarkSpec } = {
             {
                 tag: 'span',
                 getAttrs: p => {
-                    if (typeof p !== 'string') {
-                        const style = getComputedStyle(p);
-                        if (style.textDecoration === 'underline') return null;
-                        if (p.parentElement?.outerHTML.indexOf('text-decoration: underline') !== -1 && p.parentElement?.outerHTML.indexOf('text-decoration-style: solid') !== -1) {
-                            return null;
-                        }
-                    }
+                    if (p.getAttribute('data-summarizeInclusive')) return [[{ style: 'data-summarizeInclusive: true' }]];
                     return false;
                 },
             },
@@ -255,7 +245,8 @@ export const marks: { [index: string]: MarkSpec } = {
             return [
                 'span',
                 {
-                    style: 'text-decoration: underline; text-decoration-style: solid; text-decoration-color: rgba(204, 206, 210, 0.92)',
+                    'data-summarizeInclusive': 'true',
+                    style: 'text-decoration: underline; text-decoration-style: dotted; text-decoration-color: rgba(204, 206, 210)',
                 },
             ];
         },