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

feat: add tooltip #1335

Merged
merged 3 commits into from
Jul 1, 2024
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
160 changes: 160 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-toggle": "^1.1.0",
"@radix-ui/react-toggle-group": "^1.1.0",
"@radix-ui/react-tooltip": "^1.1.2",
"@snyk/protect": "latest",
"@t3-oss/env-nextjs": "^0.10.1",
"@tanstack/react-query": "^5.26.3",
Expand Down
6 changes: 6 additions & 0 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
--popover: 0 0% 100%;
--popover-foreground: 224 71.4% 4.1%;

--tooltip: 0 0% 0%;
--tooltip-foreground: 0 0% 100%;

--primary: 239 84% 67%;
--primary-hover: 243 75% 59%;
--primary-active: 245 58% 51%;
Expand Down Expand Up @@ -57,6 +60,9 @@
--popover: 240 5.26% 26.08%;
--popover-foreground: 240 2% 58%;

--tooltip: 240 5% 84%;
--tooltip-foreground: 240 4% 16%;

--primary: 238.73 70% 63%;
--primary-hover: 234 89% 74%;
--primary-active: 230 94% 82%;
Expand Down
29 changes: 29 additions & 0 deletions src/v2/components/ui/Tooltip.stories.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import type { Meta, StoryObj } from "@storybook/react"
import { Button } from "./Button"
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "./Tooltip"

const TooltipExample = () => (
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button variant="outline" size="sm">
Hover me!
</Button>
</TooltipTrigger>
<TooltipContent>
<p>This is a tooltip!</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
)

const meta: Meta<typeof TooltipExample> = {
title: "Design system/Tooltip",
component: TooltipExample,
}

export default meta

type Story = StoryObj<typeof TooltipExample>

export const Default: Story = {}
35 changes: 35 additions & 0 deletions src/v2/components/ui/Tooltip.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
"use client"

import * as TooltipPrimitive from "@radix-ui/react-tooltip"
import * as React from "react"

import { cn } from "@/lib/utils"

const TooltipProvider = TooltipPrimitive.Provider

const Tooltip: React.FC<
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Root>
> = ({ ...props }) => <TooltipPrimitive.Root delayDuration={0} {...props} />

const TooltipTrigger = TooltipPrimitive.Trigger

const TooltipContent = React.forwardRef<
React.ElementRef<typeof TooltipPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
>(({ className, sideOffset = 4, children, ...props }, ref) => (
<TooltipPrimitive.Content
ref={ref}
sideOffset={sideOffset}
className={cn(
"bg-tooltip text-tooltip-foreground z-50 overflow-hidden rounded-xl px-3 py-1.5 text-sm shadow-md duration-0 animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
className
)}
{...props}
>
{children}
{/* <TooltipPrimitive.Arrow className="fill-popover-foreground" /> */}
</TooltipPrimitive.Content>
))
TooltipContent.displayName = TooltipPrimitive.Content.displayName

export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger }
4 changes: 4 additions & 0 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ const config = {
DEFAULT: "hsl(var(--popover))",
foreground: "hsl(var(--popover-foreground))",
},
tooltip: {
DEFAULT: "hsl(var(--tooltip))",
foreground: "hsl(var(--tooltip-foreground))",
},
card: {
DEFAULT: "hsl(var(--card))",
foreground: "hsl(var(--card-foreground))",
Expand Down