Merge d94d337 into 30afd5f

no-chris · Dec 24, 2023 · 1fd8a32 · 1fd8a32
2 parents 30afd5f + d94d337
commit 1fd8a32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/chord-mark/src/renderer/components/renderChordLyricLine.js b/packages/chord-mark/src/renderer/components/renderChordLyricLine.js
@@ -3,6 +3,7 @@ import chordLyricLineTpl from './tpl/chordLyricLine';
 import _intersection from 'lodash/intersection';
 import _last from 'lodash/last';
 import stripTags from '../../core/dom/stripTags';
+import htmlToElement from '../../core/dom/htmlToElement';
 
 const breakPointsClasses = [
 	'cmChordSymbol',
@@ -42,7 +43,7 @@ export default function renderChordLyricLine(chordLine, lyricLine) {
 }
 
 function getAllChordTokens(chordLine) {
-	const chordLineNodes = getChordLineNodes(chordLine);
+	const chordLineNodes = htmlToElement(chordLine);
 
 	const allChordTokens = [];
 	// using an object as a counter instead of an integer
@@ -54,12 +55,6 @@ function getAllChordTokens(chordLine) {
 	return allChordTokens;
 }
 
-function getChordLineNodes(chordLine) {
-	// Since a chordLine is only made of ChordMark-generated html, we consider it safe
-	// eslint-disable-next-line no-unsanitized/method
-	return document.createRange().createContextualFragment(chordLine);
-}
-
 // recursive
 function addChordTokens(startNode, allNodes, textIndex) {
 	startNode.childNodes.forEach((childNode) => {

diff --git a/packages/chord-mark/tests/unit/renderer/components/renderChordLyricLine.spec.js b/packages/chord-mark/tests/unit/renderer/components/renderChordLyricLine.spec.js
@@ -1,4 +1,5 @@
 import { parseSong, renderSong } from '../../../../src/chordMark';
+import htmlToElement from '../../../../src/core/dom/htmlToElement';
 import stripTags from '../../../../src/core/dom/stripTags';
 
 describe('renderChordLyricLine', () => {
@@ -312,8 +313,7 @@ describe('renderChordLyricLine', () => {
 	// helpers functions
 	function getAllNodesOf(html, className) {
 		const allNodesOf = [];
-		// eslint-disable-next-line no-unsanitized/method
-		const startNode = document.createRange().createContextualFragment(html);
+		const startNode = htmlToElement(html);
 		addNodesOf(startNode, className, allNodesOf);
 		return allNodesOf;
 	}