@elastic/eui-theme-common 1.2.0 → 1.2.1
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/lib/cjs/utils.js +1 -1
- package/lib/esm/utils.js +1 -1
- package/package.json +1 -1
package/lib/cjs/utils.js
CHANGED
|
@@ -229,7 +229,7 @@ var getComputed = exports.getComputed = function getComputed(base, over, colorMo
|
|
|
229
229
|
var hcmCombinedOverValue = hcmOverValue !== null && hcmOverValue !== void 0 ? hcmOverValue : hcmBaseValue;
|
|
230
230
|
|
|
231
231
|
// combine internal overrides with manual overrides
|
|
232
|
-
var combinedOverValue = isObject(overValue) && isObject(
|
|
232
|
+
var combinedOverValue = isObject(overValue) && isObject(hcmCombinedOverValue) ? mergeDeep(overValue, hcmCombinedOverValue) : // optional overrides e.g. on provider level should still override theme level
|
|
233
233
|
overValue !== null && overValue !== void 0 ? overValue : hcmCombinedOverValue;
|
|
234
234
|
if (isObject(baseValue) && !Array.isArray(baseValue)) {
|
|
235
235
|
loop(baseValue, combinedOverValue !== null && combinedOverValue !== void 0 ? combinedOverValue : {}, checkExisting, newPath);
|
package/lib/esm/utils.js
CHANGED
|
@@ -207,7 +207,7 @@ export const getComputed = (base, over, colorMode, highContrastMode) => {
|
|
|
207
207
|
: undefined;
|
|
208
208
|
const hcmCombinedOverValue = hcmOverValue ?? hcmBaseValue;
|
|
209
209
|
// combine internal overrides with manual overrides
|
|
210
|
-
const combinedOverValue = isObject(overValue) && isObject(
|
|
210
|
+
const combinedOverValue = isObject(overValue) && isObject(hcmCombinedOverValue)
|
|
211
211
|
? mergeDeep(overValue, hcmCombinedOverValue)
|
|
212
212
|
: // optional overrides e.g. on provider level should still override theme level
|
|
213
213
|
overValue ?? hcmCombinedOverValue;
|