@sanity/ui 2.0.0-alpha.5 → 2.0.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/ui",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.7",
   "sideEffects": false,
   "types": "./dist/index.d.ts",
   "source": "./src/index.ts",

package/src/components/dialog/dialog.tsx

@@ -11,7 +11,7 @@ import {useArrayProp, useClickOutside, useForwardedRef, useGlobalKeyDown} from '
 import {Box, Button, Card, CardProps, Container, Flex, Text} from '../../primitives'
 import {ResponsivePaddingProps, ResponsiveWidthProps} from '../../primitives/types'
 import {responsivePaddingStyle, ResponsivePaddingStyleProps} from '../../styles/internal'
-import {ThemeColorSchemeKey, useTheme} from '../../theme'
+import {ThemeColorSchemeKey, cssVars, useTheme} from '../../theme'
 import {DialogPosition, Radius} from '../../types'
 import {Layer, LayerProps, Portal, useBoundaryElement, useLayer, usePortal} from '../../utils'
 import {BORDER_OFFSET_X} from './constants'
@@ -139,7 +139,7 @@ const DialogHeader = styled(Card)<DialogHeaderProps>`
     left: ${BORDER_OFFSET_X}px;
     right: ${BORDER_OFFSET_X}px;
     bottom: -1px;
-    border-bottom: 1px solid var(--card-border-color);
+    border-bottom: 1px solid ${cssVars.default['border-base']};
     width: auto;
     opacity: ${(props) => (props.$isContentScrollable && props.$hasScrolledFromTop ? 1 : 0)};
     transition: opacity 200ms ease-in;
@@ -164,7 +164,7 @@ const DialogFooter = styled(Box)<DialogFooterProps>`
     left: ${BORDER_OFFSET_X}px;
     right: ${BORDER_OFFSET_X}px;
     top: -1px;
-    border-top: 1px solid var(--card-border-color);
+    border-top: 1px solid ${cssVars.default['border-base']};
     width: auto;
     opacity: ${(props) => (props.$isContentScrollable && !props.$hasScrolledToBottom ? 1 : 0)};
     transition: opacity 200ms ease-in;

package/src/components/dialog/styles.ts

@@ -1,4 +1,5 @@
 import {_responsive, ThemeProps} from '../../styles'
+import {cssVars} from '../../theme'
 import {DialogPosition} from '../../types'
 import {CSSObject} from '../../types/styled'
 
@@ -9,9 +10,7 @@ export interface ResponsiveDialogPositionStyleProps {
   $position: DialogPosition[]
 }
 
