Skip to content

[98] Change ColorNames typing #99

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
Serpentarius13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[98] Change ColorNames typing #99

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
61 changes: 37 additions & 24 deletions packages/system/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,16 @@ declare global {
hardest: C
}

type ColorCustom<C = Color> = {
interface CustomPaletteRegistry {}

interface ColorCustom<C = Color> {
/** @deprecated this field */
palette: Record<string, C>
palette: CustomPaletteRegistry & {
[key: string]: C
}
}

type ColorPalette<C = Color> = {
interface ColorPalette<C = Color> {
gray: ColorShades<C>
yellow: ColorShades<C> & ColorAccentsShades<C>
orange: ColorShades<C> & ColorAccentsShades<C>
Expand All @@ -97,28 +101,37 @@ declare global {
}

type ColorNames = LiteralUnion<
LiteralUnion<
| keyof ColorMain
| `gray${keyof ColorPalette['gray']}`
| `yellow${keyof ColorPalette['yellow']}`
| `orange${keyof ColorPalette['orange']}`
| `red${keyof ColorPalette['red']}`
| `rose${keyof ColorPalette['rose']}`
| `pink${keyof ColorPalette['pink']}`
| `green${keyof ColorPalette['green']}`
| `lightGreen${keyof ColorPalette['lightGreen']}`
| `lime${keyof ColorPalette['lime']}`
| `teal${keyof ColorPalette['teal']}`
| `cyan${keyof ColorPalette['cyan']}`
| `lightBlue${keyof ColorPalette['lightBlue']}`
| `blue${keyof ColorPalette['blue']}`
| `indigo${keyof ColorPalette['indigo']}`
| `purple${keyof ColorPalette['purple']}`,
keyof ColorCustom['palette']
>,
| keyof {
[K in keyof ColorPalette as `${K}${keyof ColorPalette[K] & (string | number)}`]: string
}
| keyof ColorMain
| keyof CustomPaletteRegistry,
string
>

// type ColorNames = LiteralUnion<
// LiteralUnion<
// | keyof ColorMain
// | `gray${keyof ColorPalette['gray']}`
// | `yellow${keyof ColorPalette['yellow']}`
// | `orange${keyof ColorPalette['orange']}`
// | `red${keyof ColorPalette['red']}`
// | `rose${keyof ColorPalette['rose']}`
// | `pink${keyof ColorPalette['pink']}`
// | `green${keyof ColorPalette['green']}`
// | `lightGreen${keyof ColorPalette['lightGreen']}`
// | `lime${keyof ColorPalette['lime']}`
// | `teal${keyof ColorPalette['teal']}`
// | `cyan${keyof ColorPalette['cyan']}`
// | `lightBlue${keyof ColorPalette['lightBlue']}`
// | `blue${keyof ColorPalette['blue']}`
// | `indigo${keyof ColorPalette['indigo']}`
// | `purple${keyof ColorPalette['purple']}`,
// keyof ColorCustom['palette']
// >,
// string
// >

type Colors<C = Color, Definition = false> = ColorMain<C> &
ColorPalette<C> &
(Definition extends true ? Partial<ColorCustom<C>> : ColorCustom<C>)
Expand Down Expand Up @@ -253,8 +266,8 @@ declare global {
[P in keyof T]?: T[P] extends Array<infer U>
? Array<DeepPartial<U>>
: T[P] extends ReadonlyArray<infer U>
? ReadonlyArray<DeepPartial<U>>
: DeepPartial<T[P]>
? ReadonlyArray<DeepPartial<U>>
: DeepPartial<T[P]>
}

type LiteralUnion<LiteralType, BaseType extends Primitive> =
Expand Down
35 changes: 22 additions & 13 deletions packages/testbed/src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
import { light } from './theme'
import { DatePicker, Modal, modal, Viewport } from '@stage-ui/core'
import { Flexbox, Text, Viewport } from '@stage-ui/core'
import ReactDOM from 'react-dom'
import { useState } from 'react'
import { light } from './theme'

const App: React.FC = () => {
const handleOpen = () => {
modal({
preventEscapeClose: true,
render: () => {
return <>123</>
},
overlayClose: false,
})
declare global {
namespace Stage {
interface ColorPalette {
newRed: ColorShades
}

interface CustomPaletteRegistry {
newYellowColor: Color
}
}
}

const App: React.FC = () => {
return (
<Flexbox column backgroundColor="gray300">
<Text color="newRed100">newRed100</Text>

<Text color="newYellowColor">newYellowColor</Text>

return null
<Text color="green500">limeA100</Text>
</Flexbox>
)
}

ReactDOM.render(
Expand Down
8 changes: 8 additions & 0 deletions packages/testbed/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ export const light = themes.light.replace({
radius: {
xs: '0.25rem',
},
color: {
newRed: {
'100': '#FF0000',
},
palette: {
newYellowColor: 'yellow',
},
},
},
overrides: (main) => ({
TextField: {
Expand Down