diff options
| author | Henry Jameson <me@hjkos.com> | 2020-01-20 01:31:54 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2020-01-20 01:31:54 +0200 |
| commit | 6e1c538e4182263a75fb65b0f3c5d1ad9de94541 (patch) | |
| tree | 69e04c1445fa55be1f7eb4309ed8e842256ee98d /src/services/theme_data/theme_data.service.js | |
| parent | 6a3714fcc64fe25e6fc38a700083427c2764caec (diff) | |
multiple fixes to make style switcher not die. Made shadows work, incuding compatibility
Diffstat (limited to 'src/services/theme_data/theme_data.service.js')
| -rw-r--r-- | src/services/theme_data/theme_data.service.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index e4456b29..36837b44 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -663,7 +663,14 @@ export const SLOT_ORDERED = topoSort( Object.entries(SLOT_INHERITANCE) .sort(([aK, aV], [bK, bV]) => ((aV && aV.priority) || 0) - ((bV && bV.priority) || 0)) .reduce((acc, [k, v]) => ({ ...acc, [k]: v }), {}) -) +).sort((a, b) => { + const depsA = getDependencies(a, SLOT_INHERITANCE).length + const depsB = getDependencies(b, SLOT_INHERITANCE).length + + if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return 0 + if (depsA === 0 && depsB !== 0) return -1 + if (depsB === 0 && depsA !== 0) return 1 +}) /** * Dictionary where keys are color slots and values are opacity associated |