-export function dialogStyle({theme}: ThemeProps): CSSObject {
-  const color = theme.sanity.color.base
-
+export function dialogStyle(): CSSObject {
   return {
     '&:not([hidden])': {
       display: 'flex',
@@ -24,7 +23,7 @@ export function dialogStyle({theme}: ThemeProps): CSSObject {
     alignItems: 'center',
     justifyContent: 'center',
     outline: 'none',
-    background: color.shadow.umbra,
+    background: cssVars.default['base-shadow-umbra-color'],
   }
 }
 

package/src/components/menu/__workshop__/closableMenuButton.tsx

@@ -1,5 +1,5 @@
 import {AddIcon} from '@sanity/icons'
-import {Box, Button, Menu, MenuButton, MenuButtonProps, MenuItem, Stack} from '@sanity/ui'
+import {Box, Button, Menu, MenuButton, MenuButtonProps, MenuItem, Stack, cssVars} from '@sanity/ui'
 import {useRef} from 'react'
 
 const POPOVER_PROPS: MenuButtonProps['popover'] = {
@@ -23,7 +23,7 @@ export default function ClosableMenuButtonStory() {
                 <MenuItem text="Item 3" />
                 <MenuItem text="Item 4" />
               </Stack>
-              <Stack padding={1} style={{borderTop: '1px solid var(--card-border-color)'}}>
+              <Stack padding={1} style={{borderTop: `1px solid ${cssVars.default['border-base']}`}}>
                 <Button
                   icon={AddIcon}
                   onClick={() => {

package/src/components/menu/menuDivider.ts

@@ -1,4 +1,5 @@
 import styled from 'styled-components'
+import {cssVars} from '../../theme'
 
 /**
  * @public
@@ -6,6 +7,6 @@ import styled from 'styled-components'
 export const MenuDivider = styled.hr`
   height: 1px;
   border: 0;
-  background: var(--card-hairline-soft-color);
+  background: ${cssVars.default['border-base']};
   margin: 0;
 `

package/src/components/menu/menuGroup.tsx

@@ -4,6 +4,7 @@ import {isValidElementType} from 'react-is'
 import {useArrayProp} from '../../hooks'
 import {Box, Flex, Popover, PopoverProps, Text} from '../../primitives'
 import {Selectable} from '../../primitives/_selectable'
+import {useToneContext} from '../../theme/toneContext/useToneContext'
 import {Radius, SelectableTone} from '../../types'
 import {Menu} from './menu'
 import {useMenu} from './useMenu'
@@ -33,7 +34,7 @@ export function MenuGroup(
   const {
     as = 'button',
     children,
-    fontSize,
+    fontSize = 1,
     icon,
     onClick,
     padding = 3,
@@ -44,6 +45,7 @@ export function MenuGroup(
     tone = 'default',
     ...restProps
   } = props
+  const {scheme} = useToneContext()
   const menu = useMenu()
   const {
     activeElement,
@@ -166,6 +168,7 @@ export function MenuGroup(
         data-selected={!withinMenu && active ? '' : undefined}
         $radius={useArrayProp(radius)}
         $tone={tone}
+        $scheme={scheme}
         onClick={handleClick}
         onKeyDown={handleKeyDown}
         onMouseEnter={handleMouseEnter}
@@ -173,28 +176,24 @@ export function MenuGroup(
         tabIndex={-1}
         type={as === 'button' ? 'button' : undefined}
       >
-        <Box padding={padding}>
-          <Flex>
-            {icon && (
-              <Text size={fontSize}>
-                {isValidElement(icon) && icon}
-                {isValidElementType(icon) && createElement(icon)}
-              </Text>
-            )}
-
-            <Box flex={1} marginLeft={icon ? space : undefined}>
-              <Text size={fontSize} textOverflow="ellipsis">
-                {text}
-              </Text>
-            </Box>
-
-            <Box marginLeft={space}>
-              <Text size={fontSize}>
-                <ChevronRightIcon />
-              </Text>
-            </Box>
-          </Flex>
-        </Box>
+        <Flex gap={space} padding={padding}>
+          {icon && (
+            <Text size={fontSize}>
+              {isValidElement(icon) && icon}
+              {isValidElementType(icon) && createElement(icon)}
+            </Text>
+          )}
+
+          <Box flex={1}>
+            <Text size={fontSize} textOverflow="ellipsis" weight="medium">
+              {text}
+            </Text>
+          </Box>
+
+          <Text size={fontSize}>
+            <ChevronRightIcon />
+          </Text>
+        </Flex>
       </Selectable>
     </Popover>
   )

package/src/components/menu/menuItem.tsx

@@ -12,7 +12,8 @@ import {useArrayProp, useForwardedRef} from '../../hooks'
 import {Box, Flex, Text} from '../../primitives'
 import {Selectable} from '../../primitives/_selectable'
 import {ResponsivePaddingProps, ResponsiveRadiusProps} from '../../primitives/types'
-import {SelectableTone} from '../../types/selectable'
+import {ThemeColorToneKey} from '../../theme'
+import {useToneContext} from '../../theme/toneContext/useToneContext'
 import {Hotkeys} from '../hotkeys'
 import {useMenu} from './useMenu'
 
@@ -29,7 +30,7 @@ export interface MenuItemProps extends ResponsivePaddingProps, ResponsiveRadiusP
   selected?: boolean
   space?: number | number[]
   text?: React.ReactNode
-  tone?: SelectableTone
+  tone?: ThemeColorToneKey
 }
 
 /**
@@ -64,6 +65,7 @@ export const MenuItem = forwardRef(function MenuItem(
     tone = 'default',
     ...restProps
   } = props
+  const {scheme} = useToneContext()
   const menu = useMenu()
   const {
     activeElement,
@@ -120,7 +122,8 @@ export const MenuItem = forwardRef(function MenuItem(
       forwardedAs={as}
       $radius={useArrayProp(radius)}
       $padding={useArrayProp(0)}
-      $tone={tone}
+      $tone={disabled ? 'default' : tone}
+      $scheme={scheme}
       disabled={disabled}
       onClick={handleClick}
       onMouseEnter={onItemMouseEnter}
@@ -131,43 +134,34 @@ export const MenuItem = forwardRef(function MenuItem(
       type={as === 'button' ? 'button' : undefined}
     >
       {(icon || text || iconRight) && (
-        <Box as="span" {...paddingProps}>
-          <Flex as="span">
-            {icon && (
-              <Text size={fontSize}>
-                {isValidElement(icon) && icon}
-                {isValidElementType(icon) && createElement(icon)}
-              </Text>
-            )}
+        <Flex as="span" gap={space} align="center" {...paddingProps}>
+          {icon && (
+            <Text size={fontSize}>
+              {isValidElement(icon) && icon}
+              {isValidElementType(icon) && createElement(icon)}
+            </Text>
+          )}
 
-            {text && (
-              <Box
-                flex={1}
-                marginLeft={icon ? space : undefined}
-                marginRight={iconRight ? space : undefined}
-              >
-                <Text size={fontSize} textOverflow="ellipsis">
-                  {text}
-                </Text>
-              </Box>
-            )}
+          {text && (
+            <Box flex={1}>
+              <Text size={fontSize} textOverflow="ellipsis" weight="medium">
+                {text}
+              </Text>
+            </Box>
+          )}
 
-            {hotkeys && (
-              <Box marginLeft={space} style={{marginTop: -4, marginBottom: -4}}>
-                <Hotkeys fontSize={fontSize} keys={hotkeys} />
-              </Box>
-            )}
+          {hotkeys && (
+            <Hotkeys fontSize={fontSize} keys={hotkeys} style={{marginTop: -4, marginBottom: -4}} />
+          )}
 
-            {iconRight && (
-              <Text size={fontSize}>
-                {isValidElement(iconRight) && iconRight}
-                {isValidElementType(iconRight) && createElement(iconRight)}
-              </Text>
-            )}
-          </Flex>
-        </Box>
+          {iconRight && (
+            <Text size={fontSize}>
+              {isValidElement(iconRight) && iconRight}
+              {isValidElementType(iconRight) && createElement(iconRight)}
+            </Text>
+          )}
+        </Flex>
       )}
-
       {children && (
         <Box as="span" {...paddingProps}>
           {children}

package/src/components/skeleton/styles.ts

@@ -1,4 +1,5 @@
 import {css, keyframes} from 'styled-components'
+import {cssVars} from '../../theme'
 
 const keyframe = keyframes`
   0% {
@@ -12,11 +13,11 @@ const keyframe = keyframes`
 const animation = css`
   background-image: linear-gradient(
     to right,
-    var(--card-skeleton-color-from),
-    var(--card-skeleton-color-to),
-    var(--card-skeleton-color-from),
-    var(--card-skeleton-color-from),
-    var(--card-skeleton-color-from)
+    ${cssVars.default['skeleton-from']},
+    ${cssVars.default['skeleton-to']},
+    ${cssVars.default['skeleton-from']},
+    ${cssVars.default['skeleton-from']},
+    ${cssVars.default['skeleton-from']}
   );
   background-position: 100%;
   background-size: 200% 100%;
@@ -40,11 +41,11 @@ export const skeletonStyle = css<{$animated: boolean; $visible: boolean}>`
       $animated
         ? animation
         : css`
-            background-color: var(--card-skeleton-color-from);
+            background-color: ${cssVars.default['skeleton-from']};
           `}
   }
 
   @media screen and (prefers-reduced-motion: reduce) {
-    background-color: var(--card-skeleton-color-from);
+    background-color: ${cssVars.default['skeleton-from']};
   }
 `

package/src/components/tree/style.ts

@@ -1,6 +1,12 @@
 import {css} from 'styled-components'
 import {rem, ThemeProps} from '../../styles'
-import {_colorVarsStyle} from '../../styles/colorVars'
+import {
+  _colorVarStyleActive,
+  _colorVarStyleHover,
+  _colorVarStyleSelected,
+} from '../../styles/colorVars'
+import {cssVars} from '../../theme'
+import {cardVariables} from '../../theme/lib/theme/color/cssVariables/cardVariables'
 
 export function treeItemRootStyle(): ReturnType<typeof css> {
   return css`
@@ -29,34 +35,28 @@ export function treeItemRootStyle(): ReturnType<typeof css> {
   `
 }
 
-export function treeItemRootColorStyle(props: ThemeProps): ReturnType<typeof css> {
-  const {theme} = props
-  const $tone = 'default'
-  const {base, muted, selectable} = theme.sanity.color
-  // @todo: remove use of `muted` here
-  const tone = selectable ? selectable[$tone] || selectable.default : muted[$tone] || muted.default
-
+export function treeItemRootColorStyle(): ReturnType<typeof css> {
   return css`
     /* <div role="none"><a data-ui="TreeItem__box" role="treeitem" tabIndex="0"></div> */
     &[role='none'] {
       & > [role='treeitem'] {
-        ${_colorVarsStyle(base, tone.enabled)}
+        ${cardVariables}
 
-        background-color: var(--card-bg-color);
+        background-color:${cssVars.mutable['bg-color']};
         color: var(--treeitem-fg-color);
       }
 
       &[data-selected] > [role='treeitem'] {
-        ${_colorVarsStyle(base, tone.pressed)}
+        ${_colorVarStyleActive()}
       }
 
       @media (hover: hover) {
         &:not([data-selected]) > [role='treeitem']:not(:focus):hover {
-          ${_colorVarsStyle(base, tone.hovered)}
+          ${_colorVarStyleHover()}
         }
 
         & > [role='treeitem']:focus {
-          ${_colorVarsStyle(base, tone.selected)}
+          ${_colorVarStyleSelected()}
         }
       }
     }
@@ -64,23 +64,22 @@ export function treeItemRootColorStyle(props: ThemeProps): ReturnType<typeof css
     /* <div role="treeitem" tabIndex="0"><div data-ui="TreeItem__box"></div> */
     &[role='treeitem'] {
       & > [data-ui='TreeItem__box'] {
-        ${_colorVarsStyle(base, tone.enabled)}
-
-        background-color: var(--card-bg-color);
-        color: var(--card-fg-color);
+        ${cardVariables}
+        background-color: ${cssVars.mutable['bg-color']};
+        color: ${cssVars.mutable['fg-color']};
       }
 
       &[data-selected] > [data-ui='TreeItem__box'] {
-        ${_colorVarsStyle(base, tone.pressed)}
+        ${_colorVarStyleActive()}
       }
 
       @media (hover: hover) {
         &:not([data-selected]):not(:focus) > [data-ui='TreeItem__box']:hover {
-          ${_colorVarsStyle(base, tone.hovered)}
+          ${_colorVarStyleHover()}
         }
 
         &:focus > [data-ui='TreeItem__box'] {
-          ${_colorVarsStyle(base, tone.selected)}
+          ${_colorVarStyleSelected()}
         }
       }
     }

package/src/primitives/_selectable/style.ts

@@ -1,13 +1,19 @@
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
-import {_colorVarsStyle} from '../../styles/colorVars'
-import {SelectableTone} from '../../types/selectable'
+import {
+  _colorVarStyleHover,
+  _selectableVarStyle,
+  _selectableVarStyleDisabled,
+} from '../../styles/colorVars'
+
+import {ThemeColorSchemeKey, ThemeColorToneKey, createCssVars, cssVars} from '../../theme'
 
 /**
  * @internal
  */
 export interface SelectableStyleProps {
-  $tone: SelectableTone
+  $tone: ThemeColorToneKey
+  $scheme: ThemeColorSchemeKey
 }
 
 export function selectableBaseStyle(): ReturnType<typeof css> {
@@ -35,43 +41,41 @@ export function selectableBaseStyle(): ReturnType<typeof css> {
 export function selectableColorStyle(
   props: SelectableStyleProps & ThemeProps,
 ): ReturnType<typeof css> {
-  const {$tone, theme} = props
-  const {base, muted, selectable} = theme.sanity.color
-  // @todo: remove use of `muted` here
-  const tone = selectable ? selectable[$tone] || selectable.default : muted[$tone] || muted.default
+  const {theme, $tone, $scheme} = props
 
   return css`
-    ${_colorVarsStyle(base, tone.enabled)}
+    ${$tone !== 'default' && createCssVars($scheme, theme.sanity.color.tones, $tone)}
+    ${_selectableVarStyle($tone)}
 
-    background-color: var(--card-bg-color);
-    color: var(--card-fg-color);
+    background-color: ${cssVars.mutable['bg-color']};
+    color: ${cssVars[$tone]['text-secondary']};
     outline: none;
 
-    /* &:is(button) */
+    /* &:is(button) - Looks like a button in default mode */
     &[data-as='button'] {
       &:disabled {
-        ${_colorVarsStyle(base, tone.disabled)}
+        ${_selectableVarStyleDisabled()}
       }
 
       &:not(:disabled) {
         &[aria-pressed='true'] {
-          ${_colorVarsStyle(base, tone.pressed)}
+          ${_colorVarStyleHover()}
         }
 
         &[data-selected],
         &[aria-selected='true'] > & {
-          ${_colorVarsStyle(base, tone.selected)}
+          ${_colorVarStyleHover()}
         }
 
         @media (hover: hover) {
           &:not([data-selected]) {
             &[data-hovered],
             &:hover {
-              ${_colorVarsStyle(base, tone.hovered)}
+              ${_colorVarStyleHover()}
             }
 
             &:active {
-              ${_colorVarsStyle(base, tone.pressed)}
+              ${_colorVarStyleHover()}
             }
           }
         }
@@ -81,27 +85,26 @@ export function selectableColorStyle(
     /* &:is(a) */
     &[data-as='a'] {
       &[data-disabled] {
-        ${_colorVarsStyle(base, tone.disabled)}
+        ${_selectableVarStyleDisabled()}
       }
 
       &:not([data-disabled]) {
         &[data-pressed] {
-          ${_colorVarsStyle(base, tone.pressed)}
+          ${_colorVarStyleHover()}
         }
 
         &[data-selected] {
-          ${_colorVarsStyle(base, tone.selected)}
+          ${_colorVarStyleHover()}
         }
 
         @media (hover: hover) {
           &:not([data-selected]) {
             &[data-hovered],
             &:hover {
-              ${_colorVarsStyle(base, tone.hovered)}
+              ${_colorVarStyleHover()}
             }
-
             &:active {
-              ${_colorVarsStyle(base, tone.pressed)}
+              ${_colorVarStyleHover()}
             }
           }
         }

package/src/primitives/avatar/avatar.tsx

@@ -2,10 +2,14 @@ import {forwardRef, useCallback, useEffect, useId, useMemo, useState} from 'reac
 import ReactIs from 'react-is'
 import styled from 'styled-components'
 import {useArrayProp} from '../../hooks'
-import {ThemeColorSpotKey, useTheme} from '../../theme'
+import {useTheme} from '../../theme'
+
+import {useToneContext} from '../../theme/toneContext/useToneContext'
 import {AvatarPosition, AvatarSize, AvatarStatus} from '../../types'
 import {Text} from '../text'
+import {spotColor} from './spotColors'
 import {avatarStyle, responsiveAvatarSizeStyle} from './styles'
+import {ThemeColorSpotKey} from './types'
 
 /**
  * @public
@@ -63,9 +67,10 @@ export const Avatar = forwardRef(function Avatar(
   const as = ReactIs.isValidElementType(asProp) ? asProp : 'div'
   const size = useArrayProp(sizeProp)
   const theme = useTheme()
-  const color = theme.sanity.color.spot[colorKey] || theme.sanity.color.spot.gray
+  const {scheme} = useToneContext()
+
+  const color = spotColor[colorKey][scheme].hex
 
-  // @todo: remove this
   const avatarSize = theme.sanity.avatar.sizes[size[0]] || theme.sanity.avatar.sizes[0]
   const _sizeRem = avatarSize.size
   const _radius = _sizeRem / 2

package/src/primitives/avatar/avatarCounter.tsx

@@ -3,6 +3,7 @@ import styled, {css} from 'styled-components'
 import {EMPTY_RECORD} from '../../constants'
 import {useArrayProp} from '../../hooks'
 import {rem, _responsive, ThemeProps} from '../../styles'
+import {cssVars} from '../../theme'
 import {AvatarSize} from '../../types'
 import {Text} from '../text'
 
@@ -32,11 +33,11 @@ function _avatarCounterBaseStyle(props: ThemeProps) {
     box-sizing: border-box;
     user-select: none;
     color: inherit;
-    color: var(--card-fg-color);
-    background: var(--card-bg-color);
+    color: ${cssVars.mutable['fg-color']};
+    background:  ${cssVars.mutable['bg-color']};
     box-shadow:
-      0 0 0 1px var(--card-bg-color),
-      inset 0 0 0 1.5px var(--card-hairline-hard-color);
+      0 0 0 1px  ${cssVars.mutable['bg-color']},
+      inset 0 0 0 1.5px ${cssVars.default['border-base']});
     padding: 0 ${rem(theme.sanity.space[2])};
 
     &:not([hidden]) {

package/src/primitives/avatar/spotColors.ts

@@ -0,0 +1,53 @@
+import {
+  gray,
+  blue,
+  purple,
+  magenta,
+  red,
+  orange,
+  yellow,
+  green,
+  cyan,
+  ColorTint,
+} from '@sanity/color'
+import {ThemeColorSchemeKey} from '../../theme'
+import {ThemeColorSpotKey} from './types'
+
+export const spotColor: Record<ThemeColorSpotKey, Record<ThemeColorSchemeKey, ColorTint>> = {
+  gray: {
+    dark: gray['400'],
+    light: gray['500'],
+  },
+  blue: {
+    dark: blue['400'],
+    light: blue['500'],
+  },
+  purple: {
+    dark: purple['400'],
+    light: purple['500'],
+  },
+  magenta: {
+    dark: magenta['400'],
+    light: magenta['500'],
+  },
+  red: {
+    dark: red['400'],
+    light: red['500'],
+  },
+  orange: {
+    dark: orange['400'],
+    light: orange['500'],
+  },
+  yellow: {
+    dark: yellow['400'],
+    light: yellow['500'],
+  },
+  green: {
+    dark: green['400'],
+    light: green['500'],
+  },
+  cyan: {
+    dark: cyan['400'],
+    light: cyan['500'],
+  },
+}

package/src/primitives/avatar/styles.ts

@@ -1,5 +1,6 @@
 import {rem, _responsive, ThemeProps} from '../../styles'
 import {focusRingStyle} from '../../styles/internal'
+import {cssVars} from '../../theme/lib/theme/color/cssVariables/createCssVars'
 import {CSSObject} from '../../types/styled'
 import {AvatarRootStyleProps, ResponsiveAvatarSizeStyleProps} from './types'
 
@@ -64,7 +65,7 @@ export function avatarRootStyle(props: AvatarRootStyleProps & ThemeProps): CSSOb
     position: 'relative',
     boxSizing: 'border-box',
     userSelect: 'none',
-    boxShadow: '0 0 0 1px var(--card-bg-color)',
+    boxShadow: `0 0 0 1px ${cssVars.mutable['bg-color']}`,
 
     '&[data-status="inactive"]': {
       opacity: 0.5,
@@ -123,14 +124,11 @@ export function responsiveAvatarSizeStyle(
   })
 }
 
-export function avatarInitialsStyle(props: ThemeProps): CSSObject {
-  const {theme} = props
-  const {base} = theme.sanity.color
-
+export function avatarInitialsStyle(): CSSObject {
   return {
     width: '100%',
     height: '100%',
-    color: base.fg,
+    color: cssVars.default['text-primary'],
     alignItems: 'center',
     justifyContent: 'center',
     textTransform: 'uppercase',
@@ -146,7 +144,7 @@ export function avatarInitialsStyle(props: ThemeProps): CSSObject {
 function avatarBgStrokeStyle(): CSSObject {
   return {
     strokeWidth: '4px',
-    stroke: 'var(--card-bg-color)',
+    stroke: cssVars.mutable['bg-color'],
   }
 }