Skip to content

Commit 6cb88cd

Browse files
committed
Optimize typing
1 parent e5673ce commit 6cb88cd

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

packages/react/src/types/props/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,21 @@ export interface DevupShortcutsProps
2323
DevupUiMotionPathProps,
2424
DevupUiPositionProps,
2525
DevupUiTextProps {}
26+
2627
export type DevupCommonProps = Merge<
2728
{
2829
[K in keyof Properties]?: ResponsiveValue<Properties[K]>
2930
},
3031
DevupShortcutsProps
3132
>
3233

33-
export interface DevupProps<T extends React.ElementType>
34+
export interface DevupProps
3435
extends DevupCommonProps,
3536
DevupSelectorProps,
36-
DevupThemeSelectorProps {
37+
DevupThemeSelectorProps {}
38+
39+
export interface DevupComponentProps<T extends React.ElementType>
40+
extends DevupProps {
3741
as?: T
3842
styleVars?: Record<string, string | undefined>
3943
}

packages/react/src/utils/css.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
1-
import type { DevupCommonProps } from '../types/props'
2-
import type { DevupSelectorProps } from '../types/props/selector'
3-
import type { DevupThemeSelectorProps } from '../types/props/selector'
1+
import type { DevupProps } from '../types/props'
42

5-
export function css(
6-
props: DevupCommonProps | DevupSelectorProps | DevupThemeSelectorProps,
7-
): string
3+
export function css(props: DevupProps): string
84
export function css(strings: TemplateStringsArray): string
95
export function css(): string
106

117
export function css(
128
// eslint-disable-next-line @typescript-eslint/no-unused-vars
13-
strings?:
14-
| TemplateStringsArray
15-
| DevupCommonProps
16-
| DevupSelectorProps
17-
| DevupThemeSelectorProps,
9+
strings?: TemplateStringsArray | DevupProps,
1810
): string {
1911
throw new Error('Cannot run on the runtime')
2012
}

0 commit comments

Comments
 (0)