From bd1c4387dba2a99ecf2f6555c85a8d3dd53af334 Mon Sep 17 00:00:00 2001
From: Arthaud <arthaudp33@gmail.com>
Date: Sat, 11 Nov 2023 13:25:38 +0100
Subject: [PATCH] fix: regex and null values

---
 admin/app/editor/shortcodes/figure.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/admin/app/editor/shortcodes/figure.js b/admin/app/editor/shortcodes/figure.js
index 31261b2..fcce390 100644
--- a/admin/app/editor/shortcodes/figure.js
+++ b/admin/app/editor/shortcodes/figure.js
@@ -1,9 +1,9 @@
 /* global CMS */
-import { image_src } from '../../fields/image-src.js'
-import { image_alt } from '../../fields/image-alt.js'
-import { legend } from '../../fields/legend.js'
-import { credit } from '../../fields/credit.js'
-import {t} from "../../i18n/translater.js";
+import { credit } from '../../fields/credit.js';
+import { image_alt } from '../../fields/image-alt.js';
+import { image_src } from '../../fields/image-src.js';
+import { legend } from '../../fields/legend.js';
+import { t } from "../../i18n/translater.js";
 
 CMS.registerEditorComponent({
     id: 'figure',
@@ -14,19 +14,19 @@ CMS.registerEditorComponent({
         legend,
         credit
     ],
-    pattern: /{{< figure (.*?) >}}/,
+    pattern: /{{< figure src="(.*?)" alt="(.*?)" legend="(.*?)" credit="(.*?)" >}}/,
     fromBlock: function (match) {
         return {
-            src: match[1],
-            alt: match[2],
-            legend: match[3],
-            credit: match[4]
+            src: match[1] ?? '',
+            alt: match[2] ?? '',
+            legend: match[3] ?? '',
+            credit: match[4] ?? ''
         };
     },
     toBlock: function (obj) {
-        return `{{< figure src="${obj.src}" alt="${obj.alt}" legend="${obj.legend}" credit="${obj.credit}" >}}`;
+        return `{{< figure src="${obj.src ?? ''}" alt="${obj.alt ?? ''}" legend="${obj.legend ?? ''}" credit="${obj.credit ?? ''}" >}}`;
     },
     toPreview: function (obj) {
-        return `{{< figure src="${obj.src}" alt="${obj.alt}" legend="${obj.legend}" credit="${obj.credit}" >}}`;
+        return `{{< figure src="${obj.src ?? ''}" alt="${obj.alt ?? ''}" legend="${obj.legend ?? ''}" credit="${obj.credit ?? ''}" >}}`;
     }
 });