fix(block-tools): more robust formatting detection on copy paste in S…

…afari (#5485) * fix(block-tools): more robust formatting detection on copy paste in safari Signed-off-by: Fred Carlsen <[email protected]> * fixup! fix(block-tools): more robust formatting detection on copy paste in safari Signed-off-by: Fred Carlsen <[email protected]> --------- Signed-off-by: Fred Carlsen <[email protected]>
sanity-io · Jan 11, 2024 · 0cec72b · 0cec72b · vercel · Jan 11, 2024
1 parent a281061
commit 0cec72b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/packages/@sanity/block-tools/src/HtmlDeserializer/rules/gdocs.ts b/packages/@sanity/block-tools/src/HtmlDeserializer/rules/gdocs.ts
@@ -15,25 +15,30 @@ const LIST_CONTAINER_TAGS = Object.keys(HTML_LIST_CONTAINER_TAGS)
 // font-style:italic seems like the most important rule for italic / emphasis in their html
 function isEmphasis(el: Node): boolean {
   const style = isElement(el) && el.getAttribute('style')
-  return /font-style:italic/.test(style || '')
+  return /font-style\s*:\s*italic/.test(style || '')
 }
 
 // font-weight:700 seems like the most important rule for bold in their html
 function isStrong(el: Node): boolean {
   const style = isElement(el) && el.getAttribute('style')
-  return /font-weight:700/.test(style || '')
+  return /font-weight\s*:\s*700/.test(style || '')
 }
 
 // text-decoration seems like the most important rule for underline in their html
 function isUnderline(el: Node): boolean {
+  if (!isElement(el) || tagName(el.parentNode) === 'a') {
+    return false
+  }
+
   const style = isElement(el) && el.getAttribute('style')
-  return /text-decoration:underline/.test(style || '')
+
+  return /text-decoration\s*:\s*underline/.test(style || '')
 }
 
 // text-decoration seems like the most important rule for strike-through in their html
 function isStrikethrough(el: Node): boolean {
   const style = isElement(el) && el.getAttribute('style')
-  return /text-decoration:line-through/.test(style || '')
+  return /text-decoration\s*:\s*line-through/.test(style || '')
 }
 
 // Check for attribute given by the gdocs preprocessor

diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocs/output.json
@@ -1288,7 +1288,7 @@
       },
       {
         "_type": "span",
-        "marks": ["randomKey0", "underline"],
+        "marks": ["randomKey0"],
         "text": "Lorem Lorem",
         "_key": "randomKey881"
       },

diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsFirefox/output.json
@@ -1288,7 +1288,7 @@
       },
       {
         "_type": "span",
-        "marks": ["randomKey0", "underline"],
+        "marks": ["randomKey0"],
         "text": "Lorem Lorem",
         "_key": "randomKey881"
       },

diff --git a/...ages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json b/...ages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceNormalize/output.json
@@ -1442,7 +1442,7 @@
       },
       {
         "_type": "span",
-        "marks": ["randomKey0", "underline"],
+        "marks": ["randomKey0"],
         "text": "Lorem Lorem",
         "_key": "randomKey991"
       },

diff --git a/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json b/packages/@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemove/output.json
@@ -910,7 +910,7 @@
       },
       {
         "_type": "span",
-        "marks": ["randomKey0", "underline"],
+        "marks": ["randomKey0"],
         "text": "Lorem Lorem",
         "_key": "randomKey611"
       },

diff --git a/.../@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json b/.../@sanity/block-tools/test/tests/HtmlDeserializer/gdocsWhitespaceRemoveFirefox/output.json
@@ -910,7 +910,7 @@
       },
       {
         "_type": "span",
-        "marks": ["randomKey0", "underline"],
+        "marks": ["randomKey0"],
         "text": "Lorem Lorem",
         "_key": "randomKey611"
       },