@sanity/ui 2.0.13-alpha.2 → 2.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/ui",
-  "version": "2.0.13-alpha.2",
+  "version": "2.0.13",
   "keywords": [
     "sanity",
     "ui",
@@ -13,7 +13,6 @@
   "bugs": {
     "url": "https://github.com/sanity-io/ui/issues"
   },
-  "type": "commonjs",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sanity-io/ui.git"
@@ -107,8 +106,8 @@
   },
   "dependencies": {
     "@floating-ui/react-dom": "^2.0.8",
-    "@sanity/color": "^3.0.0",
-    "@sanity/icons": "^2.11.3",
+    "@sanity/color": "^3.0.2",
+    "@sanity/icons": "^2.11.4",
     "csstype": "^3.1.3",
     "framer-motion": "11.0.8",
     "react-refractor": "^2.1.7"
@@ -121,38 +120,38 @@
     "@commitlint/cli": "^19.2.1",
     "@commitlint/config-conventional": "^19.1.0",
     "@juggle/resize-observer": "^3.4.0",
-    "@sanity/pkg-utils": "^5.1.4",
+    "@sanity/pkg-utils": "^5.1.6",
     "@sanity/semantic-release-preset": "^4.1.7",
-    "@sanity/ui-workshop": "^2.0.6",
-    "@storybook/addon-a11y": "^8.0.2",
-    "@storybook/addon-docs": "^8.0.2",
-    "@storybook/addon-essentials": "^8.0.2",
-    "@storybook/addon-interactions": "^8.0.2",
-    "@storybook/addon-links": "^8.0.2",
-    "@storybook/addon-storysource": "^8.0.2",
-    "@storybook/addon-themes": "^8.0.2",
-    "@storybook/blocks": "^8.0.2",
+    "@sanity/ui-workshop": "^2.0.7",
+    "@storybook/addon-a11y": "^8.0.5",
+    "@storybook/addon-docs": "^8.0.5",
+    "@storybook/addon-essentials": "^8.0.5",
+    "@storybook/addon-interactions": "^8.0.5",
+    "@storybook/addon-links": "^8.0.5",
+    "@storybook/addon-storysource": "^8.0.5",
+    "@storybook/addon-themes": "^8.0.5",
+    "@storybook/blocks": "^8.0.5",
     "@storybook/jest": "^0.2.3",
-    "@storybook/manager-api": "^8.0.2",
-    "@storybook/react": "^8.0.2",
-    "@storybook/react-vite": "^8.0.2",
+    "@storybook/manager-api": "^8.0.5",
+    "@storybook/react": "^8.0.5",
+    "@storybook/react-vite": "^8.0.5",
     "@storybook/testing-library": "^0.2.2",
-    "@storybook/theming": "^8.0.2",
+    "@storybook/theming": "^8.0.5",
     "@testing-library/dom": "^9.3.4",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^14.2.2",
     "@types/jest": "^29.5.12",
     "@types/jest-axe": "^3.5.9",
     "@types/node": "^20.5.9",
-    "@types/react": "^18.2.67",
-    "@types/react-dom": "^18.2.22",
+    "@types/react": "^18.2.73",
+    "@types/react-dom": "^18.2.23",
     "@types/react-is": "^18.2.4",
     "@types/refractor": "^3.4.1",
     "@types/testing-library__jest-dom": "^5.14.9",
-    "@typescript-eslint/eslint-plugin": "^7.3.1",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/parser": "^7.5.0",
     "commitizen": "^4.3.0",
-    "cypress": "^13.7.0",
+    "cypress": "^13.7.1",
     "cypress-real-events": "^1.12.0",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.57.0",
@@ -173,19 +172,19 @@
     "module-alias": "^2.2.3",
     "npm-run-all2": "^5.0.2",
     "prettier": "^3.2.5",
-    "prettier-plugin-packagejson": "^2.4.12",
+    "prettier-plugin-packagejson": "^2.4.14",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",
     "refractor": "^4.8.1",
     "rimraf": "^5.0.1",
-    "semantic-release": "^23.0.5",
+    "semantic-release": "^23.0.6",
     "start-server-and-test": "^2.0.3",
-    "storybook": "^8.0.2",
+    "storybook": "^8.0.5",
     "styled-components": "^6.1.8",
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.4.2",
-    "vite": "^5.2.2",
+    "vite": "^5.2.7",
     "vite-tsconfig-paths": "^4.3.2"
   },
   "peerDependencies": {
@@ -194,7 +193,7 @@
     "react-is": "^18",
     "styled-components": "^5.2 || ^6"
   },
