dm - dumb-ly hand the font you receive to html (#5)

xeger · Jul 19, 2022 · 2aa81a2 · 2aa81a2
1 parent 1a98f54
commit 2aa81a2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/src/__tests__/__snapshots__/MinimalHTML.test.ts.snap b/src/__tests__/__snapshots__/MinimalHTML.test.ts.snap
@@ -11,7 +11,7 @@ exports[`generators/MinimalHTML algorithm escapes HTML syntax 1`] = `
 `;
 
 exports[`generators/MinimalHTML algorithm handles fonts 1`] = `
-"<!DOCTYPE html><html><body style=\\"color:#303030;font-weight:400;white-space:pre-wrap;font-family:sans-serif\\"><div><span style=\\"font-family:'Courier New'\\">Hello</span>, <span style=\\"font-family:serif\\">world</span>; do <span style=\\"font-weight:bold;font-family:monospace\\">you</span> like my fonts?
+"<!DOCTYPE html><html><body style=\\"color:#303030;font-weight:400;white-space:pre-wrap;font-family:sans-serif\\"><div><span style=\\"font-family:'Courier New', monospace\\">Hello</span>, <span style=\\"font-family:serif\\">world</span>; do <span style=\\"font-weight:bold;font-family:monospace\\">you</span> like my fonts?
 </div></body></html>"
 `;
 

diff --git a/src/__tests__/__snapshots__/QuillHTML.test.ts.snap b/src/__tests__/__snapshots__/QuillHTML.test.ts.snap
@@ -10,7 +10,7 @@ exports[`generators/QuillHTML algorithm escapes HTML syntax 1`] = `
 `;
 
 exports[`generators/QuillHTML algorithm handles fonts 1`] = `
-"<!DOCTYPE html><html><body><p><span style=\\"font-family:'Courier New'\\">Hello</span>, <span style=\\"font-family:serif\\">world</span>; do <span style=\\"font-weight:bold;font-family:monospace\\">you</span> like my fonts?
+"<!DOCTYPE html><html><body><p><span style=\\"font-family:'Courier New', monospace\\">Hello</span>, <span style=\\"font-family:serif\\">world</span>; do <span style=\\"font-weight:bold;font-family:monospace\\">you</span> like my fonts?
 </p></body></html>"
 `;
 

diff --git a/src/generators/MinimalHTML.ts b/src/generators/MinimalHTML.ts
@@ -38,9 +38,7 @@ const TEXTS: Record<string, TextFormatter> = {
     span.styles.push(`color:${color}`);
   },
   font: (span, font) => {
-    const fontFamily =
-      typeof font === 'string' && font.includes(' ') ? `'${font}'` : font;
-    span.styles.push(`font-family:${fontFamily}`);
+    span.styles.push(`font-family:${font}`);
   },
   italic: (span) => {
     span.styles.push('font-style:italic');

diff --git a/src/generators/QuillHTML.ts b/src/generators/QuillHTML.ts
@@ -26,9 +26,7 @@ const TEXTS: Record<string, TextFormatter> = {
     span.styles.push(`color:${color}`);
   },
   font: (span, font) => {
-    const fontFamily =
-      typeof font === 'string' && font.includes(' ') ? `'${font}'` : font;
-    span.styles.push(`font-family:${fontFamily}`);
+    span.styles.push(`font-family:${font}`);
   },
   italic: (span) => {
     span.styles.push('font-style:italic');

diff --git a/test/fixtures/font.json b/test/fixtures/font.json
@@ -1,7 +1,7 @@
 [
   {
     "attributes": {
-      "font": "Courier New"
+      "font": "'Courier New', monospace"
     },
     "insert": "Hello"
   },
@@ -27,4 +27,4 @@
   {
     "insert": " like my fonts?\n"
   }
-]
+]