The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): custom report tooltips overflow (#46772)
kemal.earth22c02a13047a
diff --git a/apps/studio/components/interfaces/Reports/ReportBlock/ChartBlock.tsx b/apps/studio/components/interfaces/Reports/ReportBlock/ChartBlock.tsxindex eb3066e2ec3..63f1888a827 100644--- a/apps/studio/components/interfaces/Reports/ReportBlock/ChartBlock.tsx+++ b/apps/studio/components/interfaces/Reports/ReportBlock/ChartBlock.tsx@@ -1,9 +1,9 @@import dayjs from 'dayjs'import { Activity, BarChartIcon, Loader2 } from 'lucide-react'import { useRouter } from 'next/router'-import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react'+import { ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react'import { Bar, BarChart, CartesianGrid, Line, LineChart, XAxis, YAxis } from 'recharts'-import { ChartContainer, ChartTooltip, ChartTooltipContent, WarningIcon } from 'ui'+import { ChartContainer, ChartTooltip, WarningIcon } from 'ui'import { METRIC_THRESHOLDS } from './ReportBlock.constants'import { ReportBlockContainer } from './ReportBlockContainer'@@ -11,6 +11,7 @@ import { ChartConfig } from '@/components/interfaces/SQLEditor/UtilityPanel/Charimport { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { timestampFormatter } from '@/components/ui/Charts/Charts.utils'import NoDataPlaceholder from '@/components/ui/Charts/NoDataPlaceholder'+import { PortalChartTooltip } from '@/components/ui/Charts/PortalChartTooltip'import {checkHasNonPositiveValues,computeYAxisWidth,@@ -71,6 +72,7 @@ export const ChartBlock = ({const { ref } = router.queryconst state = useDatabaseSelectorStateSnapshot()+ const chartRef = useRef<HTMLDivElement>(null)const [chartStyle, setChartStyle] = useState<string>(defaultChartStyle)const logScale = useMemo(() => defaultLogScale, [defaultLogScale])const [latestValue, setLatestValue] = useState<string | undefined>()@@ -298,6 +300,7 @@ export const ChartBlock = ({</p>)}<ChartContainer+ ref={chartRef}className="w-full aspect-auto px-3 py-2"style={{height: maxHeight ? `${maxHeight}px` : undefined,@@ -323,7 +326,8 @@ export const ChartBlock = ({/><ChartTooltipcontent={- <ChartTooltipContent+ <PortalChartTooltip+ chartRef={chartRef}className="min-w-[200px]"labelSuffix={isPercentage ? '%' : ''}labelFormatter={(x) => formatTooltipDate(x as string | number, 'DD MMM YYYY')}@@ -351,7 +355,8 @@ export const ChartBlock = ({/><ChartTooltipcontent={- <ChartTooltipContent+ <PortalChartTooltip+ chartRef={chartRef}labelSuffix={chartData?.format === '%' ? '%' : ''}labelFormatter={(x) => formatTooltipDate(x as string | number, 'DD MMM YYYY')}/>diff --git a/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx b/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsxindex a0740fee308..12c4ebc026d 100644--- a/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx+++ b/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx@@ -149,6 +149,7 @@ export const ReportBlock = ({{isSnippet ? (<QueryBlockblockWriteQueries+ portalTooltipid={item.id}label={item.label}chartConfig={chartConfig}diff --git a/apps/studio/components/ui/Charts/PortalChartTooltip.tsx b/apps/studio/components/ui/Charts/PortalChartTooltip.tsxnew file mode 100644index 00000000000..4c6ca32b844--- /dev/null+++ b/apps/studio/components/ui/Charts/PortalChartTooltip.tsx@@ -0,0 +1,67 @@+import { useIsomorphicLayoutEffect } from 'common'+import { ComponentProps, RefObject, useRef, useState } from 'react'+import { createPortal } from 'react-dom'+import type { TooltipProps } from 'recharts'+import type { NameType, ValueType } from 'recharts/types/component/DefaultTooltipContent'+import { ChartTooltipContent, cn } from 'ui'++const TOOLTIP_OFFSET = 16+const VIEWPORT_MARGIN = 8++type PortalChartTooltipProps = Omit<ComponentProps<typeof ChartTooltipContent>, 'content'> &+ Pick<TooltipProps<ValueType, NameType>, 'active' | 'coordinate' | 'payload'> & {+ chartRef: RefObject<HTMLElement | null>+ }++export const PortalChartTooltip = ({ chartRef, className, ...props }: PortalChartTooltipProps) => {+ const { active, coordinate, payload } = props+ const innerRef = useRef<HTMLDivElement>(null)+ const [position, setPosition] = useState<{ left: number; top: number } | null>(null)++ useIsomorphicLayoutEffect(() => {+ if (!active || typeof document === 'undefined') {+ setPosition(null)+ return+ }+ const el = innerRef.current+ if (!el) return++ const containerRect = chartRef.current?.getBoundingClientRect()+ const anchorX = (containerRect?.left ?? 0) + (coordinate?.x ?? 0)+ const anchorY = (containerRect?.top ?? 0) + (coordinate?.y ?? 0)++ const { width, height } = el.getBoundingClientRect()++ let left = anchorX + TOOLTIP_OFFSET+ if (left + width > window.innerWidth - VIEWPORT_MARGIN) {+ left = anchorX - width - TOOLTIP_OFFSET+ }+ left = Math.max(VIEWPORT_MARGIN, Math.min(left, window.innerWidth - width - VIEWPORT_MARGIN))++ const top = Math.max(+ VIEWPORT_MARGIN,+ Math.min(anchorY, window.innerHeight - height - VIEWPORT_MARGIN)+ )++ setPosition({ left, top })+ }, [active, coordinate?.x, coordinate?.y, payload, chartRef])++ if (!active || typeof document === 'undefined') return null++ return createPortal(+ <div+ ref={innerRef}+ style={{+ position: 'fixed',+ left: position?.left ?? -9999,+ top: position?.top ?? -9999,+ zIndex: 50,+ pointerEvents: 'none',+ opacity: position ? 1 : 0,+ }}+ >+ <ChartTooltipContent className={cn('max-w-xs', className)} {...props} />+ </div>,+ document.body+ )+}diff --git a/apps/studio/components/ui/QueryBlock/QueryBlock.tsx b/apps/studio/components/ui/QueryBlock/QueryBlock.tsxindex 2b4283a7522..50d18225885 100644--- a/apps/studio/components/ui/QueryBlock/QueryBlock.tsx+++ b/apps/studio/components/ui/QueryBlock/QueryBlock.tsx@@ -8,6 +8,7 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { ButtonTooltip } from '../ButtonTooltip'import { CHART_COLORS } from '../Charts/Charts.constants'+import { PortalChartTooltip } from '../Charts/PortalChartTooltip'import { SqlWarningAdmonition } from '../SqlWarningAdmonition'import { BlockViewConfiguration } from './BlockViewConfiguration'import { EditQueryButton } from './EditQueryButton'@@ -47,6 +48,8 @@ export interface QueryBlockProps {draggable?: booleandisabled?: booleanblockWriteQueries?: boolean+ /** Render the chart tooltip in a portal so it isn't clipped by overflow-hidden ancestors (e.g. report cards). */+ portalTooltip?: booleanonExecute?: (queryType: 'select' | 'mutation') => voidonRemoveChart?: () => voidonUpdateChartConfig?: ({ chartConfig }: { chartConfig: Partial<ChartConfig> }) => void@@ -69,11 +72,13 @@ export const QueryBlock = ({draggable = false,disabled = false,blockWriteQueries = false,+ portalTooltip = false,onExecute,onRemoveChart,onUpdateChartConfig,onDragStart,}: QueryBlockProps) => {+ const chartContainerRef = useRef<HTMLDivElement>(null)const [chartSettings, setChartSettings] = useState<ChartConfig>(chartConfig)const { xKey, yKey, view = 'table', logScale = false } = chartSettings@@ -280,6 +285,7 @@ export const QueryBlock = ({</p>)}<ChartContainer+ ref={chartContainerRef}className="aspect-auto px-3 py-2"style={{ height: '230px', minHeight: '230px' }}>@@ -318,14 +324,26 @@ export const QueryBlock = ({/><Tooltipcontent={- <ChartTooltipContent- className="min-w-[200px]"- labelFormatter={(value) =>- xKeyDateFormat === 'date'- ? dayjs(value).format('MMM D YYYY HH:mm')- : String(value)- }- />+ portalTooltip ? (+ <PortalChartTooltip+ chartRef={chartContainerRef}+ className="min-w-[200px]"+ labelFormatter={(value) =>+ xKeyDateFormat === 'date'+ ? dayjs(value).format('MMM D YYYY HH:mm')+ : String(value)+ }+ />+ ) : (+ <ChartTooltipContent+ className="min-w-[200px]"+ labelFormatter={(value) =>+ xKeyDateFormat === 'date'+ ? dayjs(value).format('MMM D YYYY HH:mm')+ : String(value)+ }+ />+ )}/><Bar radius={1} dataKey={yKey} fill="hsl(var(--chart-1))">