fix: if json_attrs present don't use attrs parsing (#175)

gisce/webclient#1690
gisce · Feb 17, 2025 · dda63a4 · dda63a4
1 parent 4f11e11
commit dda63a4
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/helpers/attributeParser.ts b/src/helpers/attributeParser.ts
@@ -278,15 +278,6 @@ const evaluateAttributes = ({
   fallbackMode?: boolean;
 }) => {
   let finalTagAttributes = {};
-  let oldTagAttributes = {};
-  if (tagAttributes.attrs) {
-    oldTagAttributes = parseAttributes({
-      attrs: tagAttributes.attrs,
-      values,
-      fields,
-      widgetType,
-    });
-  }
 
   if (tagAttributes.json_attrs) {
     try {
@@ -298,13 +289,23 @@ const evaluateAttributes = ({
       });
     } catch (error) {
       if (fallbackMode && tagAttributes.attrs) {
-        finalTagAttributes = oldTagAttributes;
+        finalTagAttributes = parseAttributes({
+          attrs: tagAttributes.attrs,
+          values,
+          fields,
+          widgetType,
+        });
       } else {
         throw error;
       }
     }
   } else if (tagAttributes.attrs) {
-    finalTagAttributes = oldTagAttributes;
+    finalTagAttributes = parseAttributes({
+      attrs: tagAttributes.attrs,
+      values,
+      fields,
+      widgetType,
+    });
   }
 
   return {