@zohodesk/utils 1.3.12 → 1.3.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -0
- package/es/mergeStyle.js +8 -9
- package/package.json +1 -1
package/README.md
CHANGED
package/es/mergeStyle.js
CHANGED
|
@@ -14,27 +14,26 @@ export default function mergeStyle(defaultStyle) {
|
|
|
14
14
|
if (next.startsWith(REPLACER_SYMBOL)) {
|
|
15
15
|
let styleValue = customStyle[next];
|
|
16
16
|
let styleName = next.replace(REPLACER_SYMBOL, '');
|
|
17
|
-
if (!
|
|
17
|
+
if (!res[styleName] && !additionalStyle.includes(styleName)) {
|
|
18
18
|
throw new Error(`UNKNOWN CLASSNAME DETECTED - Given customStyle's key "${styleName}" is not available in that component style`);
|
|
19
19
|
} else if (additionalStyle.includes(styleName)) {
|
|
20
20
|
res[styleName] = styleValue;
|
|
21
21
|
} else {
|
|
22
|
-
let val =
|
|
22
|
+
let val = res[styleName];
|
|
23
23
|
Object.keys(res).map(keyName => {
|
|
24
24
|
let styleKey = res[keyName];
|
|
25
|
-
let
|
|
26
|
-
let ind = styleClasses.indexOf(val);
|
|
25
|
+
let ind = styleKey.indexOf(val);
|
|
27
26
|
if (ind !== -1) {
|
|
28
|
-
|
|
29
|
-
res[keyName] = styleClasses.join(' ');
|
|
27
|
+
res[keyName] = styleKey.replace(val, styleValue);
|
|
30
28
|
}
|
|
31
29
|
});
|
|
32
30
|
}
|
|
33
|
-
} else if (
|
|
34
|
-
let val =
|
|
31
|
+
} else if (res[next]) {
|
|
32
|
+
let val = res[next];
|
|
35
33
|
Object.keys(res).map(keyName => {
|
|
36
34
|
let styleKey = res[keyName];
|
|
37
35
|
let styleClasses = styleKey.split(' ');
|
|
36
|
+
val = val.split(' ')[0];
|
|
38
37
|
let ind = styleClasses.indexOf(val);
|
|
39
38
|
if (ind !== -1) {
|
|
40
39
|
styleClasses[ind] = styleClasses[ind] + ' ' + customStyle[next];
|
|
@@ -43,7 +42,7 @@ export default function mergeStyle(defaultStyle) {
|
|
|
43
42
|
});
|
|
44
43
|
} else if (additionalStyle.includes(next)) {
|
|
45
44
|
res[next] = customStyle[next];
|
|
46
|
-
} else if (!
|
|
45
|
+
} else if (!res[next] && !additionalStyle.includes(next)) {
|
|
47
46
|
// res[next] = customStyle[next];
|
|
48
47
|
throw new Error(`UNKNOWN CLASSNAME DETECTED - Given customStyle's key "${next}" is not available in that component style`);
|
|
49
48
|
}
|