Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-02-24 12:12:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

theme: fix theme validation

Browse Source
This commit is contained in:
ammarahm-ed
2023-07-28 18:11:31 +05:00
parent becd852165
commit 5140fd7108
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/theme/src/theme-engine/index.ts
View File

@@ -280,7 +280,6 @@ const HEX_COLOR_REGEX_ALPHA =
export function validateTheme(json: ThemeDefinition) {
const flattenedTheme = flatten(json);
const missingKeys = [];
for (const key of RequiredKeys) {
if (!Object.keys(flattenedTheme).includes(key)) {
@@ -294,31 +293,27 @@ export function validateTheme(json: ThemeDefinition) {
)} are missing from the theme.`
};
}
const invalidColors = [];
for (const key in flattenedTheme) {
if (!key.startsWith("scopes")) continue;
const keyPart = key.split(".").pop() as string;
const value = flattenedTheme[key];
const isHexAlphaColor = /hover|shade|backdrop|textSelection/g.test(keyPart);
HEX_COLOR_REGEX.lastIndex = 0;
HEX_COLOR_REGEX_ALPHA.lastIndex = 0;
if (
!/hover|shade|backdrop|textSelection/g.test(key) &&
!HEX_COLOR_REGEX.test(value)
(!isHexAlphaColor && !HEX_COLOR_REGEX.test(value)) ||
(isHexAlphaColor && !HEX_COLOR_REGEX_ALPHA.test(value))
) {
invalidColors.push(key);
} else if (
/hover|shade|backdrop|textSelection/g.test(key) &&
!HEX_COLOR_REGEX_ALPHA.test(value)
) {
invalidColors.push(key);
if (!HEX_COLOR_REGEX.test(value)) invalidColors.push(key);
}
}
if (invalidColors.length > 0) {
return {
error: `Failed to apply theme, ${missingKeys.join(
error: `Failed to apply theme, ${invalidColors.join(
","
)} are missing from the theme.`
)} have invalid values.`
};
}