@sanity/ui 3.0.0-static.2 → 3.0.0-static.21

package/src/theme/v3/{color/parseColor.ts → _parseColorToken.ts}

@@ -1,31 +1,45 @@
-import {Hue, HUES, Tint, TINTS} from '../../palette'
+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]+)?/
 
-export interface TokenizeColorResult {
-  color: {type: 'black' | 'white'} | {type: 'hue'; hue: Hue | undefined; tint: Tint | undefined}
-  opacity: number | undefined
-  mix: number | undefined
+/** @internal */
+export interface ColorNode {
+  type: 'color'
+  name: 'black' | 'white'
+  /** Between 0 and 1 */
+  opacity: number
+  /** Between 0 and 1 */
+  mix: number
 }
 
-export function parseColor(str: string): TokenizeColorResult {
-  let cursor = 0
+/** @internal */
+export interface ColorTintNode {
+  type: 'tint'
+  hue: Hue
+  tint: Tint
+  /** Between 0 and 1 */
+  opacity: number
+  /** Between 0 and 1 */
+  mix: number
+}
 
-  const color = getColor()
+/** @internal */
+export interface ColorInheritNode {
+  type: 'inherit'
+}
 
-  if (!color) {
-    throw new Error(`Invalid color: ${str}`)
-  }
+/** @internal */
+export type TokenizeColorResult = ColorNode | ColorTintNode | ColorInheritNode
 
-  const opacity = getOpacity()
-  const mix = getMixPercentage()
+/** @internal */
+export function _parseColorToken(str: ColorToken, options: {defaultHue: Hue}): TokenizeColorResult {
+  const {defaultHue} = options
 
-  return {
-    color,
-    mix,
-    opacity,
-  }
+  let cursor = 0
+
+  return parseColorNode()
 
   function _consume(s: string) {
     if (str.startsWith(s, cursor)) {
@@ -41,14 +55,17 @@ export function parseColor(str: string): TokenizeColorResult {
     return str[cursor]
   }
 
-  function getColor(): TokenizeColorResult['color'] | undefined {
+  function parseColorNode(): ColorNode | ColorTintNode | ColorInheritNode {
     ignoreWhitespace()
 
     let v = _consume('black') || _consume('white')
 
     if (v) {
       return {
-        type: v as 'black' | 'white',
+        type: 'color',
+        name: v as 'black' | 'white',
+        opacity: parseOpacity() ?? 1,
+        mix: parseMix() ?? 1,
       }
     }
 
@@ -56,45 +73,52 @@ export function parseColor(str: string): TokenizeColorResult {
       v = _consume(String(hue))
 
       if (v) {
-        if (_peek() !== '/') {
-          throw new Error(`Expected slash after hue`)
+        if (_peek() !== '-') {
+          throw new Error(`Expected "-" after hue key`)
         }
 
         cursor += 1
 
-        const tint = getTint()
+        const tint = parseTint()
 
         if (!tint) {
           throw new Error(`Expected tint after hue`)
         }
 
         return {
-          type: 'hue',
+          type: 'tint',
           hue,
           tint,
+          opacity: parseOpacity() ?? 1,
+          mix: parseMix() ?? 1,
         }
       }
     }
 
-    const tint = getTint()
+    const tint = parseTint()
 
     if (tint) {
       return {
-        type: 'hue',
-        hue: undefined,
+        type: 'tint',
+        hue: defaultHue,
         tint,
+        opacity: parseOpacity() ?? 1,
+        mix: parseMix() ?? 1,
       }
     }
 
-    return undefined
+    if (str === 'inherit') {
+      return {
+        type: 'inherit',
+      }
+    }
+
+    throw new Error(`Invalid color: ${str}`)
   }
 
-  function getTint() {
+  function parseTint() {
     ignoreWhitespace()
 
-    // if (_peek() === '/') {
-    //   cursor += 1
-
     let v = Number(str.slice(cursor, cursor + 3)) as Tint
 
     if (TINTS.includes(v)) {
@@ -111,21 +135,10 @@ export function parseColor(str: string): TokenizeColorResult {
       return v
     }
 
-    // for (const tint of COLOR_TINTS) {
-    //   const v = _consume(String(tint))
-
-    //   if (v) {
-    //     return tint
-    //   }
-    // }
-
-    //   cursor -= 1
-    // }
-
     return undefined
   }
 
-  function getMixPercentage() {
+  function parseMix() {
     ignoreWhitespace()
 
     const match = RE_PERCENTAGE.exec(str.slice(cursor))
@@ -133,13 +146,13 @@ export function parseColor(str: string): TokenizeColorResult {
     if (match) {
       cursor += match[0].length
 
-      return parseFloat(match[1])
+      return parseFloat(match[1]) / 100
     }
 
     return undefined
   }
 
-  function getOpacity() {
+  function parseOpacity() {
     ignoreWhitespace()
 
     if (_peek() === '/') {

package/src/theme/v3/buildTheme_v3.ts

@@ -1,10 +1,13 @@
-import {defaultThemeConfig} from '../defaults/config'
-import {defaultThemeFonts} from '../defaults/fonts'
-import {buildColor_v3} from './color/buildColor_v3'
-import {defaultPalette, defaultTokens} from './defaults'
+import {black, hues, white} from '@sanity/color'
+
+import type {ThemeShadow} from '../v0'
+import {defaultThemeConfig} from '../v2/defaults/config'
+import {defaultThemeFonts} from './defaultFonts'
+import {defaultTokens} from './defaultTokens'
 import {resolveTokens} from './resolveTokens'
-import {Theme_v3, ThemeOptions} from './types'
+import type {Radius, Shadow, Space, Theme_v3, ThemeOptions} from './types'
 
+/** @public */
 export function buildTheme_v3(options?: ThemeOptions): Theme_v3 {
   const {v2} = options ?? {}
 
@@ -12,19 +15,25 @@ export function buildTheme_v3(options?: ThemeOptions): Theme_v3 {
 
   return {
     _version: 3,
-    _palette: options?.palette ?? defaultPalette,
     _tokens: tokens,
     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,
+    font: defaultThemeFonts,
     input: v2?.input ?? defaultThemeConfig.input,
     layer: v2?.layer ?? defaultThemeConfig.layer,
     media: v2?.media ?? defaultThemeConfig.media,
-    radius: v2?.radius ?? defaultThemeConfig.radius,
-    shadow: v2?.shadow ?? defaultThemeConfig.shadow,
-    space: v2?.space ?? defaultThemeConfig.space,
+    palette: {black, white, hues},
+    // TODO
+    radius: (v2?.radius ?? defaultThemeConfig.radius) as unknown as Record<Radius, number>,
+    // TODO
+    shadow: (v2?.shadow ?? defaultThemeConfig.shadow) as unknown as Record<
+      Shadow,
+      ThemeShadow | undefined
+    >,
+    // TODO
+    space: (v2?.space ?? defaultThemeConfig.space) as unknown as Record<Space, number>,
   }
 }

package/src/theme/v3/color/_constants.ts

@@ -0,0 +1,15 @@
+/** @public */
+export const COLOR_VARIANTS = ['tinted', 'solid'] as const
+
+/** @public */
+export const AVATAR_COLORS = [
+  'gray',
+  'blue',
+  'purple',
+  'magenta',
+  'red',
+  'orange',
+  'yellow',
+  'green',
+  'cyan',
+] as const

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

@@ -0,0 +1,14 @@
+import type {AVATAR_COLORS} from './_constants'
+import type {ColorValue} from './token'
+
+/** @public */
+export type AvatarColor = (typeof AVATAR_COLORS)[number]
+
+/** @public */
+export interface ThemeColorAvatarHue_v3 {
+  bg: ColorValue
+  fg: ColorValue
+}
+
+/** @public */
+export type ThemeColorAvatar_v3 = Record<AvatarColor, ThemeColorAvatarHue_v3>

package/src/theme/v3/color/card.ts

@@ -1,7 +1,7 @@
-import {Hue} from '../../palette'
-import {ThemeColorStateToneKey} from '../../v2'
-import {ElementColorTokens} from './element'
-import {ColorToken} from './token'
+import type {ThemeColorStateToneKey} from '../../v2'
+import type {Hue} from '../palette'
+import type {ElementColorTokens} from './element'
+import type {ColorValue} from './token'
 
 /** @public */
 export interface CardColorTokens {
@@ -10,107 +10,70 @@ export interface CardColorTokens {
     Hue,
     {
       _hue: Hue
-      bg: [ColorToken, ColorToken]
-      fg: [ColorToken, ColorToken]
+      bg: ColorValue
+      fg: ColorValue
     }
   >
-  backdrop: [ColorToken, ColorToken]
-  focusRing: [ColorToken, ColorToken]
+  backdrop: ColorValue
+  code: {
+    bg: ColorValue
+    fg: ColorValue
+    token: {
+      atrule: ColorValue
+      attrName: ColorValue
+      attrValue: ColorValue
+      attribute: ColorValue
+      boolean: ColorValue
+      builtin: ColorValue
+      cdata: ColorValue
+      char: ColorValue
+      class: ColorValue
+      className: ColorValue
+      comment: ColorValue
+      constant: ColorValue
+      deleted: ColorValue
+      doctype: ColorValue
+      entity: ColorValue
+      function: ColorValue
+      hexcode: ColorValue
+      id: ColorValue
+      important: ColorValue
+      inserted: ColorValue
+      keyword: ColorValue
+      number: ColorValue
+      operator: ColorValue
+      prolog: ColorValue
+      property: ColorValue
+      pseudoClass: ColorValue
+      pseudoElement: ColorValue
+      punctuation: ColorValue
+      regex: ColorValue
+      selector: ColorValue
+      string: ColorValue
+      symbol: ColorValue
+      tag: ColorValue
+      unit: ColorValue
+      url: ColorValue
+      variable: ColorValue
+    }
+  }
+  focusRing: ColorValue
   link: {
-    fg: [ColorToken, ColorToken]
+    fg: ColorValue
   }
   shadow: {
-    outline: [ColorToken, ColorToken]
-    umbra: [ColorToken, ColorToken]
-    penumbra: [ColorToken, ColorToken]
-    ambient: [ColorToken, ColorToken]
+    outline: ColorValue
+    umbra: ColorValue
+    penumbra: ColorValue
+    ambient: ColorValue
   }
   skeleton: {
-    from: [ColorToken, ColorToken]
-    to: [ColorToken, ColorToken]
-  }
-  token: {
-    atrule: [ColorToken, ColorToken]
-    attrName: [ColorToken, ColorToken]
-    attrValue: [ColorToken, ColorToken]
-    attribute: [ColorToken, ColorToken]
-    boolean: [ColorToken, ColorToken]
-    builtin: [ColorToken, ColorToken]
-    cdata: [ColorToken, ColorToken]
-    char: [ColorToken, ColorToken]
-    class: [ColorToken, ColorToken]
-    className: [ColorToken, ColorToken]
-    comment: [ColorToken, ColorToken]
-    constant: [ColorToken, ColorToken]
-    deleted: [ColorToken, ColorToken]
-    doctype: [ColorToken, ColorToken]
-    entity: [ColorToken, ColorToken]
-    function: [ColorToken, ColorToken]
-    hexcode: [ColorToken, ColorToken]
-    id: [ColorToken, ColorToken]
-    important: [ColorToken, ColorToken]
-    inserted: [ColorToken, ColorToken]
-    keyword: [ColorToken, ColorToken]
-    number: [ColorToken, ColorToken]
-    operator: [ColorToken, ColorToken]
-    prolog: [ColorToken, ColorToken]
-    property: [ColorToken, ColorToken]
-    pseudoClass: [ColorToken, ColorToken]
-    pseudoElement: [ColorToken, ColorToken]
-    punctuation: [ColorToken, ColorToken]
-    regex: [ColorToken, ColorToken]
-    selector: [ColorToken, ColorToken]
-    string: [ColorToken, ColorToken]
-    symbol: [ColorToken, ColorToken]
-    tag: [ColorToken, ColorToken]
-    unit: [ColorToken, ColorToken]
-    url: [ColorToken, ColorToken]
-    variable: [ColorToken, ColorToken]
+    from: ColorValue
+    to: ColorValue
   }
+
   variant: {
     solid: Record<'*' | ThemeColorStateToneKey, ElementColorTokens>
     tinted: Record<'*' | ThemeColorStateToneKey, ElementColorTokens>
   }
 }
-
-// /**
-//  * @public
-//  */
-// export interface ThemeColorSyntax {
-//   atrule: string
-//   attrName: string
-//   attrValue: string
-//   attribute: string
-//   boolean: string
-//   builtin: string
-//   cdata: string
-//   char: string
-//   class: string
-//   className: string
-//   comment: string
-//   constant: string
-//   deleted: string
-//   doctype: string
-//   entity: string
-//   function: string
-//   hexcode: string
-//   id: string
-//   important: string
-//   inserted: string
-//   keyword: string
-//   number: string
-//   operator: string
-//   prolog: string
-//   property: string
-//   pseudoClass: string
-//   pseudoElement: string
-//   punctuation: string
-//   regex: string
-//   selector: string
-//   string: string
-//   symbol: string
-//   tag: string
-//   unit: string
-//   url: string
-//   variable: string
-// }

package/src/theme/v3/color/color.ts

@@ -1,94 +1,98 @@
-import {Hue} from '../../palette'
-import {
-  ThemeColorAvatar_v2,
-  ThemeColorCardToneKey,
-  ThemeColorSchemeKey,
-  ThemeColorStateToneKey,
+import type {
+  ThemeColorCardToneKey as CardTone,
+  ThemeColorStateToneKey as ElementTone,
 } from '../../v2'
+import type {Hue} from '../palette'
+import type {COLOR_VARIANTS} from './_constants'
+import type {ThemeColorAvatar_v3} from './avatar'
+import type {ColorValue} from './token'
 
-// export interface ThemeColorAvatarHue_v2 {}
-
+/** @public */
 export interface ThemeColorElement {
   _hue: Hue
   bg: {
-    0: string
-    4: string
+    0: ColorValue
+    4: ColorValue
   }
   border: {
-    0: string
-    4: string
+    0: ColorValue
+    4: ColorValue
   }
   fg: {
-    0: string
-    4: string
+    0: ColorValue
+    4: ColorValue
   }
 }
 
-export type ThemeColorVariant = Record<ThemeColorStateToneKey, ThemeColorElement>
-
-export type ThemeColorVariantKey = 'tinted' | 'solid'
+/** @public */
+export type ThemeColorVariant = Record<ElementTone, ThemeColorElement>
 
-// export type ThemeColorCard_v3 = Record<ThemeColorVariantKey, ThemeColorVariant>
+/** @public */
+export type ThemeColorVariantKey = (typeof COLOR_VARIANTS)[number] // 'tinted' | 'solid'
 
+/** @public */
 export interface ThemeColorCard_v3 {
   _hue: Hue
-  avatar: ThemeColorAvatar_v2
-  backdrop: string
-  focusRing: string
-  shadow: {
-    outline: string
-    umbra: string
-    penumbra: string
-    ambient: string
+  avatar: ThemeColorAvatar_v3
+  backdrop: ColorValue
+  code: {
+    bg: ColorValue
+    fg: ColorValue
+    token: {
+      atrule: ColorValue
+      attrName: ColorValue
+      attrValue: ColorValue
+      attribute: ColorValue
+      boolean: ColorValue
+      builtin: ColorValue
+      cdata: ColorValue
+      char: ColorValue
+      class: ColorValue
+      className: ColorValue
+      comment: ColorValue
+      constant: ColorValue
+      deleted: ColorValue
+      doctype: ColorValue
+      entity: ColorValue
+      function: ColorValue
+      hexcode: ColorValue
+      id: ColorValue
+      important: ColorValue
+      inserted: ColorValue
+      keyword: ColorValue
+      number: ColorValue
+      operator: ColorValue
+      prolog: ColorValue
+      property: ColorValue
+      pseudoClass: ColorValue
+      pseudoElement: ColorValue
+      punctuation: ColorValue
+      regex: ColorValue
+      selector: ColorValue
+      string: ColorValue
+      symbol: ColorValue
+      tag: ColorValue
+      unit: ColorValue
+      url: ColorValue
+      variable: ColorValue
+    }
   }
-  token: {
-    atrule: string
-    attrName: string
-    attrValue: string
-    attribute: string
-    boolean: string
-    builtin: string
-    cdata: string
-    char: string
-    class: string
-    className: string
-    comment: string
-    constant: string
-    deleted: string
-    doctype: string
-    entity: string
-    function: string
-    hexcode: string
-    id: string
-    important: string
-    inserted: string
-    keyword: string
-    number: string
-    operator: string
-    prolog: string
-    property: string
-    pseudoClass: string
-    pseudoElement: string
-    punctuation: string
-    regex: string
-    selector: string
-    string: string
-    symbol: string
-    tag: string
-    unit: string
-    url: string
-    variable: string
+  focusRing: ColorValue
+  link: {
+    fg: ColorValue
+  }
+  shadow: {
+    outline: ColorValue
+    umbra: ColorValue
+    penumbra: ColorValue
+    ambient: ColorValue
   }
   skeleton: {
-    from: string
-    to: string
+    from: ColorValue
+    to: ColorValue
   }
   variant: Record<ThemeColorVariantKey, ThemeColorVariant>
 }
 
-export interface ThemeColorScheme_v3 {
-  card: Record<ThemeColorCardToneKey, ThemeColorCard_v3>
-}
-
-// color[scheme].card[cardTone][colorVariant][elementTone][property][level]
-export type ThemeColor_v3 = Record<ThemeColorSchemeKey, ThemeColorScheme_v3>
+/** @public */
+export type ThemeColor_v3 = Record<CardTone, ThemeColorCard_v3>

package/src/theme/v3/color/element.ts

@@ -1,19 +1,19 @@
-import {Hue} from '../../palette'
-import {ColorToken} from './token'
+import type {Hue} from '../palette'
+import type {ColorValue} from './token'
 
 /** @public */
 export interface ElementColorTokens {
   _hue: Hue
   bg: {
-    0: [ColorToken, ColorToken]
-    4: [ColorToken, ColorToken]
+    0: ColorValue
+    4: ColorValue
   }
   border: {
-    0: [ColorToken, ColorToken]
-    4: [ColorToken, ColorToken]
+    0: ColorValue
+    4: ColorValue
   }
   fg: {
-    0: [ColorToken, ColorToken]
-    4: [ColorToken, ColorToken]
+    0: ColorValue
+    4: ColorValue
   }
 }

package/src/theme/v3/color/index.ts

@@ -1,7 +1,7 @@
-export * from './buildColor_v3'
+export * from './_constants'
+export * from './avatar'
 export * from './card'
 export * from './color'
 export * from './element'
-export * from './renderColor'
 export * from './token'
 export * from './tokens'

package/src/theme/v3/color/token.ts

@@ -1,17 +1,32 @@
-import {Hue, Tint} from '../../palette'
+import type {Hue, Tint} from '../palette'
 
 /** @public */
 export type ColorTokenOpacityValue = `0` | `0.${number}` | `1`
 
 /** @public */
 export type ColorToken =
+  | `inherit`
   | `black`
   | `black/${ColorTokenOpacityValue}`
   | `white`
   | `white/${ColorTokenOpacityValue}`
-  | `${Hue}/${Tint}`
-  | `${Hue}/${Tint}/${ColorTokenOpacityValue}`
-  | `${Hue}/${Tint} ${number}%`
+  | `${Hue}-${Tint}`
+  | `${Hue}-${Tint}/${ColorTokenOpacityValue}`
+  | `${Hue}-${Tint} ${number}%`
   | `${Tint}`
   | `${Tint}/${ColorTokenOpacityValue}`
   | `${Tint} ${number}%`
+
+/**
+ * Theme color values are tuples of [light, dark] color tokens.
+ *
+ * @public
+ */
+export type ColorValue = [ColorToken, ColorToken]
+
+/** @public */
+export interface ResolvedColorToken {
+  color: {type: 'inherit'} | {type: 'black' | 'white'} | {type: 'hue'; hue: Hue; tint: Tint}
+  opacity: number
+  mix: number
+}