-
Notifications
You must be signed in to change notification settings - Fork 329
fix(web): apply opacity modifiers to theme colors #1485
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.
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
divyanshu-iitian
wants to merge
3
commits into
sourcebot-dev:main
Choose a base branch
from
divyanshu-iitian:divyanshu-iitian/fix-tailwind-color-opacity
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+164
−75
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,38 @@ | ||
| import resolveConfig from 'tailwindcss/resolveConfig'; | ||
| import tailwindConfig from '../tailwind.config'; | ||
|
|
||
| const tailwind = resolveConfig(tailwindConfig); | ||
| export default tailwind; | ||
| // Tailwind substitutes this placeholder only while generating utilities. | ||
| // Runtime consumers need a concrete opaque value instead. | ||
| const resolveRuntimeAlphaValues = <T>(value: T): T => { | ||
| if (typeof value === 'string') { | ||
| return value | ||
| .replaceAll('calc(<alpha-value> * 100%)', '100%') | ||
| .replaceAll('<alpha-value>', '1') as T; | ||
| } | ||
|
|
||
| if (Array.isArray(value)) { | ||
| return value.map(resolveRuntimeAlphaValues) as T; | ||
| } | ||
|
|
||
| if (value !== null && typeof value === 'object') { | ||
| return Object.fromEntries( | ||
| Object.entries(value).map(([key, child]) => [ | ||
| key, | ||
| resolveRuntimeAlphaValues(child), | ||
| ]), | ||
| ) as T; | ||
| } | ||
|
|
||
| return value; | ||
| }; | ||
|
|
||
| const resolvedConfig = resolveConfig(tailwindConfig); | ||
| const tailwind = { | ||
| ...resolvedConfig, | ||
| theme: { | ||
| ...resolvedConfig.theme, | ||
| colors: resolveRuntimeAlphaValues(resolvedConfig.theme.colors), | ||
| }, | ||
| }; | ||
|
|
||
| export default tailwind; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| import postcss from "postcss"; | ||
| import tailwindcss from "tailwindcss"; | ||
| import { describe, expect, test } from "vitest"; | ||
|
|
||
| import tailwind from "./src/tailwind"; | ||
| import tailwindConfig from "./tailwind.config"; | ||
|
|
||
| const compileUtilities = async (classes: string) => { | ||
| const result = await postcss([ | ||
| tailwindcss({ | ||
| ...tailwindConfig, | ||
| content: [{ raw: `<div class="${classes}"></div>` }], | ||
| }), | ||
| ]).process("@tailwind utilities;", { from: undefined }); | ||
|
|
||
| return result.css; | ||
| }; | ||
|
|
||
| describe("Tailwind theme colors", () => { | ||
| test("applies opacity modifiers to CSS variable colors", async () => { | ||
| const css = await compileUtilities( | ||
| "text-primary text-primary/80 bg-warning/10 border-border/30", | ||
| ); | ||
|
|
||
| expect(css).toContain( | ||
| "color: color-mix(in srgb, var(--primary) calc(var(--tw-text-opacity, 1) * 100%), transparent)", | ||
| ); | ||
| expect(css).toContain( | ||
| "color: color-mix(in srgb, var(--primary) calc(0.8 * 100%), transparent)", | ||
| ); | ||
| expect(css).toContain( | ||
| "background-color: color-mix(in srgb, var(--warning) calc(0.1 * 100%), transparent)", | ||
| ); | ||
| expect(css).toContain( | ||
| "border-color: color-mix(in srgb, var(--border) calc(0.3 * 100%), transparent)", | ||
| ); | ||
| }); | ||
|
|
||
| test("resolves valid opaque colors for runtime consumers", () => { | ||
| expect(tailwind.theme.colors.background).toBe( | ||
| "color-mix(in srgb, var(--background) 100%, transparent)", | ||
| ); | ||
| expect(tailwind.theme.colors.editor.background).toBe( | ||
| "color-mix(in srgb, var(--editor-background) 100%, transparent)", | ||
| ); | ||
| expect(JSON.stringify(tailwind.theme.colors)).not.toContain( | ||
| "<alpha-value>", | ||
| ); | ||
| }); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.