@eeacms/volto-slate-footnote 7.1.0 → 7.2.0

package/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [7.2.0](https://github.com/eea/volto-slate-footnote/compare/7.1.1...7.2.0) - 28 November 2024
+
+### [7.1.1](https://github.com/eea/volto-slate-footnote/compare/7.1.0...7.1.1) - 16 September 2024
+
 ### [7.1.0](https://github.com/eea/volto-slate-footnote/compare/7.0.1...7.1.0) - 13 September 2024
 
 #### :rocket: New Features

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-footnote",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "volto-slate-footnote: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/Blocks/Footnote/FootnotesBlockView.jsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { escapeRegExp } from 'lodash';
 import {
   openAccordionOrTabIfContainsFootnoteReference,
   getAllBlocksAndSlateFields,
@@ -9,7 +10,8 @@ import './less/public.less';
 import { UniversalLink } from '@plone/volto/components';
 
 const alphabet = 'abcdefghijklmnopqrstuvwxyz';
-const urlRegex = /https?:\/\/[^\s]+/g;
+const urlRegex =
+  /\b((http|https|ftp):\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?\b/g;
 
 /**
  * @summary The React component that displays the list of footnotes inserted
@@ -78,27 +80,44 @@ const FootnotesBlockView = (props) => {
 
   const renderTextWithLinks = (text) => {
     if (!text) return null;
-    const parts = text.split(urlRegex);
     const links = text.match(urlRegex);
+    if (!links) {
+      return (
+        <div
+          dangerouslySetInnerHTML={{
+            __html: text,
+          }}
+        />
+      );
+    }
     let result = [];
-
+    const parts = text.split(
+      new RegExp(`(${links.map((link) => escapeRegExp(link)).join('|')})`),
+    );
     parts.forEach((part, index) => {
-      result.push(<span key={`text-${index}`}>{part}</span>);
-
-      if (links && links[index]) {
+      if (links.includes(part)) {
         result.push(
           <UniversalLink
             key={`link-${index}`}
-            href={links[index]}
+            href={part}
             openLinkInNewTab={false}
           >
-            {links[index]}
+            {part}
           </UniversalLink>,
         );
+        return;
       }
+
+      result.push(
+        <span
+          dangerouslySetInnerHTML={{
+            __html: part,
+          }}
+        />,
+      );
     });
 
-    return result;
+    return <div>{result}</div>;
   };
   return (
     <div className="footnotes-listing-block">

package/src/editor/render.jsx

@@ -58,7 +58,14 @@ export const FootnoteElement = (props) => {
     let result = [];
 
     parts.forEach((part, index) => {
-      result.push(<span key={`text-${index}`}>{part}</span>);
+      result.push(
+        <div
+          dangerouslySetInnerHTML={{
+            __html: part,
+          }}
+        />,
+      );
+
       if (links && links[index]) {
         result.push(
           <UniversalLink
@@ -71,7 +78,6 @@ export const FootnoteElement = (props) => {
         );
       }
     });
-
     return result;
   };
   const citationIndice = zoteroId // ZOTERO