Skip to content
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

Jump to bottom

fix: jssStyle type #1423

Merged
merged 2 commits into from
Nov 18, 2020
Merged

fix: jssStyle type #1423

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b493ed
fix: jssStyle type
hosseinmd Nov 15, 2020
74b94ba
chore: add missed JssValue
hosseinmd Nov 16, 2020
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
18 changes: 11 additions & 7 deletions packages/jss/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,17 @@ type NormalCssValues<K> = K extends keyof NormalCssProperties
? NormalCssProperties[K] | JssValue
: JssValue

export type JssStyle = {
[K in keyof NormalCssProperties | string]:
| NormalCssValues<K>
| JssStyle
| Func<NormalCssValues<K> | JssStyle | undefined>
| Observable<NormalCssValues<K> | JssStyle | undefined>
}
export type JssStyle =
| {
[K in keyof NormalCssProperties]:
| NormalCssValues<K>
| JssStyle
| Func<NormalCssValues<K> | JssStyle | undefined>
| Observable<NormalCssValues<K> | JssStyle | undefined>
}
| {
[K: string]: JssStyle | Func<JssStyle> | Observable<JssStyle | undefined>
hosseinmd marked this conversation as resolved.
Show resolved Hide resolved
}

export type Styles<Name extends string | number | symbol = string> = Record<
Name,
Expand Down