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.

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

Add hover and focus on toast #996

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Add hover and focus on toast #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d032b34
feat: add hover and focus on toast
kevinmulier Dec 18, 2024
053607a
feat: allow user to activate action with keyboard
kevinmulier Dec 19, 2024
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
2 changes: 1 addition & 1 deletion apps/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"react-markdown": "9.0.1",
"react-player": "2.16.0",
"react-syntax-highlighter": "15.6.1",
"react-toastify": "^10.0.6",
"react-toastify": "^11.0.1",
"react-use-websocket": "^4.11.1",
"recharts": "^2.14.1",
"rehype-mathjax": "6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/main-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const MainLayout = ({
if (hasJustRegistered) {
customToast(t('auth.dashboardUnlocked'), {
mode: variant === 'dark' ? 'dark' : 'light',
color: 'secondary',
color: 'primary',
time: 5000,
closeButton: true,
imgSrc: SignInIconLight,
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/routes/_content/courses/$courseId/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ function CourseDetails() {
: async () => {
if (!isLoggedIn && !hasSeenRegisterToast) {
customToast(t('auth.trackProgress'), {
color: 'secondary',
color: 'primary',
mode: 'light',
imgSrc: SignInIconLight,
onClick: () => {
Expand All @@ -674,7 +674,7 @@ function CourseDetails() {
userCourseProgress[0].completedChaptersCount === 0))
) {
customToast(t('courses.details.courseAddedToDashboard'), {
color: 'secondary',
color: 'primary',
mode: 'light',
imgSrc: SignInIconLight,
closeButton: true,
Expand Down
154 changes: 94 additions & 60 deletions packages/ui/src/atoms/toast.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ import { IoCloseOutline } from 'react-icons/io5';
import type { IconType } from 'react-icons/lib';
import { toast } from 'react-toastify';

const toastVariants = cva('md:!w-[299px]', {
const toastVariants = cva('md:!w-[299px] focus:ring-1 focus:ring-newGray-2', {
variants: {
mode: {
light: '',
dark: 'dark',
},
color: {
primary: '!bg-darkOrange-2 dark:!bg-darkOrange-8',
secondary: '!bg-darkOrange-0 dark:!bg-darkOrange-10',
warning: '!bg-red-1 dark:!bg-red-7',
success: '!bg-brightGreen-1 dark:!bg-brightGreen-9',
neutral: '!bg-newBlack-3 dark:!bg-newGray-6',
primary:
'!bg-darkOrange-0 dark:!bg-darkOrange-10 hover:!bg-darkOrange-1 hover:dark:!bg-darkOrange-9 focus:!bg-darkOrange-1 focus:dark:!bg-darkOrange-9',
warning:
'!bg-red-1 dark:!bg-red-9 hover:!bg-red-2 hover:dark:!bg-red-8 focus:!bg-red-2 focus:dark:!bg-red-8',
success:
'!bg-brightGreen-1 dark:!bg-brightGreen-9 hover:!bg-brightGreen-2 hover:dark:!bg-brightGreen-8 focus:!bg-brightGreen-2 focus:dark:!bg-brightGreen-8',
neutral:
'!bg-newGray-6 dark:!bg-newBlack-3 hover:!bg-newGray-5 hover:dark:!bg-newBlack-4 focus:!bg-newGray-5 focus:dark:!bg-newBlack-4',
},
},
defaultVariants: {
Expand Down Expand Up @@ -43,11 +46,10 @@ const iconVariants = cva('shrink-0', {
dark: 'dark',
},
color: {
primary: '!text-darkOrange-5',
secondary: '!text-darkOrange-3 dark:!text-darkOrange-5',
warning: '!text-red-5 dark:!text-red-3',
success: '!text-brightGreen-4',
neutral: '!text-newGray-3 dark:!text-newGray-4',
primary: '!text-darkOrange-4 dark:!text-darkOrange-6',
warning: '!text-red-5',
success: '!text-brightGreen-4 dark:!text-brightGreen-6',
neutral: '!text-newGray-3 dark:!text-newGray-2',
},
},
defaultVariants: {
Expand All @@ -64,10 +66,9 @@ const progressBarVariants = cva('', {
},
color: {
primary: '!bg-darkOrange-4 dark:!bg-darkOrange-6',
secondary: '!bg-darkOrange-2 dark:!bg-darkOrange-7',
warning: '!bg-red-2 dark:!bg-red-4',
success: '!bg-brightGreen-3 dark:!bg-brightGreen-5',
neutral: '!bg-newGray-4 dark:!bg-newGray-3',
warning: '!bg-red-5',
success: '!bg-brightGreen-4 dark:!bg-brightGreen-6',
neutral: '!bg-newGray-3 dark:!bg-newGray-2',
},
},
defaultVariants: {
Expand All @@ -83,10 +84,9 @@ const toastCloseButtonVariants = cva('shrink-0', {
dark: 'dark hover:!brightness-110',
},
color: {
primary: '!text-darkOrange-6',
secondary: '!text-darkOrange-4 dark:!text-darkOrange-6',
warning: '!text-red-4',
success: '!text-brightGreen-5 dark:!text-brightGreen-6',
primary: '!text-darkOrange-4 dark:!text-darkOrange-6',
warning: '!text-red-5',
success: '!text-brightGreen-4 dark:!text-brightGreen-6',
neutral: '!text-newGray-3 dark:!text-newGray-2',
},
},
Expand All @@ -98,7 +98,7 @@ const toastCloseButtonVariants = cva('shrink-0', {

interface ToastProps {
mode?: 'light' | 'dark';
color?: 'primary' | 'secondary' | 'warning' | 'success' | 'neutral';
color?: 'primary' | 'warning' | 'success' | 'neutral';
}

export const customToast = (
Expand All @@ -116,51 +116,85 @@ export const customToast = (
) => {
const { closeOnClick = true } = options;

return toast(message, {
autoClose: options.time || 5000,
className: toastVariants({
mode: options.mode,
color: options.color,
}),
bodyClassName: textVariants({
mode: options.mode,
}),
progressClassName: progressBarVariants({
mode: options.mode,
color: options.color,
return toast(
ToastContent({
message: message,
className: textVariants({
mode: options.mode,
}),
onClick: options.onClick,
}),
icon: options.imgSrc
? () => (
<img src={options.imgSrc} alt={message} className="shrink-0 size-8" />
)
: options.icon && (
<ToastIconWithClasses
icon={options.icon}
mode={options.mode}
color={options.color}
/>
),
closeButton: options.onClick
? false
: options.closeButton
? ({
closeToast,
}: {
closeToast: MouseEventHandler<HTMLButtonElement>;
}) => (
<ToastCloseButton
closeToast={closeToast}
{
autoClose: options.time || 5000,
className: toastVariants({
mode: options.mode,
color: options.color,
}),
progressClassName: progressBarVariants({
mode: options.mode,
color: options.color,
}),
icon: options.imgSrc
? () => (
<img
src={options.imgSrc}
alt={message}
className="shrink-0 size-8"
/>
)
: options.icon && (
<ToastIconWithClasses
icon={options.icon}
mode={options.mode}
color={options.color}
/>
)
: false,
onClick: options.onClick,
closeOnClick: closeOnClick,
});
),
closeButton: options.onClick
? false
: options.closeButton
? ({
closeToast,
}: {
closeToast: MouseEventHandler<HTMLButtonElement>;
}) => (
<ToastCloseButton
closeToast={closeToast}
mode={options.mode}
color={options.color}
/>
)
: false,
onClick: options.onClick,
closeOnClick: closeOnClick,
},
);
};

export const ToastCloseButton = ({
const ToastContent = ({
message,
className,
onClick,
}: {
message: string;
className: string;
onClick?: () => void;
}) => (
<span
className={className}
onKeyDown={(e) => {
if (onClick && (e.key === 'Enter' || e.key === ' ')) {
e.preventDefault();
onClick();
}
}}
role={onClick ? 'button' : undefined}
tabIndex={onClick ? 0 : undefined}
>
{message}
</span>
);

const ToastCloseButton = ({
closeToast,
mode,
color,
Expand All @@ -181,7 +215,7 @@ export const ToastCloseButton = ({
</button>
);

export const ToastIconWithClasses = ({
const ToastIconWithClasses = ({
icon: Icon,
mode,
color,
Expand Down
19 changes: 0 additions & 19 deletions packages/ui/src/styles/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,10 +677,6 @@
transform: translate3d(0, var(--y), 0) scale(var(--s));
transition: transform 0.3s;
}
.Toastify__toast--stacked[data-collapsed] .Toastify__toast-body,
.Toastify__toast--stacked[data-collapsed] .Toastify__close-button {
transition: opacity 0.1s;
}
.Toastify__toast--stacked[data-collapsed='false'] {
overflow: visible;
}
Expand Down Expand Up @@ -723,21 +719,6 @@
.Toastify__toast--close-on-click {
cursor: pointer;
}
.Toastify__toast-body {
margin: auto 0;
-ms-flex: 1 1 auto;
flex: 1 1 auto;
padding: 6px;
display: -ms-flexbox;
display: flex;
-ms-flex-align: center;
align-items: center;
}
.Toastify__toast-body > div:last-child {
word-break: break-word;
-ms-flex: 1;
flex: 1;
}
.Toastify__toast-icon {
-webkit-margin-end: 12px;
margin-inline-end: 12px;
Expand Down
24 changes: 18 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading