Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(typings): use React.JSX namespace #1543

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sanity/ui",
"version": "2.10.16",
"version": "2.10.17-canary.0",
"keywords": [
"sanity",
"ui",
Expand Down
4 changes: 2 additions & 2 deletions src/core/components/menu/menuGroup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ChevronRightIcon} from '@sanity/icons'
import {isValidElement, useCallback, useEffect, useState, type JSX} from 'react'
import {isValidElement, useCallback, useEffect, useState} from 'react'
import {isValidElementType} from 'react-is'
import {useArrayProp} from '../../hooks'
import {Box, Flex, Popover, PopoverProps, Text} from '../../primitives'
Expand All @@ -13,7 +13,7 @@ import {useMenu} from './useMenu'
* @public
*/
export interface MenuGroupProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
fontSize?: number | number[]
icon?: React.ElementType | React.ReactNode
padding?: number | number[]
Expand Down
3 changes: 1 addition & 2 deletions src/core/components/menu/menuItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
useMemo,
useRef,
useState,
type JSX,
} from 'react'
import {isValidElementType} from 'react-is'
import {useArrayProp} from '../../hooks'
Expand All @@ -23,7 +22,7 @@ import {useMenu} from './useMenu'
* @public
*/
export interface MenuItemProps extends ResponsivePaddingProps, ResponsiveRadiusProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
fontSize?: number | number[]
hotkeys?: string[]
icon?: React.ElementType | React.ReactNode
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/avatar/avatar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ThemeColorAvatarColorKey} from '@sanity/ui/theme'
import {forwardRef, useCallback, useEffect, useId, useMemo, useState, type JSX} from 'react'
import {forwardRef, useCallback, useEffect, useId, useMemo, useState} from 'react'
import ReactIs from 'react-is'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
Expand All @@ -16,7 +16,7 @@ export interface AvatarProps {
__unstable_hideInnerStroke?: boolean
animateArrowFrom?: AvatarPosition
arrowPosition?: AvatarPosition
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
color?: ThemeColorAvatarColorKey
initials?: string
onImageLoadError?: (event: Error) => void
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/badge/badge.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
Expand All @@ -13,7 +13,7 @@ import {BadgeStyleProps} from './types'
* @public
*/
export interface BadgeProps extends BoxProps, ResponsiveRadiusProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
fontSize?: number | number[]
/** @deprecated No longer used. */
mode?: BadgeMode
Expand Down
6 changes: 3 additions & 3 deletions src/core/primitives/box/box.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {
Expand Down Expand Up @@ -31,8 +31,8 @@ export interface BoxProps
ResponsiveGridItemProps,
ResponsiveMarginProps,
ResponsivePaddingProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
forwardedAs?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
forwardedAs?: React.ElementType | keyof React.JSX.IntrinsicElements
}

const Root = styled.div<
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/button/button.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, isValidElement, useMemo, type JSX} from 'react'
import {forwardRef, isValidElement, useMemo} from 'react'
import {isValidElementType} from 'react-is'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
Expand All @@ -17,7 +17,7 @@ import {buttonBaseStyles, buttonColorStyles} from './styles'
* @public
*/
export interface ButtonProps extends ResponsivePaddingProps, ResponsiveRadiusProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
fontSize?: number | number[]
mode?: ButtonMode
icon?: React.ElementType | React.ReactNode
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/code/code.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import Refractor from 'react-refractor'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
Expand All @@ -9,7 +9,7 @@ import {codeBaseStyle} from './styles'
* @public
*/
export interface CodeProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
/** Define the language to use for syntax highlighting. */
language?: string
size?: number | number[]
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/heading/heading.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ThemeFontWeightKey} from '@sanity/ui/theme'
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {
Expand All @@ -18,7 +18,7 @@ import {HeadingStyleProps} from './types'
export interface HeadingProps {
accent?: boolean
align?: TextAlign | TextAlign[]
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
muted?: boolean
size?: number | number[]
/**
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/kbd/kbd.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled, css} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {responsiveRadiusStyle, ResponsiveRadiusStyleProps} from '../../styles/internal'
Expand All @@ -10,7 +10,7 @@ import {Text} from '../text'
* @public
*/
export interface KBDProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
fontSize?: number | number[]
padding?: number | number[]
radius?: Radius | Radius[]
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/label/label.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ThemeFontWeightKey} from '@sanity/ui/theme'
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {responsiveLabelFont, responsiveTextAlignStyle} from '../../styles/internal'
Expand All @@ -12,7 +12,7 @@ import {labelBaseStyle} from './styles'
export interface LabelProps {
accent?: boolean
align?: TextAlign | TextAlign[]
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
muted?: boolean
size?: number | number[]
/**
Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/stack/stack.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {Box, BoxProps} from '../box'
Expand All @@ -8,7 +8,7 @@ import {stackBaseStyle, responsiveStackSpaceStyle, ResponsiveStackSpaceStyleProp
* @public
*/
export interface StackProps extends BoxProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
space?: number | number[]
}

Expand Down
4 changes: 2 additions & 2 deletions src/core/primitives/text/text.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {ThemeFontWeightKey} from '@sanity/ui/theme'
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'
import {useArrayProp} from '../../hooks'
import {
Expand All @@ -16,7 +16,7 @@ import {textBaseStyle} from './styles'
export interface TextProps {
accent?: boolean
align?: TextAlign | TextAlign[]
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
/** When `true` the text color will be muted. */
muted?: boolean
size?: number | number[]
Expand Down
4 changes: 2 additions & 2 deletions src/core/utils/elementQuery/elementQuery.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {forwardRef, useImperativeHandle, useMemo, useState, type JSX} from 'react'
import {forwardRef, useImperativeHandle, useMemo, useState} from 'react'
import {useElementSize} from '../../hooks'
import {useTheme_v2} from '../../theme'
import {findMaxBreakpoints, findMinBreakpoints} from './helpers'
Expand All @@ -8,7 +8,7 @@ import {findMaxBreakpoints, findMinBreakpoints} from './helpers'
* @beta
*/
export interface MediaQueryProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
media?: number[]
}

Expand Down
14 changes: 3 additions & 11 deletions src/core/utils/layer/layer.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import {
FocusEvent,
forwardRef,
useCallback,
useEffect,
useImperativeHandle,
useRef,
type JSX,
} from 'react'
import {FocusEvent, forwardRef, useCallback, useEffect, useImperativeHandle, useRef} from 'react'
import {styled} from 'styled-components'
import {EMPTY_RECORD} from '../../constants'
import {containsOrEqualsElement, isHTMLElement} from '../../helpers'
Expand All @@ -17,14 +9,14 @@ import {useLayer} from './useLayer'
* @public
*/
export interface LayerProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
/** A callback that fires when the layer becomes the top layer when it was not the top layer before. */
onActivate?: (props: {activeElement: HTMLElement | null}) => void
zOffset?: number | number[]
}

interface LayerChildrenProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
onActivate?: LayerProps['onActivate']
}

