Merge pull request #423 from VEuPathDB/420-safeHtml-changes

Add check for HTML entities in safeHtml util
VEuPathDB · Aug 15, 2023 · 4b7cd15 · 4b7cd15
2 parents d67dec7 + e3e4a93
commit 4b7cd15
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/libs/wdk-client/src/Utils/ComponentUtils.tsx b/packages/libs/wdk-client/src/Utils/ComponentUtils.tsx
@@ -261,7 +261,12 @@ export function safeHtml<P>(
   Component: any = 'span'
 ): JSX.Element {
   str = str ?? '';
-  if (str.indexOf('<') === -1) {
+  /**
+   * To improve performance, let's skip the element creation and innerHTML magic
+   * when we detect neither HTML nor an HTML entity in the string
+   */
+  const isHtmlEntityFound = /(\&(.+?);)/.test(str);
+  if (str.indexOf('<') === -1 && !isHtmlEntityFound) {
     return <Component {...props}>{str}</Component>;
   }
   // Use innerHTML to auto close tags