@sanity/ui 2.0.0-alpha.10 → 2.0.0-alpha.12

package/src/primitives/button/styles.ts

@@ -1,9 +1,7 @@
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
+import {_colorVarsStyle} from '../../styles/colorVars'
 import {focusRingBorderStyle, focusRingStyle} from '../../styles/internal'
-import {mutableCardVariables} from '../../theme/lib/theme/color/cssVariables/cardVariables'
-import {cssVars} from '../../theme/lib/theme/color/cssVariables/createCssVars'
-import {getToneCssVar} from '../../theme/lib/theme/color/cssVariables/tones'
 import {ButtonMode, ButtonTone} from '../../types'
 import {CSSObject} from '../../types/styled'
 
@@ -56,65 +54,21 @@ function combineBoxShadow(...boxShadows: (string | undefined)[]): string {
 export function buttonColorStyles(
   props: {$mode: ButtonMode; $tone: ButtonTone} & ThemeProps,
 ): CSSObject[] {
-  const {$mode, theme, $tone} = props
+  const {$mode, theme} = props
   const {focusRing} = theme.sanity.button
   const shadow = props.$mode !== 'bleed'
-  const border = {
-    width: buttonTheme.border.width,
-    color:
-      $mode === 'default'
-        ? cssVars[$tone]['bg-accent']
-        : $mode === 'ghost'
-        ? cssVars[$tone]['border-base']
-        : cssVars[$tone]['bg-base'],
-  }
+  const base = theme.sanity.color.base
+  const mode = theme.sanity.color.button[$mode] || theme.sanity.color.button.default
+  const color = mode[props.$tone] || mode.default
+  const border = {width: buttonTheme.border.width, color: 'var(--card-border-color)'}
 
   return [
+    _colorVarsStyle(base, color.enabled),
     {
-      // This is going to be used by the text elements inside the button
-      [mutableCardVariables['fg-color']]:
-        $mode === 'default' ? cssVars[$tone]['base-text-color'] : cssVars[$tone]['text-primary'],
-      [mutableCardVariables['muted-fg-color']]:
-        $mode === 'default' ? cssVars[$tone]['base-text-color'] : cssVars[$tone]['text-secondary'],
-      [mutableCardVariables['icon-color']]:
-        $mode === 'default' ? cssVars[$tone]['icon-inverted'] : cssVars[$tone]['icon-default'],
-      [mutableCardVariables['bg-color']]:
-        $mode === 'default' ? cssVars[$tone]['bg-accent'] : cssVars[$tone]['bg-base'],
-
-      // Override the default variables for elements used inside buttons
-      [getToneCssVar('default', 'bg-tint-code')]:
-        $mode === 'default' ? cssVars[$tone]['bg-accent'] : cssVars[$tone]['bg-tint-code'],
-      ...($mode === 'default' && {
-        [getToneCssVar('default', 'text-code')]: cssVars[$tone]['base-text-color'],
-        [getToneCssVar('default', 'text-code')]: cssVars[$tone]['base-text-color'],
-        [getToneCssVar('default', 'text-link')]: cssVars[$tone]['base-text-color'],
-        [getToneCssVar('default', 'text-accent')]: cssVars[$tone]['base-text-color'],
-      }),
-
-      '&:disabled, &[data-disabled="true"]': {
-        /* Updates the variables for the */
-        [mutableCardVariables['fg-color']]: cssVars.primary['text-inactive'],
-        [mutableCardVariables['muted-fg-color']]: cssVars.primary['text-inactive'],
-        [mutableCardVariables['icon-color']]: cssVars.primary['border-base'],
-        [mutableCardVariables['bg-color']]:
-          $mode === 'default' ? cssVars.primary['bg-tint'] : cssVars.default['bg-base'],
-      },
-    },
-    {
-      backgroundColor:
-        $mode === 'default' ? cssVars[$tone]['bg-accent'] : cssVars[$tone]['bg-base'],
-      color:
-        $mode === 'default' ? cssVars[$tone]['base-text-color'] : cssVars[$tone]['text-primary'],
+      backgroundColor: 'var(--card-bg-color)',
+      color: 'var(--card-fg-color)',
       boxShadow: focusRingBorderStyle(border),
-      '&:disabled, &[data-disabled="true"]': {
-        backgroundColor:
-          $mode === 'default' ? cssVars.primary['bg-tint'] : cssVars.default['bg-base'],
-        color: cssVars.primary['text-inactive'],
-        boxShadow: focusRingBorderStyle({
-          ...border,
-          color: $mode === 'default' ? cssVars.primary['bg-tint'] : cssVars.primary['border-base'],
-        }),
-      },
+      '&:disabled, &[data-disabled="true"]': _colorVarsStyle(base, color.disabled),
       "&:not([data-disabled='true'])": {
         boxShadow: combineBoxShadow(
           focusRingBorderStyle(border),
@@ -122,8 +76,8 @@ export function buttonColorStyles(
         ),
         '&:focus': {
           boxShadow: focusRingStyle({
-            base: {bg: cssVars.positive['border-accent']},
-            border: {width: 2, color: cssVars.default['bg-base']},
+            base,
+            border: {width: 2, color: base.bg},
             focusRing,
           }),
         },
@@ -134,31 +88,11 @@ export function buttonColorStyles(
           ),
         },
         '@media (hover: hover)': {
-          '&:hover': {
-            backgroundColor:
-              $mode === 'default'
-                ? cssVars[$tone]['bg-accent-hover']
-                : cssVars[$tone]['bg-base-hover'],
-          },
-          '&:active': {
-            backgroundColor:
-              $mode === 'default'
-                ? cssVars[$tone]['bg-accent-active']
-                : cssVars[$tone]['bg-base-active'],
-          },
-          '&[data-hovered]': {
-            backgroundColor:
-              $mode === 'default'
-                ? cssVars[$tone]['bg-accent-hover']
-                : cssVars[$tone]['bg-base-hover'],
-          },
-        },
-        '&[data-selected]': {
-          backgroundColor:
-            $mode === 'default'
-              ? cssVars[$tone]['bg-accent-active']
-              : cssVars[$tone]['bg-base-active'],
+          '&:hover': _colorVarsStyle(base, color.hovered),
+          '&:active': _colorVarsStyle(base, color.pressed),
+          '&[data-hovered]': _colorVarsStyle(base, color.hovered),
         },
+        '&[data-selected]': _colorVarsStyle(base, color.pressed),
       },
     },
     theme.sanity.styles?.button?.root,

package/src/primitives/card/__workshop__/selected.tsx

@@ -7,30 +7,31 @@ import {
   Inline,
   Stack,
   Text,
+  Theme,
   ThemeColorToneKey,
   useRootTheme,
 } from '@sanity/ui'
 import {useBoolean} from '@sanity/ui-workshop'
 import styled, {css} from 'styled-components'
-import {mutableCardVariables} from '../../../theme/lib/theme/color/cssVariables/cardVariables'
-import {cssVars} from '../../../theme/lib/theme/color/cssVariables/createCssVars'
 
 const TextWithTone = styled(Text)<{$tone: ThemeColorToneKey}>(({
   $tone,
+  theme,
 }: {
   $tone: ThemeColorToneKey
+  theme: Theme
 }) => {
+  const tone = theme.sanity.color.solid[$tone]
+
   return css`
     &:not([data-selected]) {
-      ${mutableCardVariables['fg-color']}: ${$tone ? cssVars[$tone]['text-secondary'] : undefined};
-      ${mutableCardVariables['muted-fg-color']} ${$tone
-        ? cssVars[$tone]['text-secondary']
-        : undefined};
+      --card-fg-color: ${tone ? tone.enabled.bg : undefined};
+      --card-muted-fg-color: ${tone ? tone.enabled.bg : undefined};
     }
 
     [data-ui='Card']:disabled & {
-      ${mutableCardVariables['fg-color']}: inherit;
-      ${mutableCardVariables['muted-fg-color']} inherit;
+      --card-fg-color: inherit;
+      --card-muted-fg-color: inherit;
     }
   `
 })

package/src/primitives/card/card.tsx

@@ -10,9 +10,7 @@ import {
   responsiveShadowStyle,
   ResponsiveShadowStyleProps,
 } from '../../styles/internal'
-import {ThemeColorName, ThemeColorSchemeKey} from '../../theme'
-import {ToneProvider} from '../../theme/toneContext/toneProvider'
-import {useToneContext} from '../../theme/toneContext/useToneContext'
+import {ThemeColorProvider, ThemeColorSchemeKey, useRootTheme} from '../../theme'
 import {CardTone} from '../../types'
 import {Box, BoxProps} from '../box'
 import {ResponsiveBorderProps, ResponsiveRadiusProps, ResponsiveShadowProps} from '../types'
@@ -40,12 +38,6 @@ export interface CardProps
   pressed?: boolean
   scheme?: ThemeColorSchemeKey
   tone?: CardTone
-  /**
-   * @internal
-   * Used by the popover, as it creates a new html element that it's ouside of the previous scope of the card.
-   * So if it's inheriting styles from the parent, it needs to create a new cars context
-   */
-  updateCssVars?: boolean
 }
 
 const Root = styled(Box)<
@@ -55,29 +47,6 @@ const Root = styled(Box)<
     ResponsiveShadowStyleProps
 >(responsiveBorderStyle, responsiveRadiusStyle, responsiveShadowStyle, cardStyle)
 
-const Wrapper = ({
-  shouldAddContext,
-  scheme,
-  tone,
-  children,
-}: {
-  shouldAddContext: boolean
-  scheme: ThemeColorSchemeKey
-  tone: ThemeColorName
-  children: React.ReactElement
-}): React.ReactElement => {
-  // Avoid creating a new react context if the card is just inheriting styles from the parent.
-  if (shouldAddContext) {
-    return (
-      <ToneProvider scheme={scheme} tone={tone}>
-        {children}
-      </ToneProvider>
-    )
-  }
-
-  return children
-}
-
 /**
  * @public
  */
@@ -96,28 +65,25 @@ export const Card = forwardRef(function Card(
     borderLeft,
     pressed,
     radius = 0,
-    scheme: schemeProp,
+    scheme,
     selected,
     shadow,
     tone: toneProp = 'default',
-    updateCssVars = false,
     ...restProps
   } = props
 
   const as = isValidElementType(asProp) ? asProp : 'div'
-  const toneContext = useToneContext()
-  const tone = toneProp === 'inherit' ? toneContext.tone : toneProp
-  const scheme = schemeProp ?? toneContext.scheme
-  const shouldAddContext = scheme !== toneContext.scheme || tone !== toneContext.tone
+  const rootTheme = useRootTheme()
+  const tone = toneProp === 'inherit' ? rootTheme.tone : toneProp
 
+  // TODO: Consider adding the wrapper approach for nested cards in which the tones are not changing, avoid unnecessary ThemeColorProvider
   return (
-    <Wrapper shouldAddContext={shouldAddContext} scheme={scheme} tone={tone}>
+    <ThemeColorProvider scheme={scheme} tone={tone}>
       <Root
         data-as={typeof as === 'string' ? as : undefined}
-        data-scheme={scheme}
+        data-scheme={rootTheme.scheme}
         data-ui="Card"
         data-tone={tone}
-        $scheme={scheme ?? toneContext.scheme}
         {...restProps}
         $border={useArrayProp(border)}
         $borderTop={useArrayProp(borderTop)}
@@ -129,7 +95,6 @@ export const Card = forwardRef(function Card(
         $radius={useArrayProp(radius)}
         $shadow={useArrayProp(shadow)}
         $tone={tone}
-        $updateCssVars={updateCssVars || shouldAddContext}
         data-checkered={checkered ? '' : undefined}
         data-pressed={pressed ? '' : undefined}
         data-selected={selected ? '' : undefined}
@@ -137,6 +102,6 @@ export const Card = forwardRef(function Card(
         ref={ref}
         selected={selected}
       />
-    </Wrapper>
+    </ThemeColorProvider>
   )
 })

package/src/primitives/card/styles.ts

@@ -1,13 +1,7 @@
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
-import {
-  _colorVarStyleActive,
-  _colorVarStyleDisabled,
-  _colorVarStyleHover,
-  _colorVarStyleSelected,
-} from '../../styles/colorVars'
+import {_colorVarsStyle} from '../../styles/colorVars'
 import {focusRingBorderStyle, focusRingStyle} from '../../styles/focusRing'
-import {createCssVars, cssVars} from '../../theme/lib/theme/color/cssVariables'
 import {CardStyleProps} from './types'
 
 export function cardStyle(
@@ -25,7 +19,7 @@ export function cardBaseStyle(props: CardStyleProps & ThemeProps): ReturnType<ty
     css`
       background-size: ${space[3]}px ${space[3]}px;
       background-position: 50% 50%;
-      background-image: ${cssVars.mutable['bg-image']};
+      background-image: var(--card-bg-image);
     `}
 
     &[data-as='button'] {
@@ -52,20 +46,18 @@ export function cardBaseStyle(props: CardStyleProps & ThemeProps): ReturnType<ty
 }
 
 export function cardColorStyle(props: CardStyleProps & ThemeProps): ReturnType<typeof css> {
-  const {$checkered, $focusRing, theme, $tone, $scheme, $updateCssVars} = props
+  const {$checkered, $focusRing, theme} = props
   const {focusRing} = theme.sanity.card
-
-  const border = {width: 0, color: cssVars.positive['border-accent']}
+  const {base, card, dark} = theme.sanity.color
+  const border = {width: 0, color: 'var(--card-border-color)'}
 
   return css`
-    /* A new css vars context is created, allowing for override of the default tone and changing the scheme */
-    ${$updateCssVars && createCssVars($scheme, theme.sanity.color.tones, $tone)}
-    color-scheme: ${$scheme === 'dark' ? 'dark' : 'light'};
-    ${$checkered &&
-    `--card-bg-image: repeating-conic-gradient(${cssVars.default['base-bg-card']} 0% 25%, ${cssVars.default['bg-tint']} 0% 50%)`}
+    color-scheme: ${dark ? 'dark' : 'light'};
+
+    ${_colorVarsStyle(base, card.enabled, $checkered)}
 
-    background-color: ${cssVars.mutable['bg-color']};
-    color: ${cssVars.default['text-primary']};
+    background-color: var(--card-bg-color);
+    color: var(--card-fg-color);
 
     /* &:is(button) */
     &[data-as='button'] {
@@ -75,34 +67,34 @@ export function cardColorStyle(props: CardStyleProps & ThemeProps): ReturnType<t
       box-shadow: var(--card-focus-ring-box-shadow);
 
       &:disabled {
-        ${_colorVarStyleDisabled($checkered)}
+        ${_colorVarsStyle(base, card.disabled, $checkered)}
       }
 
       &:not(:disabled) {
         &[data-pressed] {
-          ${_colorVarStyleActive()}
+          ${_colorVarsStyle(base, card.pressed, $checkered)}
         }
 
         &[data-selected] {
-          ${_colorVarStyleSelected()}
+          ${_colorVarsStyle(base, card.selected, $checkered)}
         }
 
         @media (hover: hover) {
           &:not([data-pressed]):not([data-selected]) {
             &[data-hovered],
             &:hover {
-              ${_colorVarStyleHover()}
+              ${_colorVarsStyle(base, card.hovered, $checkered)}
             }
 
             &:active {
-              ${_colorVarStyleActive()}
+              ${_colorVarsStyle(base, card.pressed, $checkered)}
             }
           }
         }
 
         &:focus {
           --card-focus-ring-box-shadow: ${$focusRing
-            ? focusRingStyle({border, focusRing})
+            ? focusRingStyle({base, border, focusRing})
             : undefined};
         }
 
@@ -118,34 +110,34 @@ export function cardColorStyle(props: CardStyleProps & ThemeProps): ReturnType<t
       box-shadow: var(--card-focus-ring-box-shadow);
 
       &[data-disabled] {
-        ${_colorVarStyleDisabled($checkered)}
+        ${_colorVarsStyle(base, card.disabled, $checkered)}
       }
 
       &:not([data-disabled]) {
         &[data-pressed] {
-          ${_colorVarStyleActive()}
+          ${_colorVarsStyle(base, card.pressed, $checkered)}
         }
 
         &[data-selected] {
-          ${_colorVarStyleSelected()}
+          ${_colorVarsStyle(base, card.selected, $checkered)}
         }
 
         @media (hover: hover) {
           &:not([data-pressed]):not([data-selected]) {
             &[data-hovered],
             &:hover {
-              ${_colorVarStyleHover()}
+              ${_colorVarsStyle(base, card.hovered, $checkered)}
             }
 
             &:active {
-              ${_colorVarStyleActive()}
+              ${_colorVarsStyle(base, card.pressed, $checkered)}
             }
           }
         }
 
         &:focus {
           --card-focus-ring-box-shadow: ${$focusRing
-            ? focusRingStyle({border, focusRing})
+            ? focusRingStyle({base, border, focusRing})
             : undefined};
         }
 

package/src/primitives/card/types.ts

@@ -1,4 +1,4 @@
-import {ThemeColorSchemeKey, ThemeColorToneKey} from '../../theme'
+import {ThemeColorToneKey} from '../../theme'
 
 /**
  * @internal
@@ -7,6 +7,4 @@ export interface CardStyleProps {
   $checkered: boolean
   $focusRing: boolean
   $tone: ThemeColorToneKey
-  $scheme: ThemeColorSchemeKey
-  $updateCssVars: boolean
 }

package/src/primitives/checkbox/styles.ts

@@ -1,7 +1,6 @@
 import {css} from 'styled-components'
 import {rem, ThemeProps} from '../../styles'
 import {focusRingBorderStyle, focusRingStyle} from '../../styles/internal'
-import {cssVars} from '../../theme/lib/theme/color/cssVariables/createCssVars'
 
 export function checkboxBaseStyles(): ReturnType<typeof css> {
   return css`
@@ -12,6 +11,7 @@ export function checkboxBaseStyles(): ReturnType<typeof css> {
 
 export function inputElementStyles(props: ThemeProps): ReturnType<typeof css> {
   const {theme} = props
+  const color = theme.sanity.color.input
   const {input, radius} = theme.sanity
   const {focusRing} = input.checkbox
 
@@ -34,12 +34,12 @@ export function inputElementStyles(props: ThemeProps): ReturnType<typeof css> {
       width: ${rem(input.checkbox.size)};
       box-sizing: border-box;
       box-shadow: ${focusRingBorderStyle({
-        color: cssVars.default['border-base'],
+        color: color.default.enabled.border,
         width: input.border.width,
       })};
       border-radius: ${rem(radius[2])};
       line-height: 1;
-      background-color: ${cssVars.default['bg-base']};
+      background-color: ${color.default.enabled.bg};
 
       & > svg {
         display: block;
@@ -55,12 +55,12 @@ export function inputElementStyles(props: ThemeProps): ReturnType<typeof css> {
       }
     }
     &:checked + span {
-      background: ${cssVars.default['text-secondary']};
+      background: ${color.default.enabled.bg2};
       box-shadow: ${focusRingBorderStyle({
-        color: cssVars.default['text-secondary'],
+        color: color.default.enabled.bg2,
         width: input.border.width,
       })};
-      color: ${cssVars.default['bg-base']};
+      color: ${color.default.enabled.bg};
     }
 
     /* focus */
@@ -74,47 +74,47 @@ export function inputElementStyles(props: ThemeProps): ReturnType<typeof css> {
     }
 
     &[data-error] + span {
-      background-color: ${cssVars.critical['border-base']};
+      background-color: ${color.invalid.enabled.border};
       box-shadow: ${focusRingBorderStyle({
         width: input.border.width,
-        color: cssVars.critical['text-secondary'],
+        color: color.invalid.enabled.bg2,
       })};
-      color: ${cssVars.default['text-secondary']};
+      color: ${color.default.disabled.fg};
     }
     &[data-error]&:checked + span {
-      background-color: ${cssVars.critical['text-secondary']};
-      color: ${cssVars.default['bg-base']};
+      background-color: ${color.invalid.enabled.bg2};
+      color: ${color.default.enabled.bg};
     }
     &[data-error]&:checked&:not(:disabled):focus:focus-visible + span {
       box-shadow: ${focusRingStyle({
-        border: {width: input.border.width, color: cssVars.critical['text-secondary']},
+        border: {width: input.border.width, color: color.invalid.readOnly.bg2},
         focusRing: {width: 1, offset: 1},
       })};
     }
 
     &:disabled + span {
-      background-color: ${cssVars.default['bg-tint']};
+      background-color: ${color.default.disabled.bg};
       box-shadow: ${focusRingBorderStyle({
         width: input.border.width,
-        color: cssVars.default['border-base'],
+        color: color.default.disabled.border,
       })};
-      color: ${cssVars.default['text-secondary']};
+      color: ${color.default.disabled.fg};
     }
     &:disabled&:checked + span {
-      background-color: ${cssVars.default['border-base']};
+      background-color: ${color.default.disabled.bg2};
     }
 
     &[data-read-only] + span {
-      background-color: ${cssVars.default['bg-tint']};
+      background-color: ${color.default.readOnly.bg};
       box-shadow: ${focusRingBorderStyle({
         width: input.border.width,
-        color: cssVars.default['border-base'],
+        color: color.default.readOnly.border,
       })};
-      color: ${cssVars.default['text-secondary']};
+      color: ${color.default.readOnly.fg};
     }
 
     &[data-read-only]&:checked + span {
-      background-color: ${cssVars.default['border-base']};
+      background-color: ${color.default.readOnly.bg2};
     }
 
     &:checked + span > svg:first-child {

package/src/primitives/code/code.tsx

@@ -4,8 +4,7 @@ import Refractor from 'react-refractor'
 import styled from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {responsiveCodeFontStyle, ResponsiveFontStyleProps} from '../../styles/internal'
-import {useToneContext} from '../../theme/toneContext/useToneContext'
-import {codeBaseStyle, CodeBaseStyleProps} from './styles'
+import {codeBaseStyle} from './styles'
 
 /**
  * @public
@@ -17,10 +16,7 @@ export interface CodeProps {
   weight?: string
 }
 
-const Root = styled.pre<CodeBaseStyleProps & ResponsiveFontStyleProps>(
-  codeBaseStyle,
-  responsiveCodeFontStyle,
-)
+const Root = styled.pre<ResponsiveFontStyleProps>(codeBaseStyle, responsiveCodeFontStyle)
 
 /**
  * @public
@@ -32,17 +28,9 @@ export const Code = forwardRef(function Code(
   const {children, language: languageProp, size = 2, weight, ...restProps} = props
   const language = typeof languageProp === 'string' ? languageProp : undefined
   const registered = language ? Refractor.hasLanguage(language as any) : false
-  const {scheme} = useToneContext()
 
   return (
-    <Root
-      data-ui="Code"
-      {...restProps}
-      $size={useArrayProp(size)}
-      $weight={weight}
-      ref={ref}
-      $scheme={scheme}
-    >
+    <Root data-ui="Code" {...restProps} $size={useArrayProp(size)} $weight={weight} ref={ref}>
       {!(language && registered) && <code>{children}</code>}
       {language && registered && <Refractor inline language={language} value={String(children)} />}
     </Root>