Merge branch 'master' into mediainfo-use-relative-path

jesec · Sep 29, 2023 · 1ec8456 · 1ec8456
2 parents aca269f + 7117764
commit 1ec8456
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/client/src/javascript/components/general/LinkedText.tsx b/client/src/javascript/components/general/LinkedText.tsx
@@ -18,15 +18,19 @@ function isValidHttpUrl(s: string) {
 }
 
 const LinkedText: FC<LinkedTextProps> = ({text, className}: LinkedTextProps) => {
-  const nodes = text.split(/\s/).map((s) =>
-    isValidHttpUrl(s.trimEnd()) ? (
-      <a href={s.trimEnd()} target="_blank" rel="noopener noreferrer">
-        {s}
-      </a>
-    ) : (
-      s
-    ),
-  );
+  const nodes = text.split(/([ \n])/).map((s) => {
+    if (s === '\n') {
+      return <br />;
+    }
+    if (isValidHttpUrl(s)) {
+      return (
+        <a href={s.trimEnd()} target="_blank" rel="noopener noreferrer">
+          {s}
+        </a>
+      );
+    }
+    return s;
+  });
 
   return <span className={className}>{nodes}</span>;
 };