Merge pull request #43 from eea/develop

Release
eea · Jul 24, 2023 · 9056da5 · 9056da5
2 parents 6680fbc + 4cc4564
commit 9056da5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ 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).
 
+### [6.1.2](https://github.com/eea/volto-slate-footnote/compare/6.1.1...6.1.2) - 24 July 2023
+
 ### [6.1.1](https://github.com/eea/volto-slate-footnote/compare/6.1.0...6.1.1) - 12 June 2023
 
 #### :house: Internal changes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-footnote",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "description": "volto-slate-footnote: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/editor/MultiSelectSearchWidget.jsx b/src/editor/MultiSelectSearchWidget.jsx
@@ -68,9 +68,7 @@ const MultiSelectSearchWidget = injectLazyLibs('reactSelectAsyncCreateable')(
       const isMatch = (result) => re.test(result.value);
       const resultsFiltered = filter(props.choices, isMatch);
 
-      return new Promise((resolve, reject) => {
-        resolve(resultsFiltered);
-      });
+      return Promise.resolve(resultsFiltered);
     };
 
     /**
@@ -110,7 +108,6 @@ const MultiSelectSearchWidget = injectLazyLibs('reactSelectAsyncCreateable')(
           ...item,
           footnote: item.value,
         };
-
         const { __isNew__: remove, extra, ...rest } = obj;
         return rest;
       });

diff --git a/src/editor/render.jsx b/src/editor/render.jsx
@@ -41,21 +41,23 @@ export const FootnoteElement = (props) => {
 
     // will cosider zotero citations and footnote
     // notesObjResult contains all zotero/footnote as unique, and contain refs for other zotero/footnote
+    const indiceIfZoteroId = data.extra
+      ? [
+          `[${Object.keys(notesObjResult).indexOf(zoteroId) + 1}]`, // parent footnote
+          ...data.extra.map(
+            // citations from extra
+            (zoteroObj, _index) =>
+              // all zotero citation are indexed by zoteroId in notesObjResult
+              `[${
+                Object.keys(notesObjResult).indexOf(zoteroObj.zoteroId) + 1
+              }]`,
+          ),
+        ].join('')
+      : // no extra citations (no multiples)
+        `[${Object.keys(notesObjResult).indexOf(zoteroId) + 1}]`;
+
     const indice = zoteroId // ZOTERO
-      ? data.extra
-        ? [
-            `[${Object.keys(notesObjResult).indexOf(zoteroId) + 1}]`, // parent footnote
-            ...data.extra.map(
-              // citations from extra
-              (zoteroObj, _index) =>
-                // all zotero citation are indexed by zoteroId in notesObjResult
-                `[${
-                  Object.keys(notesObjResult).indexOf(zoteroObj.zoteroId) + 1
-                }]`,
-            ),
-          ].join('')
-        : // no extra citations (no multiples)
-          `[${Object.keys(notesObjResult).indexOf(zoteroId) + 1}]`
+      ? indiceIfZoteroId
       : // FOOTNOTES
         // parent footnote
         [data, ...(data.extra || [])]