Skip to content

fix: improve Tooltip stability and integration with DropdownMenu #747

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.

Sign up for GitHub

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

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: improve Tooltip stability and integration with DropdownMenu #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion src/components/Tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,22 @@ export function Tooltip({
className = '',
}: TooltipProps) {
const [isOpen, setIsOpen] = React.useState(false)
const isMounted = React.useRef(true)

React.useEffect(() => {
isMounted.current = true
return () => {
isMounted.current = false
}
}, [])

const { refs, floatingStyles, context } = useFloating({
open: isOpen,
onOpenChange: setIsOpen,
onOpenChange: (open) => {
if (isMounted.current) {
setIsOpen(open)
}
},
placement,
middleware: [offset(5), flip(), shift()],
whileElementsMounted: autoUpdate,
Expand Down
153 changes: 83 additions & 70 deletions src/components/npm-stats/ChartControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,14 @@ export function ChartControls({
{/* Time Range */}
<DropdownMenu>
<Tooltip content="Select time range">
<DropdownMenuTrigger asChild>
<button className={twMerge(dropdownButtonStyles.base)}>
{timeRanges.find((r) => r.value === range)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button className={twMerge(dropdownButtonStyles.base)}>
{timeRanges.find((r) => r.value === range)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand All @@ -103,17 +105,19 @@ export function ChartControls({
{/* Binning Interval */}
<DropdownMenu>
<Tooltip content="Select binning interval">
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
binType !== 'weekly' && dropdownButtonStyles.active,
)}
>
{binningOptions.find((b) => b.value === binType)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
binType !== 'weekly' && dropdownButtonStyles.active,
)}
>
{binningOptions.find((b) => b.value === binType)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand Down Expand Up @@ -142,17 +146,19 @@ export function ChartControls({
{/* Y-Axis Transform */}
<DropdownMenu>
<Tooltip content="Transform the Y-axis to show relative changes between packages. 'None' shows actual download numbers, while 'Normalize Y' shows percentage changes relative to the first data point.">
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
transform !== 'none' && dropdownButtonStyles.active,
)}
>
{transformOptions.find((opt) => opt.value === transform)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
transform !== 'none' && dropdownButtonStyles.active,
)}
>
{transformOptions.find((opt) => opt.value === transform)?.label}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand All @@ -178,19 +184,21 @@ export function ChartControls({
{showFacets && (
<DropdownMenu>
<Tooltip content="Split the visualization horizontally by package">
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
facetX && dropdownButtonStyles.active,
)}
>
{facetX
? `Facet X by ${facetOptions.find((opt) => opt.value === facetX)?.label}`
: 'No Facet X'}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
facetX && dropdownButtonStyles.active,
)}
>
{facetX
? `Facet X by ${facetOptions.find((opt) => opt.value === facetX)?.label}`
: 'No Facet X'}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand Down Expand Up @@ -227,19 +235,21 @@ export function ChartControls({
{showFacets && (
<DropdownMenu>
<Tooltip content="Split the visualization vertically by package">
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
facetY && dropdownButtonStyles.active,
)}
>
{facetY
? `Facet Y by ${facetOptions.find((opt) => opt.value === facetY)?.label}`
: 'No Facet Y'}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
facetY && dropdownButtonStyles.active,
)}
>
{facetY
? `Facet Y by ${facetOptions.find((opt) => opt.value === facetY)?.label}`
: 'No Facet Y'}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand Down Expand Up @@ -281,22 +291,25 @@ export function ChartControls({
: 'Control how data is displayed'
}
>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
showDataMode !== 'all' && dropdownButtonStyles.active,
transform === 'normalize-y' && 'opacity-50 cursor-not-allowed',
)}
disabled={transform === 'normalize-y'}
>
{
showDataModeOptions.find((opt) => opt.value === showDataMode)
?.label
}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
<span>
<DropdownMenuTrigger asChild>
<button
className={twMerge(
dropdownButtonStyles.base,
showDataMode !== 'all' && dropdownButtonStyles.active,
transform === 'normalize-y' &&
'opacity-50 cursor-not-allowed',
)}
disabled={transform === 'normalize-y'}
>
{
showDataModeOptions.find((opt) => opt.value === showDataMode)
?.label
}
<EllipsisVertical className="w-3 h-3" />
</button>
</DropdownMenuTrigger>
</span>
</Tooltip>
<DropdownMenuContent className="min-w-[200px] bg-white dark:bg-gray-800 rounded-lg shadow-lg p-2 z-50">
<div className="flex justify-between items-center mb-2">
Expand Down
Loading