From dc37c7b28b2142227f73a36acc27a7ac77c7e59a Mon Sep 17 00:00:00 2001 From: tusooa Date: Fri, 31 May 2024 14:33:44 -0400 Subject: Fix Themes v3 not working on Safari --- src/services/theme_data/iss_utils.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/services/theme_data/iss_utils.js') diff --git a/src/services/theme_data/iss_utils.js b/src/services/theme_data/iss_utils.js index 2d9dd0b5..83ca8242 100644 --- a/src/services/theme_data/iss_utils.js +++ b/src/services/theme_data/iss_utils.js @@ -1,3 +1,5 @@ +import { sortBy } from 'lodash' + // "Unrolls" a tree structure of item: { parent: { ...item2, parent: { ...item3, parent: {...} } }} // into an array [item2, item3] for iterating export const unroll = (item) => { @@ -24,7 +26,7 @@ export const getAllPossibleCombinations = (array) => { }) const flatCombos = newCombos.reduce((acc, x) => [...acc, ...x], []) const uniqueComboStrings = new Set() - const uniqueCombos = flatCombos.map(x => x.toSorted()).filter(x => { + const uniqueCombos = flatCombos.map(sortBy).filter(x => { if (uniqueComboStrings.has(x.join())) { return false } else { @@ -64,7 +66,7 @@ export const genericRuleToSelector = components => (rule, ignoreOutOfTreeSelecto } const selectors = [realSelector, applicableVariant, ...applicableStates] - .toSorted((a, b) => { + .sort((a, b) => { if (a.startsWith(':')) return 1 if (/^[a-z]/.exec(a)) return -1 else return 0 -- cgit v1.2.3-70-g09d2