-  "packageManager": "pnpm@8.15.5",
+  "packageManager": "pnpm@8.15.6",
   "engines": {
     "node": ">=14.0.0"
   },

package/src/core/components/autocomplete/autocomplete.styles.tsx

@@ -1,5 +1,5 @@
 import {SpinnerIcon} from '@sanity/icons'
-import styled, {keyframes} from 'styled-components'
+import {styled, keyframes} from 'styled-components'
 import {Box} from '../../primitives'
 
 /**

package/src/core/components/breadcrumbs/breadcrumbs.styles.ts

@@ -1,4 +1,4 @@
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {Button} from '../../primitives'
 
 export const Root = styled.ol`

package/src/core/components/dialog/__workshop__/panes.tsx

@@ -1,5 +1,5 @@
 import {useCallback, useState} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {Box, Button, Card, Flex} from '../../../primitives'
 import {BoundaryElementProvider, PortalProvider} from '../../../utils'
 import {Menu, MenuButton, MenuItem} from '../../menu'

package/src/core/components/dialog/dialog.tsx

@@ -1,7 +1,7 @@
 import {CloseIcon} from '@sanity/icons'
 import {ThemeColorSchemeKey} from '@sanity/ui/theme'
 import {forwardRef, useCallback, useEffect, useRef, useState} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {
   containsOrEqualsElement,
   focusFirstDescendant,

package/src/core/components/dialog/styles.ts

@@ -1,4 +1,4 @@
-import {CSSObject} from '@sanity/ui/theme'
+import {CSSObject, getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {_responsive, ThemeProps} from '../../styles'
 import {DialogPosition} from '../../types'
@@ -11,7 +11,7 @@ export interface ResponsiveDialogPositionStyleProps {
 }
 
 export function dialogStyle({theme}: ThemeProps): CSSObject {
-  const {color} = theme.sanity.v2
+  const {color} = getTheme_v2(theme)
 
   return {
     '&:not([hidden])': {
@@ -32,7 +32,7 @@ export function dialogStyle({theme}: ThemeProps): CSSObject {
 export function responsiveDialogPositionStyle(
   props: ResponsiveDialogPositionStyleProps & ThemeProps,
 ): CSSObject[] {
-  const {media} = props.theme.sanity.v2
+  const {media} = getTheme_v2(props.theme)
 
   return _responsive(media, props.$position, (position) => ({'&&': {position}}))
 }

package/src/core/components/hotkeys/hotkeys.tsx

@@ -1,5 +1,5 @@
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {Inline, KBD} from '../../primitives'
 import {Radius} from '../../types'

package/src/core/components/menu/menu.tsx

@@ -1,5 +1,5 @@
 import {forwardRef, useCallback, useEffect, useMemo} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useClickOutside, useForwardedRef, useGlobalKeyDown} from '../../hooks'
 import {Box, Stack} from '../../primitives'
 import {ResponsivePaddingProps} from '../../primitives/types'

package/src/core/components/menu/menuDivider.ts

@@ -1,4 +1,4 @@
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 
 /**
  * @public

package/src/core/components/skeleton/skeleton.tsx

@@ -1,5 +1,5 @@
 import {forwardRef, useEffect, useState} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {Box} from '../../primitives'
 import {BoxProps, ResponsiveRadiusProps} from '../../primitives'

package/src/core/components/skeleton/textSkeleton.tsx

@@ -1,6 +1,6 @@
-import {ThemeFontKey} from '@sanity/ui/theme'
+import {ThemeFontKey, getTheme_v2} from '@sanity/ui/theme'
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {ThemeProps, _responsive} from '../../styles'
 import {Skeleton, SkeletonProps} from './skeleton'
@@ -12,7 +12,7 @@ const Root = styled(Skeleton)<{$size: number[]; $style: ThemeFontKey}>((
   } & ThemeProps,
 ) => {
   const {$size, $style} = props
-  const {font, media} = props.theme.sanity.v2
+  const {font, media} = getTheme_v2(props.theme)
   const fontStyle = font[$style]
 
   const styles = _responsive(media, $size, (sizeIndex) => {

package/src/core/components/tab/tab.tsx

@@ -1,5 +1,5 @@
 import {forwardRef, useCallback, useEffect, useRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useForwardedRef} from '../../hooks'
 import {Button} from '../../primitives'
 import {ButtonTone} from '../../types'

package/src/core/components/tab/tabList.tsx

@@ -1,5 +1,5 @@
 import {cloneElement, forwardRef, useCallback, useMemo, useState} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {Inline, InlineProps} from '../../primitives'
 
 /**

package/src/core/components/toast/toast.tsx

@@ -1,6 +1,6 @@
 import {CloseIcon} from '@sanity/icons'
 import {ThemeColorToneKey} from '@sanity/ui/theme'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {POPOVER_MOTION_CONTENT_OPACITY_PROPERTY} from '../../constants'
 import {Box, Button, Card, Flex, Stack, Text} from '../../primitives'
 import type {ButtonTone} from '../../types'

package/src/core/components/toast/toastProvider.tsx

@@ -1,6 +1,6 @@
 import {AnimatePresence, motion, type Variants} from 'framer-motion'
 import {useMemo, useRef, useState, startTransition, useEffect} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {POPOVER_MOTION_CONTENT_OPACITY_PROPERTY} from '../../constants'
 import {useMounted} from '../../hooks/useMounted'
 import {usePrefersReducedMotion} from '../../hooks/usePrefersReducedMotion'

package/src/core/components/tree/style.ts

@@ -1,3 +1,4 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {rem, ThemeProps} from '../../styles'
 import {_cardColorStyle} from '../../styles/card'
@@ -37,7 +38,7 @@ export function treeItemRootStyle(): ReturnType<typeof css> {
 
 export function treeItemRootColorStyle(props: ThemeProps): ReturnType<typeof css> {
   const $tone = 'default'
-  const {color} = props.theme.sanity.v2
+  const {color} = getTheme_v2(props.theme)
   const tone = color.selectable[$tone]
 
   return css`
@@ -91,7 +92,7 @@ export function treeItemBoxStyle(
   props: TreeItemBoxStyleProps & ThemeProps,
 ): ReturnType<typeof css> {
   const {$level} = props
-  const {space} = props.theme.sanity.v2
+  const {space} = getTheme_v2(props.theme)
 
   return css`
     padding-left: ${rem(space[2] * $level)};

package/src/core/components/tree/treeItem.tsx

@@ -1,7 +1,7 @@
 import {ToggleArrowRightIcon} from '@sanity/icons'
 import {ThemeFontWeightKey} from '@sanity/ui/theme'
 import {createElement, memo, useCallback, useEffect, useId, useMemo, useRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {Box, BoxProps, Flex, Text} from '../../primitives'
 import {
   treeItemRootStyle,

package/src/core/hooks/useMediaIndex/useMediaIndex.test.tsx

@@ -1,7 +1,7 @@
 /** @jest-environment node */
 
