diff options
| author | Henry Jameson <me@hjkos.com> | 2020-01-24 00:56:47 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2020-01-24 00:56:47 +0200 |
| commit | d7e7f47b66de160b351e4e836de08ac188fc3079 (patch) | |
| tree | 27a887c3764d16cb765bb1d7b20f5526201788f8 /src | |
| parent | 75fa07626d4543c0fcca80007c717367f4f85d90 (diff) | |
fix transparent color not affecting downstream slots
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/theme_data/theme_data.service.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index c0861a4a..0a6733a9 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -326,7 +326,7 @@ export const getColors = (sourceColors, sourceOpacity, mod) => SLOT_ORDERED.redu } else { let color = { ...colors[deps[0]] } if (value.color) { - color = value.color(mod, ...deps.map((dep) => ({ ...colors[dep] }))) + color = colorFunc(mod, ...deps.map((dep) => ({ ...colors[dep] }))) } outputColor = getTextColor( @@ -348,7 +348,13 @@ export const getColors = (sourceColors, sourceOpacity, mod) => SLOT_ORDERED.redu } const opacitySlot = getOpacitySlot(key) if (opacitySlot && outputColor.a === undefined) { - outputColor.a = sourceOpacity[opacitySlot] || OPACITIES[opacitySlot].defaultValue || 1 + const deps = getDependencies(key, SLOT_INHERITANCE) + const dependencySlot = deps && deps[0] + if (dependencySlot && sourceColors[dependencySlot] === 'transparent') { + outputColor.a = 0 + } else { + outputColor.a = sourceOpacity[opacitySlot] || OPACITIES[opacitySlot].defaultValue || 1 + } } if (opacitySlot) { return { |
