[Fix] PR - Styles overriding #29

roundtableAI · Aug 12, 2024 · 9affd24 · 9affd24
1 parent 5e35990
commit 9affd24
Showing 1 changed file with 8 additions and 11 deletions.
diff --git a/library/core/survey.js b/library/core/survey.js
@@ -126,21 +126,19 @@ class Survey {
     deepMerge(target, source) {
         if (!source || typeof source !== 'object') return target;
         if (!target || typeof target !== 'object') return source;
-
+    
         const merged = { ...target };
-
-        // First pass: merge primary properties
-        Object.entries(source).forEach(([key, value]) => {
-            if (!(key.startsWith('&') || key.startsWith('@media'))) {
-                merged[key] = value;
-            }
-        });
-
-        // Second pass: handle special keys and ensure inherited properties
+
         Object.entries(source).forEach(([key, value]) => {
             if (key.startsWith('&') || key.startsWith('@media')) {
+                if(target[key]){
+                    Object.entries(target[key]).forEach(([k,v]) => {
+                        if(k in source) target[key][k] = source[k];
+                    })
+                }
                 merged[key] = this.deepMerge(target[key] || {}, value);
             } else {
+                merged[key] = value;
                 Object.entries(merged).forEach(([k, v]) => {
                     if (k.startsWith('&') || k.startsWith('@media')) {
                         merged[k] = {
@@ -151,7 +149,6 @@ class Survey {
                 });
             }
         });
-
         return merged;
     }