@sanity/ui 2.3.6-canary.6 → 2.3.6

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

@@ -45,6 +45,8 @@ const ToastContainer = styled.div`
   width: 100%;
 `
 
+let toastId = 0
+
 /**
  * @public
  */
@@ -55,7 +57,27 @@ export function ToastProvider(props: ToastProviderProps): React.ReactElement {
   const mounted = useMounted()
   const prefersReducedMotion = usePrefersReducedMotion()
   const variants = useMemo<Variants>(
-    () => getVariants(prefersReducedMotion),
+    () => ({
+      initial: {
+        opacity: 0,
+        [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: 0,
+        y: 32,
+        scale: 0.25,
+        willChange: 'transform',
+      },
+      animate: {
+        opacity: [0, 1, 1],
+        [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: [0, 0, 1],
+        y: 0,
+        scale: 1,
+      },
+      exit: {
+        opacity: [1, 1, 0],
+        [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: [1, 0, 0],
+        scale: 0.5,
+        transition: prefersReducedMotion ? {duration: 0} : {duration: 0.2},
+      },
+    }),
     [prefersReducedMotion],
   )
 
@@ -64,7 +86,7 @@ export function ToastProvider(props: ToastProviderProps): React.ReactElement {
       // Wrap setState in startTransition to allow React to give input state updates higher priority
       const setState: typeof _setState = (state) => startTransition(() => _setState(state))
 
-      const id = params.id || crypto.randomUUID()
+      const id = params.id || String(toastId++)
       const duration = params.duration || 5000
 
       const dismiss = () => {
@@ -166,27 +188,3 @@ export function ToastProvider(props: ToastProviderProps): React.ReactElement {
     </ToastContext.Provider>
   )
 }
-
-function getVariants(prefersReducedMotion: boolean) {
-  return {
-    initial: {
-      opacity: 0,
-      [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: 0,
-      y: 32,
-      scale: 0.25,
-      willChange: 'transform',
-    },
-    animate: {
-      opacity: [0, 1, 1],
-      [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: [0, 0, 1],
-      y: 0,
-      scale: 1,
-    },
-    exit: {
-      opacity: [1, 1, 0],
-      [POPOVER_MOTION_CONTENT_OPACITY_PROPERTY as string]: [1, 0, 0],
-      scale: 0.5,
-      transition: {duration: prefersReducedMotion ? 0 : 0.2},
-    },
-  }
-}

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

@@ -1,10 +1,16 @@
 import {ToggleArrowRightIcon} from '@sanity/icons'
 import {ThemeFontWeightKey} from '@sanity/ui/theme'
 import {memo, useCallback, useEffect, useId, useMemo, useRef} from 'react'
+import {styled} from 'styled-components'
 import {Box, BoxProps, Flex, Text} from '../../primitives'
+import {
+  treeItemRootStyle,
+  treeItemRootColorStyle,
+  treeItemBoxStyle,
+  TreeItemBoxStyleProps,
+} from './style'
 import {TreeContext} from './treeContext'
 import {TreeGroup} from './treeGroup'
-import {Root, ToggleArrowText, TreeItemBox} from './treeItem.styles'
 import {useTree} from './useTree'
 
 /**
@@ -24,6 +30,16 @@ export interface TreeItemProps {
   weight?: ThemeFontWeightKey
 }
 
+const Root = memo(styled.li(treeItemRootStyle, treeItemRootColorStyle))
+
+const TreeItemBox = styled(Box).attrs({forwardedAs: 'a'})<TreeItemBoxStyleProps>(treeItemBoxStyle)
+
+const ToggleArrowText = styled(Text)`
+  & > svg {
+    transition: transform 100ms;
+  }
+`
+
 /**
  * This API might change. DO NOT USE IN PRODUCTION.
  * @beta
@@ -54,7 +70,7 @@ export const TreeItem = memo(function TreeItem(
   const {path, registerItem, setExpanded, setFocusedElement} = tree
   const _id = useId()
   const id = idProp || _id
-  const itemPath = useMemo(() => [...path, id || ''], [id, path])
+  const itemPath = useMemo(() => path.concat([id || '']), [id, path])
   const itemKey = itemPath.join('/')
   const itemState = tree.state[itemKey]
   const focused = tree.focusedElement === rootRef.current
@@ -67,7 +83,7 @@ export const TreeItem = memo(function TreeItem(
 
   const handleClick = useCallback(
     (event: React.MouseEvent<HTMLLIElement>) => {
-      onClick?.(event)
+      if (onClick) onClick(event)
 
       const target = event.target
 
@@ -101,35 +117,32 @@ export const TreeItem = memo(function TreeItem(
     return registerItem(rootRef.current, itemPath.join('/'), expanded, selected)
   }, [expanded, itemPath, registerItem, selected])
 
-  const content = useMemo(
-    () => (
-      <Flex padding={padding}>
-        <Box
-          marginRight={space}
-          style={{
-            visibility: IconComponent || children ? 'visible' : 'hidden',
-            pointerEvents: 'none',
-          }}
-        >
-          {IconComponent && (
-            <Text muted={muted} size={fontSize} weight={weight}>
-              <IconComponent />
-            </Text>
-          )}
-          {!IconComponent && (
-            <ToggleArrowText muted={muted} size={fontSize} weight={weight}>
-              <ToggleArrowRightIcon style={{transform: expanded ? 'rotate(90deg)' : undefined}} />
-            </ToggleArrowText>
-          )}
-        </Box>
-        <Box flex={1}>
-          <Text muted={muted} size={fontSize} textOverflow="ellipsis" weight={weight}>
-            {text}
+  const content = (
+    <Flex padding={padding}>
+      <Box
+        marginRight={space}
+        style={{
+          visibility: IconComponent || children ? 'visible' : 'hidden',
+          pointerEvents: 'none',
+        }}
+      >
+        {IconComponent && (
+          <Text muted={muted} size={fontSize} weight={weight}>
+            <IconComponent />
           </Text>
-        </Box>
-      </Flex>
-    ),
-    [IconComponent, children, expanded, fontSize, muted, padding, space, text, weight],
+        )}
+        {!IconComponent && (
+          <ToggleArrowText muted={muted} size={fontSize} weight={weight}>
+            <ToggleArrowRightIcon style={{transform: expanded ? 'rotate(90deg)' : undefined}} />
+          </ToggleArrowText>
+        )}
+      </Box>
+      <Box flex={1}>
+        <Text muted={muted} size={fontSize} textOverflow="ellipsis" weight={weight}>
+          {text}
+        </Text>
+      </Box>
+    </Flex>
   )
 
   if (href) {

package/src/core/hooks/useArrayProp.ts

@@ -7,20 +7,19 @@ export type ArrayPropPrimitive = string | number | boolean | undefined | null
 /**
  * This API might change. DO NOT USE IN PRODUCTION.
  * @beta
- * @deprecated use `_getArrayProp` and `useMemo` directly instead
- * @example
- * ```diff
- * -import {useArrayProp} from '@sanity/ui'
- * +import {_getArrayProp} from '@sanity/ui'
- * +import {useMemo} from 'react'
- *
- * -const width = useArrayProp(props.width)
- * +const width = useMemo(() => _getArrayProp(props.width), [props.width])
- * ```
  */
 export function useArrayProp<T extends ArrayPropPrimitive = ArrayPropPrimitive>(
   val: T | T[] | undefined,
   defaultVal?: T[],
 ): T[] {
-  return useMemo(() => _getArrayProp(val, defaultVal), [defaultVal, val])
+  // JSON.stringify is fast, but it's not faster than useMemo's referencial equality check
+  const __perf_hash__ = useMemo(() => JSON.stringify(val ?? defaultVal), [defaultVal, val])
+
+  return useMemo(
+    () => _getArrayProp(val, defaultVal),
+
+    // Improve performance: Keep object identify for a given hash of the value
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [__perf_hash__],
+  )
 }

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

@@ -1,8 +1,8 @@
 import {ThemeColorAvatarColorKey} from '@sanity/ui/theme'
-import {forwardRef, useCallback, useEffect, useId, useState} from 'react'
-import {isValidElementType} from 'react-is'
+import {forwardRef, useCallback, useEffect, useId, useMemo, useState} from 'react'
+import ReactIs from 'react-is'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {useTheme_v2} from '../../theme'
 import {AvatarPosition, AvatarSize, AvatarStatus} from '../../types'
 import {Label} from '../label'
@@ -73,8 +73,8 @@ export const Avatar = forwardRef(function Avatar(
     ...restProps
   } = props
   const {avatar} = useTheme_v2()
-  const as = isValidElementType(asProp) ? asProp : 'div'
-  const size = _getArrayProp(sizeProp)
+  const as = ReactIs.isValidElementType(asProp) ? asProp : 'div'
+  const size = useArrayProp(sizeProp)
 
   // @todo: remove this
   const avatarSize = avatar.sizes[size[0]] || avatar.sizes[0]
@@ -111,13 +111,17 @@ export const Avatar = forwardRef(function Avatar(
     }
   }, [onImageLoadError])
 
-  const initialsSize = size.map((s) => {
-    if (s === 1) return 1
-    if (s === 2) return 3
-    if (s === 3) return 5
+  const initialsSize = useMemo(
+    () =>
+      size.map((s) => {
+        if (s === 1) return 1
+        if (s === 2) return 3
+        if (s === 3) return 5
 
-    return 0
-  })
+        return 0
+      }),
+    [size],
+  )
 
   return (
     <Root

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

@@ -1,8 +1,9 @@
 import {getTheme_v2} from '@sanity/ui/theme'
-import {forwardRef} from 'react'
+import {forwardRef, useMemo} from 'react'
 import {styled, css} from 'styled-components'
 import {EMPTY_RECORD} from '../../constants'
-import {rem, _responsive, ThemeProps, _getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
+import {rem, _responsive, ThemeProps} from '../../styles'
 import {AvatarSize} from '../../types'
 import {Label} from '../label'
 
@@ -66,18 +67,23 @@ export const AvatarCounter = forwardRef(function AvatarCounter(
   props: AvatarCounterProps,
   ref: React.Ref<HTMLDivElement>,
 ) {
-  const {count, size} = props
-  const $size = _getArrayProp(size ?? 1)
-  const fontSize = $size.map((s) => {
-    if (s === 1) return 1
-    if (s === 2) return 3
-    if (s === 3) return 5
+  const {count, size: sizeProp = 1} = props
+  const size = useArrayProp(sizeProp)
 
-    return 0
-  })
+  const fontSize = useMemo(
+    () =>
+      size.map((s) => {
+        if (s === 1) return 1
+        if (s === 2) return 3
+        if (s === 3) return 5
+
+        return 0
+      }),
+    [size],
+  )
 
   return (
-    <Root $size={$size} data-ui="AvatarCounter" ref={ref}>
+    <Root $size={size} data-ui="AvatarCounter" ref={ref}>
       <Label as="span" size={fontSize} weight="medium">
         {count}
       </Label>

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

@@ -2,7 +2,8 @@ import {getTheme_v2} from '@sanity/ui/theme'
 import {Children, cloneElement, forwardRef, isValidElement, useMemo} from 'react'
 import {styled, css} from 'styled-components'
 import {EMPTY_RECORD} from '../../constants'
-import {rem, _responsive, ThemeProps, _getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
+import {rem, _responsive, ThemeProps} from '../../styles'
 import {AvatarSize} from '../../types'
 import {AvatarCounter} from './avatarCounter'
 
@@ -64,9 +65,12 @@ export const AvatarStack = forwardRef(function AvatarStack(
     size: sizeProp = 1,
     ...restProps
   } = props
-  const children: React.ReactElement[] = Children.toArray(childrenProp).filter(isValidElement)
+  const children = useMemo<React.ReactElement[]>(
+    () => Children.toArray(childrenProp).filter(isValidElement),
+    [childrenProp],
+  )
   const maxLength = Math.max(maxLengthProp, 0)
-  const size = useMemo(() => _getArrayProp(sizeProp), [sizeProp])
+  const size = useArrayProp(sizeProp)
 
   const len = children.length
   const visibleCount = maxLength - 1

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

@@ -1,6 +1,6 @@
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
 import {BadgeMode, BadgeTone} from '../../types'
 import {Box, BoxProps} from '../box'
@@ -45,16 +45,13 @@ export const Badge = forwardRef(function Badge(
     ...restProps
   } = props
 
-  const $radius = useMemo(() => _getArrayProp(radius), [radius])
-  const $padding = useMemo(() => _getArrayProp(padding), [padding])
-
   return (
     <Root
       data-ui="Badge"
       {...restProps}
       $tone={tone}
-      $radius={$radius}
-      padding={$padding}
+      $radius={useArrayProp(radius)}
+      padding={useArrayProp(padding)}
       ref={ref}
     >
       <Text size={fontSize}>{children}</Text>

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

@@ -1,6 +1,6 @@
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {
   boxStyle,
   flexItemStyle,
@@ -90,62 +90,36 @@ export const Box = forwardRef(function Box(
     ...restProps
   } = props
 
-  const $column = useMemo(() => _getArrayProp(column), [column])
-  const $columnStart = useMemo(() => _getArrayProp(columnStart), [columnStart])
-  const $columnEnd = useMemo(() => _getArrayProp(columnEnd), [columnEnd])
-  const $display = useMemo(() => _getArrayProp(display), [display])
-  const $flex = useMemo(() => _getArrayProp(flex), [flex])
-  const $height = useMemo(() => _getArrayProp(height), [height])
-  const $margin = useMemo(() => _getArrayProp(margin), [margin])
-  const $marginX = useMemo(() => _getArrayProp(marginX), [marginX])
-  const $marginY = useMemo(() => _getArrayProp(marginY), [marginY])
-  const $marginTop = useMemo(() => _getArrayProp(marginTop), [marginTop])
-  const $marginRight = useMemo(() => _getArrayProp(marginRight), [marginRight])
-  const $marginBottom = useMemo(() => _getArrayProp(marginBottom), [marginBottom])
-  const $marginLeft = useMemo(() => _getArrayProp(marginLeft), [marginLeft])
-  const $overflow = useMemo(() => _getArrayProp(overflow), [overflow])
-  const $padding = useMemo(() => _getArrayProp(padding), [padding])
-  const $paddingX = useMemo(() => _getArrayProp(paddingX), [paddingX])
-  const $paddingY = useMemo(() => _getArrayProp(paddingY), [paddingY])
-  const $paddingTop = useMemo(() => _getArrayProp(paddingTop), [paddingTop])
-  const $paddingRight = useMemo(() => _getArrayProp(paddingRight), [paddingRight])
-  const $paddingBottom = useMemo(() => _getArrayProp(paddingBottom), [paddingBottom])
-  const $paddingLeft = useMemo(() => _getArrayProp(paddingLeft), [paddingLeft])
-  const $row = useMemo(() => _getArrayProp(row), [row])
-  const $rowStart = useMemo(() => _getArrayProp(rowStart), [rowStart])
-  const $rowEnd = useMemo(() => _getArrayProp(rowEnd), [rowEnd])
-  const $sizing = useMemo(() => _getArrayProp(sizing), [sizing])
-
   return (
     <Root
       data-as={typeof asProp === 'string' ? asProp : undefined}
       data-ui="Box"
       {...restProps}
-      $column={$column}
-      $columnStart={$columnStart}
-      $columnEnd={$columnEnd}
-      $display={$display}
-      $flex={$flex}
-      $height={$height}
-      $margin={$margin}
-      $marginX={$marginX}
-      $marginY={$marginY}
-      $marginTop={$marginTop}
-      $marginRight={$marginRight}
-      $marginBottom={$marginBottom}
-      $marginLeft={$marginLeft}
-      $overflow={$overflow}
-      $padding={$padding}
-      $paddingX={$paddingX}
-      $paddingY={$paddingY}
-      $paddingTop={$paddingTop}
-      $paddingRight={$paddingRight}
-      $paddingBottom={$paddingBottom}
-      $paddingLeft={$paddingLeft}
-      $row={$row}
-      $rowStart={$rowStart}
-      $rowEnd={$rowEnd}
-      $sizing={$sizing}
+      $column={useArrayProp(column)}
+      $columnStart={useArrayProp(columnStart)}
+      $columnEnd={useArrayProp(columnEnd)}
+      $display={useArrayProp(display)}
+      $flex={useArrayProp(flex)}
+      $height={useArrayProp(height)}
+      $margin={useArrayProp(margin)}
+      $marginX={useArrayProp(marginX)}
+      $marginY={useArrayProp(marginY)}
+      $marginTop={useArrayProp(marginTop)}
+      $marginRight={useArrayProp(marginRight)}
+      $marginBottom={useArrayProp(marginBottom)}
+      $marginLeft={useArrayProp(marginLeft)}
+      $overflow={useArrayProp(overflow)}
+      $padding={useArrayProp(padding)}
+      $paddingX={useArrayProp(paddingX)}
+      $paddingY={useArrayProp(paddingY)}
+      $paddingTop={useArrayProp(paddingTop)}
+      $paddingRight={useArrayProp(paddingRight)}
+      $paddingBottom={useArrayProp(paddingBottom)}
+      $paddingLeft={useArrayProp(paddingLeft)}
+      $row={useArrayProp(row)}
+      $rowStart={useArrayProp(rowStart)}
+      $rowEnd={useArrayProp(rowEnd)}
+      $sizing={useArrayProp(sizing)}
       as={asProp}
       ref={ref}
     >

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

@@ -1,7 +1,8 @@
 import {forwardRef, isValidElement, useMemo} from 'react'
 import {isValidElementType} from 'react-is'
 import {styled} from 'styled-components'
-import {ThemeProps, _getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
+import {ThemeProps} from '../../styles'
 import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
 import {useTheme_v2} from '../../theme'
 import {ButtonMode, ButtonTextAlign, ButtonTone, ButtonWidth, FlexJustify} from '../../types'
@@ -92,16 +93,16 @@ export const Button = forwardRef(function Button(
   } = props
   const {button} = useTheme_v2()
 
-  const justify = useMemo(() => _getArrayProp(justifyProp), [justifyProp])
-  const padding = useMemo(() => _getArrayProp(paddingProp), [paddingProp])
-  const paddingX = useMemo(() => _getArrayProp(paddingXProp), [paddingXProp])
-  const paddingY = useMemo(() => _getArrayProp(paddingYProp), [paddingYProp])
-  const paddingTop = useMemo(() => _getArrayProp(paddingTopProp), [paddingTopProp])
-  const paddingBottom = useMemo(() => _getArrayProp(paddingBottomProp), [paddingBottomProp])
-  const paddingLeft = useMemo(() => _getArrayProp(paddingLeftProp), [paddingLeftProp])
-  const paddingRight = useMemo(() => _getArrayProp(paddingRightProp), [paddingRightProp])
-  const radius = useMemo(() => _getArrayProp(radiusProp), [radiusProp])
-  const space = useMemo(() => _getArrayProp(spaceProp), [spaceProp])
+  const justify = useArrayProp(justifyProp)
+  const padding = useArrayProp(paddingProp)
+  const paddingX = useArrayProp(paddingXProp)
+  const paddingY = useArrayProp(paddingYProp)
+  const paddingTop = useArrayProp(paddingTopProp)
+  const paddingBottom = useArrayProp(paddingBottomProp)
+  const paddingLeft = useArrayProp(paddingLeftProp)
+  const paddingRight = useArrayProp(paddingRightProp)
+  const radius = useArrayProp(radiusProp)
+  const space = useArrayProp(spaceProp)
 
   const boxProps = useMemo(
     () => ({

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

@@ -1,8 +1,8 @@
 import {ThemeColorSchemeKey} from '@sanity/ui/theme'
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import {isValidElementType} from 'react-is'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {
   responsiveBorderStyle,
   ResponsiveBorderStyleProps,
@@ -82,14 +82,6 @@ export const Card = forwardRef(function Card(
   const rootTheme = useRootTheme()
   const tone = toneProp === 'inherit' ? rootTheme.tone : toneProp
 
-  const $border = useMemo(() => _getArrayProp(border), [border])
-  const $borderTop = useMemo(() => _getArrayProp(borderTop), [borderTop])
-  const $borderRight = useMemo(() => _getArrayProp(borderRight), [borderRight])
-  const $borderBottom = useMemo(() => _getArrayProp(borderBottom), [borderBottom])
-  const $borderLeft = useMemo(() => _getArrayProp(borderLeft), [borderLeft])
-  const $radius = useMemo(() => _getArrayProp(radius), [radius])
-  const $shadow = useMemo(() => _getArrayProp(shadow), [shadow])
-
   // 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}>
@@ -99,16 +91,16 @@ export const Card = forwardRef(function Card(
         data-ui="Card"
         data-tone={tone}
         {...restProps}
-        $border={$border}
-        $borderTop={$borderTop}
-        $borderRight={$borderRight}
-        $borderBottom={$borderBottom}
-        $borderLeft={$borderLeft}
-        $radius={$radius}
-        $shadow={$shadow}
+        $border={useArrayProp(border)}
+        $borderTop={useArrayProp(borderTop)}
+        $borderRight={useArrayProp(borderRight)}
+        $borderBottom={useArrayProp(borderBottom)}
+        $borderLeft={useArrayProp(borderLeft)}
         $checkered={checkered}
         $focusRing={focusRing}
         $muted={muted}
+        $radius={useArrayProp(radius)}
+        $shadow={useArrayProp(shadow)}
         $tone={tone}
         data-checkered={checkered ? '' : undefined}
         data-pressed={pressed ? '' : undefined}

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

@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import Refractor from 'react-refractor'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {responsiveCodeFontStyle, ResponsiveFontStyleProps} from '../../styles/internal'
 import {codeBaseStyle} from './styles'
 
@@ -29,10 +29,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 $size = useMemo(() => _getArrayProp(size), [size])
 
   return (
-    <Root data-ui="Code" {...restProps} $size={$size} $weight={weight} ref={ref}>
+    <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>

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

@@ -1,6 +1,6 @@
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {Box, BoxProps} from '../box'
 import {ResponsiveWidthProps} from '../types'
 import {containerBaseStyle, responsiveContainerWidthStyle} from './styles'
@@ -26,7 +26,14 @@ export const Container = forwardRef(function Container(
   ref: React.ForwardedRef<HTMLDivElement>,
 ) {
   const {as, width = 2, ...restProps} = props
-  const $width = useMemo(() => _getArrayProp(width), [width])
 
-  return <Root data-ui="Container" {...restProps} $width={$width} forwardedAs={as} ref={ref} />
+  return (
+    <Root
+      data-ui="Container"
+      {...restProps}
+      $width={useArrayProp(width)}
+      forwardedAs={as}
+      ref={ref}
+    />
+  )
 })

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

@@ -1,6 +1,6 @@
-import {forwardRef, useMemo} from 'react'
+import {forwardRef} from 'react'
 import {styled} from 'styled-components'
-import {_getArrayProp} from '../../styles'
+import {useArrayProp} from '../../hooks'
 import {
   flexItemStyle,
   FlexItemStyleProps,
@@ -36,21 +36,15 @@ export const Flex = forwardRef(function Flex(
 ) {
   const {align, as, direction = 'row', gap, justify, wrap, ...restProps} = props
 
-  const $align = useMemo(() => _getArrayProp(align), [align])
-  const $direction = useMemo(() => _getArrayProp(direction), [direction])
-  const $gap = useMemo(() => _getArrayProp(gap), [gap])
-  const $justify = useMemo(() => _getArrayProp(justify), [justify])
-  const $wrap = useMemo(() => _getArrayProp(wrap), [wrap])
-
   return (
     <Root
       data-ui="Flex"
       {...restProps}
-      $align={$align}
-      $direction={$direction}
-      $gap={$gap}
-      $justify={$justify}
-      $wrap={$wrap}
+      $align={useArrayProp(align)}
+      $direction={useArrayProp(direction)}
+      $gap={useArrayProp(gap)}
+      $justify={useArrayProp(justify)}
+      $wrap={useArrayProp(wrap)}
       forwardedAs={as}
       ref={ref}
     />