Expand Down
4 changes: 2 additions & 2 deletions src/core/utils/srOnly/srOnly.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import {forwardRef, type JSX} from 'react'
import {forwardRef} from 'react'
import {styled} from 'styled-components'

/**
* @public
*/
export interface SrOnlyProps {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
children?: React.ReactNode
}

Expand Down
12 changes: 2 additions & 10 deletions src/core/utils/virtualList/virtualList.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
import {
forwardRef,
useEffect,
useImperativeHandle,
useMemo,
useRef,
useState,
type JSX,
} from 'react'
import {forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react'
import {styled} from 'styled-components'
import {_isScrollable} from '../../helpers'
import {_ResizeObserver} from '../../observers'
Expand All @@ -29,7 +21,7 @@ export interface VirtualListChangeOpts {
* @beta
*/
export interface VirtualListProps<Item = any> {
as?: React.ElementType | keyof JSX.IntrinsicElements
as?: React.ElementType | keyof React.JSX.IntrinsicElements
gap?: number
getItemKey?: (item: Item, itemIndex: number) => string
items?: Item[]
Expand Down
3 changes: 1 addition & 2 deletions stories/components/Autocomplete.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {SearchIcon} from '@sanity/icons'
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import type {JSX} from 'react'
import {Autocomplete} from '../../src/core/components'
import {Card} from '../../src/core/primitives'
import {RADII} from '../constants'
Expand All @@ -14,7 +13,7 @@ const meta: Meta<typeof Autocomplete> = {
},
component: Autocomplete,
decorators: [
(Story: StoryFn): JSX.Element => (
(Story: StoryFn): React.JSX.Element => (
<Card paddingBottom={8} paddingTop={3}>
{/* @ts-expect-error fix later */}
<Story />
Expand Down
4 changes: 2 additions & 2 deletions stories/components/Dialog.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable react-hooks/rules-of-hooks */
import {ArrowDownIcon, ArrowUpIcon} from '@sanity/icons'
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import {useCallback, useState, type JSX} from 'react'
import {useCallback, useState} from 'react'
import {Dialog} from '../../src/core/components'
import {Box, Button, Card, Flex, Inline, Stack, Text} from '../../src/core/primitives'
import {BoundaryElementProvider, PortalProvider} from '../../src/core/utils'
Expand Down Expand Up @@ -58,7 +58,7 @@ const meta: Meta<typeof Dialog> = {
},
component: Dialog,
decorators: [
(Story: StoryFn): JSX.Element => {
(Story: StoryFn): React.JSX.Element => {
const [boundaryElement, setBoundaryElement] = useState<HTMLDivElement | null>(null)
const [portalElement, setPortalElement] = useState<HTMLDivElement | null>(null)

Expand Down
3 changes: 1 addition & 2 deletions stories/components/MenuItem.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import type {JSX} from 'react'
import {Menu, MenuItem} from '../../src/core/components'
import {Card, Container} from '../../src/core/primitives'
import {LayerProvider} from '../../src/core/utils'
Expand All @@ -22,7 +21,7 @@ const meta: Meta<typeof MenuItem> = {
},
component: MenuItem,
decorators: [
(Story: StoryFn): JSX.Element => (
(Story: StoryFn): React.JSX.Element => (
<Container width={0}>
<Card radius={3} shadow={2}>
<LayerProvider>
Expand Down
3 changes: 1 addition & 2 deletions stories/components/Toast.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/* eslint-disable react-hooks/rules-of-hooks */
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import type {JSX} from 'react'
import {Toast, ToastProvider, useToast} from '../../src/core/components'
import {Button, Inline} from '../../src/core/primitives'

const meta: Meta<typeof Toast> = {
args: {title: 'Toast title', description: 'Toast description'},
component: Toast,
decorators: [
(Story: StoryFn): JSX.Element => (
(Story: StoryFn): React.JSX.Element => (
<ToastProvider>
{/* @ts-expect-error fix later */}
<Story />
Expand Down
3 changes: 1 addition & 2 deletions stories/helpers/matrixBuilder.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import type {JSX} from 'react'
import {Card, Flex, Grid, Text} from '../../src/core/primitives'
import {ThemeColorSchemeKey} from '../../src/theme'

Expand Down Expand Up @@ -96,7 +95,7 @@ export function matrixBuilder<Rows extends string[], Cols extends string[]>({
title,
renderItem,
subHeader,
}: MatrixBuilderProps<Rows, Cols>): JSX.Element {
}: MatrixBuilderProps<Rows, Cols>): React.JSX.Element {
return (
<Table scheme={scheme} columns={columns} rows={rows} title={title} subHeader={subHeader}>
{rows.map((row) => (
Expand Down
3 changes: 1 addition & 2 deletions stories/primitives/AvatarCounter.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import type {JSX} from 'react'
import {AvatarCounter, AvatarStack} from '../../src/core/primitives'
import {getAvatarSizeControls} from '../controls'

Expand All @@ -12,7 +11,7 @@ const meta: Meta<typeof AvatarCounter> = {
},
component: AvatarCounter,
decorators: [
(Story: StoryFn): JSX.Element => (
(Story: StoryFn): React.JSX.Element => (
<AvatarStack>
{/* @ts-expect-error fix later */}
<Story />
Expand Down
3 changes: 1 addition & 2 deletions stories/primitives/Tooltip.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type {Meta, StoryFn, StoryObj} from '@storybook/react'
import {userEvent, within} from '@storybook/test'
import type {JSX} from 'react'
import {Button, Card, Text, Tooltip, TooltipDelayGroupProvider} from '../../src/core/primitives'
import {PLACEMENT_OPTIONS} from '../constants'
import {getShadowControls, getSpaceControls} from '../controls'
Expand All @@ -16,7 +15,7 @@ const meta: Meta<typeof Tooltip> = {
shadow: getShadowControls(),
},
decorators: [
(Story: StoryFn): JSX.Element => (
(Story: StoryFn): React.JSX.Element => (
<Card padding={6}>
{/* @ts-expect-error fix later */}
<Story />
Expand Down
Loading