diff --git a/src/app/about/AboutDialogToolbarButton.tsx b/src/app/about/AboutDialogToolbarButton.tsx index d3b99ff9..1e90c06d 100644 --- a/src/app/about/AboutDialogToolbarButton.tsx +++ b/src/app/about/AboutDialogToolbarButton.tsx @@ -1,12 +1,12 @@ import { Dialog, DialogBody } from '@blueprintjs/core'; import { IconName } from '@blueprintjs/icons'; -import { JSX, ReactNode } from 'react'; +import { type ReactElement, ReactNode } from 'react'; import { Toolbar, useOnOff } from '../../components'; interface AboutDialogToolbarButtonProps { name: string; - icon: IconName | JSX.Element; + icon: IconName | ReactElement; body: ReactNode; } diff --git a/src/components/toolbar/Toolbar.tsx b/src/components/toolbar/Toolbar.tsx index 2633ab1c..9596a0ef 100644 --- a/src/components/toolbar/Toolbar.tsx +++ b/src/components/toolbar/Toolbar.tsx @@ -3,21 +3,20 @@ import { ButtonGroup, Classes, Colors, + Icon, Intent, Popover, PopoverProps, TagProps, - Icon, TooltipProps, } from '@blueprintjs/core'; import { IconName } from '@blueprintjs/icons'; import { css } from '@emotion/react'; import { cloneElement, - JSX, - MouseEvent, - ReactElement, - ReactNode, + type MouseEvent, + type ReactElement, + type ReactNode, useLayoutEffect, useMemo, useRef, @@ -57,7 +56,7 @@ export interface ToolbarItemProps extends ToolbarBaseProps { id?: string; tooltip?: TooltipProps['content']; tooltipProps?: Omit; - icon: IconName | JSX.Element; + icon: IconName | ReactElement; active?: boolean; onClick?: ( item: ToolbarItemProps & { diff --git a/stories/components/toolbar.stories.tsx b/stories/components/toolbar.stories.tsx index 4adb03b2..5fdf5695 100644 --- a/stories/components/toolbar.stories.tsx +++ b/stories/components/toolbar.stories.tsx @@ -1,17 +1,17 @@ import { Menu, MenuItem, Tooltip } from '@blueprintjs/core'; import { Meta } from '@storybook/react'; -import { JSX, useState } from 'react'; +import { type ReactElement, useState } from 'react'; import { BiClipboard, BiCreditCard, BiPaperclip } from 'react-icons/bi'; import { FaClipboard, FaCreditCard, FaPaperclip } from 'react-icons/fa6'; import { HiClipboard, HiCreditCard, HiOutlinePaperClip } from 'react-icons/hi2'; import { + PopoverInteractionType, Toolbar, ToolbarItemProps, ToolbarProps, - PopoverInteractionType, - TooltipItem, TooltipHelpContent, + TooltipItem, } from '../../src/components'; export default { @@ -34,7 +34,7 @@ export default { type ToolbarItems = Array< Pick & { id: string; - content?: JSX.Element; + content?: ReactElement; } >;