Skip to content

#719 tooltip: add disabled prop #799

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.

Sign up for GitHub

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

Open
divineLush wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#719 tooltip: add disabled prop #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions apps/playground/app/(themeable)/sink/tooltip/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ export default function TooltipPage() {
Multiline
</Button>
</Tooltip>

<Tooltip content="This tooltip is disabled" disabled>
<Button variant="solid" size="1">
Disabled
</Button>
</Tooltip>
</Flex>
</DocsSectionBody>
</DocsSection>
Expand Down
Binary file added ...__/visual-regression.spec.ts-snapshots/sink-tooltip-disabled-chromium-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s__/visual-regression.spec.ts-snapshots/sink-tooltip-disabled-firefox-linux.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions apps/playground/tests/visual-regression.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,18 @@ test.describe('visual regression', () => {
});
});

test('/sink/tooltip - disabled state', async ({ page }) => {
await page.goto('/sink/tooltip');
await page.waitForLoadState('networkidle');
const disabledButton = page.getByRole('button', { name: 'Disabled' });
await disabledButton.hover();
await page.waitForTimeout(500);
await expect(page).toHaveScreenshot('sink-tooltip-disabled.png', {
fullPage: true,
animations: 'disabled',
});
});

test('/sink/typography', async ({ page }) => {
await page.goto('/sink/typography');
await page.waitForLoadState('networkidle');
Expand Down
2 changes: 2 additions & 0 deletions packages/radix-ui-themes/src/components/tooltip.props.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { PropDef, GetPropDefTypes } from '../props/prop-def.js';

const tooltipPropDefs = {
content: { type: 'ReactNode', required: true },
disabled: { type: 'boolean', default: false },
width: widthPropDefs.width,
minWidth: widthPropDefs.minWidth,
maxWidth: { ...widthPropDefs.maxWidth, default: '360px' },
Expand All @@ -12,6 +13,7 @@ const tooltipPropDefs = {
minWidth: PropDef<string>;
maxWidth: PropDef<string>;
content: PropDef<React.ReactNode>;
disabled: PropDef<boolean>;
};

type TooltipOwnProps = GetPropDefTypes<typeof tooltipPropDefs & typeof widthPropDefs>;
Expand Down
37 changes: 20 additions & 17 deletions packages/radix-ui-themes/src/components/tooltip.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const Tooltip = React.forwardRef<TooltipElement, TooltipProps>((props, forwarded
onOpenChange,
delayDuration,
disableHoverableContent,
disabled,
content,
container,
forceMount,
Expand All @@ -38,23 +39,25 @@ const Tooltip = React.forwardRef<TooltipElement, TooltipProps>((props, forwarded
return (
<TooltipPrimitive.Root {...rootProps}>
<TooltipPrimitive.Trigger asChild>{children}</TooltipPrimitive.Trigger>
<TooltipPrimitive.Portal container={container} forceMount={forceMount}>
<Theme asChild>
<TooltipPrimitive.Content
sideOffset={4}
collisionPadding={10}
{...tooltipContentProps}
asChild={false}
ref={forwardedRef}
className={classNames('rt-TooltipContent', className)}
>
<Text as="p" className="rt-TooltipText" size="1">
{content}
</Text>
<TooltipPrimitive.Arrow className="rt-TooltipArrow" />
</TooltipPrimitive.Content>
</Theme>
</TooltipPrimitive.Portal>
{!disabled && (
<TooltipPrimitive.Portal container={container} forceMount={forceMount}>
<Theme asChild>
<TooltipPrimitive.Content
sideOffset={4}
collisionPadding={10}
{...tooltipContentProps}
asChild={false}
ref={forwardedRef}
className={classNames('rt-TooltipContent', className)}
>
<Text as="p" className="rt-TooltipText" size="1">
{content}
</Text>
<TooltipPrimitive.Arrow className="rt-TooltipArrow" />
</TooltipPrimitive.Content>
</Theme>
</TooltipPrimitive.Portal>
)}
</TooltipPrimitive.Root>
);
});
Expand Down