@pushwoosh/dumb-components 1.0.52 → 1.0.54

package/RichMessageEditor/slate/helpers.js

@@ -94,14 +94,11 @@ export function stringifyDc(dc) {
   } = dc;
   return `{${tagName}|${modifier}${defaultValue ? `|${defaultValue}` : ''}}`;
 }
-// This regex matches a string that starts with '{', contains at least one '|', and ends with '}'.
-// It captures the entire string, including the '{' and '}'.
-// The lookahead (?=[^}]*\|) ensures that there is at least one '|' before the closing '}'.
-// The regex is not greedy, so it will stop at the first '}' after the last '|'.
-// This means it will match strings like '{tag|modifier|default}', '{tag|modifier}', and '{tag|modifier|}'.
-// It will not match strings like '{tag|modifier|default}' if there is no '}' after the last '|'.
-// This regex is used to split the string into parts, where the parts are either text or dynamic content.
-const DynamicContentRegex = /(\{(?=[^}]*\|)[^}]*?})/;
+// Regular expression to match dynamic content tags in the format "{tagName|modifier|defaultValue}"
+// The regex captures the entire tag, including the curly braces and pipe characters
+// It uses a positive lookahead to ensure that there is at least one pipe character in the tag
+// This allows for the presence of a default value, but does not require it
+const DynamicContentRegex = /(\{(?=[^}]*\|).*?})/;
 /**
  * Converts a string to Slate editor content, parsing dynamic content tags
  * @param value - The input string to convert
@@ -152,8 +149,8 @@ export function content2string(state) {
 export function validateContent(value) {
   for (const el of value) {
     if (isElement(el)) {
-      if (el.type === 'dc') {
-        return !!el.dc.tagName;
+      if (el.type === 'dc' && !el.dc.tagName) {
+        return false;
       }
       if (!validateContent(el.children)) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",