SheWhoReignsSupreme/GoonCord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: readd semantic fallback for spec 2 themes

Browse source
This commit is contained in:
pylixonly 2024-10-21 22:17:23 +08:00
parent d7be92ff49
commit 0fd2107473
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/addons/themes/colors/parser.ts
View file

@ -47,6 +47,7 @@ export function parseColorManifest(manifest: ColorManifest): InternalColorDefini
}
return {
spec: 3,
reference: resolveType(manifest.type),
semantic: semanticColorDefinitions,
raw: manifest.raw ?? {},
@ -83,6 +84,7 @@ export function parseColorManifest(manifest: ColorManifest): InternalColorDefini
return {
spec: 2,
reference: resolveType(),
semantic: semanticDefinitions,
raw: manifest.rawColors ?? {},

19
src/lib/addons/themes/colors/patches/resolver.ts
View file

@ -9,6 +9,19 @@ import chroma from "chroma-js";
const tokenReference = findByProps("SemanticColor");
const isThemeModule = createLazyModule(byMutableProp("isThemeDark"));
const SEMANTIC_FALLBACK_MAP: Record<string, string> = {
"BG_BACKDROP": "BACKGROUND_FLOATING",
"BG_BASE_PRIMARY": "BACKGROUND_PRIMARY",
"BG_BASE_SECONDARY": "BACKGROUND_SECONDARY",
"BG_BASE_TERTIARY": "BACKGROUND_SECONDARY_ALT",
"BG_MOD_FAINT": "BACKGROUND_MODIFIER_ACCENT",
"BG_MOD_STRONG": "BACKGROUND_MODIFIER_ACCENT",
"BG_MOD_SUBTLE": "BACKGROUND_MODIFIER_ACCENT",
"BG_SURFACE_OVERLAY": "BACKGROUND_FLOATING",
"BG_SURFACE_OVERLAY_TMP": "BACKGROUND_FLOATING",
"BG_SURFACE_RAISED": "BACKGROUND_MOBILE_PRIMARY"
};
export default function patchDefinitionAndResolver() {
const callback = ([theme]: any[]) => theme === _colorRef.key ? [_colorRef.current!.reference] : void 0;
@ -35,7 +48,11 @@ export default function patchDefinitionAndResolver() {
const [name, colorDef] = extractInfo(_colorRef.current!.reference, args[1]);
const semanticDef = _colorRef.current.semantic[name];
let semanticDef = _colorRef.current.semantic[name];
if (!semanticDef && _colorRef.current?.spec === 2 && name in SEMANTIC_FALLBACK_MAP) {
semanticDef = _colorRef.current.semantic[SEMANTIC_FALLBACK_MAP[name]];
}
if (semanticDef?.value) {
return chroma(semanticDef.value).alpha(semanticDef.opacity).hex();
}

3
src/lib/addons/themes/colors/types.ts
View file

@ -3,7 +3,7 @@ import { Author, BunnyManifest } from "@lib/addons/types";
interface SemanticReference {
type: "color" | "raw";
value: string;
opacity?: number
opacity?: number;
}
interface BackgroundDefinition {
@ -36,6 +36,7 @@ export interface VendettaThemeManifest {
/** @internal */
export interface InternalColorDefinition {
spec: 2 | 3;
reference: "darker" | "light";
semantic: Record<string, {
value: string;