@sanity/ui 0.38.2 → 0.38.3-next.18

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@sanity/ui",
-  "version": "0.38.2",
+  "version": "0.38.3-next.18+f1216ee3",
   "sideEffects": false,
-  "source": "./src/index.ts",
-  "module": "./dist/sanity-ui.js",
   "types": "./dist/types/src/index.d.ts",
-  "main": "./dist/sanity-ui.cjs",
+  "source": "./src/index.ts",
+  "module": "./dist/sanity-ui.mjs",
+  "main": "./dist/sanity-ui.js",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
       "source": "./src/index.ts",
-      "import": "./dist/sanity-ui.js",
-      "require": "./dist/sanity-ui.cjs",
-      "default": "./dist/sanity-ui.js"
+      "import": "./dist/sanity-ui.mjs",
+      "require": "./dist/sanity-ui.js",
+      "default": "./dist/sanity-ui.mjs"
     }
   },
   "files": [
@@ -27,33 +27,36 @@
     "lint": "eslint . --ext .js,.jsx,.mjs,.ts,.tsx --quiet",
     "postbuild": "run-s check:package",
     "prebuild": "run-s clean",
-    "test": "vitest run",
+    "test": "jest",
     "type-check": "tsc --build",
     "watch": "pkg watch --tsconfig tsconfig.dist.json"
   },
   "dependencies": {
-    "@juggle/resize-observer": "^3.4.0",
     "@popperjs/core": "^2.11.6",
-    "@reach/auto-id": "^0.17.0",
-    "@sanity/color": "^2.1.16",
-    "@sanity/icons": "^1.3.6",
-    "framer-motion": "6.3.0",
+    "@sanity/color": "2.1.17-next.18+f1216ee3",
+    "@sanity/icons": "1.3.7-next.18+f1216ee3",
+    "framer-motion": "^7.3.5",
     "popper-max-size-modifier": "^0.2.0",
-    "react-is": "^17.0.2",
+    "react-is": "^18.2.0",
     "react-popper": "^2.3.0",
     "react-refractor": "^2.1.7"
   },
   "devDependencies": {
+    "@floating-ui/react-dom": "^1.0.0",
+    "@juggle/resize-observer": "^3.4.0",
     "@testing-library/dom": "^8.17.1",
-    "@testing-library/react": "^12.1.5",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.4.0",
     "@types/refractor": "^3.0.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "framer-motion": "^7.3.5",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-refractor": "^2.1.7",
     "styled-components": "^5.3.5"
   },
   "peerDependencies": {
-    "react": "^16.9 || ^17 || ^18",
-    "react-dom": "^16.9 || ^17 || ^18",
+    "react": "^18",
+    "react-dom": "^18",
     "styled-components": "^5.2"
   },
   "repository": {
@@ -73,5 +76,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4c9ab2537fa3b3d437de5ca979b6fb932f3d115b"
+  "gitHead": "f1216ee3ef45b3710598c841bda1b3fc47ea97ac"
 }

package/src/__workshop__/color/overview.tsx

@@ -1,6 +1,6 @@
 import {black, ColorTints, ColorValue, COLOR_HUES, hues, white} from '@sanity/color'
 import {Box, Card, Code, Flex, Grid, Heading, Stack, useToast} from '@sanity/ui'
