Skip to content

fix: add fallbacks to jssStyle #1493

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 5 commits into
base: master
Choose a base branch
from
Open

fix: add fallbacks to jssStyle #1493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75f792b
fix: add fallbacks to jssStyle
hosseinmd Apr 10, 2021
cdf00ac
fix: fallbacks to be optional
hosseinmd Apr 10, 2021
893045d
test: fallbacks
hosseinmd Apr 20, 2021
de99cd1
tests: add array type fallbacks to test
hosseinmd Apr 23, 2021
602d9e5
fix: expected error
hosseinmd Jul 2, 2021
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
6 changes: 4 additions & 2 deletions packages/jss/src/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ type Func<P, T, R> = T extends undefined ? ((data: P) => R) : ((data: P & {theme
type NormalCssProperties = CSSProperties<string | number>
type NormalCssValues<K> = K extends keyof NormalCssProperties ? NormalCssProperties[K] : JssValue

export type JssStyle<Props = any, Theme = undefined> =
export type JssStyle<Props = any, Theme = undefined> = {
fallbacks?: JssStyle<Props, Theme> | (JssStyle<Props, Theme>[])
} & (
| {
[K in keyof NormalCssProperties]:
| NormalCssValues<K>
Expand All @@ -30,7 +32,7 @@ export type JssStyle<Props = any, Theme = undefined> =
| JssStyle<Props, Theme>
| Func<Props, Theme, JssValue | JssStyle<undefined, undefined> | undefined>
| MinimalObservable<JssValue | JssStyle | undefined>
}
})

export type Styles<
Name extends string | number | symbol = string,
Expand Down
29 changes: 29 additions & 0 deletions packages/jss/tests/jss-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,35 @@ attachedStyleSheet.addRules({
}
})

// fallbacks test
attachedStyleSheet.addRules({
rule4: {
fallbacks: {
fontFamily: 'other',
color: '#black'
},
fontFamily: 'Roboto',
color: '#FFFFFF'
},
// @ts-expect-error
rule5: {
fallbacks: {
borderRadius: ['solid', 2],
fontSize: Symbol()
},
borderRadius: ['solid', 2],
fontSize: 17
},
// @ts-expect-error
rule6: {
fallbacks: Symbol()
},
container: {
display: 'flex',
fallbacks: [{display: 'box'}, {display: 'flex-box'}]
}
})

const styleSheet2 = sharedInstance.createStyleSheet({
container: {
background: '#000099'
Expand Down