Skip to content

feat: enhance theme style generator to support Tailwind CSS version 4 #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: enhance theme style generator to support Tailwind CSS version 4 #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66a56af
feat: enhance theme style generator to support Tailwind CSS version 4
aarjun8060 Jun 24, 2025
a2bb4f8
feat: simplify theme variable handling and add key renaming function
aarjun8060 Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions utils/theme-style-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ type ThemeMode = "light" | "dark";
const generateColorVariables = (
themeStyles: ThemeStyles,
mode: ThemeMode,
formatColor: (color: string) => string
formatColor: (color: string) => string,
): string => {
const styles = themeStyles[mode];
return `
Expand Down Expand Up @@ -38,7 +38,7 @@ const generateColorVariables = (
--chart-3: ${formatColor(styles["chart-3"])};
--chart-4: ${formatColor(styles["chart-4"])};
--chart-5: ${formatColor(styles["chart-5"])};
--sidebar: ${formatColor(styles.sidebar)};
--sidebar: ${formatColor(styles["sidebar"])};
--sidebar-foreground: ${formatColor(styles["sidebar-foreground"])};
--sidebar-primary: ${formatColor(styles["sidebar-primary"])};
--sidebar-primary-foreground: ${formatColor(styles["sidebar-primary-foreground"])};
Expand Down Expand Up @@ -86,7 +86,7 @@ const generateTrackingVariables = (themeStyles: ThemeStyles): string => {
const generateThemeVariables = (
themeStyles: ThemeStyles,
mode: ThemeMode,
formatColor: (color: string) => string
formatColor: (color: string) => string,
): string => {
const selector = mode === "dark" ? ".dark" : ":root";
const colorVars = generateColorVariables(themeStyles, mode, formatColor);
Expand Down Expand Up @@ -145,7 +145,7 @@ const generateTailwindV4ThemeInline = (themeStyles: ThemeStyles): string => {
--color-chart-3: var(--chart-3);
--color-chart-4: var(--chart-4);
--color-chart-5: var(--chart-5);
--color-sidebar: var(--sidebar);
--color-sidebar-background: var(--sidebar-background);
--color-sidebar-foreground: var(--sidebar-foreground);
--color-sidebar-primary: var(--sidebar-primary);
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
Expand Down Expand Up @@ -174,6 +174,19 @@ const generateTailwindV4ThemeInline = (themeStyles: ThemeStyles): string => {
}`;
};

export function changeThemeObjKeyName(
cssVars: string,
oldKey: string,
newKey: string,
) {
console.log("calling")
const escapedOldKey = oldKey.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
console.log("calling",escapedOldKey)
const regex = new RegExp(`(${escapedOldKey}):`, 'g');
console.log("calling",regex)
console.log("")
return cssVars.replace(regex, `${newKey}:`);
}
export const generateThemeCode = (
themeEditorState: ThemeEditorState,
colorFormat: ColorFormat = "hsl",
Expand All @@ -190,11 +203,15 @@ export const generateThemeCode = (
const themeStyles = themeEditorState.styles as ThemeStyles;
const formatColor = (color: string) => colorFormatter(color, colorFormat, tailwindVersion);

const lightTheme = generateThemeVariables(themeStyles, "light", formatColor);
const darkTheme = generateThemeVariables(themeStyles, "dark", formatColor);
let lightTheme = generateThemeVariables(themeStyles, "light", formatColor);
let darkTheme = generateThemeVariables(themeStyles, "dark", formatColor);
const tailwindV4Theme =
tailwindVersion === "4" ? `\n\n${generateTailwindV4ThemeInline(themeStyles)}` : "";

if(tailwindVersion === "4") {
lightTheme = changeThemeObjKeyName(lightTheme,"--sidebar","--sidebar-background");
darkTheme = changeThemeObjKeyName(darkTheme,"--sidebar","--sidebar-background");
}
const bodyLetterSpacing =
themeStyles["light"]["letter-spacing"] !== "0em"
? "\n\nbody {\n letter-spacing: var(--tracking-normal);\n}"
Expand Down