@sanity/ui 3.0.0-static.18 → 3.0.0-static.19

package/src/theme/{build → v2/build}/resolveColorTokens.ts

@@ -1,6 +1,18 @@
-import {COLOR_HUES, ColorHueKey} from '@sanity/color'
+import {COLOR_HUES, type ColorHueKey} from '@sanity/color'
 
 import {
+  THEME_COLOR_BUTTON_MODES,
+  THEME_COLOR_CARD_TONES,
+  THEME_COLOR_INPUT_MODES,
+  THEME_COLOR_INPUT_STATES,
+  THEME_COLOR_STATE_TONES,
+  THEME_COLOR_STATES,
+  type ThemeColorButtonModeKey,
+  type ThemeColorCardToneKey,
+  type ThemeColorStateKey,
+  type ThemeColorStateToneKey,
+} from '../color'
+import type {
   ColorConfigCardTone,
   ColorConfigInputMode,
   ColorConfigInputState,
@@ -16,18 +28,6 @@ import {
   ThemeColorTokens,
 } from '../config'
 import {defaultColorTokens} from '../defaults/colorTokens'
-import {
-  THEME_COLOR_BUTTON_MODES,
-  THEME_COLOR_CARD_TONES,
-  THEME_COLOR_INPUT_MODES,
-  THEME_COLOR_INPUT_STATES,
-  THEME_COLOR_STATE_TONES,
-  THEME_COLOR_STATES,
-  ThemeColorButtonModeKey,
-  ThemeColorCardToneKey,
-  ThemeColorStateKey,
-  ThemeColorStateToneKey,
-} from '../v2'
 import {merge} from './merge'
 
 /**

package/src/theme/v2/color/_helpers.ts

@@ -1,7 +1,7 @@
-import {COLOR_HUES, COLOR_TINTS, ColorHueKey, ColorTintKey} from '@sanity/color'
+import {COLOR_HUES, COLOR_TINTS, type ColorHueKey, type ColorTintKey} from '@sanity/color'
 
 import {THEME_COLOR_BLEND_MODES, THEME_COLOR_BUTTON_MODES} from './_constants'
-import {ThemeColorBlendModeKey, ThemeColorButtonModeKey} from './_system'
+import type {ThemeColorBlendModeKey, ThemeColorButtonModeKey} from './_system'
 
 /** @internal */
 export function isColorBlendModeValue(str: string): str is ThemeColorBlendModeKey {

package/src/theme/v2/color/_system.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   THEME_COLOR_AVATAR_COLORS,
   THEME_COLOR_BLEND_MODES,
   THEME_COLOR_BUTTON_MODES,

package/src/theme/v2/color/avatar.ts

@@ -1,4 +1,4 @@
-import {ThemeColorAvatarColorKey, ThemeColorBlendModeKey} from './_system'
+import type {ThemeColorAvatarColorKey, ThemeColorBlendModeKey} from './_system'
 
 /** @public */
 export interface ThemeColorAvatarHue_v2 {

package/src/theme/v2/color/badge.ts

@@ -1,4 +1,4 @@
-import {ThemeColorStateToneKey} from './_system'
+import type {ThemeColorStateToneKey} from './_system'
 
 /** @public */
 export interface ThemeColorBadgeTone_v2 {

package/src/theme/v2/color/button.ts

@@ -1,5 +1,5 @@
-import {ThemeColorButtonModeKey, ThemeColorStateKey, ThemeColorStateToneKey} from './_system'
-import {ThemeColorState_v2} from './state'
+import type {ThemeColorButtonModeKey, ThemeColorStateKey, ThemeColorStateToneKey} from './_system'
+import type {ThemeColorState_v2} from './state'
 
 /** @public */
 export type ThemeColorButtonTone_v2 = Record<ThemeColorStateKey, ThemeColorState_v2>

package/src/theme/v2/color/color.ts

@@ -1,10 +1,10 @@
-import {ThemeColorBlendModeKey, ThemeColorCardToneKey, ThemeColorSchemeKey} from './_system'
-import {ThemeColorButton_v2} from './button'
-import {ThemeColorInput_v2} from './input'
-import {ThemeColorSelectable_v2} from './selectable'
-import {ThemeColorShadow} from './shadow'
-import {ThemeColorState_v2} from './state'
-import {ThemeColorSyntax} from './syntax'
+import type {ThemeColorBlendModeKey, ThemeColorCardToneKey, ThemeColorSchemeKey} from './_system'
+import type {ThemeColorButton_v2} from './button'
+import type {ThemeColorInput_v2} from './input'
+import type {ThemeColorSelectable_v2} from './selectable'
+import type {ThemeColorShadow} from './shadow'
+import type {ThemeColorState_v2} from './state'
+import type {ThemeColorSyntax} from './syntax'
 
 /** @public */
 export interface ThemeColorCard_v2 extends ThemeColorState_v2 {

package/src/theme/v2/color/input.ts

@@ -1,4 +1,8 @@
-import {ThemeColorBlendModeKey, ThemeColorInputModeKey, ThemeColorInputStateKey} from './_system'
+import type {
+  ThemeColorBlendModeKey,
+  ThemeColorInputModeKey,
+  ThemeColorInputStateKey,
+} from './_system'
 
 /** @public */
 export interface ThemeColorInputState_v2 {

package/src/theme/v2/color/selectable.ts

@@ -1,5 +1,5 @@
-import {ThemeColorStateKey, ThemeColorStateToneKey} from './_system'
-import {ThemeColorState_v2} from './state'
+import type {ThemeColorStateKey, ThemeColorStateToneKey} from './_system'
+import type {ThemeColorState_v2} from './state'
 
 /** @public */
 export type ThemeColorSelectableTone_v2 = Record<ThemeColorStateKey, ThemeColorState_v2>

package/src/theme/v2/color/state.ts

@@ -1,7 +1,7 @@
-import {ThemeColorBlendModeKey} from './_system'
-import {ThemeColorAvatar_v2} from './avatar'
-import {ThemeColorBadge_v2} from './badge'
-import {ThemeColorKBD} from './kbd'
+import type {ThemeColorBlendModeKey} from './_system'
+import type {ThemeColorAvatar_v2} from './avatar'
+import type {ThemeColorBadge_v2} from './badge'
+import type {ThemeColorKBD} from './kbd'
 
 /** @public */
 export interface ThemeColorState_v2 {

package/src/theme/{config → v2/config}/helpers.ts

@@ -4,15 +4,13 @@ import {
   COLOR_CONFIG_CARD_TONES,
   COLOR_CONFIG_STATE_KEYS,
   COLOR_CONFIG_STATE_TONES,
-  ColorConfigBlendKey,
-  ColorConfigCardKey,
-  ColorConfigCardTone,
-  ColorConfigOpacityValue,
-  ColorConfigStateKey,
-  ColorConfigStateTone,
-  ColorConfigValue,
+  type ColorConfigBlendKey,
+  type ColorConfigCardKey,
+  type ColorConfigCardTone,
+  type ColorConfigOpacityValue,
+  type ColorConfigStateKey,
+  type ColorConfigStateTone,
 } from './system'
-import {parseTokenValue} from './tokens'
 
 /** @internal */
 export function isColorConfigBaseTone(str: string): str is ColorConfigCardTone {
@@ -39,11 +37,6 @@ export function isColorConfigBlendKey(str: string): str is ColorConfigBlendKey {
   return COLOR_CONFIG_BLEND_KEYS.includes(str as ColorConfigBlendKey)
 }
 
-/** @internal */
-export function isColorTokenValue(str: string): str is ColorConfigValue {
-  return parseTokenValue(str)?.type === 'color' || parseTokenValue(str)?.type === 'hue'
-}
-
 /** @internal */
 export function isColorValue(str: string): str is 'black' | 'white' {
   return str === 'black' || str === 'white'

package/src/theme/{config → v2/config}/system.ts

@@ -1,5 +1,4 @@
-import {ColorHueKey, ColorTintKey} from '@sanity/color'
-
+import type {Hue, Tint} from '../../v3'
 import {
   THEME_COLOR_AVATAR_COLORS,
   THEME_COLOR_CARD_TONES,
@@ -7,8 +6,8 @@ import {
   THEME_COLOR_INPUT_STATES,
   THEME_COLOR_STATE_TONES,
   THEME_COLOR_STATES,
-  ThemeColorBlendModeKey,
-} from '../v2'
+  type ThemeColorBlendModeKey,
+} from '../color'
 
 /** @public */
 export const COLOR_CONFIG_STATE_KEYS = [
@@ -63,14 +62,14 @@ export type ColorConfigValue =
   | `white`
   | `black/${ColorConfigOpacityValue}`
   | `white/${ColorConfigOpacityValue}`
-  | `${ColorHueKey}`
-  | `${ColorHueKey} ${number}%`
-  | `${ColorHueKey}/${ColorTintKey}`
-  | `${ColorHueKey}/${ColorTintKey} ${number}%`
-  | `${ColorHueKey}/${ColorTintKey}/${ColorConfigOpacityValue}`
-  | `${ColorTintKey}`
-  | `${ColorTintKey} ${number}%`
-  | `${ColorTintKey}/${ColorConfigOpacityValue}`
+  | `${Hue}`
+  | `${Hue} ${number}%`
+  | `${Hue}/${Tint}`
+  | `${Hue}/${Tint} ${number}%`
+  | `${Hue}/${Tint}/${ColorConfigOpacityValue}`
+  | `${Tint}`
+  | `${Tint} ${number}%`
+  | `${Tint}/${ColorConfigOpacityValue}`
 
 /** @public */
 export type ThemeColorTokenValue = [ColorConfigValue, ColorConfigValue]

package/src/theme/{config → v2/config}/tokens/color/types.ts

@@ -1,7 +1,11 @@
-import {ColorHueKey} from '@sanity/color'
+import type {Hue} from '@sanity/ui/theme'
 
-import {ThemeColorButtonModeKey, ThemeColorStateToneKey, ThemeColorSyntax} from '../../../v2'
-import {
+import type {
+  ThemeColorButtonModeKey,
+  ThemeColorStateToneKey,
+  ThemeColorSyntax,
+} from '../../../color'
+import type {
   ColorBlendModeTokenValue,
   ColorConfigCardTone,
   ColorConfigInputMode,
@@ -14,7 +18,7 @@ import {
 /** @public */
 export interface ThemeColorAvatarHueTokens {
   _blend?: ColorBlendModeTokenValue
-  _hue?: ColorHueKey
+  _hue?: Hue
   bg?: ThemeColorTokenValue
   fg?: ThemeColorTokenValue
 }
@@ -48,7 +52,7 @@ export interface ThemeColorBaseTokens extends ThemeColorStateTokens {
 /** @public */
 export interface ThemeColorBadgeToneTokens {
   _blend?: ColorBlendModeTokenValue
-  _hue?: ColorHueKey
+  _hue?: Hue
   bg?: ThemeColorTokenValue
   dot?: ThemeColorTokenValue
   fg?: ThemeColorTokenValue
@@ -63,7 +67,7 @@ export type ThemeColorBadgeTokens = Partial<
 /** @public */
 export interface ThemeColorStateTokens {
   _blend?: ColorBlendModeTokenValue
-  _hue?: ColorHueKey
+  _hue?: Hue
   accent?: {
     fg?: ThemeColorTokenValue
   }
@@ -101,13 +105,13 @@ export type ThemeColorStatesTokens = Partial<Record<ColorConfigState, ThemeColor
 /** @public */
 export interface ThemeColorButtonTokens
   extends Partial<Record<ColorConfigStateTone, ThemeColorStatesTokens>> {
-  _hue?: ColorHueKey
+  _hue?: Hue
 }
 
 /** @public */
 export interface ThemeColorInputStateTokens {
   _blend?: ColorBlendModeTokenValue
-  _hue?: ColorHueKey
+  _hue?: Hue
   bg?: ThemeColorTokenValue
   border?: ThemeColorTokenValue
   fg?: ThemeColorTokenValue
@@ -120,7 +124,7 @@ export interface ThemeColorInputStateTokens {
 /** @public */
 export interface ThemeColorInputTokens
   extends Partial<Record<ColorConfigInputState, ThemeColorInputStateTokens>> {
-  _hue?: ColorHueKey
+  _hue?: Hue
 }
 
 /** @public */
@@ -128,6 +132,6 @@ export interface ThemeColorTokens {
   base?: Partial<Record<ColorConfigCardTone, ThemeColorBaseTokens>>
   button?: Partial<Record<ThemeColorButtonModeKey, ThemeColorButtonTokens>>
   input?: Partial<Record<ColorConfigInputMode, ThemeColorInputTokens>>
-  selectable?: Partial<Record<ColorConfigStateTone, {_hue?: ColorHueKey} & ThemeColorStatesTokens>>
+  selectable?: Partial<Record<ColorConfigStateTone, {_hue?: Hue} & ThemeColorStatesTokens>>
   syntax?: Partial<Record<keyof ThemeColorSyntax, ThemeColorTokenValue>>
 }

package/src/theme/{config → v2/config}/tokens/index.ts

@@ -1,4 +1,3 @@
 export * from './color'
-export * from './parseTokenKey'
 export * from './parseTokenValue'
 export * from './types'

package/src/theme/{config → v2/config}/tokens/parseTokenValue.test.ts

@@ -1,3 +1,5 @@
+import {expect, test} from 'vitest'
+
 import {parseTokenValue} from './parseTokenValue'
 
 test('parse color value', () => {

package/src/theme/{config → v2/config}/tokens/parseTokenValue.ts

@@ -1,6 +1,6 @@
-import {isColorBlendModeValue, isColorHueKey, isColorTintKey} from '../../v2'
+import {isColorBlendModeValue, isColorHueKey, isColorTintKey} from '../../color'
 import {isColorOpacityValue, isColorValue} from '../helpers'
-import {TokenValueNode} from './types'
+import type {TokenValueNode} from './types'
 
 function isColorMixPercentValue(str: string): str is `${number}%` {
   return /^\d+%$/.test(str)

package/src/theme/{config → v2/config}/tokens/types.ts

@@ -1,7 +1,7 @@
-import {ColorHueKey, ColorTintKey} from '@sanity/color'
+import type {ColorHueKey, ColorTintKey} from '@sanity/color'
 
-import {ThemeColorBlendModeKey, ThemeColorButtonModeKey} from '../../v2'
-import {
+import type {ThemeColorBlendModeKey, ThemeColorButtonModeKey} from '../../color'
+import type {
   ColorConfigBlendKey,
   ColorConfigCardKey,
   ColorConfigCardTone,

package/src/theme/{config → v2/config}/types.ts

@@ -1,21 +1,23 @@
-import {ColorHueKey, ColorTint as ColorPaletteValue, ColorTintKey} from '@sanity/color'
+import type {ColorTint as ColorPaletteValue} from '@sanity/color'
 
-import {
+import type {
   ThemeFocusRing,
   ThemeFonts,
   ThemeFontWeightKey,
   ThemeLayer,
   ThemeShadow,
   ThemeStyles,
-} from '../v0'
-import {ThemeAvatar_v2, ThemeInput_v2} from '../v2'
-import {ThemeColorTokens} from './tokens'
+} from '../../v0'
+import type {Hue, Tint} from '../../v3'
+import type {ThemeAvatar_v2} from '../avatar'
+import type {ThemeInput_v2} from '../input'
+import type {ThemeColorTokens} from './tokens'
 
 /** @public */
 export type ThemeColorPalette = {
   black: string | ColorPaletteValue
   white: string | ColorPaletteValue
-} & Record<ColorHueKey, Record<ColorTintKey, string | ColorPaletteValue>>
+} & Record<Hue, Record<Tint, string | ColorPaletteValue>>
 
 /** @public */
 export interface ThemeConfig {

package/src/theme/{defaults → v2/defaults}/colorPalette.ts

@@ -1,5 +1,5 @@
 import {color} from '@sanity/color'
 
-import {ThemeColorPalette} from '../config'
+import type {ThemeColorPalette} from '../config'
 
 export const defaultColorPalette: ThemeColorPalette = color

package/src/theme/{defaults → v2/defaults}/colorTokens.ts

@@ -1,4 +1,4 @@
-import {ThemeColorTokens} from '../config'
+import type {ThemeColorTokens} from '../config'
 
 export const defaultColorTokens: ThemeColorTokens = {
   base: {

package/src/theme/{defaults → v2/defaults}/config.ts

@@ -1,4 +1,4 @@
-import {RootTheme_v2} from '../v2'
+import type {RootTheme_v2} from '../theme'
 
 const BORDER_WIDTH = 1
 const OUTLINE_WIDTH = 0.5

package/src/theme/{defaults → v2/defaults}/fonts.ts

@@ -1,4 +1,4 @@
-import {ThemeFonts} from '../v0'
+import type {ThemeFonts} from '../../v0'
 
 export const defaultThemeFonts: ThemeFonts = {
   code: {

package/src/theme/v2/index.ts

@@ -1,4 +1,6 @@
 export * from './avatar'
+export * from './build'
 export * from './color'
+export * from './config'
 export * from './input'
 export * from './theme'

package/src/theme/v2/input.ts

@@ -1,4 +1,4 @@
-import {ThemeFocusRing} from '../v0/focusRing'
+import type {ThemeFocusRing} from '../v0/focusRing'
 
 /** @public */
 export interface ThemeInput_v2 {

package/src/theme/v2/theme.ts

@@ -1,11 +1,11 @@
-import {ThemeFocusRing} from '../v0/focusRing'
-import {ThemeFonts, ThemeFontWeightKey} from '../v0/font'
-import {ThemeLayer} from '../v0/layer'
-import {ThemeShadow} from '../v0/shadow'
-import {ThemeStyles} from '../v0/styles'
-import {ThemeAvatar_v2} from './avatar'
-import {ThemeColorCard_v2, ThemeColorSchemes_v2} from './color'
-import {ThemeInput_v2} from './input'
+import type {ThemeFocusRing} from '../v0/focusRing'
+import type {ThemeFonts, ThemeFontWeightKey} from '../v0/font'
+import type {ThemeLayer} from '../v0/layer'
+import type {ThemeShadow} from '../v0/shadow'
+import type {ThemeStyles} from '../v0/styles'
+import type {ThemeAvatar_v2} from './avatar'
+import type {ThemeColorCard_v2, ThemeColorSchemes_v2} from './color'
+import type {ThemeInput_v2} from './input'
 
 /** @public */
 export interface RootTheme_v2 {

package/src/theme/{_constants.ts → v3/_constants.ts}

@@ -2,13 +2,16 @@
 export const AVATAR_SIZE = [0, 1, 2, 3] as const
 
 /** @public */
-export const CONTAINER = [0, 1, 2, 3, 4, 5, 'auto'] as const
+export const CONTAINER_SCALE = [0, 1, 2, 3, 4, 5] as const
 
 /** @public */
-export const RADIUS = [0, 1, 2, 3, 4, 5, 6, 'full'] as const
+export const CONTAINER = [...CONTAINER_SCALE, 'auto'] as const
 
 /** @public */
-export const SPACE = [0, 0.5, 1, 2, 3, 4, 5, 6, 7, 8, 9] as const
+export const RADIUS = [0, 1, 2, 3, 4, 5, 6] as const
+
+/** @public */
+export const SPACE = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] as const
 
 /** @public */
 export const FONT_CODE_SIZE = [0, 1, 2, 3, 4] as const

package/src/theme/v3/_parseColorToken.ts

@@ -0,0 +1,185 @@
+import type {ColorToken} from './color'
+import {type Hue, HUES, type Tint, TINTS} from './palette'
+
+const RE_PERCENTAGE = /^([0-9]+)%/
+const RE_OPACITY = /^(1|0\.[0-9]+)?/
+
+/** @internal */
+export interface ColorNode {
+  type: 'color'
+  name: 'black' | 'white'
+  /** Between 0 and 1 */
+  opacity: number
+  /** Between 0 and 1 */
+  mix: number
+}
+
+/** @internal */
+export interface ColorTintNode {
+  type: 'tint'
+  hue: Hue
+  tint: Tint
+  /** Between 0 and 1 */
+  opacity: number
+  /** Between 0 and 1 */
+  mix: number
+}
+
+/** @internal */
+export interface ColorInheritNode {
+  type: 'inherit'
+}
+
+/** @internal */
+export type TokenizeColorResult = ColorNode | ColorTintNode | ColorInheritNode
+
+/** @internal */
+export function _parseColorToken(str: ColorToken, options: {defaultHue: Hue}): TokenizeColorResult {
+  const {defaultHue} = options
+
+  let cursor = 0
+
+  return parseColorNode()
+
+  function _consume(s: string) {
+    if (str.startsWith(s, cursor)) {
+      cursor += s.length
+
+      return s
+    }
+
+    return undefined
+  }
+
+  function _peek() {
+    return str[cursor]
+  }
+
+  function parseColorNode(): ColorNode | ColorTintNode | ColorInheritNode {
+    ignoreWhitespace()
+
+    let v = _consume('black') || _consume('white')
+
+    if (v) {
+      return {
+        type: 'color',
+        name: v as 'black' | 'white',
+        opacity: parseOpacity() ?? 1,
+        mix: parseMix() ?? 1,
+      }
+    }
+
+    for (const hue of HUES) {
+      v = _consume(String(hue))
+
+      if (v) {
+        if (_peek() !== '-') {
+          throw new Error(`Expected "-" after hue key`)
+        }
+
+        cursor += 1
+
+        const tint = parseTint()
+
+        if (!tint) {
+          throw new Error(`Expected tint after hue`)
+        }
+
+        return {
+          type: 'tint',
+          hue,
+          tint,
+          opacity: parseOpacity() ?? 1,
+          mix: parseMix() ?? 1,
+        }
+      }
+    }
+
+    const tint = parseTint()
+
+    if (tint) {
+      return {
+        type: 'tint',
+        hue: defaultHue,
+        tint,
+        opacity: parseOpacity() ?? 1,
+        mix: parseMix() ?? 1,
+      }
+    }
+
+    if (str === 'inherit') {
+      return {
+        type: 'inherit',
+      }
+    }
+
+    throw new Error(`Invalid color: ${str}`)
+  }
+
+  function parseTint() {
+    ignoreWhitespace()
+
+    let v = Number(str.slice(cursor, cursor + 3)) as Tint
+
+    if (TINTS.includes(v)) {
+      cursor += 3
+
+      return v
+    }
+
+    v = Number(str.slice(cursor, cursor + 2)) as Tint
+
+    if (TINTS.includes(v)) {
+      cursor += 2
+
+      return v
+    }
+
+    return undefined
+  }
+
+  function parseMix() {
+    // expect at least 1 white space
+    if (_peek() !== ' ') {
+      return undefined
+    }
+
+    ignoreWhitespace()
+
+    const match = RE_PERCENTAGE.exec(str.slice(cursor))
+
+    if (match) {
+      cursor += match[0].length
+
+      return parseFloat(match[1]) / 100
+    }
+
+    return undefined
+  }
+
+  function parseOpacity() {
+    ignoreWhitespace()
+
+    if (_peek() === '/') {
+      cursor += 1
+
+      const match = RE_OPACITY.exec(str.slice(cursor))
+
+      if (match) {
+        cursor += match[0].length
+
+        return parseFloat(match[1])
+      }
+
+      cursor -= 1
+    }
+
+    return undefined
+  }
+
+  function ignoreWhitespace() {
+    while (_peek() === ' ') {
+      cursor++
+    }
+  }
+}

package/src/theme/v3/buildTheme_v3.ts

@@ -1,9 +1,10 @@
-import {defaultThemeConfig} from '../defaults/config'
-import {defaultThemeFonts} from '../defaults/fonts'
-import {buildColor_v3} from './color/buildColor_v3'
+import {black, hues, white} from '@sanity/color'
+
+import {defaultThemeConfig} from '../v2/defaults/config'
+import {defaultThemeFonts} from '../v2/defaults/fonts'
 import {defaultTokens} from './defaultTokens'
 import {resolveTokens} from './resolveTokens'
-import {Theme_v3, ThemeOptions} from './types'
+import type {Radius, Space, Theme_v3, ThemeOptions} from './types'
 
 /** @public */
 export function buildTheme_v3(options?: ThemeOptions): Theme_v3 {
@@ -17,14 +18,17 @@ export function buildTheme_v3(options?: ThemeOptions): Theme_v3 {
     avatar: v2?.avatar ?? defaultThemeConfig.avatar,
     button: v2?.button ?? defaultThemeConfig.button,
     card: v2?.card ?? defaultThemeConfig.card,
-    color: buildColor_v3(tokens.color),
+    color: tokens.color,
     container: v2?.container ?? defaultThemeConfig.container,
     font: v2?.font ?? defaultThemeFonts,
     input: v2?.input ?? defaultThemeConfig.input,
     layer: v2?.layer ?? defaultThemeConfig.layer,
     media: v2?.media ?? defaultThemeConfig.media,
-    radius: v2?.radius ?? defaultThemeConfig.radius,
+    palette: {black, white, hues},
+    // TODO
+    radius: (v2?.radius ?? defaultThemeConfig.radius) as unknown as Record<Radius, number>,
     shadow: v2?.shadow ?? defaultThemeConfig.shadow,
-    space: v2?.space ?? defaultThemeConfig.space,
+    // TODO
+    space: (v2?.space ?? defaultThemeConfig.space) as unknown as Record<Space, number>,
   }
 }