@sanity/ui 2.0.0-alpha.1 → 2.0.0-alpha.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/ui",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.11",
   "sideEffects": false,
   "types": "./dist/index.d.ts",
   "source": "./src/index.ts",
@@ -52,7 +52,7 @@
   },
   "dependencies": {
     "@floating-ui/react-dom": "2.0.0",
-    "@sanity/color": "^2.2.5",
+    "@sanity/color": "3.0.0-beta.5",
     "@sanity/icons": "^2.4.1",
     "csstype": "^3.1.2",
     "framer-motion": "^10.16.2",

package/src/components/dialog/constants.ts

@@ -0,0 +1,4 @@
+/**
+ * Left/right border offsets for header + footer components (in px).
+ */
+export const BORDER_OFFSET_X: number = 12

package/src/components/dialog/dialog.tsx

@@ -8,12 +8,13 @@ import {
   isHTMLElement,
 } from '../../helpers'
 import {useArrayProp, useClickOutside, useForwardedRef, useGlobalKeyDown} from '../../hooks'
-import {Box, Button, Card, Container, Flex, Text} from '../../primitives'
+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 {DialogPosition, Radius} from '../../types'
 import {Layer, LayerProps, Portal, useBoundaryElement, useLayer, usePortal} from '../../utils'
+import {BORDER_OFFSET_X} from './constants'
 import {
   dialogStyle,
   responsiveDialogPositionStyle,
@@ -71,6 +72,15 @@ interface DialogCardProps extends ResponsiveWidthProps {
   shadow: number | number[]
 }
 
+interface DialogHeaderProps extends CardProps {
+  $hasScrolledFromTop: boolean
+  $isContentScrollable: boolean
+}
+interface DialogFooterProps extends CardProps {
+  $hasScrolledToBottom: boolean
+  $isContentScrollable: boolean
+}
+
 function isTargetWithinScope(
   boundaryElement: HTMLElement | null,
   portalElement: HTMLElement | null,
@@ -118,7 +128,7 @@ const DialogLayout = styled(Flex)`
   width: 100%;
 `
 
-const DialogHeader = styled(Card)`
+const DialogHeader = styled(Box)<DialogHeaderProps>`
   position: relative;
   z-index: 2;
 
@@ -126,10 +136,13 @@ const DialogHeader = styled(Card)`
     content: '';
     display: block;
     position: absolute;
-    left: 0;
-    right: 0;
+    left: ${BORDER_OFFSET_X}px;
+    right: ${BORDER_OFFSET_X}px;
     bottom: -1px;
-    border-bottom: 1px solid var(--card-hairline-soft-color);
+    border-bottom: 1px solid var(--card-border-color);
+    width: auto;
+    opacity: ${(props) => (props.$isContentScrollable && props.$hasScrolledFromTop ? 1 : 0)};
+    transition: opacity 200ms ease-in;
   }
 `
 
@@ -140,10 +153,22 @@ const DialogContent = styled(Box)`
   outline: none;
 `
 
-const DialogFooter = styled(Box)`
+const DialogFooter = styled(Box)<DialogFooterProps>`
   position: relative;
   z-index: 3;
-  border-top: 1px solid var(--card-hairline-soft-color);
+
+  &:before {
+    content: '';
+    display: block;
+    position: absolute;
+    left: ${BORDER_OFFSET_X}px;
+    right: ${BORDER_OFFSET_X}px;
+    top: -1px;
+    border-top: 1px solid var(--card-border-color);
+    width: auto;
+    opacity: ${(props) => (props.$isContentScrollable && !props.$hasScrolledToBottom ? 1 : 0)};
+    transition: opacity 200ms ease-in;
+  }
 `
 
 const DialogCard = forwardRef(function DialogCard(
@@ -180,6 +205,9 @@ const DialogCard = forwardRef(function DialogCard(
   const labelId = `${id}_label`
   const showCloseButton = Boolean(onClose) && hideCloseButton === false
   const showHeader = Boolean(header) || showCloseButton
+  const [isContentScrollable, setIsContentScrollable] = useState(false)
+  const [hasScrolledFromTop, setHasScrolledFromTop] = useState(false)
+  const [hasScrolledToBottom, setHasScrolledToBottom] = useState(false)
 
   useEffect(() => {
     if (!autoFocus) return
@@ -248,41 +276,75 @@ const DialogCard = forwardRef(function DialogCard(
     [contentRef],
   )
 
+  const handleContentUpdate = useCallback(() => {
+    if (localContentRef.current) {
+      setIsContentScrollable(
+        localContentRef.current.clientHeight < localContentRef.current.scrollHeight,
+      )
+      setHasScrolledFromTop(localContentRef.current.scrollTop > 0)
+      setHasScrolledToBottom(
+        localContentRef.current.scrollTop >=
+          localContentRef.current.scrollHeight - localContentRef.current.clientHeight,
+      )
+    }
+  }, [])
+
+  useEffect(() => {
+    const resizeObserver = new ResizeObserver(handleContentUpdate)
+
+    if (localContentRef.current) {
+      resizeObserver.observe(localContentRef.current)
+    }
+
+    return () => {
+      resizeObserver.disconnect()
+    }
+  }, [contentRef, handleContentUpdate])
+
   return (
     <DialogContainer data-ui="DialogCard" width={width}>
       <DialogCardRoot radius={radius} ref={setRef} scheme={scheme} shadow={shadow}>
         <DialogLayout direction="column">
           {showHeader && (
-            <DialogHeader>
-              <Flex>
-                <Box flex={1} padding={4}>
+            <DialogHeader
+              $isContentScrollable={isContentScrollable}
+              $hasScrolledFromTop={hasScrolledFromTop}
+              padding={3}
+            >
+              <Flex align="center">
+                <Box flex={1} padding={3}>
                   {header && (
-                    <Text id={labelId} weight="semibold">
+                    <Text id={labelId} size={1} weight="medium">
                       {header}
                     </Text>
                   )}
                 </Box>
                 {showCloseButton && (
-                  <Box padding={2}>
-                    <Button
-                      aria-label="Close dialog"
-                      disabled={!onClose}
-                      icon={CloseIcon}
-                      mode="bleed"
-                      onClick={onClose}
-                      padding={3}
-                    />
-                  </Box>
+                  <Button
+                    aria-label="Close dialog"
+                    disabled={!onClose}
+                    icon={CloseIcon}
+                    mode="bleed"
+                    onClick={onClose}
+                    padding={3}
+                  />
                 )}
               </Flex>
             </DialogHeader>
           )}
 
-          <DialogContent flex={1} ref={setContentRef} tabIndex={-1}>
+          <DialogContent flex={1} ref={setContentRef} tabIndex={-1} onScroll={handleContentUpdate}>
             {children}
           </DialogContent>
 
-          {footer && <DialogFooter>{footer}</DialogFooter>}
+          {footer && (
+            <DialogFooter
+              $isContentScrollable={isContentScrollable}
+              $hasScrolledToBottom={hasScrolledToBottom}
+            >
+              {footer}
+            </DialogFooter>
+          )}
         </DialogLayout>
       </DialogCardRoot>
     </DialogContainer>

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 {useRootTheme} from '../../theme'
 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,
@@ -45,6 +46,7 @@ export function MenuGroup(
     ...restProps
   } = props
   const menu = useMenu()
+  const {scheme} = useRootTheme()
   const {
     activeElement,
     mount,
@@ -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,6 +12,7 @@ import {useArrayProp, useForwardedRef} from '../../hooks'
 import {Box, Flex, Text} from '../../primitives'
 import {Selectable} from '../../primitives/_selectable'
 import {ResponsivePaddingProps, ResponsiveRadiusProps} from '../../primitives/types'
+import {useRootTheme} from '../../theme'
 import {SelectableTone} from '../../types/selectable'
 import {Hotkeys} from '../hotkeys'
 import {useMenu} from './useMenu'
@@ -44,7 +45,7 @@ export const MenuItem = forwardRef(function MenuItem(
     as = 'button',
     children,
     disabled,
-    fontSize = 2,
+    fontSize = 1,
     hotkeys,
     icon,
     iconRight,
@@ -64,6 +65,7 @@ export const MenuItem = forwardRef(function MenuItem(
     tone = 'default',
     ...restProps
   } = props
+  const {scheme} = useRootTheme()
   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/primitives/_selectable/style.ts

@@ -99,7 +99,6 @@ export function selectableColorStyle(
             &:hover {
               ${_colorVarsStyle(base, tone.hovered)}
             }
-
             &:active {
               ${_colorVarsStyle(base, tone.pressed)}
             }

package/src/primitives/badge/badge.tsx

@@ -4,7 +4,7 @@ import {useArrayProp} from '../../hooks'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
 import {BadgeMode, BadgeTone} from '../../types'
 import {Box, BoxProps} from '../box'
-import {Label} from '../label'
+import {Text} from '../text'
 import {ResponsiveRadiusProps} from '../types'
 import {badgeStyle} from './styles'
 import {BadgeStyleProps} from './types'
@@ -33,7 +33,7 @@ export const Badge = forwardRef(function Badge(
 ) {
   const {
     children,
-    fontSize,
+    fontSize = 1,
     mode = 'default',
     padding = 1,
     radius = 2,
@@ -51,7 +51,9 @@ export const Badge = forwardRef(function Badge(
       padding={useArrayProp(padding)}
       ref={ref}
     >
-      <Label size={fontSize}>{children}</Label>
+      <Text size={fontSize} weight="medium">
+        {children}
+      </Text>
     </Root>
   )
 })

package/src/primitives/card/card.tsx

@@ -76,6 +76,7 @@ export const Card = forwardRef(function Card(
   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 (
     <ThemeColorProvider scheme={scheme} tone={tone}>
       <Root

package/src/primitives/textArea/textArea.tsx

@@ -60,7 +60,7 @@ export const TextArea = forwardRef(function TextArea(
     disabled = false,
     fontSize = 2,
     padding = 3,
-    radius = 1,
+    radius = 2,
     weight,
     ...restProps
   } = props

package/src/primitives/textInput/textInput.tsx

@@ -156,7 +156,7 @@ export const TextInput = forwardRef(function TextInput(
     onClear,
     padding: paddingProp = 3,
     prefix,
-    radius: radiusProp = 1,
+    radius: radiusProp = 2,
     readOnly,
     space: spaceProp = 3,
     suffix,

package/src/theme/lib/color-fns/blend/multiply.ts

@@ -1,4 +1,4 @@
-import {RGB} from '../types'
+import {RGB, RGBA} from '../types'
 
 function multiplyChannel(b: number, s: number) {
   return b * s
@@ -9,7 +9,7 @@ function multiplyChannel(b: number, s: number) {
  * Source: https://www.w3.org/TR/compositing-1/#blendingmultiply
  * @internal
  */
-export function multiply(b: RGB, s: RGB): RGB {
+export function multiply(b: RGB | RGBA, s: RGB | RGBA): RGB {
   return {
     r: Math.round(clamp(multiplyChannel(b.r / 255, s.r / 255) * 255)),
     g: Math.round(clamp(multiplyChannel(b.g / 255, s.g / 255) * 255)),

package/src/theme/lib/color-fns/blend/screen.ts

@@ -1,4 +1,4 @@
-import {RGB} from '../types'
+import {RGB, RGBA} from '../types'
 
 function screenChannel(b: number, s: number) {
   return b + s - b * s
@@ -9,7 +9,7 @@ function screenChannel(b: number, s: number) {
  * Source: https://www.w3.org/TR/compositing-1/#blendingscreen
  * @internal
  */
-export function screen(b: RGB, s: RGB): RGB {
+export function screen(b: RGB | RGBA, s: RGB | RGBA): RGB {
   return {
     r: Math.round(clamp(screenChannel(b.r / 255, s.r / 255) * 255)),
     g: Math.round(clamp(screenChannel(b.g / 255, s.g / 255) * 255)),

package/src/theme/lib/color-fns/convert.ts

@@ -1,4 +1,4 @@
-import {HSL, RGB} from './types'
+import {HSL, RGB, RGBA} from './types'
 
 /**
  * @internal
@@ -23,6 +23,20 @@ export function hexToRgb(hex: string): RGB {
   }
 }
 
+/**
+ * @internal
+ */
+export function rgbaToRGBA(rgba: string): RGBA {
+  const values = rgba.replace(/rgba\(|\)/g, '').split(',')
+
+  return {
+    r: parseInt(values[0]),
+    g: parseInt(values[1]),
+    b: parseInt(values[2]),
+    a: parseFloat(values[3]),
+  }
+}
+
 /**
  * @internal
  */

package/src/theme/lib/color-fns/parse.ts

@@ -1,5 +1,5 @@
-import {hexToRgb, hslToRgb} from './convert'
-import {HSL, RGB} from './types'
+import {hexToRgb, hslToRgb, rgbaToRGBA} from './convert'
+import {HSL, RGB, RGBA} from './types'
 
 const HEX_CHARS = '0123456789ABCDEFabcdef'
 
@@ -37,7 +37,7 @@ function parseHsl(str: string): HSL {
 /**
  * @internal
  */
-export function parseColor(color: unknown): RGB {
+export function parseColor(color: unknown): RGB | RGBA {
   if (!color) return {r: 0, g: 0, b: 0}
 
   if (typeof color !== 'string') {
@@ -52,5 +52,9 @@ export function parseColor(color: unknown): RGB {
     return hslToRgb(parseHsl(color))
   }
 
+  if (color.startsWith('rgba(')) {
+    return rgbaToRGBA(color)
+  }
+
   throw new Error(`parseColor: unexpected color format: "${color}"`)
 }

package/src/theme/lib/color-fns/types.ts

@@ -5,6 +5,17 @@ export interface RGB {
   r: number
   g: number
   b: number
+  a?: undefined
+}
+
+/**
+ * @internal
+ */
+export interface RGBA {
+  r: number
+  g: number
+  b: number
+  a: number
 }
 
 /**

package/src/theme/lib/theme/color/_legacy/createColorTheme.ts

@@ -0,0 +1,7 @@
+/**
+ * @internal
+ * @deprecated Use studioTheme instead.
+ */
+export function createColorTheme(): null {
+  return null
+}

package/src/theme/lib/theme/color/_legacy/index.ts

@@ -0,0 +1 @@
+export * from './createColorTheme'