From 40e3595ad3e85ff0fec39bdbf538b7cb053617ef Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 12 Jul 2020 15:41:34 +0300 Subject: [PATCH] fix chrome69 --- src/services/theme_data/pleromafe.js | 30 +++++++++++-------- src/services/theme_data/theme_data.service.js | 10 +++++-- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js index b58ca9be3b..7ed8579757 100644 --- a/src/services/theme_data/pleromafe.js +++ b/src/services/theme_data/pleromafe.js @@ -675,23 +675,22 @@ export const SLOT_INHERITANCE = { depends: ['bg'] }, - chatMessage: { - depends: ['chatBg'] - }, - chatMessageIncomingBg: { - depends: ['chatMessage'], - layer: 'chatMessage' + depends: ['chatBg'] }, chatMessageIncomingText: { depends: ['text'], - layer: 'text' + layer: 'chatMessage', + variant: 'chatMessageIncomingBg', + textColor: true }, chatMessageIncomingLink: { depends: ['link'], - layer: 'link' + layer: 'chatMessage', + variant: 'chatMessageIncomingBg', + textColor: 'preserve' }, chatMessageIncomingBorder: { @@ -701,22 +700,27 @@ export const SLOT_INHERITANCE = { }, chatMessageOutgoingBg: { - depends: ['chatMessage'], + depends: ['chatMessageIncomingBg'], color: (mod, chatMessage) => brightness(5 * mod, chatMessage).rgb }, chatMessageOutgoingText: { depends: ['text'], - layer: 'text' + layer: 'chatMessage', + variant: 'chatMessageOutgoingBg', + textColor: true }, chatMessageOutgoingLink: { depends: ['link'], - layer: 'link' + layer: 'chatMessage', + variant: 'chatMessageOutgoingBg', + textColor: 'preserve' }, chatMessageOutgoingBorder: { - depends: ['chatMessage'], - opacity: 'chatMessage' + depends: ['chatMessageOutgoingBg'], + opacity: 'border', + color: (mod, border) => brightness(2 * mod, border).rgb } } diff --git a/src/services/theme_data/theme_data.service.js b/src/services/theme_data/theme_data.service.js index dd87e3cffe..138ed5c63b 100644 --- a/src/services/theme_data/theme_data.service.js +++ b/src/services/theme_data/theme_data.service.js @@ -128,14 +128,18 @@ export const topoSort = ( while (unprocessed.length > 0) { step(unprocessed.pop()) } - return output.sort((a, b) => { + + // The index thing is to make sorting stable on browsers + // where Array.sort() isn't stable + return output.map((data, index) => ({ data, index })).sort(({ data: a, index: ai }, { data: b, index: bi }) => { + console.log(a, b, ai, bi) const depsA = getDeps(a, inheritance).length const depsB = getDeps(b, inheritance).length - if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return 0 + if (depsA === depsB || (depsB !== 0 && depsA !== 0)) return ai - bi if (depsA === 0 && depsB !== 0) return -1 if (depsB === 0 && depsA !== 0) return 1 - }) + }).map(({ data }) => data) } const expandSlotValue = (value) => {