+import {buildTheme} from '@sanity/ui/theme'
 import {renderToString, renderToStaticMarkup} from 'react-dom/server'
-import {buildTheme} from '../../../theme'
 import {ThemeProvider} from '../../theme'
 import {useMediaIndex} from './useMediaIndex'
 

package/src/core/primitives/_selectable/selectable.tsx

@@ -1,4 +1,4 @@
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/radius'
 import {Box} from '../box'
 import {selectableBaseStyle, selectableColorStyle, SelectableStyleProps} from './style'

package/src/core/primitives/_selectable/style.ts

@@ -1,3 +1,4 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
 import {_cardColorStyle} from '../../styles/card'
@@ -38,7 +39,7 @@ export function selectableColorStyle(
   props: SelectableStyleProps & ThemeProps,
 ): ReturnType<typeof css> {
   const {$tone} = props
-  const {color, style} = props.theme.sanity.v2
+  const {color, style} = getTheme_v2(props.theme)
   const tone = color.selectable[$tone]
 
   return css`

package/src/core/primitives/avatar/avatar.tsx

@@ -1,7 +1,7 @@
 import {ThemeColorAvatarColorKey} from '@sanity/ui/theme'
 import {forwardRef, useCallback, useEffect, useId, useMemo, useState} from 'react'
 import ReactIs from 'react-is'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {useTheme_v2} from '../../theme'
 import {AvatarPosition, AvatarSize, AvatarStatus} from '../../types'

package/src/core/primitives/avatar/avatarCounter.tsx

@@ -1,5 +1,6 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {forwardRef, useMemo} from 'react'
-import styled, {css} from 'styled-components'
+import {styled, css} from 'styled-components'
 import {EMPTY_RECORD} from '../../constants'
 import {useArrayProp} from '../../hooks'
 import {rem, _responsive, ThemeProps} from '../../styles'
@@ -7,7 +8,7 @@ import {AvatarSize} from '../../types'
 import {Label} from '../label'
 
 function _responsiveAvatarCounterSizeStyle(props: {$size: AvatarSize[]} & ThemeProps) {
-  const {avatar, media} = props.theme.sanity.v2
+  const {avatar, media} = getTheme_v2(props.theme)
 
   return _responsive(media, props.$size, (size) => {
     const avatarSize = avatar.sizes[size]
@@ -23,7 +24,7 @@ function _responsiveAvatarCounterSizeStyle(props: {$size: AvatarSize[]} & ThemeP
 }
 
 function _avatarCounterBaseStyle(props: ThemeProps) {
-  const {space} = props.theme.sanity.v2
+  const {space} = getTheme_v2(props.theme)
 
   return css`
     align-items: center;

package/src/core/primitives/avatar/avatarStack.tsx

@@ -1,5 +1,6 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {cloneElement, forwardRef} from 'react'
-import styled, {css} from 'styled-components'
+import {styled, css} from 'styled-components'
 import {EMPTY_RECORD} from '../../constants'
 import {useArrayProp} from '../../hooks'
 import {rem, _responsive, ThemeProps} from '../../styles'
@@ -24,7 +25,7 @@ function avatarStackStyle() {
 }
 
 function responsiveAvatarStackSizeStyle(props: {$size: AvatarSize[]} & ThemeProps) {
-  const {avatar, media} = props.theme.sanity.v2
+  const {avatar, media} = getTheme_v2(props.theme)
 
   return _responsive(media, props.$size, (size) => {
     const avatarSize = avatar.sizes[size]

package/src/core/primitives/avatar/styles.ts

@@ -1,4 +1,4 @@
-import {CSSObject} from '@sanity/ui/theme'
+import {CSSObject, getTheme_v2} from '@sanity/ui/theme'
 import {rem, _responsive, ThemeProps} from '../../styles'
 import {focusRingStyle} from '../../styles/internal'
 import {AvatarRootStyleProps, ResponsiveAvatarSizeStyleProps} from './types'
@@ -57,7 +57,7 @@ function avatarArrowStyle(): CSSObject {
 
 export function avatarRootStyle(props: AvatarRootStyleProps & ThemeProps): CSSObject {
   const {$color} = props
-  const {avatar} = props.theme.sanity.v2
+  const {avatar} = getTheme_v2(props.theme)
 
   return {
     '--avatar-bg-color': `var(--card-avatar-${$color}-bg-color)`,
@@ -104,7 +104,7 @@ export function avatarRootStyle(props: AvatarRootStyleProps & ThemeProps): CSSOb
 export function responsiveAvatarSizeStyle(
   props: ResponsiveAvatarSizeStyleProps & ThemeProps,
 ): CSSObject[] {
-  const {avatar, media} = props.theme.sanity.v2
+  const {avatar, media} = getTheme_v2(props.theme)
 
   return _responsive(media, props.$size, (size) => {
     const avatarSize = avatar.sizes[size] || avatar.sizes[0]

package/src/core/primitives/badge/badge.tsx

@@ -1,5 +1,5 @@
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
 import {BadgeMode, BadgeTone} from '../../types'

package/src/core/primitives/box/box.tsx

@@ -1,5 +1,5 @@
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {
   boxStyle,

package/src/core/primitives/button/__workshop__/sanityUploadButton.tsx

@@ -1,6 +1,6 @@
 import {UploadIcon} from '@sanity/icons'
 import {Button, Flex} from '@sanity/ui'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 
 const SanityUploadButton = styled(Button).attrs({forwardedAs: 'label'})`
   & input {

package/src/core/primitives/button/__workshop__/styled1.tsx

@@ -1,5 +1,5 @@
 import {Button, Flex} from '@sanity/ui'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 
 const StyledButton1 = styled.a`
   &:hover {

package/src/core/primitives/button/__workshop__/styled2.tsx

@@ -1,5 +1,5 @@
 import {Button, Flex} from '@sanity/ui'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 
 const StyledButton2 = styled(Button)<{$color?: boolean}>`
   &:hover {

package/src/core/primitives/button/button.tsx

@@ -1,6 +1,6 @@
 import {createElement, forwardRef, isValidElement, useMemo} from 'react'
 import {isValidElementType} from 'react-is'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {ThemeProps} from '../../styles'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'

package/src/core/primitives/button/styles.ts

@@ -1,4 +1,4 @@
-import {CSSObject} from '@sanity/ui/theme'
+import {CSSObject, getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
 import {_cardColorStyle} from '../../styles/card'
@@ -12,7 +12,7 @@ export function buttonBaseStyles(
   props: {$width?: ButtonWidth} & ThemeProps,
 ): ReturnType<typeof css> {
   const {$width} = props
-  const {style} = props.theme.sanity.v2
+  const {style} = getTheme_v2(props.theme)
 
   return css`
     ${style?.button};
@@ -67,7 +67,7 @@ export function buttonColorStyles(
   props: {$mode: ButtonMode; $tone: ButtonTone} & ThemeProps,
 ): CSSObject[] {
   const {$mode} = props
-  const {button, color: baseColor, style} = props.theme.sanity.v2
+  const {button, color: baseColor, style} = getTheme_v2(props.theme)
   const shadow = props.$mode === 'ghost'
   const mode = baseColor.button[$mode] || baseColor.button.default
   const color = mode[props.$tone] || mode.default

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

@@ -1,8 +1,8 @@
 import {EditIcon, PublishIcon} from '@sanity/icons'
 import {Box, Card, Container, Flex, Inline, Stack, Text, ThemeProps, useRootTheme} from '@sanity/ui'
-import {ThemeColorStateToneKey} from '@sanity/ui/theme'
+import {ThemeColorStateToneKey, getTheme_v2} from '@sanity/ui/theme'
 import {useBoolean} from '@sanity/ui-workshop'
-import styled, {css} from 'styled-components'
+import {styled, css} from 'styled-components'
 
 const TextWithTone = styled(Text)<{$tone: ThemeColorStateToneKey}>((
   props: {
@@ -10,7 +10,7 @@ const TextWithTone = styled(Text)<{$tone: ThemeColorStateToneKey}>((
   } & ThemeProps,
 ) => {
   const {$tone} = props
-  const {color} = props.theme.sanity.v2
+  const {color} = getTheme_v2(props.theme)
   const tone = color.button.default[$tone]
 
   return css`

package/src/core/primitives/card/__workshop__/styled.tsx

@@ -1,5 +1,5 @@
 import {Card, Flex, Text} from '@sanity/ui'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 
 const StyledCard = styled(Card).attrs({forwardedAs: 'ol'})``
 

package/src/core/primitives/card/card.tsx

@@ -1,7 +1,7 @@
 import {ThemeColorSchemeKey} from '@sanity/ui/theme'
 import {forwardRef} from 'react'
 import {isValidElementType} from 'react-is'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {
   responsiveBorderStyle,

package/src/core/primitives/card/styles.ts

@@ -1,3 +1,4 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {ThemeProps} from '../../styles'
 import {_cardColorStyle} from '../../styles/card'
@@ -12,7 +13,7 @@ export function cardStyle(
 
 export function cardBaseStyle(props: CardStyleProps & ThemeProps): ReturnType<typeof css> {
   const {$checkered} = props
-  const {space} = props.theme.sanity.v2
+  const {space} = getTheme_v2(props.theme)
 
   return css`
     ${$checkered &&
@@ -49,7 +50,7 @@ export function cardBaseStyle(props: CardStyleProps & ThemeProps): ReturnType<ty
 
 export function cardColorStyle(props: CardStyleProps & ThemeProps): ReturnType<typeof css> {
   const {$checkered, $focusRing} = props
-  const {card, color, style} = props.theme.sanity.v2
+  const {card, color, style} = getTheme_v2(props.theme)
   const border = {width: card.border.width, color: 'var(--card-border-color)'}
 
   return css`

package/src/core/primitives/checkbox/checkbox.tsx

@@ -1,6 +1,6 @@
 import {CheckmarkIcon, RemoveIcon} from '@sanity/icons'
 import {forwardRef, useEffect} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useForwardedRef, useCustomValidity} from '../../hooks'
 import {checkboxBaseStyles, inputElementStyles} from './styles'
 

package/src/core/primitives/checkbox/styles.ts

@@ -1,3 +1,4 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {css} from 'styled-components'
 import {rem, ThemeProps} from '../../styles'
 import {focusRingBorderStyle, focusRingStyle} from '../../styles/internal'
@@ -10,7 +11,7 @@ export function checkboxBaseStyles(): ReturnType<typeof css> {
 }
 
 export function inputElementStyles(props: ThemeProps): ReturnType<typeof css> {
-  const {color, input, radius} = props.theme.sanity.v2
+  const {color, input, radius} = getTheme_v2(props.theme)
   const {focusRing} = input.checkbox
 
   return css`

package/src/core/primitives/code/code.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {forwardRef} from 'react'
 import Refractor from 'react-refractor'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {responsiveCodeFontStyle, ResponsiveFontStyleProps} from '../../styles/internal'
 import {codeBaseStyle} from './styles'

package/src/core/primitives/code/styles.ts

@@ -1,7 +1,10 @@
+import {getTheme_v2} from '@sanity/ui/theme'
 import {css, ExecutionContext} from 'styled-components'
 
 function codeSyntaxHighlightingStyle({theme}: ExecutionContext) {
-  const color = theme.sanity.v2.color.syntax
+  const {
+    color: {syntax: color},
+  } = getTheme_v2(theme)
 
   return {
     '&.atrule': {color: color.atrule},

package/src/core/primitives/container/container.tsx

@@ -1,5 +1,5 @@
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {Box, BoxProps} from '../box'
 import {ResponsiveWidthProps} from '../types'

package/src/core/primitives/container/styles.ts

@@ -1,4 +1,4 @@
-import {CSSObject} from '@sanity/ui/theme'
+import {CSSObject, getTheme_v2} from '@sanity/ui/theme'
 import {rem, _responsive, ThemeProps} from '../../styles'
 import {ResponsiveWidthStyleProps} from './types'
 
@@ -14,7 +14,7 @@ export function containerBaseStyle(): CSSObject {
 export function responsiveContainerWidthStyle(
   props: ResponsiveWidthStyleProps & ThemeProps,
 ): CSSObject[] {
-  const {container, media} = props.theme.sanity.v2
+  const {container, media} = getTheme_v2(props.theme)
 
   return _responsive(media, props.$width, (val) => ({
     maxWidth: val === 'auto' ? 'none' : rem(container[val]),

package/src/core/primitives/flex/__workshop__/example.tsx

@@ -1,6 +1,6 @@
 import {Card, Code, Flex} from '@sanity/ui'
 import {useSelect} from '@sanity/ui-workshop'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {WORKSHOP_FLEX_DIRECTION_OPTIONS} from '../../../__workshop__/constants'
 
 const DebugCard = styled(Card)`

package/src/core/primitives/flex/flex.tsx

@@ -1,5 +1,5 @@
 import {forwardRef} from 'react'
-import styled from 'styled-components'
+import {styled} from 'styled-components'
 import {useArrayProp} from '../../hooks'
 import {
   flexItemStyle,