-import React, {useCallback} from 'react'
+import {useCallback} from 'react'
 import {hexToRgb, rgbToHsl} from '../../theme'
 
 function ucfirst(str: string) {

package/src/__workshop__/constants.ts

@@ -235,6 +235,7 @@ export const WORKSHOP_TEXT_INPUT_TYPE_OPTIONS: {[key: string]: TextInputType} =
   time: 'time',
   text: 'text',
   week: 'week',
+  color: 'color',
 }
 
 export const WORKSHOP_TEXT_OVERFLOW_OPTIONS: {[key: string]: 'ellipsis' | ''} = {

package/src/components/autocomplete/__workshop__/async.tsx

@@ -10,7 +10,7 @@ import {
   Stack,
   Text,
 } from '@sanity/ui'
-import React, {useCallback, useEffect, useRef, useState} from 'react'
+import {useCallback, useEffect, useRef, useState} from 'react'
 import {countriesStore} from '../__mocks__/apiStore'
 
 export default function AsyncStory() {

package/src/components/autocomplete/__workshop__/constrainedHeight.tsx

@@ -7,7 +7,7 @@ import {
   Stack,
   Text,
 } from '@sanity/ui'
-import React, {useCallback, useState} from 'react'
+import {useCallback, useState} from 'react'
 import {Popover} from '../../../primitives'
 import countries from '../__fixtures__/countries'
 import {AutocompleteProps} from '../autocomplete'

package/src/components/autocomplete/__workshop__/custom.tsx

@@ -1,6 +1,6 @@
 import {Autocomplete, Box, Button, Card, Code, Stack, Text} from '@sanity/ui'
 import {useBoolean, useSelect} from '@sanity/ui-workshop'
-import React, {useCallback, useState} from 'react'
+import {useCallback, useState} from 'react'
 import {
   WORKSHOP_RADIUS_OPTIONS,
   WORKSHOP_SPACE_OPTIONS,

package/src/components/autocomplete/__workshop__/example.tsx

@@ -2,7 +2,7 @@ import {Autocomplete, Box, Card, Container, Stack, Text} from '@sanity/ui'
 import {useBoolean, useSelect, useText} from '@sanity/ui-workshop'
 import {PerfTestProps, usePerfTest} from '@sanity/ui-workshop'
 import {fireEvent} from '@testing-library/dom'
-import React, {useCallback, useMemo, useState} from 'react'
+import {useCallback, useMemo, useState} from 'react'
 import {
   WORKSHOP_CARD_TONE_OPTIONS,
   WORKSHOP_RADIUS_OPTIONS,

package/src/components/autocomplete/__workshop__/focusAndBlur.tsx

@@ -1,5 +1,5 @@
 import {Autocomplete, Box, Button, Card, Code, Stack} from '@sanity/ui'
-import React, {useCallback, useState} from 'react'
+import {useCallback, useState} from 'react'
 
 export default function FocusAndBlurStory() {
   const [value, setValue] = useState('')

package/src/components/autocomplete/__workshop__/fullscreen.tsx

@@ -18,7 +18,7 @@ import {
   useToast,
 } from '@sanity/ui'
 import {useBoolean} from '@sanity/ui-workshop'
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react'
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 import {countriesStore} from '../__mocks__/apiStore'
 
 export default function Fullscreen() {

package/src/components/autocomplete/autocomplete.tsx

@@ -1,14 +1,5 @@
 import {ChevronDownIcon} from '@sanity/icons'
-import React, {
-  cloneElement,
-  forwardRef,
-  useCallback,
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react'
+import {cloneElement, forwardRef, useCallback, useEffect, useMemo, useReducer, useRef} from 'react'
 import {EMPTY_ARRAY, EMPTY_RECORD} from '../../constants'
 import {_hasFocus, _raf, focusFirstDescendant} from '../../helpers'
 import {useForwardedRef, useArrayProp} from '../../hooks'
@@ -32,7 +23,7 @@ export interface AutocompleteProps<Option extends BaseAutocompleteOption = BaseA
   customValidity?: string
   filterOption?: (query: string, option: Option) => boolean
   fontSize?: number | number[]
-  icon?: React.ComponentType | React.ReactNode
+  icon?: React.ElementType | React.ReactNode
   id: string
   /**
    * @beta
@@ -164,15 +155,21 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
     typeof renderOptionProp === 'function' ? renderOptionProp : defaultRenderOption
   const filterOption =
     typeof filterOptionProp === 'function' ? filterOptionProp : defaultFilterOption
-  const [rootElement, setRootElement] = useState<HTMLDivElement | null>(null)
-  const [resultsPopoverElement, setResultsPopoverElement] = useState<HTMLDivElement | null>(null)
+
+  // Element refs
+  const rootElementRef = useRef<HTMLDivElement | null>(null)
+  const resultsPopoverElementRef = useRef<HTMLDivElement | null>(null)
   const inputElementRef = useRef<HTMLInputElement | null>(null)
   const listBoxElementRef = useRef<HTMLDivElement | null>(null)
-  const focusedElementRef = useRef<HTMLElement | null>(null)
+
+  // Value refs
+  const listFocusedRef = useRef(false)
   const valueRef = useRef(value)
   const valuePropRef = useRef(valueProp)
-  const forwardedRef = useForwardedRef(ref)
   const popoverMouseWithinRef = useRef(false)
+
+  const forwardedRef = useForwardedRef(ref)
+
   const listBoxId = `${id}-listbox`
   const options = Array.isArray(optionsProp) ? optionsProp : EMPTY_ARRAY
   const padding = useArrayProp(paddingProp)
@@ -199,8 +196,8 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
         }
 
         const elements: HTMLElement[] = (relatedElements || []).concat(
-          rootElement ? [rootElement] : [],
-          resultsPopoverElement ? [resultsPopoverElement] : []
+          rootElementRef.current ? [rootElementRef.current] : [],
+          resultsPopoverElementRef.current ? [resultsPopoverElementRef.current] : []
         )
 
         let focusInside = false
@@ -222,20 +219,19 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
         }
       }, 0)
     },
-    [onBlur, onQueryChange, relatedElements, resultsPopoverElement, rootElement]
+    [onBlur, onQueryChange, relatedElements]
   )
 
   const handleRootFocus = useCallback((event: React.FocusEvent) => {
     const listBoxElement = listBoxElementRef.current
     const focusedElement = event.target instanceof HTMLElement ? event.target : null
+    const listFocused = listBoxElement?.contains(focusedElement) || false
 
-    focusedElementRef.current = focusedElement
+    if (listFocused !== listFocusedRef.current) {
+      listFocusedRef.current = listFocused
 
-    const nextListFocused = Boolean(
-      listBoxElement && focusedElement && listBoxElement.contains(focusedElement)
-    )
-
-    dispatch({type: 'root/setListFocused', listFocused: nextListFocused})
+      dispatch({type: 'root/setListFocused', listFocused})
+    }
   }, [])
 
   const handleOptionSelect = useCallback(
@@ -363,6 +359,7 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
 
   // Change the value when `value` prop changes
   useEffect(() => {
+    // If `valueProp` changed
     if (valueProp !== valuePropRef.current) {
       valuePropRef.current = valueProp
 
@@ -374,17 +371,18 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
       return
     }
 
-    if (valueProp !== value) {
+    // If `valueProp` is not equal to `value`
+    if (valueProp !== valueRef.current) {
+      valueRef.current = valueProp || null
+
       dispatch({type: 'value/change', value: valueProp || null})
     }
-  }, [valueProp, value])
+  }, [valueProp])
 
   // Reset active item when closing
   useEffect(() => {
-    if (!focused) {
-      if (valueRef.current) {
-        dispatch({type: 'root/setActiveValue', value: valueRef.current})
-      }
+    if (!focused && valueRef.current) {
+      dispatch({type: 'root/setActiveValue', value: valueRef.current})
     }
   }, [focused])
 
@@ -623,7 +621,7 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
           onMouseEnter: handlePopoverMouseEnter,
           onMouseLeave: handlePopoverMouseLeave,
         },
-        setResultsPopoverElement
+        resultsPopoverElementRef
       )
     }
 
@@ -645,7 +643,7 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
         placement={AUTOCOMPLETE_POPOVER_PLACEMENT}
         portal
         radius={radius}
-        ref={setResultsPopoverElement}
+        ref={resultsPopoverElementRef}
         referenceElement={inputElementRef.current}
         {...popover}
       />
@@ -667,7 +665,7 @@ const InnerAutocomplete = forwardRef(function InnerAutocomplete<
       onBlur={handleRootBlur}
       onFocus={handleRootFocus}
       onKeyDown={handleRootKeyDown}
-      ref={setRootElement}
+      ref={rootElementRef}
     >
       {input}
       {results}

package/src/components/autocomplete/autocompleteOption.tsx

@@ -1,4 +1,4 @@
-import React, {useCallback} from 'react'
+import {useCallback} from 'react'
 import {_isEnterToClickElement} from '../../helpers'
 
 export interface AutocompleteOptionProps {

package/src/components/autocomplete/autocompleteReducer.ts

@@ -36,9 +36,6 @@ export function autocompleteReducer(
   }
 
   if (msg.type === 'root/setListFocused') {
-    // prevent unnecessary re-render
-    if (state.listFocused === msg.listFocused) return state
-
     return {...state, listFocused: msg.listFocused}
   }
 

package/src/components/breadcrumbs/__workshop__/example.tsx

@@ -1,6 +1,5 @@
 import {Breadcrumbs, Flex, Text} from '@sanity/ui'
 import {useSelect} from '@sanity/ui-workshop'
-import React from 'react'
 
 const BREADCRUMBS_MAX_LENGTH_OPTIONS = {
   '(none)': 0,

package/src/components/breadcrumbs/breadcrumbs.tsx

@@ -1,12 +1,4 @@
-import React, {
-  Children,
-  forwardRef,
-  Fragment,
-  isValidElement,
-  useCallback,
-  useMemo,
-  useState,
-} from 'react'
+import {Children, forwardRef, Fragment, isValidElement, useCallback, useMemo, useState} from 'react'
 import {useArrayProp, useClickOutside} from '../../hooks'
 import {Box, Popover, Stack, Text} from '../../primitives'
 import {ExpandButton, Root} from './breadcrumbs.styles'

package/src/components/dialog/__workshop__/autoFocus.tsx

@@ -1,6 +1,5 @@
 import {Box, Button, Dialog, Text} from '@sanity/ui'
 import {useAction, useBoolean} from '@sanity/ui-workshop'
-import React from 'react'
 
 export default function AutoFocusStory() {
   const autoFocus = useBoolean('Auto-focus', true, 'Props')

package/src/components/dialog/__workshop__/layering.tsx

@@ -1,6 +1,5 @@
 import {Box, Card, Code, Dialog, Layer, LayerProvider, useLayer} from '@sanity/ui'
 import {useAction} from '@sanity/ui-workshop'
-import React from 'react'
 
 export default function LayeringStory() {
   return (

package/src/components/dialog/__workshop__/nested.tsx

@@ -1,5 +1,5 @@
 import {Box, Button, Dialog, LayerProvider, Menu, MenuButton, MenuItem} from '@sanity/ui'
-import React, {useState} from 'react'
+import {useState} from 'react'
 
 export default function NestedStory() {
   const [open1] = useState(true)

package/src/components/dialog/__workshop__/onScroll.tsx

@@ -1,6 +1,6 @@
 import {Box, Dialog, LayerProvider, Text} from '@sanity/ui'
 import {useAction} from '@sanity/ui-workshop'
-import React, {useEffect, useRef} from 'react'
+import {useEffect, useRef} from 'react'
 
 export default function OnScrollStory() {
   const ref = useRef<HTMLDivElement | null>(null)

package/src/components/dialog/__workshop__/position.tsx

@@ -1,7 +1,6 @@
 import {ArrowDownIcon, ArrowUpIcon} from '@sanity/icons'
 import {Box, Dialog, LayerProvider, Stack, Text} from '@sanity/ui'
 import {useBoolean, useSelect} from '@sanity/ui-workshop'
-import React from 'react'
 import {WORKSHOP_DIALOG_POSITION_OPTIONS} from '../../../__workshop__/constants'
 
 export default function PositionStory() {

package/src/components/dialog/__workshop__/props.tsx

@@ -1,6 +1,6 @@
 import {Box, Button, Dialog, LayerProvider, Stack, Text} from '@sanity/ui'
 import {useBoolean, useSelect, useText} from '@sanity/ui-workshop'
-import React, {useCallback, useRef, useState} from 'react'
+import {useCallback, useRef, useState} from 'react'
 import {WORKSHOP_WIDTH_OPTIONS} from '../../../__workshop__/constants'
 
 export default function PropsStory() {

package/src/components/dialog/__workshop__/provider.tsx

@@ -1,5 +1,4 @@
 import {Dialog, DialogProvider} from '@sanity/ui'
-import React from 'react'
 
 export default function ProviderStory() {
   return (

package/src/components/dialog/dialog.tsx

@@ -1,5 +1,5 @@
 import {CloseIcon} from '@sanity/icons'
-import React, {forwardRef, useCallback, useEffect, useRef, useState} from 'react'
+import {forwardRef, useCallback, useEffect, useRef, useState} from 'react'
 import styled from 'styled-components'
 import {focusFirstDescendant, focusLastDescendant} from '../../helpers'
 import {useArrayProp, useClickOutside, useForwardedRef, useGlobalKeyDown} from '../../hooks'

package/src/components/dialog/dialogProvider.tsx

@@ -1,4 +1,4 @@
-import React, {useMemo} from 'react'
+import {useMemo} from 'react'
 import {DialogPosition} from '../../types'
 import {DialogContext, DialogContextValue} from './dialogContext'
 

package/src/components/hotkeys/__workshop__/plain.tsx

@@ -1,5 +1,4 @@
 import {Flex, Hotkeys} from '@sanity/ui'
-import React from 'react'
 
 export default function PlainStory() {
   return (

package/src/components/hotkeys/hotkeys.tsx

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

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

@@ -1,5 +1,5 @@
 import {Button, Flex, Menu, MenuButton, MenuItem, Text} from '@sanity/ui'
-import React, {forwardRef} from 'react'
+import {forwardRef} from 'react'
 
 const CustomLink = forwardRef(function CustomLink(
   props: {req: string} & Omit<React.HTMLProps<HTMLAnchorElement>, 'as' | 'href'>,

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

@@ -1,6 +1,6 @@
 import {AddIcon} from '@sanity/icons'
 import {Box, Button, Menu, MenuButton, MenuItem, Stack} from '@sanity/ui'
-import React, {useRef} from 'react'
+import {useRef} from 'react'
 
 export default function ClosableMenuButtonStory() {
   const ref = useRef<HTMLButtonElement | null>(null)

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

@@ -11,7 +11,7 @@ import {
   SelectableTone,
   Text,
 } from '@sanity/ui'
-import React, {useState} from 'react'
+import {useState} from 'react'
 import {MenuButtonProps} from '../menuButton'
 
 const POPOVER_PROPS: MenuButtonProps['popover'] = {

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

@@ -1,5 +1,4 @@
 import {Box, Card, LayerProvider, Menu, MenuDivider, MenuItem, Stack, Text} from '@sanity/ui'
-import React from 'react'
 
 export default function CustomMenuItemStory() {
   return (

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

@@ -1,7 +1,6 @@
 import {SelectIcon} from '@sanity/icons'
 import {Button, Flex, Menu, MenuButton, MenuItem} from '@sanity/ui'
 import {useBoolean} from '@sanity/ui-workshop'
-import React from 'react'
 
 export default function DisableFocusOnCloseStory() {
   const disableRestoreFocusOnClose = useBoolean('Disable restore focus on close', false)

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

@@ -11,7 +11,6 @@ import {
   MenuItem,
 } from '@sanity/ui'
 import {useAction} from '@sanity/ui-workshop'
-import React from 'react'
 
 export default function GroupsStory() {
   return (

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

@@ -11,7 +11,6 @@ import {
   MenuItem,
 } from '@sanity/ui'
 import {useAction, useBoolean, useSelect} from '@sanity/ui-workshop'
-import React from 'react'
 import {WORKSHOP_CARD_TONE_OPTIONS} from '../../../__workshop__/constants'
 
 export default function MenuButtonStory() {

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

@@ -18,7 +18,6 @@ import {
   MenuGroup,
   MenuItem,
 } from '@sanity/ui'
-import React from 'react'
 
 export default function MenuGroupRightStory() {
   return (

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

@@ -1,5 +1,4 @@
 import {Box, Button, Menu, MenuButton, MenuDivider, MenuItem, Stack} from '@sanity/ui'
-import React from 'react'
 
 export default function NestedMenuItems() {
   return (

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

@@ -1,5 +1,5 @@
 import {Box, Button, Menu, MenuButton, MenuItem, Stack, useToast} from '@sanity/ui'
-import React, {useCallback} from 'react'
+import {useCallback} from 'react'
 
 export default function OnCloseMenuButton() {
   const {push} = useToast()

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

@@ -1,6 +1,6 @@
 import {CheckmarkIcon, ClockIcon, ExpandIcon, SearchIcon} from '@sanity/icons'
 import {Box, Button, Code, Menu, MenuButton, MenuDivider, MenuItem, Stack} from '@sanity/ui'
-import React, {useState} from 'react'
+import {useState} from 'react'
 
 export default function SelectedItemStory() {
   const [selectedIndex, setSelectedIndex] = useState(0)

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

@@ -1,7 +1,6 @@
 import {SearchIcon} from '@sanity/icons'
 import {Box, Card, LayerProvider, Menu, MenuItem} from '@sanity/ui'
 import {useBoolean, useSelect} from '@sanity/ui-workshop'
-import React from 'react'
 import {WORKSHOP_CARD_TONE_OPTIONS} from '../../../__workshop__/constants'
 
 export default function TonesStory() {

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

@@ -1,5 +1,4 @@
 import {Box, Button, Menu, MenuButton, MenuItem, Stack} from '@sanity/ui'
-import React from 'react'
 
 export default function WithoutArrowStory() {
   return (

package/src/components/menu/menu.test.tsx

@@ -1,7 +1,6 @@
 /* eslint-disable no-console */
 
 import React, {useCallback, useMemo} from 'react'
-import {vi} from 'vitest'
 import {render} from '../../../test'
 import {MenuContext, MenuContextValue} from './menuContext'
 import {useMenu} from './useMenu'
@@ -9,7 +8,7 @@ import {useMenu} from './useMenu'
 describe('components/menu', () => {
   describe('useMenu', () => {
     it('should get context value', async () => {
-      const log = vi.fn()
+      const log = jest.fn()
 
       function Debug() {
         const rootMenu = useMenu()
@@ -65,7 +64,7 @@ describe('components/menu', () => {
     })
 
     it('should fail when no context value is provided', async () => {
-      const log = vi.fn()
+      const log = jest.fn()
 
       function Debug() {
         try {
@@ -94,7 +93,7 @@ describe('components/menu', () => {
     })
 
     it('should fail when context value is not compatible', async () => {
-      const log = vi.fn()
+      const log = jest.fn()
 
       function Debug() {
         try {

package/src/components/menu/menu.tsx

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

package/src/components/menu/menuButton.tsx

@@ -1,12 +1,4 @@
-import React, {
-  cloneElement,
-  forwardRef,
-  useCallback,
-  useMemo,
-  useState,
-  useEffect,
-  useRef,
-} from 'react'
+import {cloneElement, forwardRef, useCallback, useMemo, useState, useEffect, useRef} from 'react'
 import {isElement} from 'react-is'
 import {Popover, PopoverProps} from '../../primitives'
 import {ThemeColorSchemeKey} from '../../theme'

package/src/components/menu/menuGroup.tsx

@@ -1,5 +1,5 @@
 import {ChevronRightIcon} from '@sanity/icons'
-import React, {createElement, isValidElement, useCallback, useEffect, useRef, useState} from 'react'
+import {createElement, isValidElement, useCallback, useEffect, useRef, useState} from 'react'
 import {isValidElementType} from 'react-is'
 import {useArrayProp} from '../../hooks'
 import {Box, Flex, Popover, PopoverProps, Text} from '../../primitives'
@@ -14,7 +14,7 @@ import {useMenu} from './useMenu'
 export interface MenuGroupProps {
   as?: React.ElementType | keyof JSX.IntrinsicElements
   fontSize?: number | number[]
-  icon?: React.ComponentType | React.ReactNode
+  icon?: React.ElementType | React.ReactNode
   padding?: number | number[]
   popover?: Omit<PopoverProps, 'content' | 'open'>
   radius?: number | number[]

package/src/components/menu/menuItem.tsx

@@ -1,4 +1,4 @@
-import React, {
+import {
   createElement,
   forwardRef,
   isValidElement,
@@ -23,8 +23,8 @@ export interface MenuItemProps extends ResponsivePaddingProps, ResponsiveRadiusP
   as?: React.ElementType | keyof JSX.IntrinsicElements
   fontSize?: number | number[]
   hotkeys?: string[]
-  icon?: React.ComponentType | React.ReactNode
-  iconRight?: React.ComponentType | React.ReactNode
+  icon?: React.ElementType | React.ReactNode
+  iconRight?: React.ElementType | React.ReactNode
   pressed?: boolean
   selected?: boolean
   space?: number | number[]