- Notifications
You must be signed in to change notification settings - Fork1.1k
refactor: migrate CopyableValue from MUI to Radix UI#20261
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
7 commits Select commitHold shift + click to select a range
75bf770 refactor: migrate CopyableValue from MUI to Radix UI
jaaydenhe199c54 refactor: update SensitiveValue to pass className instead of css
jaaydenh3c90fd2 fix: improvements
jaaydenh6a2a508 fix: simplify and handle keyboard usage
jaaydenhe6a3bc9 chore: cleanup
jaaydenh1c700a6 Merge branch 'main' into jaaydenh/refactor-copyable-value
jaaydenh589a27a chore: PR review updates
jaaydenhFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
86 changes: 71 additions & 15 deletionssite/src/components/CopyableValue/CopyableValue.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,91 @@ | ||
| import { | ||
| Tooltip, | ||
| TooltipContent, | ||
| TooltipProvider, | ||
| TooltipTrigger, | ||
| } from "components/Tooltip/Tooltip"; | ||
| import { useClickable } from "hooks/useClickable"; | ||
| import { useClipboard } from "hooks/useClipboard"; | ||
| import { type FC, type HTMLAttributes, useState } from "react"; | ||
| import { cn } from "utils/cn"; | ||
| type TooltipSide = "top" | "right" | "bottom" | "left"; | ||
| interface CopyableValueProps extends HTMLAttributes<HTMLSpanElement> { | ||
| value: string; | ||
| side?: TooltipSide; | ||
| } | ||
| export const CopyableValue: FC<CopyableValueProps> = ({ | ||
| value, | ||
| side = "bottom", | ||
| children, | ||
| className, | ||
| role, | ||
| tabIndex, | ||
| onClick, | ||
| onKeyDown, | ||
| onKeyUp, | ||
| ...attrs | ||
| }) => { | ||
| const { showCopiedSuccess, copyToClipboard } = useClipboard(); | ||
| const [tooltipOpen, setTooltipOpen] = useState(false); | ||
| const [isFocused, setIsFocused] = useState(false); | ||
Contributor
| ||
| const clickableProps = useClickable<HTMLSpanElement>(() => { | ||
| copyToClipboard(value); | ||
| setTooltipOpen(true); | ||
| }); | ||
| return ( | ||
| <TooltipProvider delayDuration={100}> | ||
| <Tooltip | ||
| open={tooltipOpen} | ||
| onOpenChange={(shouldBeOpen) => { | ||
| // Always keep the tooltip open when in focus to handle issues when onOpenChange is unexpectedly false | ||
| if (!shouldBeOpen && isFocused) return; | ||
| setTooltipOpen(shouldBeOpen); | ||
| }} | ||
| > | ||
| <TooltipTrigger asChild> | ||
| <span | ||
| ref={clickableProps.ref} | ||
| {...attrs} | ||
| className={cn("cursor-pointer", className)} | ||
| role={role ?? clickableProps.role} | ||
| tabIndex={tabIndex ?? clickableProps.tabIndex} | ||
| onClick={(event) => { | ||
| clickableProps.onClick(event); | ||
| onClick?.(event); | ||
| }} | ||
| onKeyDown={(event) => { | ||
| clickableProps.onKeyDown(event); | ||
| onKeyDown?.(event); | ||
| }} | ||
| onKeyUp={(event) => { | ||
| clickableProps.onKeyUp(event); | ||
| onKeyUp?.(event); | ||
| }} | ||
| onMouseEnter={() => { | ||
| setIsFocused(true); | ||
| setTooltipOpen(true); | ||
| }} | ||
| onMouseLeave={() => { | ||
| setTooltipOpen(false); | ||
| }} | ||
| onFocus={() => { | ||
| setIsFocused(true); | ||
| }} | ||
Comment on lines +75 to +77 Contributor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Do we also want to open the tooltip here? | ||
| onBlur={() => { | ||
| setTooltipOpen(false); | ||
| }} | ||
| > | ||
| {children} | ||
| </span> | ||
| </TooltipTrigger> | ||
| <TooltipContent side={side}> | ||
| {showCopiedSuccess ? "Copied!" : "Click to copy"} | ||
| </TooltipContent> | ||
| </Tooltip> | ||
| </TooltipProvider> | ||
| ); | ||
| }; | ||
13 changes: 4 additions & 9 deletionssite/src/modules/resources/SensitiveValue.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletionssite/src/pages/DeploymentSettingsPage/OAuth2AppsSettingsPage/EditOAuth2AppPageView.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
32 changes: 7 additions & 25 deletionssite/src/pages/IconsPage/IconsPage.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.