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] Enhance the Tooltip component #2889

Merged
merged 1 commit into from
Jul 3, 2023
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
28 changes: 7 additions & 21 deletions src/aimcore/web/ui/src/components/kit_v2/Popover/Popover.style.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
import * as PopoverPrimitive from '@radix-ui/react-popover';

import { keyframes, styled } from 'config/stitches';

const slideUpAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideRightAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(-2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});

const slideDownAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(-2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideLeftAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});
import { styled } from 'config/stitches';
import {
slideDownAndFade,
slideLeftAndFade,
slideRightAndFade,
slideUpAndFade,
} from 'config/stitches/animations';

const StyledContent = styled(PopoverPrimitive.Content, {
br: '5px',
Expand Down
6 changes: 6 additions & 0 deletions src/aimcore/web/ui/src/components/kit_v2/Tooltip/Tooltip.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,10 @@ export interface ITooltipProps extends TooltipProps {
* @optional
*/
hasArrow?: boolean;
/**
* The color of the tooltip.
* @defaultValue 'info'
* @optional
*/
color?: 'info' | 'success' | 'warning' | 'danger';
}
54 changes: 30 additions & 24 deletions src/aimcore/web/ui/src/components/kit_v2/Tooltip/Tooltip.style.ts
Original file line number Diff line number Diff line change
@@ -1,37 +1,24 @@
import * as Tooltip from '@radix-ui/react-tooltip';

import { keyframes, styled } from 'config/stitches';

const slideUpAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideRightAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(-2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});

const slideDownAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(-2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideLeftAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});
import { styled } from 'config/stitches';
import {
slideDownAndFade,
slideLeftAndFade,
slideRightAndFade,
slideUpAndFade,
} from 'config/stitches/animations';

const TooltipContent = styled(Tooltip.Content, {
borderRadius: 4,
padding: '10px 15px',
p: '$4 $5',
maxWidth: 400,
fontSize: '$3',
border: '1px solid rgba(90, 102, 122, 0.2)',
border: '1px solid $colors$border-bgborder-airly-opacity',
wordBreak: 'break-word',
lineHeight: 1,
backgroundColor: 'white',
bs: 'rgba(90, 102, 122, 0.3) 0px 10px 38px -10px, rgba(90, 102, 122, 0.3) 0px 10px 20px -15px',
bs: '$moderate',
zIndex: 1000,
userSelect: 'none',
animationDuration: '300ms',
animationTimingFunction: 'cubic-bezier(0.16, 1, 0.3, 1)',
Expand All @@ -42,6 +29,25 @@ const TooltipContent = styled(Tooltip.Content, {
'&[data-side="bottom"]': { animationName: slideUpAndFade },
'&[data-side="left"]': { animationName: slideRightAndFade },
},
variants: {
colorPalette: {
info: {
bc: 'white',
},
success: {
bc: '$background-default-success-plain',
color: 'white',
},
warning: {
bc: '$background-default-warning-plain',
color: 'white',
},
danger: {
bc: '$background-default-danger-plain',
color: 'white',
},
},
},
});

const TooltipArrow = styled(Tooltip.Arrow, {
Expand Down
3 changes: 2 additions & 1 deletion src/aimcore/web/ui/src/components/kit_v2/Tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function Tooltip({
skipDelayDuration = 300,
hasArrow = false,
contentProps = {},
color = 'info',
children,
...props
}: ITooltipProps): React.FunctionComponentElement<React.ReactNode> {
Expand All @@ -57,7 +58,7 @@ function Tooltip({
ref={ref}
data-testid='tooltip-content'
sideOffset={5}
style={{ zIndex: 1000 }}
colorPalette={color}
{...contentProps}
>
{content}
Expand Down
34 changes: 33 additions & 1 deletion src/aimcore/web/ui/src/config/stitches/animations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,36 @@ const slideOut = keyframes({
'100%': { transform: 'translateY(100%)' },
});

export { fadeIn, fadeOut, toastSlideIn, toastSwipeOut, slideIn, slideOut };
// Tooltip and Popover animations
const slideUpAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideRightAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(-2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});

const slideDownAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateY(-2px)' },
'100%': { opacity: 1, transform: 'translateY(0)' },
});

const slideLeftAndFade = keyframes({
'0%': { opacity: 0, transform: 'translateX(2px)' },
'100%': { opacity: 1, transform: 'translateX(0)' },
});

export {
fadeIn,
fadeOut,
toastSlideIn,
toastSwipeOut,
slideIn,
slideOut,
slideUpAndFade,
slideRightAndFade,
slideDownAndFade,
slideLeftAndFade,
};
1 change: 1 addition & 0 deletions src/aimcore/web/ui/src/config/stitches/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@ export const lightTheme: ConfigType.Theme = {
'border-default-bgborder-soft': '#B4BFCA',
'border-default-bgborder-light': '#D9DFE4',
'border-default-bgborder-airly': '#E8EBEF',
'border-default-bgborder-airly-opacity': 'hsla(210, 17%, 75%, 0.3)',
'border-default-bgborder-lumos': '#F7F8FA',
'border-default-bgborder-pastel-opacity': 'hsla(210, 17%, 75%, 0.3)',

Expand Down
7 changes: 6 additions & 1 deletion src/aimcore/web/ui/src/stories/Tooltip.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ import TooltipComponent from 'components/kit_v2/Tooltip';
export default {
title: 'Kit/Data Display',
component: TooltipComponent,
argTypes: {},
argTypes: {
color: {
control: 'select',
options: ['info', 'success', 'warning', 'danger'],
},
},
} as ComponentMeta<typeof TooltipComponent>;

const Template: ComponentStory<typeof TooltipComponent> = (args) => (
Expand Down