Skip to content

Fix global css typing #498

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

Merged
owjs3901 merged 1 commit into from
Nov 21, 2025
Merged

Fix global css typing #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changepacks/changepack_log_dRVzImm0AJhTH8RnWMkOY.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"changes": { "packages/react/package.json": "Patch" },
"note": "Fix globalCss typing",
"date": "2025-11-21T14:17:50.816538300Z"
}
15 changes: 15 additions & 0 deletions packages/react/src/utils/__tests__/global-css.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { AdditionalGlobalCssProps, GlobalCssProps } from '../global-css'

describe('globalCss', () => {
it('globalCss', () => {
assertType<GlobalCssProps | AdditionalGlobalCssProps>({
imports: ['https://example.com'],
a: {
color: 'blue',
},
_hover: {
bg: 'red',
},
})
})
})
8 changes: 4 additions & 4 deletions packages/react/src/utils/global-css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type GlobalCssKeys<T extends string> =
| `${keyof SVGElementTagNameMap}${T}`
| `_${CamelCase<ExtractSelector<T>>}`

type GlobalCssProps = {
export type GlobalCssProps = {
[K in GlobalCssKeys<AdvancedSelector>]?: DevupCommonProps &
DevupSelectorProps &
DevupThemeSelectorProps & {
Expand Down Expand Up @@ -56,13 +56,13 @@ interface FontFaceProps {
}

type Import = { url: string; query?: string } | string
interface AdditionalGlobalCssProps {
export interface AdditionalGlobalCssProps {
imports?: Import[]
fontFaces?: FontFaceProps[]
}

export function globalCss(
strings: AdditionalGlobalCssProps & GlobalCssProps,
strings: AdditionalGlobalCssProps | GlobalCssProps,
): void

export function globalCss(
Expand All @@ -80,7 +80,7 @@ export function globalCss(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
strings?:
| TemplateStringsArray
| (GlobalCssProps & AdditionalGlobalCssProps)
| (GlobalCssProps | AdditionalGlobalCssProps)
| Record<
string,
DevupCommonProps & DevupSelectorProps & DevupThemeSelectorProps
Expand Down