Merge branch 'master' of github.com:prismicio/prismic-client into lh/…

…update-eslint-config
prismicio · Jul 23, 2024 · a4e90cf · a4e90cf
2 parents 2f8de18 + 3bcf410
commit a4e90cf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.7.3](https://github.com/prismicio/prismic-client/compare/v7.7.2...v7.7.3) (2024-07-23)
+
+
+### Bug Fixes
+
+* ignore trimmed empty spans ([6d1ce03](https://github.com/prismicio/prismic-client/commit/6d1ce035f7f5b3c112c3f00460190fdbd98e3543))
+
 ### [7.7.2](https://github.com/prismicio/prismic-client/compare/v7.7.1...v7.7.2) (2024-07-23)
 
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@prismicio/client",
-	"version": "7.7.2",
+	"version": "7.7.3",
 	"description": "The official JavaScript + TypeScript client library for Prismic",
 	"keywords": [
 		"typescript",

diff --git a/src/lib/hastToRichText.ts b/src/lib/hastToRichText.ts
@@ -157,7 +157,7 @@ export const hastToRichText = (
 						case RichTextNodeType.em:
 						case RichTextNodeType.label:
 						case RichTextNodeType.hyperlink: {
-							const length = toString(node).length
+							const length = toString(node).trimEnd().length
 
 							try {
 								builder.appendSpan(shorthandOrNode, length)
@@ -238,7 +238,7 @@ export const hastToRichText = (
 					case RichTextNodeType.label:
 					case RichTextNodeType.hyperlink: {
 						const span = serializeSpan(node, match)
-						const length = toString(node).length
+						const length = toString(node).trimEnd().length
 
 						try {
 							builder.appendSpan(span, length)

diff --git a/test/__snapshots__/helpers-unstable_htmlAsRichText.test.ts.snap b/test/__snapshots__/helpers-unstable_htmlAsRichText.test.ts.snap
@@ -1001,7 +1001,7 @@ exports[`transforms HTML to rich text > spans > empty spans 1`] = `
   {
     "direction": "ltr",
     "spans": [],
-    "text": "lorem ipsum dolor sit amet",
+    "text": "lorem ipsum dolorsit amet",
     "type": "paragraph",
   },
 ]

diff --git a/test/helpers-unstable_htmlAsRichText.test.ts b/test/helpers-unstable_htmlAsRichText.test.ts
@@ -47,7 +47,9 @@ describe("transforms HTML to rich text", () => {
 		})
 
 		testHTMLAsRichTextHelper("empty spans", {
-			input: /* html */ `<p>lorem <strong></strong>ipsum dolor sit amet</p>`,
+			// It's normal for `dolor` and `sit` to be concatenated here.
+			// That's how the browser would render it.
+			input: /* html */ `<p>lorem <strong></strong>ipsum dolor<em> </em>sit amet</p>`,
 			expectHTMLToMatchInputExactly: false,
 		})