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

minor: abstract copy button #291

Merged
merged 1 commit into from
Sep 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import {
Button,
CopyButton,
Icon,
Table,
TableBody,
Expand Down Expand Up @@ -34,7 +35,7 @@ export default function WorkspaceApiKeys() {
</TableHeader>
<TableBody>
{apiKeys.map((apiKey) => (
<TableRow key={apiKey.id} verticalPadding>
<TableRow key={apiKey.id} verticalPadding hoverable={false}>
<TableCell>
<Text.H4>{apiKey.name || 'Unnamed API Key'}</Text.H4>
</TableCell>
Expand All @@ -50,9 +51,15 @@ export default function WorkspaceApiKeys() {
})
}}
>
<Text.H4 color='foregroundMuted'>
{apiKey.token}
</Text.H4>
<div className='flex flex-row items-center gap-2'>
<Text.H4 color='foregroundMuted'>
{apiKey.token}
</Text.H4>
<CopyButton
content={apiKey.token}
color='foregroundMuted'
/>
</div>
</Button>
}
>
Expand Down
4 changes: 2 additions & 2 deletions packages/web-ui/src/ds/atoms/CodeBlock/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react'
import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'
import { oneLight } from 'react-syntax-highlighter/dist/esm/styles/prism'

import { CopyButton } from './CopyButton'
import { CopyButton } from '../CopyButton'

interface CodeBlockProps {
language: string
Expand All @@ -14,7 +14,7 @@ export function CodeBlock({ language, children }: CodeBlockProps) {
return (
<div className='relative max-w-full'>
<div className='absolute top-4 right-2'>
<CopyButton content={children} />
<CopyButton content={children} color='foregroundMuted' />
</div>
<SyntaxHighlighter
language={language}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,18 @@
import React from 'react'

import { Button } from '../Button'
import { Icon } from '../Icons'
import { Icon, IconProps } from '../Icons'
import { useToast } from '../Toast/useToast'

interface CopyButtonProps {
type CopyButtonProps = Omit<IconProps, 'name'> & {
content: string
}

export function CopyButton({ content }: CopyButtonProps) {
export function CopyButton({
content,
color = 'foregroundMuted',
...rest
}: CopyButtonProps) {
const { toast } = useToast()

const handleCopy = () => {
Expand All @@ -23,8 +27,8 @@ export function CopyButton({ content }: CopyButtonProps) {
}

return (
<Button onClick={handleCopy} variant='ghost' size='small'>
<Icon name='clipboard' />
<Button onClick={handleCopy} variant='nope' size='small'>
<Icon name='clipboard' color={color} {...rest} />
</Button>
)
}
6 changes: 4 additions & 2 deletions packages/web-ui/src/ds/atoms/Table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,16 @@ const TableRow = forwardRef<
HTMLTableRowElement,
HTMLAttributes<HTMLTableRowElement> & {
verticalPadding?: boolean
hoverable?: boolean
}
>(({ className, verticalPadding, ...props }, ref) => (
>(({ className, verticalPadding, hoverable = true, ...props }, ref) => (
<tr
ref={ref}
className={cn(
'border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted',
'border-b transition-colors data-[state=selected]:bg-muted',
{
'[&>td]:py-4': verticalPadding,
'hover:bg-muted/50': hoverable,
},
className,
)}
Expand Down
1 change: 1 addition & 0 deletions packages/web-ui/src/ds/atoms/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ export * from './DropzoneInput'
export * from './Charts'
export * from './CircularProgress'
export * from './CodeBlock'
export * from './CopyButton'
Loading