arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-30 11:47:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(module): safelist all colors for toast.add

Browse Source 
Resolves #375, resolves #440
This commit is contained in:
Benjamin Canac
2023-07-27 18:28:25 +02:00
parent 0300be8539
commit 2cd620899f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/colors.ts
View File

@@ -204,7 +204,7 @@ const colorsAsRegex = (colors: string[]): string => colors.join('|')
export const excludeColors = (colors: object) => Object.keys(omit(colors, colorsToExclude)).map(color => kebabCase(color)) as string[] export const excludeColors = (colors: object) => Object.keys(omit(colors, colorsToExclude)).map(color => kebabCase(color)) as string[]
export const generateSafelist = (colors: string[]) => { export const generateSafelist = (colors: string[], globalColors) => {
const baseSafelist = Object.keys(safelistByComponent).flatMap(component => safelistByComponent[component](colorsAsRegex(colors))) const baseSafelist = Object.keys(safelistByComponent).flatMap(component => safelistByComponent[component](colorsAsRegex(colors)))
// Ensure `red` color is safelisted for form elements so that `error` prop of `UFormGroup` always works // Ensure `red` color is safelisted for form elements so that `error` prop of `UFormGroup` always works
@@ -213,6 +213,8 @@ export const generateSafelist = (colors: string[]) => {
return [ return [
...baseSafelist, ...baseSafelist,
...formsSafelist, ...formsSafelist,
// Ensure all global colors are safelisted for the Notification (toast.add)
...safelistByComponent['notification'](colorsAsRegex(globalColors)),
// Gray safelist for Avatar & Notification // Gray safelist for Avatar & Notification
'bg-gray-500', 'bg-gray-500',
'dark:bg-gray-400', 'dark:bg-gray-400',

2
src/module.ts
View File

@@ -123,7 +123,7 @@ export default defineNuxtModule<ModuleOptions>({
} }
tailwindConfig.safelist = tailwindConfig.safelist || [] tailwindConfig.safelist = tailwindConfig.safelist || []
tailwindConfig.safelist.push(...generateSafelist(options.safelistColors)) tailwindConfig.safelist.push(...generateSafelist(options.safelistColors, colors))
tailwindConfig.plugins = tailwindConfig.plugins || [] tailwindConfig.plugins = tailwindConfig.plugins || []
tailwindConfig.plugins.push(iconsPlugin({ collections: getIconCollections(options.icons as any[]) })) tailwindConfig.plugins.push(iconsPlugin({ collections: getIconCollections(options.icons as any[]) }))