refact: Simplify $helper.string.hasEmoji() (#7966)

distantnative · web-flow · commit 3371ea2872b8 · 2026-02-24T13:18:42.000+01:00
diff --git a/panel/src/helpers/string.hasEmoji.test.js b/panel/src/helpers/string.hasEmoji.test.js
@@ -4172,6 +4172,9 @@ describe.concurrent("$helper.string.hasEmoji", () => {
 			"🏴󠁧󠁢󠁥󠁮󠁧󠁿",
 			"🏴󠁧󠁢󠁳󠁣󠁴󠁿",
 			"🏴󠁧󠁢󠁷󠁬󠁳󠁿",
+			"👩🏼‍❤️‍💋‍👩🏿",
+			"🐻‍❄️",
+			"❤️‍🔥",
 			"text with emoji 😜"
 		];
 		for (const emoji of emojis) {
diff --git a/panel/src/helpers/string.js b/panel/src/helpers/string.js
@@ -72,13 +72,7 @@ export function hasEmoji(string) {
 		return false;
 	}
 
-	// Source: https://thekevinscott.com/emojis-in-javascript/
-	const result = string.match(
-		// eslint-disable-next-line no-misleading-character-class
-		/(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c\ude32-\ude3a]|[\ud83c\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/i
-	);
-
-	return result !== null && result.length !== null;
+	return /\p{Emoji}/u.test(string);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -72,13 +72,7 @@ export function hasEmoji(string) {`
`72`	`72`	`return false;`
`73`	`73`	`}`
`74`	`74`
`75`		`- // Source: https://thekevinscott.com/emojis-in-javascript/`
`76`		`- const result = string.match(`
`77`		`- // eslint-disable-next-line no-misleading-character-class`
`78`		- /(?:[\u2700-\u27bf]\|(?:\ud83c[\udde6-\uddff]){2}\|[\ud800-\udbff][\udc00-\udfff]\|[\u0023-\u0039]\ufe0f?\u20e3\|\u3299\|\u3297\|\u303d\|\u3030\|\u24c2\|\ud83c[\udd70-\udd71]\|\ud83c[\udd7e-\udd7f]\|\ud83c\udd8e\|\ud83c[\udd91-\udd9a]\|\ud83c[\udde6-\uddff]\|[\ud83c\ude01-\ude02]\|\ud83c\ude1a\|\ud83c\ude2f\|[\ud83c\ude32-\ude3a]\|[\ud83c\ude50-\ude51]\|\u203c\|\u2049\|[\u25aa-\u25ab]\|\u25b6\|\u25c0\|[\u25fb-\u25fe]\|\u00a9\|\u00ae\|\u2122\|\u2139\|\ud83c\udc04\|[\u2600-\u26FF]\|\u2b05\|\u2b06\|\u2b07\|\u2b1b\|\u2b1c\|\u2b50\|\u2b55\|\u231a\|\u231b\|\u2328\|\u23cf\|[\u23e9-\u23f3]\|[\u23f8-\u23fa]\|\ud83c\udccf\|\u2934\|\u2935\|[\u2190-\u21ff])/i
`79`		`- );`
`80`		`-`
`81`		`- return result !== null && result.length !== null;`
	`75`	`+ return /\p{Emoji}/u.test(string);`
`82`	`76`	`}`
`83`	`77`
`84`	`78`	`/**`