Elgato_dark/console
1
0
Fork 0
mirror of https://github.com/graphql-hive/console synced 2026-05-23 17:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[hive/app] fixes error <button> cannot appear as a descendant of <button> for TabsTrigger inside `TooltipTrigger (#4999)

Browse source
This commit is contained in:
Dimitri POSTOLOV 2024-07-10 11:53:35 +02:00 committed by GitHub
parent fff0a790fa
commit 8ca175b917
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/web/app/src/components/ui/tabs.tsx
View file

@ -28,7 +28,8 @@ const TabsTrigger = React.forwardRef<
<TabsPrimitive.Trigger
ref={ref}
className={cn(
'ring-offset-background focus-visible:ring-ring data-[state=active]:bg-background data-[state=active]:text-foreground inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
'ring-offset-background focus-visible:ring-ring data-[state=active]:bg-background data-[state=active]:text-foreground inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:opacity-50 data-[state=active]:shadow-sm',
'disabled:cursor-not-allowed active:disabled:pointer-events-none', // `:active` allows `:hover` state for using with `TooltipTrigger` with `asChild` prop
className,
)}
{...props}

5
packages/web/app/src/pages/target-history-version.tsx
View file

@ -283,7 +283,10 @@ function DefaultSchemaVersionView(props: {
<TabsList className="bg-background border-muted w-full justify-start rounded-none border-x border-b">
{availableViews.map(item => (
<Tooltip key={item.value}>
<TooltipTrigger>
<TooltipTrigger
// fixes <button> cannot appear as a descendant of <button>
asChild
>
<TabsTrigger value={item.value} disabled={!!item.disabledReason}>
{item.icon}
<span className="ml-2">{item.label}</span>