Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Slight UI components refactor & accessibility improvements

Blue Mouse2d8d28473248
diff --git a/web/app/components/NotificationChannels/NotificationChannels.tsx b/web/app/components/NotificationChannels/NotificationChannels.tsx
index b3990d391..7488c322f 100644
--- a/web/app/components/NotificationChannels/NotificationChannels.tsx
+++ b/web/app/components/NotificationChannels/NotificationChannels.tsx
@@ -314,35 +314,26 @@ const NotificationChannels = ({
return (
<section>
- <div className='flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between'>
+ <div className='mb-4 flex flex-col items-start justify-between gap-y-2 sm:flex-row sm:items-center'>
<div>
<Text as='h3' size='lg' weight='bold'>
{headingTitle}
</Text>
- <Text
- as='p'
- size='sm'
- colour='secondary'
- className='mt-1 max-w-prose'
- >
+ <Text as='p' size='sm' colour='muted' className='mt-1 max-w-prose'>
{headingDescription}
</Text>
</div>
- <div className='flex flex-wrap items-center gap-2'>
- <Button
- small
- primary
- onClick={() => {
- setForm(blankForm(allowedTypes[0]))
- setCreating(true)
- }}
- >
- <span className='inline-flex items-center gap-1'>
- <PlusIcon className='size-4' aria-hidden />
- {t('notificationChannels.add')}
- </span>
- </Button>
- </div>
+ <Button
+ small
+ primary
+ onClick={() => {
+ setForm(blankForm(allowedTypes[0]))
+ setCreating(true)
+ }}
+ >
+ <PlusIcon className='mr-1 size-4' aria-hidden />
+ {t('notificationChannels.add')}
+ </Button>
</div>
{!isLoaded ? (
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index 2b56785d6..cdd913bff 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -361,21 +361,19 @@ const Dashboard = () => {
>
<span>{t('titles.dashboard')}</span>
{isSearchActive ? (
- <button
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
- type='button'
+ <Button
+ icon
onClick={() => {
setSearch('')
setIsSearchActive(false)
}}
aria-label={t('common.close')}
>
- <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />
- </button>
+ <XIcon className='size-5' />
+ </Button>
) : (
- <button
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
- type='button'
+ <Button
+ icon
onClick={() => {
setIsSearchActive(true)
setTimeout(() => {
@@ -384,8 +382,8 @@ const Dashboard = () => {
}}
aria-label={t('project.search')}
>
- <MagnifyingGlassIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />
- </button>
+ <MagnifyingGlassIcon className='size-5' />
+ </Button>
)}
</Text>
{isSearchActive ? (
@@ -423,26 +421,24 @@ const Dashboard = () => {
/>
<div className='hidden lg:block'>
{viewMode === DASHBOARD_VIEW.GRID ? (
- <button
- type='button'
+ <Button
+ icon
title={t('dashboard.listView')}
+ aria-label={t('dashboard.listView')}
onClick={() => handleViewModeChange(DASHBOARD_VIEW.LIST)}
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
>
- <RowsIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />
- </button>
+ <RowsIcon className='size-5' />
+ </Button>
) : null}
{viewMode === DASHBOARD_VIEW.LIST ? (
- <button
- type='button'
+ <Button
+ icon
title={t('dashboard.gridView')}
- onClick={() => {
- handleViewModeChange(DASHBOARD_VIEW.GRID)
- }}
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
+ aria-label={t('dashboard.gridView')}
+ onClick={() => handleViewModeChange(DASHBOARD_VIEW.GRID)}
>
- <SquaresFourIcon className='h-5 w-5 text-gray-700 dark:text-gray-50' />
- </button>
+ <SquaresFourIcon className='size-5' />
+ </Button>
) : null}
</div>
<Button onClick={onNewProject} primary large>
diff --git a/web/app/pages/Organisations/Organisations.tsx b/web/app/pages/Organisations/Organisations.tsx
index 51f1fbe93..295d40bb1 100644
--- a/web/app/pages/Organisations/Organisations.tsx
+++ b/web/app/pages/Organisations/Organisations.tsx
@@ -186,21 +186,19 @@ const Organisations = () => {
>
<span>{t('titles.organisations')}</span>
{isSearchActive ? (
- <button
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
- type='button'
+ <Button
+ icon
onClick={() => {
setSearch('')
setIsSearchActive(false)
}}
aria-label={t('common.close')}
>
- <XIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />
- </button>
+ <XIcon className='size-5' />
+ </Button>
) : (
- <button
- className='rounded-md border border-transparent bg-gray-50 p-2 transition-colors hover:border-gray-300 hover:bg-white dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900'
- type='button'
+ <Button
+ icon
onClick={() => {
setIsSearchActive(true)
setTimeout(() => {
@@ -209,8 +207,8 @@ const Organisations = () => {
}}
aria-label={t('project.search')}
>
- <MagnifyingGlassIcon className='h-5 w-5 cursor-pointer rounded-md text-gray-900 dark:text-gray-50' />
- </button>
+ <MagnifyingGlassIcon className='size-5' />
+ </Button>
)}
</Text>
{isSearchActive ? (
diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsx
index 6c4120d54..d0b2fc108 100644
--- a/web/app/pages/Organisations/Settings/People.tsx
+++ b/web/app/pages/Organisations/Settings/People.tsx
@@ -29,6 +29,7 @@ import { Badge } from '~/ui/Badge'
import Button from '~/ui/Button'
import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
+import { RadioCardGroup } from '~/ui/RadioCardGroup'
import { isValidEmail } from '~/utils/validator'
const NoPeople = () => {
@@ -408,118 +409,26 @@ const People = ({ organisation }: PeopleProps) => {
onChange={handleInput}
error={beenSubmitted ? errors.email : null}
/>
- <fieldset className='mt-4'>
- {}
- <label
- className='block text-sm font-medium text-gray-700 dark:text-gray-300'
- htmlFor='role'
- >
- {t('project.settings.role')}
- </label>
- <div
- className={cx(
- 'mt-1 -space-y-px rounded-md bg-white dark:bg-slate-950',
- {
- 'border border-red-300': errors.role,
- },
- )}
- >
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- <label
- className={cx(
- 'relative flex cursor-pointer rounded-tl-md rounded-tr-md border border-gray-200 p-4 dark:border-slate-600',
- {
- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':
- form.role === 'admin',
- 'border-gray-200': form.role !== 'admin',
- },
- )}
- >
- <input
- name='role'
- className='h-4 w-4 border-gray-300 text-slate-900 focus:ring-slate-900 dark:text-slate-100 dark:focus:ring-slate-300'
- id='role_admin'
- type='radio'
- value='admin'
- onChange={handleInput}
- checked={form.role === 'admin'}
- />
- <div className='ml-3 flex flex-col'>
- <span
- className={cx('block text-sm font-medium', {
- 'text-indigo-900 dark:text-white':
- form.role === 'admin',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'admin',
- })}
- >
- {t('organisations.role.admin.name')}
- </span>
- <span
- className={cx('block text-sm', {
- 'text-indigo-700 dark:text-gray-100':
- form.role === 'admin',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'admin',
- })}
- >
- {t('organisations.role.admin.desc')}
- </span>
- </div>
- </label>
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- <label
- className={cx(
- 'relative flex cursor-pointer rounded-br-md rounded-bl-md border border-gray-200 p-4 dark:border-gray-500',
- {
- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':
- form.role === 'viewer',
- 'border-gray-200': form.role !== 'viewer',
- },
- )}
- >
- <input
- name='role'
- className='h-4 w-4 border-gray-300 text-slate-900 focus:ring-slate-900 dark:text-slate-100 dark:focus:ring-slate-300'
- id='role_viewer'
- type='radio'
- value='viewer'
- onChange={handleInput}
- checked={form.role === 'viewer'}
- />
- <div className='ml-3 flex flex-col'>
- <span
- className={cx('block text-sm font-medium', {
- 'text-indigo-900 dark:text-white':
- form.role === 'viewer',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'viewer',
- })}
- >
- {t('organisations.role.viewer.name')}
- </span>
- <span
- className={cx('block text-sm', {
- 'text-indigo-700 dark:text-gray-100':
- form.role === 'viewer',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'viewer',
- })}
- >
- {t('organisations.role.viewer.desc')}
- </span>
- </div>
- </label>
- </div>
- {errors.role ? (
- <p
- className='mt-2 text-sm text-red-600 dark:text-red-500'
- id='email-error'
- >
- {errors.role}
- </p>
- ) : null}
- </fieldset>
+ <RadioCardGroup<'admin' | 'viewer'>
+ name='role'
+ label={t('project.settings.role')}
+ className='mt-4'
+ value={(form.role as 'admin' | 'viewer') || null}
+ onChange={(role) => setForm((prev) => ({ ...prev, role }))}
+ error={errors.role}
+ options={[
+ {
+ value: 'admin',
+ label: t('organisations.role.admin.name'),
+ description: t('organisations.role.admin.desc'),
+ },
+ {
+ value: 'viewer',
+ label: t('organisations.role.viewer.name'),
+ description: t('organisations.role.viewer.desc'),
+ },
+ ]}
+ />
</div>
}
isOpened={showModal}
diff --git a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx
index b4e426f6b..3f7ba873f 100644
--- a/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/Settings/Alerts/ProjectAlertsView.tsx
@@ -426,19 +426,26 @@ const ProjectAlertsInner = ({
if (!canManageAlerts) {
return (
- <div className='flex flex-col'>
- <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
- <div className='flex items-center text-gray-50'>
- <BellRingingIcon className='mr-2 h-8 w-8' />
- <p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>
- </div>
- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>
- {t('dashboard.alertsDesc')}
- </p>
+ <div className='mx-auto w-full max-w-2xl py-16 text-center'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
+ <BellRingingIcon className='size-7 text-gray-700 dark:text-gray-200' />
+ </div>
+ <Text as='h3' size='xl' weight='medium' className='tracking-tight'>
+ {t('dashboard.alerts')}
+ </Text>
+ <Text
+ as='p'
+ size='sm'
+ colour='secondary'
+ className='mx-auto mt-2 max-w-md whitespace-pre-wrap'
+ >
+ {t('dashboard.alertsDesc')}
+ </Text>
+ <div className='mt-6'>
<Link
to={routes.signup}
- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-slate-900 hover:bg-indigo-50 md:px-4'
aria-label={t('titles.signup')}
+ className='inline-flex items-center justify-center rounded-md border border-transparent bg-slate-900 px-4 py-2 text-sm font-medium text-white shadow-xs transition-colors hover:bg-slate-700 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white'
>
{t('header.startForFree')}
</Link>
@@ -484,21 +491,24 @@ const ProjectAlertsInner = ({
<>
<div className='mt-4'>
{alerts === null ? null : alerts.length === 0 ? (
- <div className='flex flex-col'>
- <div className='mt-5 rounded-lg bg-slate-700 p-5 dark:bg-slate-900'>
- <div className='flex items-center text-gray-50'>
- <BellRingingIcon className='mr-2 h-8 w-8' />
- <p className='text-3xl font-bold'>{t('dashboard.alerts')}</p>
- </div>
- <p className='mt-2 text-sm whitespace-pre-wrap text-gray-100'>
- {t('dashboard.alertsDesc')}
- </p>
- <Button
- onClick={handleNewAlert}
- className='mt-6 block max-w-max rounded-md border border-transparent bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-indigo-50 md:px-4'
- secondary
- large
- >
+ <div className='mx-auto w-full max-w-2xl py-16 text-center'>
+ <div className='mx-auto mb-6 flex size-14 items-center justify-center rounded-xl bg-gray-100 dark:bg-slate-900'>
+ <BellRingingIcon className='size-7 text-gray-700 dark:text-gray-200' />
+ </div>
+ <Text as='h3' size='xl' weight='medium' className='tracking-tight'>
+ {t('dashboard.alerts')}
+ </Text>
+ <Text
+ as='p'
+ size='sm'
+ colour='secondary'
+ className='mx-auto mt-2 max-w-md whitespace-pre-wrap'
+ >
+ {t('dashboard.alertsDesc')}
+ </Text>
+ <div className='mt-6'>
+ <Button onClick={handleNewAlert} primary large>
+ <PlusIcon className='mr-1.5 size-4' />
{t('alert.add')}
</Button>
</div>
diff --git a/web/app/pages/Project/Settings/Annotations.tsx b/web/app/pages/Project/Settings/Annotations.tsx
index bd859c72f..a7aaa7fac 100644
--- a/web/app/pages/Project/Settings/Annotations.tsx
+++ b/web/app/pages/Project/Settings/Annotations.tsx
@@ -14,6 +14,7 @@ import Button from '~/ui/Button'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
+import { Text } from '~/ui/Text'
const ANNOTATIONS_PER_PAGE = 10
@@ -167,18 +168,18 @@ const Annotations = ({ projectId, allowedToManage }: AnnotationsProps) => {
return (
<div>
- <div className='mb-4 flex items-center justify-between'>
+ <div className='mb-4 flex flex-col items-start justify-between gap-y-2 sm:flex-row sm:items-center'>
<div>
- <h3 className='text-lg font-medium text-gray-900 dark:text-gray-50'>
+ <Text as='h3' size='lg' weight='bold'>
{t('project.settings.annotations.title')}
- </h3>
- <p className='mt-1 text-sm text-gray-500 dark:text-gray-400'>
+ </Text>
+ <Text as='p' size='sm' colour='muted' className='mt-1 max-w-prose'>
{t('project.settings.annotations.description')}
- </p>
+ </Text>
</div>
{allowedToManage ? (
- <Button type='button' onClick={openCreateModal} primary regular>
- <PlusIcon className='mr-1 h-4 w-4' />
+ <Button type='button' onClick={openCreateModal} primary small>
+ <PlusIcon className='mr-1 size-4' />
{t('project.settings.annotations.add')}
</Button>
) : null}
diff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsx
index ca5567cb9..58077b94f 100644
--- a/web/app/pages/Project/Settings/Emails/Emails.tsx
+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx
@@ -25,10 +25,15 @@ import Button from '~/ui/Button'
import Input from '~/ui/Input'
import Loader from '~/ui/Loader'
import Modal from '~/ui/Modal'
+import { RadioCardGroup } from '~/ui/RadioCardGroup'
+import { Text } from '~/ui/Text'
import { isValidEmail } from '~/utils/validator'
interface ModalMessageProps {
handleInput: (e: React.ChangeEvent<HTMLInputElement>) => void
+ setForm: React.Dispatch<
+ React.SetStateAction<{ email: string; reportFrequency: string }>
+ >
beenSubmitted: boolean
errors: {
email?: string
@@ -42,6 +47,7 @@ interface ModalMessageProps {
const ModalMessage = ({
handleInput,
+ setForm,
beenSubmitted,
errors,
form,
@@ -66,91 +72,21 @@ const ModalMessage = ({
onChange={handleInput}
error={beenSubmitted ? errors.email : null}
/>
- <fieldset className='mt-4'>
- <legend className='block text-sm font-medium text-gray-700 dark:text-gray-300'>
- {t('project.emails.reportFrequency')}
- </legend>
- <div
- className={cx(
- 'mt-1 -space-y-px rounded-md bg-white dark:bg-slate-950',
- {
- 'border border-red-300': errors.reportFrequency,
- },
- )}
- >
- {reportFrequencyForEmailsOptions.map((item, index) => (
- <ReportFrequencyOption
- key={item.value}
- item={item}
- index={index}
- form={form}
- handleInput={handleInput}
- totalOptions={reportFrequencyForEmailsOptions.length}
- />
- ))}
- </div>
- {errors.reportFrequency ? (
- <p
- className='mt-2 text-sm text-red-600 dark:text-red-500'
- id='reportFrequency-error'
- >
- {errors.reportFrequency}
- </p>
- ) : null}
- </fieldset>
- </div>
- )
-}
-
-interface ReportFrequencyOptionProps {
- item: { value: string; label: string }
- index: number
- form: { reportFrequency: string }
- handleInput: (e: React.ChangeEvent<HTMLInputElement>) => void
- totalOptions: number
-}
-
-const ReportFrequencyOption = ({
- item,
- index,
- form,
- handleInput,
- totalOptions,
-}: ReportFrequencyOptionProps) => {
- const { t } = useTranslation('common')
-
- return (
- <label
- className={cx(
- 'relative flex cursor-pointer border border-gray-200 p-4 dark:border-slate-600',
- {
- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':
- item.value === form.reportFrequency,
- 'border-gray-200': form.reportFrequency !== item.value,
- 'rounded-t-md': index === 0,
- 'rounded-b-md': index === totalOptions - 1,
- },
- )}
- >
- <input
+ <RadioCardGroup
name='reportFrequency'
- className='h-4 w-4 border-gray-300 text-indigo-600 focus:ring-slate-900 dark:focus:ring-slate-300'
- type='radio'
- value={item.value}
- onChange={handleInput}
- checked={form.reportFrequency === item.value}
+ label={t('project.emails.reportFrequency')}
+ className='mt-4'
+ value={form.reportFrequency || null}
+ onChange={(reportFrequency) =>
+ setForm((prev) => ({ ...prev, reportFrequency }))
+ }
+ error={errors.reportFrequency}
+ options={reportFrequencyForEmailsOptions.map((item) => ({
+ value: item.value,
+ label: t(`profileSettings.${item.value}`),
+ }))}
/>
- <span
- className={cx('ml-3 block text-sm font-medium', {
- 'text-indigo-900 dark:text-white':
- form.reportFrequency === item.value,
- 'text-gray-700 dark:text-gray-200':
- form.reportFrequency !== item.value,
- })}
- >
- {t(`profileSettings.${item.value}`)}
- </span>
- </label>
+ </div>
)
}
@@ -505,26 +441,18 @@ const Emails = ({ projectId }: { projectId: string }) => {
return (
<div>
- <div className='mb-3 flex flex-col items-start justify-between gap-y-2 sm:flex-row sm:items-center'>
+ <div className='mb-4 flex flex-col items-start justify-between gap-y-2 sm:flex-row sm:items-center'>
<div>
- <h3 className='text-lg font-bold text-gray-900 dark:text-gray-50'>
+ <Text as='h3' size='lg' weight='bold'>
{t('project.emails.title')}
- </h3>
- <p className='text-sm text-gray-500 dark:text-gray-400'>
+ </Text>
+ <Text as='p' size='sm' colour='muted' className='mt-1 max-w-prose'>
{t('project.emails.description')}
- </p>
+ </Text>
</div>
- <Button
- className='h-8 pl-2 whitespace-nowrap'
- primary
- regular
- type='button'
- onClick={() => setShowModal(true)}
- >
- <>
- <EnvelopeSimpleIcon className='mr-1 h-5 w-5' />
- {t('project.emails.add')}
- </>
+ <Button small primary type='button' onClick={() => setShowModal(true)}>
+ <EnvelopeSimpleIcon className='mr-1 size-4' />
+ {t('project.emails.add')}
</Button>
</div>
<div>
@@ -586,6 +514,7 @@ const Emails = ({ projectId }: { projectId: string }) => {
message={
<ModalMessage
form={form}
+ setForm={setForm}
handleInput={handleInput}
errors={errors}
beenSubmitted={beenSubmitted}
diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsx
index 6210a997b..9bf784189 100644
--- a/web/app/pages/Project/Settings/People/People.tsx
+++ b/web/app/pages/Project/Settings/People/People.tsx
@@ -29,6 +29,8 @@ import { Badge } from '~/ui/Badge'
import Button from '~/ui/Button'
import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
+import { RadioCardGroup } from '~/ui/RadioCardGroup'
+import { Text } from '~/ui/Text'
import { cn } from '~/utils/generic'
import { isValidEmail } from '~/utils/validator'
@@ -319,26 +321,18 @@ const People = ({ project }: PeopleProps) => {
return (
<div>
- <div className='mb-3 flex items-center justify-between'>
+ <div className='mb-4 flex flex-col items-start justify-between gap-y-2 sm:flex-row sm:items-center'>
<div>
- <h3 className='flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>
+ <Text as='h3' size='lg' weight='bold'>
{t('project.settings.people')}
- </h3>
- <p className='text-sm text-gray-500 dark:text-gray-400'>
+ </Text>
+ <Text as='p' size='sm' colour='muted' className='mt-1 max-w-prose'>
{t('project.settings.inviteCoworkers')}
- </p>
+ </Text>
</div>
- <Button
- className='h-8 pl-2'
- primary
- regular
- type='button'
- onClick={() => setShowModal(true)}
- >
- <>
- <UserCirclePlusIcon className='mr-1 h-5 w-5' />
- {t('project.settings.invite')}
- </>
+ <Button small primary type='button' onClick={() => setShowModal(true)}>
+ <UserCirclePlusIcon className='mr-1 size-4' />
+ {t('project.settings.invite')}
</Button>
</div>
<div>
@@ -450,118 +444,26 @@ const People = ({ project }: PeopleProps) => {
onChange={handleInput}
error={beenSubmitted ? errors.email : null}
/>
- <fieldset className='mt-4'>
- {}
- <label
- className='block text-sm font-medium text-gray-700 dark:text-gray-300'
- htmlFor='role'
- >
- {t('project.settings.role')}
- </label>
- <div
- className={cn(
- 'mt-1 -space-y-px rounded-md bg-white dark:bg-slate-950',
- {
- 'border border-red-300': errors.role,
- },
- )}
- >
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- <label
- className={cn(
- 'relative flex cursor-pointer rounded-tl-md rounded-tr-md border border-gray-200 p-4 dark:border-slate-600',
- {
- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':
- form.role === 'admin',
- 'border-gray-200': form.role !== 'admin',
- },
- )}
- >
- <input
- name='role'
- className='h-4 w-4 border-gray-300 text-slate-900 focus:ring-slate-900 dark:text-slate-100 dark:focus:ring-slate-300'
- id='role_admin'
- type='radio'
- value='admin'
- onChange={handleInput}
- checked={form.role === 'admin'}
- />
- <div className='ml-3 flex flex-col'>
- <span
- className={cn('block text-sm font-medium', {
- 'text-indigo-900 dark:text-white':
- form.role === 'admin',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'admin',
- })}
- >
- {t('project.settings.roles.admin.name')}
- </span>
- <span
- className={cn('block text-sm', {
- 'text-indigo-700 dark:text-gray-100':
- form.role === 'admin',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'admin',
- })}
- >
- {t('project.settings.roles.admin.desc')}
- </span>
- </div>
- </label>
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- <label
- className={cn(
- 'relative flex cursor-pointer rounded-br-md rounded-bl-md border border-gray-200 p-4 dark:border-gray-500',
- {
- 'z-10 border-indigo-200 bg-indigo-50 dark:border-indigo-800/40 dark:bg-indigo-600/40':
- form.role === 'viewer',
- 'border-gray-200': form.role !== 'viewer',
- },
- )}
- >
- <input
- name='role'
- className='h-4 w-4 border-gray-300 text-slate-900 focus:ring-slate-900 dark:text-slate-100 dark:focus:ring-slate-300'
- id='role_viewer'
- type='radio'
- value='viewer'
- onChange={handleInput}
- checked={form.role === 'viewer'}
- />
- <div className='ml-3 flex flex-col'>
- <span
- className={cn('block text-sm font-medium', {
- 'text-indigo-900 dark:text-white':
- form.role === 'viewer',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'viewer',
- })}
- >
- {t('project.settings.roles.viewer.name')}
- </span>
- <span
- className={cn('block text-sm', {
- 'text-indigo-700 dark:text-gray-100':
- form.role === 'viewer',
- 'text-gray-700 dark:text-gray-200':
- form.role !== 'viewer',
- })}
- >
- {t('project.settings.roles.viewer.desc')}
- </span>
- </div>
- </label>
- </div>
- {errors.role ? (
- <p
- className='mt-2 text-sm text-red-600 dark:text-red-500'
- id='email-error'
- >
- {errors.role}
- </p>
- ) : null}
- </fieldset>
+ <RadioCardGroup<'admin' | 'viewer'>
+ name='role'
+ label={t('project.settings.role')}
+ className='mt-4'
+ value={(form.role as 'admin' | 'viewer') || null}
+ onChange={(role) => setForm((prev) => ({ ...prev, role }))}
+ error={errors.role}
+ options={[
+ {
+ value: 'admin',
+ label: t('project.settings.roles.admin.name'),
+ description: t('project.settings.roles.admin.desc'),
+ },
+ {
+ value: 'viewer',
+ label: t('project.settings.roles.viewer.name'),
+ description: t('project.settings.roles.viewer.desc'),
+ },
+ ]}
+ />
</div>
}
isOpened={showModal}
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 3875f84fe..30b58d29c 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -73,6 +73,7 @@ import ViewProjectHotkeys from '~/modals/ViewProjectHotkeys'
import { useAuth } from '~/providers/AuthProvider'
import { useTheme } from '~/providers/ThemeProvider'
import { ProjectViewActionData } from '~/routes/projects.$id'
+import Button from '~/ui/Button'
import Dropdown from '~/ui/Dropdown'
import Flag from '~/ui/Flag'
import Loader from '~/ui/Loader'
@@ -1643,14 +1644,13 @@ const ViewProjectContent = () => {
headless
/>
<div className='flex items-center gap-2'>
- <button
- type='button'
+ <Button
+ icon
onClick={() => setIsHotkeysHelpOpened(true)}
aria-label={t('modals.shortcuts.title')}
- className='relative rounded-md border border-transparent bg-gray-50 p-2 transition-colors ring-inset hover:border-gray-300 hover:bg-white focus:z-10 focus:ring-1 focus:ring-slate-900 focus:outline-hidden dark:bg-slate-950 hover:dark:border-slate-700/80 dark:hover:bg-slate-900 dark:focus:ring-slate-300'
>
- <KeyboardIcon className='h-6 w-6 text-slate-700 dark:text-gray-200' />
- </button>
+ <KeyboardIcon className='size-6 text-slate-700 dark:text-gray-200' />
+ </Button>
<Dropdown
title={
<span className='flex items-center justify-center'>
diff --git a/web/app/ui/Alert.tsx b/web/app/ui/Alert.tsx
index ef0ec8947..952e50b7d 100644
--- a/web/app/ui/Alert.tsx
+++ b/web/app/ui/Alert.tsx
@@ -28,38 +28,43 @@ const variantConfig: Record<
> = {
info: {
icon: InfoIcon,
- containerClass: 'bg-sky-50 dark:bg-sky-900/50',
+ containerClass:
+ 'bg-sky-50/80 ring-1 ring-sky-200/70 ring-inset dark:bg-sky-500/10 dark:ring-sky-400/20',
iconClass: 'text-sky-600 dark:text-sky-400',
- titleClass: 'text-sky-900 dark:text-sky-50',
- textClass: 'text-sky-800 dark:text-sky-50',
+ titleClass: 'text-sky-900 dark:text-sky-100',
+ textClass: 'text-sky-800 dark:text-sky-200',
},
warning: {
icon: WarningIcon,
- containerClass: 'bg-amber-50 dark:bg-amber-900/50',
+ containerClass:
+ 'bg-amber-50/80 ring-1 ring-amber-200/70 ring-inset dark:bg-amber-500/10 dark:ring-amber-400/20',
iconClass: 'text-amber-600 dark:text-amber-400',
- titleClass: 'text-amber-900 dark:text-amber-50',
- textClass: 'text-amber-800 dark:text-amber-50',
+ titleClass: 'text-amber-900 dark:text-amber-100',
+ textClass: 'text-amber-800 dark:text-amber-200',
},
error: {
icon: WarningCircleIcon,
- containerClass: 'bg-red-50 dark:bg-red-900/50',
+ containerClass:
+ 'bg-red-50/80 ring-1 ring-red-200/70 ring-inset dark:bg-red-500/10 dark:ring-red-400/20',
iconClass: 'text-red-600 dark:text-red-400',
- titleClass: 'text-red-900 dark:text-red-50',
- textClass: 'text-red-800 dark:text-red-50',
+ titleClass: 'text-red-900 dark:text-red-100',
+ textClass: 'text-red-800 dark:text-red-200',
},
success: {
icon: CheckCircleIcon,
- containerClass: 'bg-green-50 dark:bg-emerald-900/50',
- iconClass: 'text-green-600 dark:text-emerald-400',
- titleClass: 'text-green-900 dark:text-emerald-50',
- textClass: 'text-green-800 dark:text-emerald-50',
+ containerClass:
+ 'bg-emerald-50/80 ring-1 ring-emerald-200/70 ring-inset dark:bg-emerald-500/10 dark:ring-emerald-400/20',
+ iconClass: 'text-emerald-600 dark:text-emerald-400',
+ titleClass: 'text-emerald-900 dark:text-emerald-100',
+ textClass: 'text-emerald-800 dark:text-emerald-200',
},
tip: {
icon: LightbulbIcon,
- containerClass: 'bg-green-50 dark:bg-emerald-900/50',
- iconClass: 'text-green-600 dark:text-emerald-400',
- titleClass: 'text-green-900 dark:text-green-50',
- textClass: 'text-green-800 dark:text-green-50',
+ containerClass:
+ 'bg-emerald-50/80 ring-1 ring-emerald-200/70 ring-inset dark:bg-emerald-500/10 dark:ring-emerald-400/20',
+ iconClass: 'text-emerald-600 dark:text-emerald-400',
+ titleClass: 'text-emerald-900 dark:text-emerald-100',
+ textClass: 'text-emerald-800 dark:text-emerald-200',
},
}
@@ -74,18 +79,19 @@ const Alert = ({ variant, title, children, className }: AlertProps) => {
return (
<div
+ role={variant === 'error' || variant === 'warning' ? 'alert' : 'status'}
className={cx(
- 'flex w-full rounded-lg px-3 py-2 text-sm',
+ 'flex w-full items-start rounded-lg px-3.5 py-2.5 text-sm',
containerClass,
className,
)}
>
<Icon
- className={cx('mt-0.5 mr-2 size-4 shrink-0', iconClass)}
+ className={cx('mt-0.5 mr-2.5 size-4 shrink-0', iconClass)}
weight='duotone'
aria-hidden='true'
/>
- <div className={cx('flex grow flex-col gap-y-1', textClass)}>
+ <div className={cx('flex grow flex-col gap-y-0.5', textClass)}>
{title && (
<span className={cx('font-semibold', titleClass)}>{title}</span>
)}
diff --git a/web/app/ui/Badge.tsx b/web/app/ui/Badge.tsx
index 2325f2725..239416198 100644
--- a/web/app/ui/Badge.tsx
+++ b/web/app/ui/Badge.tsx
@@ -6,24 +6,36 @@ export interface BadgeProps {
label: React.ReactNode
className?: string
colour?: 'red' | 'yellow' | 'green' | 'indigo' | 'slate' | 'sky'
+ size?: 'sm' | 'md'
}
-export const Badge = ({ label, className, colour }: BadgeProps) => (
+const sizeClasses: Record<NonNullable<BadgeProps['size']>, string> = {
+ sm: 'px-1.5 py-0.5 text-[11px]',
+ md: 'px-2 py-1 text-xs',
+}
+
+export const Badge = ({
+ label,
+ className,
+ colour,
+ size = 'md',
+}: BadgeProps) => (
<span
className={cn(
- 'inline-flex items-center rounded-md px-2 py-1 text-xs font-medium ring-1 ring-inset',
+ 'inline-flex items-center rounded-md font-medium ring-1 ring-inset',
+ sizeClasses[size],
{
- 'bg-slate-50 text-slate-700 ring-slate-500/10 dark:bg-slate-400/10 dark:text-slate-400 dark:ring-slate-400/20':
+ 'bg-slate-50 text-slate-700 ring-slate-500/15 dark:bg-slate-400/10 dark:text-slate-300 dark:ring-slate-400/20':
colour === 'slate',
- 'bg-indigo-50 text-indigo-700 ring-indigo-700/10 dark:bg-indigo-400/10 dark:text-indigo-400 dark:ring-indigo-400/30':
+ 'bg-indigo-50 text-indigo-700 ring-indigo-700/15 dark:bg-indigo-400/10 dark:text-indigo-300 dark:ring-indigo-400/30':
colour === 'indigo',
- 'bg-yellow-50 text-yellow-800 ring-yellow-600/20 dark:bg-yellow-400/10 dark:text-yellow-500 dark:ring-yellow-400/20':
+ 'bg-amber-50 text-amber-800 ring-amber-600/20 dark:bg-amber-400/10 dark:text-amber-300 dark:ring-amber-400/20':
colour === 'yellow',
- 'bg-green-50 text-green-700 ring-green-600/20 dark:bg-green-500/10 dark:text-green-400 dark:ring-green-500/20':
+ 'bg-emerald-50 text-emerald-700 ring-emerald-600/20 dark:bg-emerald-500/10 dark:text-emerald-300 dark:ring-emerald-500/20':
colour === 'green',
- 'bg-red-50 text-red-700 ring-red-600/10 dark:bg-red-400/10 dark:text-red-400 dark:ring-red-400/20':
+ 'bg-red-50 text-red-700 ring-red-600/15 dark:bg-red-400/10 dark:text-red-300 dark:ring-red-400/20':
colour === 'red',
- 'bg-sky-50 text-sky-700 ring-sky-600/20 dark:bg-sky-400/10 dark:text-sky-400 dark:ring-sky-400/20':
+ 'bg-sky-50 text-sky-700 ring-sky-600/20 dark:bg-sky-400/10 dark:text-sky-300 dark:ring-sky-400/20':
colour === 'sky',
},
className,
diff --git a/web/app/ui/Button.tsx b/web/app/ui/Button.tsx
index 846fed963..282342372 100644
--- a/web/app/ui/Button.tsx
+++ b/web/app/ui/Button.tsx
@@ -25,6 +25,11 @@ interface ButtonProps extends React.ComponentPropsWithoutRef<
noBorder?: boolean
title?: string
ghost?: boolean
+ /**
+ * Square icon-only button. Quiet by default, reveals a border + lifts to white
+ * on hover. Pair with an icon child sized `size-5` (or `size-4` for compact toolbars).
+ */
+ icon?: boolean
}
const Button = ({
@@ -47,6 +52,7 @@ const Button = ({
focus = true,
disabled,
ghost,
+ icon,
...props
}: ButtonProps) => (
<HeadlessButton
@@ -54,28 +60,33 @@ const Button = ({
disabled={disabled || loading}
type={type}
className={cn(
- 'relative inline-flex items-center rounded-md border leading-4 font-medium transition-all select-none disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50',
+ 'relative inline-flex items-center rounded-md border leading-4 font-medium select-none',
+ 'transition-[background-color,color,box-shadow,transform] duration-150 ease-out',
+ 'active:scale-[0.985] active:duration-75',
+ 'disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 disabled:active:scale-100',
{
'border-transparent bg-slate-900 text-gray-50 shadow-xs hover:bg-slate-700 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white':
primary,
- 'border border-gray-300 bg-gray-50 text-slate-900 hover:bg-slate-200 dark:border-slate-700/80 dark:bg-slate-950 dark:text-slate-100 dark:hover:bg-slate-900':
+ 'border-gray-300 bg-gray-50 text-slate-900 hover:bg-slate-200/70 dark:border-slate-700/80 dark:bg-slate-950 dark:text-slate-100 dark:hover:bg-slate-900':
secondary,
- 'border-transparent bg-white text-gray-700 hover:bg-gray-50 dark:bg-slate-900 dark:text-gray-100 dark:ring-1 dark:ring-slate-700 dark:hover:bg-slate-800':
+ 'border-transparent bg-white text-gray-700 shadow-xs hover:bg-gray-50 dark:bg-slate-900 dark:text-gray-100 dark:ring-1 dark:ring-slate-700 dark:hover:bg-slate-800':
white,
- 'border-transparent bg-red-500 text-gray-50 hover:bg-red-600 dark:bg-red-600 dark:hover:bg-red-500':
+ 'border-transparent bg-red-500 text-gray-50 shadow-xs hover:bg-red-600 dark:bg-red-600 dark:hover:bg-red-500':
danger,
- 'border border-red-500 text-red-600 hover:bg-red-100/80 dark:border-red-400 dark:text-red-400 dark:hover:bg-red-500/20':
+ 'border-red-500 text-red-600 hover:bg-red-50 dark:border-red-400/70 dark:text-red-400 dark:hover:bg-red-500/15':
semiDanger,
'border-transparent bg-transparent text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-slate-900 dark:hover:text-gray-100':
ghost,
+ 'border-transparent bg-gray-50 p-2 text-gray-700 hover:border-gray-300 hover:bg-white dark:bg-slate-950 dark:text-gray-200 dark:hover:border-slate-700/80 dark:hover:bg-slate-900':
+ icon,
'border-none text-gray-700 focus:border-none focus:ring-0 focus:ring-offset-0 dark:text-gray-200':
noBorder,
- 'px-2.5 py-1.5 text-xs': small,
- 'px-2.5 py-1.5 text-sm': semiSmall,
- 'px-4 py-2 text-sm': large,
- 'px-6 py-3 text-base': giant,
- 'px-3 py-2 text-sm': regular,
- 'focus:ring-2 focus:ring-slate-900 focus:ring-offset-2 focus:outline-hidden dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900':
+ 'px-2.5 py-1.5 text-xs': small && !icon,
+ 'px-2.5 py-1.5 text-sm': semiSmall && !icon,
+ 'px-4 py-2 text-sm': large && !icon,
+ 'px-6 py-3 text-base': giant && !icon,
+ 'px-3 py-2 text-sm': regular && !icon,
+ 'focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:ring-offset-2 focus-visible:outline-hidden dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-950':
focus,
},
className,
diff --git a/web/app/ui/Checkbox.tsx b/web/app/ui/Checkbox.tsx
index ff074da74..e44f3e3d1 100644
--- a/web/app/ui/Checkbox.tsx
+++ b/web/app/ui/Checkbox.tsx
@@ -4,7 +4,7 @@ import {
Field,
Label,
} from '@headlessui/react'
-import { CheckIcon } from '@phosphor-icons/react'
+import { CheckIcon, MinusIcon } from '@phosphor-icons/react'
import cx from 'clsx'
import React, { memo } from 'react'
@@ -15,6 +15,7 @@ interface CheckboxProps {
onChange?: (checked: boolean) => void
checked?: boolean
disabled?: boolean
+ indeterminate?: boolean
classes?: {
label?: string
hint?: string
@@ -28,26 +29,45 @@ const Checkbox = ({
onChange,
checked,
disabled,
+ indeterminate,
classes,
}: CheckboxProps) => (
<Field disabled={disabled}>
- <div className={cx('group flex items-center gap-2', classes?.label)}>
+ <div className={cx('group flex items-center gap-x-2', classes?.label)}>
<HeadlessCheckbox
name={name}
checked={checked}
+ indeterminate={indeterminate}
onChange={onChange}
- className='group/checkbox size-4 shrink-0 cursor-pointer rounded-sm bg-white ring-1 ring-gray-300 transition-colors duration-100 ease-out ring-inset group-hover:bg-gray-100 data-[checked]:bg-slate-900 data-[checked]:ring-slate-900 dark:bg-slate-950 dark:ring-slate-700/80 dark:group-hover:bg-slate-900/70 dark:data-[checked]:bg-slate-100 dark:data-[checked]:ring-slate-100'
+ className={cx(
+ 'group/checkbox relative size-4 shrink-0 cursor-pointer rounded-[5px] bg-white ring-1 ring-gray-300 transition-[background-color,box-shadow] duration-150 ease-out ring-inset',
+ 'group-hover:ring-gray-400 dark:bg-slate-950 dark:ring-slate-700/80 dark:group-hover:ring-slate-600',
+ 'data-checked:bg-slate-900 data-checked:ring-slate-900 dark:data-checked:bg-slate-100 dark:data-checked:ring-slate-100',
+ 'data-indeterminate:bg-slate-900 data-indeterminate:ring-slate-900 dark:data-indeterminate:bg-slate-100 dark:data-indeterminate:ring-slate-100',
+ 'focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:ring-offset-2 focus-visible:outline-hidden dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-950',
+ 'disabled:cursor-not-allowed disabled:opacity-50',
+ )}
>
- <CheckIcon className='pointer-events-none size-4 scale-90 text-white opacity-0 transition-all duration-100 group-data-[checked]/checkbox:scale-100 group-data-[checked]/checkbox:opacity-100 dark:text-slate-900' />
+ {indeterminate ? (
+ <MinusIcon
+ weight='bold'
+ className='pointer-events-none absolute inset-0 m-auto size-3 text-white dark:text-slate-900'
+ />
+ ) : (
+ <CheckIcon
+ weight='bold'
+ className='pointer-events-none absolute inset-0 m-auto size-3 scale-50 text-white opacity-0 transition-[transform,opacity] duration-150 ease-out group-data-checked/checkbox:scale-100 group-data-checked/checkbox:opacity-100 dark:text-slate-900'
+ />
+ )}
</HeadlessCheckbox>
- <Label className='cursor-pointer text-sm font-medium text-gray-900 transition-colors duration-100 ease-out group-hover:text-gray-950 dark:text-gray-200 dark:group-hover:text-white'>
+ <Label className='cursor-pointer text-sm font-medium text-gray-900 transition-colors duration-150 ease-out group-hover:text-gray-950 dark:text-gray-200 dark:group-hover:text-white'>
{label}
</Label>
</div>
{hint ? (
<Description
className={cx(
- 'mt-1 text-sm text-gray-500 dark:text-gray-300',
+ 'mt-1 text-sm text-gray-500 dark:text-gray-400',
classes?.hint,
)}
>
diff --git a/web/app/ui/CodeBlock.tsx b/web/app/ui/CodeBlock.tsx
index 601571685..a56c292a8 100644
--- a/web/app/ui/CodeBlock.tsx
+++ b/web/app/ui/CodeBlock.tsx
@@ -100,23 +100,28 @@ const CodeBlock = ({ code, onCopy }: CodeBlockProps) => {
return (
<div className='group relative'>
- <pre className='overflow-x-auto rounded-lg bg-white p-4 font-mono text-xs leading-relaxed text-gray-800 ring-1 ring-gray-200 dark:bg-slate-950 dark:text-gray-200 dark:ring-slate-700'>
+ <pre className='overflow-x-auto rounded-lg bg-white p-4 pr-12 font-mono text-xs leading-relaxed text-gray-800 ring-1 ring-gray-200 dark:bg-slate-950 dark:text-gray-200 dark:ring-slate-800'>
<code>{highlighted}</code>
</pre>
<button
type='button'
onClick={handleCopy}
- className='absolute top-2.5 right-2.5 flex items-center gap-1.5 rounded-md bg-gray-100 px-2 py-1.5 text-xs font-medium text-gray-600 opacity-0 transition-opacity group-hover:opacity-100 hover:bg-gray-200 dark:bg-slate-800 dark:text-gray-300 dark:hover:bg-slate-700'
+ aria-label={copied ? t('common.copied') : t('common.copy')}
+ className='absolute top-2.5 right-2.5 inline-flex items-center gap-1.5 rounded-md bg-white/90 px-2 py-1.5 text-xs font-medium text-gray-700 ring-1 ring-gray-200 backdrop-blur-sm transition-[background-color,color,box-shadow] duration-150 ease-out hover:bg-gray-100 hover:text-gray-900 focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:bg-slate-900/80 dark:text-gray-200 dark:ring-slate-700 dark:hover:bg-slate-800 dark:hover:text-white dark:focus-visible:ring-slate-300'
>
{copied ? (
<>
- <CheckIcon className='size-3.5' />
- {t('common.copied')}
+ <CheckIcon
+ className='size-3.5 text-emerald-600 dark:text-emerald-400'
+ weight='bold'
+ aria-hidden='true'
+ />
+ <span>{t('common.copied')}</span>
</>
) : (
<>
- <CopyIcon className='size-3.5' />
- {t('common.copy')}
+ <CopyIcon className='size-3.5' aria-hidden='true' />
+ <span>{t('common.copy')}</span>
</>
)}
</button>
diff --git a/web/app/ui/Combobox.tsx b/web/app/ui/Combobox.tsx
index 59d749b6c..ee26d4943 100644
--- a/web/app/ui/Combobox.tsx
+++ b/web/app/ui/Combobox.tsx
@@ -52,11 +52,11 @@ const Combobox = ({
return (
<HeadlessCombobox disabled={disabled} value={title} onChange={onSelect}>
- <div className={cx('relative mt-1', className)}>
- <div className='relative w-full cursor-default rounded-lg'>
+ <div className={cx('relative', className)}>
+ <div className='relative w-full'>
<ComboboxInput
className={cx(
- 'relative w-full cursor-default rounded-md border-0 bg-white py-2 pr-10 pl-3 text-left ring-1 ring-gray-300 ring-inset focus:ring-2 focus:ring-slate-900 focus:outline-hidden sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:focus:ring-slate-300',
+ 'block w-full rounded-md border-0 bg-white py-2 pr-9 pl-3 text-left text-sm text-gray-900 ring-1 ring-gray-300 transition-[background-color,box-shadow] duration-150 ease-out ring-inset placeholder:text-gray-400 hover:ring-gray-400 focus:ring-2 focus:ring-slate-900 focus:outline-hidden disabled:cursor-not-allowed disabled:opacity-60 dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:placeholder:text-gray-500 dark:hover:ring-slate-600 dark:focus:ring-slate-300',
buttonClassName,
)}
// @ts-expect-error
@@ -66,23 +66,26 @@ const Combobox = ({
onChange={(event) => setQuery(event.target.value)}
placeholder={placeholder}
/>
- <ComboboxButton className='absolute inset-y-0 right-0 flex items-center pr-2'>
- <CaretUpDownIcon
- className='h-5 w-5 text-gray-400'
- aria-hidden='true'
- />
+ <ComboboxButton
+ className='absolute inset-y-0 right-0 flex items-center pr-2 text-gray-400 dark:text-gray-500'
+ aria-label='Toggle options'
+ >
+ <CaretUpDownIcon className='size-4' aria-hidden='true' />
</ComboboxButton>
</div>
<Transition
as={Fragment}
+ enter='transition ease-out duration-150'
+ enterFrom='opacity-0 -translate-y-0.5'
+ enterTo='opacity-100 translate-y-0'
leave='transition ease-in duration-100'
- leaveFrom='opacity-100'
- leaveTo='opacity-0'
+ leaveFrom='opacity-100 translate-y-0'
+ leaveTo='opacity-0 -translate-y-0.5'
afterLeave={() => setQuery('')}
>
- <ComboboxOptions className='absolute z-30 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-950 dark:ring-slate-700/80'>
+ <ComboboxOptions className='absolute z-30 mt-1.5 max-h-60 w-full overflow-auto rounded-lg bg-white py-1 text-sm shadow-lg ring-1 ring-gray-200/80 focus:outline-hidden dark:bg-slate-950 dark:ring-slate-700/60'>
{_isEmpty(filteredItems) && !_isEmpty(query) ? (
- <div className='relative cursor-default px-4 py-2 text-gray-900 select-none dark:text-white'>
+ <div className='relative px-3 py-2 text-gray-500 select-none dark:text-gray-400'>
{t('common.nothingFound')}
</div>
) : (
@@ -90,32 +93,34 @@ const Combobox = ({
<ComboboxOption
key={keyExtractor ? keyExtractor(item, index) : item}
className={({ active }) =>
- cx('relative cursor-default py-2 pr-4 pl-8 select-none', {
- 'bg-gray-100 text-gray-900 dark:bg-slate-800 dark:text-white':
- active,
- 'text-gray-900 dark:text-white': !active,
- })
+ cx(
+ 'relative mx-1 cursor-pointer rounded-md py-2 pr-8 pl-3 transition-colors duration-100 ease-out select-none',
+ {
+ 'bg-gray-100 text-gray-900 dark:bg-slate-800/80 dark:text-white':
+ active,
+ 'text-gray-700 dark:text-gray-50': !active,
+ },
+ )
}
value={labelExtractor ? labelExtractor(item, index) : item}
>
- {({ selected, active }) => (
+ {({ selected }) => (
<>
<span
- className={`block truncate ${selected ? 'font-medium' : 'font-normal'}`}
+ className={cx(
+ 'block truncate',
+ selected ? 'font-semibold' : 'font-normal',
+ )}
>
{labelExtractor ? labelExtractor(item, index) : item}
</span>
{selected ? (
- <span
- className={cx(
- 'absolute inset-y-0 left-0 flex items-center pl-1.5',
- {
- 'text-gray-900 dark:text-white': active,
- 'text-gray-600 dark:text-gray-300': !active,
- },
- )}
- >
- <CheckIcon className='h-5 w-5' aria-hidden='true' />
+ <span className='absolute inset-y-0 right-2 flex items-center text-slate-900 dark:text-slate-100'>
+ <CheckIcon
+ weight='bold'
+ className='size-4'
+ aria-hidden='true'
+ />
</span>
) : null}
</>
diff --git a/web/app/ui/Drawer.tsx b/web/app/ui/Drawer.tsx
index 9ae328155..74499c3aa 100644
--- a/web/app/ui/Drawer.tsx
+++ b/web/app/ui/Drawer.tsx
@@ -26,7 +26,7 @@ function DrawerOverlay({
return (
<DrawerPrimitive.Overlay
className={cn(
- 'fixed inset-0 z-50 bg-gray-500/50 dark:bg-black/60',
+ 'fixed inset-0 z-50 bg-gray-900/40 backdrop-blur-[2px] dark:bg-black/60',
className,
)}
{...props}
@@ -44,11 +44,11 @@ function DrawerContent({
<DrawerOverlay />
<DrawerPrimitive.Content
className={cn(
- 'fixed z-50 flex h-full flex-col bg-white shadow-xl outline-none dark:bg-slate-900',
+ 'fixed z-50 flex h-full flex-col bg-white shadow-2xl ring-1 ring-gray-200/80 outline-none dark:bg-slate-950 dark:ring-slate-700/60',
'data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-full data-[vaul-drawer-direction=right]:max-w-lg',
'data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-full data-[vaul-drawer-direction=left]:max-w-lg',
- 'data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:h-auto data-[vaul-drawer-direction=bottom]:rounded-t-xl',
- 'data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:h-auto data-[vaul-drawer-direction=top]:rounded-b-xl',
+ 'data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:h-auto data-[vaul-drawer-direction=bottom]:rounded-t-2xl',
+ 'data-[vaul-drawer-direction=top]:inset-x-0 data-[vaul-drawer-direction=top]:top-0 data-[vaul-drawer-direction=top]:mb-24 data-[vaul-drawer-direction=top]:h-auto data-[vaul-drawer-direction=top]:rounded-b-2xl',
className,
)}
{...props}
@@ -66,7 +66,7 @@ function DrawerHeader({
return (
<div
className={cn(
- 'border-b border-gray-200 px-4 py-4 sm:px-5 dark:border-slate-700/80',
+ 'border-b border-gray-200 px-5 py-4 dark:border-slate-700/60',
className,
)}
{...props}
@@ -81,7 +81,7 @@ function DrawerTitle({
return (
<DrawerPrimitive.Title
className={cn(
- 'text-base font-semibold text-gray-900 dark:text-gray-50',
+ 'text-base font-semibold tracking-tight text-gray-900 dark:text-gray-50',
className,
)}
{...props}
diff --git a/web/app/ui/Dropdown.tsx b/web/app/ui/Dropdown.tsx
index 0bc9fa1ea..c34bd37c3 100644
--- a/web/app/ui/Dropdown.tsx
+++ b/web/app/ui/Dropdown.tsx
@@ -67,31 +67,34 @@ function Dropdown<T>({
{({ open, close }) => (
<>
{!_isEmpty(desc) ? (
- <p className='mb-2 text-sm text-gray-900'>{desc}</p>
+ <p className='mb-2 text-sm text-gray-900 dark:text-gray-200'>
+ {desc}
+ </p>
) : null}
<MenuButton
onClick={onClick}
disabled={disabled}
className={cn(
- 'transition-colors',
+ 'transition-[background-color,color,box-shadow] duration-150 ease-out',
{
'justify-between': aside,
'justify-center': !aside,
- 'inline-flex w-full rounded-md border-0 bg-white px-3 py-2 text-sm font-medium ring-1 ring-gray-300 ring-inset hover:bg-gray-50 focus:ring-2 focus:ring-slate-900 focus:outline-hidden md:px-4 dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:hover:bg-slate-800 dark:focus:ring-slate-300':
+ 'inline-flex w-full rounded-md border-0 bg-white px-3 py-2 text-sm font-medium ring-1 ring-gray-300 ring-inset hover:bg-gray-50 hover:ring-gray-400 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden md:px-4 dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:hover:bg-slate-900 dark:hover:ring-slate-600 dark:focus-visible:ring-slate-300':
!headless,
'group inline-flex w-full px-3 py-2 text-sm font-medium outline-hidden md:px-4':
headless,
'text-gray-700 dark:text-gray-50': !disabled,
- 'cursor-not-allowed text-gray-500 dark:text-gray-400': disabled,
+ 'cursor-not-allowed text-gray-500 opacity-60 dark:text-gray-400':
+ disabled,
},
buttonClassName,
)}
>
- <span>{title}</span>
+ <span className='truncate'>{title}</span>
{chevron === 'regular' ? (
<CaretDownIcon
className={cn(
- 'ml-2 h-5 w-5 transform-gpu transition-transform',
+ 'ml-2 size-4 shrink-0 transform-gpu transition-transform duration-200 ease-out',
{
'rotate-180': open,
},
@@ -102,7 +105,7 @@ function Dropdown<T>({
{chevron === 'mini' ? (
<CaretDownIcon
className={cn(
- 'ml-1 h-5 w-5 transform-gpu transition-transform',
+ 'ml-1 size-4 shrink-0 transform-gpu transition-transform duration-200 ease-out',
{
'rotate-180': open,
},
@@ -115,32 +118,35 @@ function Dropdown<T>({
<Transition
show={open}
as={Fragment}
- enter='transition ease-out duration-100'
- enterFrom='transform opacity-0 scale-95'
- enterTo='transform opacity-100 scale-100'
- leave='transition ease-in duration-75'
- leaveFrom='transform opacity-100 scale-100'
- leaveTo='transform opacity-0 scale-95'
+ enter='transition ease-out duration-150'
+ enterFrom='transform opacity-0 scale-95 -translate-y-0.5'
+ enterTo='transform opacity-100 scale-100 translate-y-0'
+ leave='transition ease-in duration-100'
+ leaveFrom='transform opacity-100 scale-100 translate-y-0'
+ leaveTo='transform opacity-0 scale-95 -translate-y-0.5'
>
<MenuItems
anchor={{
to: position === 'down' ? 'bottom end' : 'top end',
- offset: 8,
+ offset: 6,
}}
modal={false}
className={cn(
- 'z-50 w-40 min-w-max rounded-md bg-white p-1 ring-1 ring-gray-200 focus:outline-hidden dark:bg-slate-900 dark:ring-slate-800',
+ 'z-50 w-40 min-w-max rounded-lg bg-white p-1 shadow-lg ring-1 ring-gray-200/80 focus:outline-hidden dark:bg-slate-900 dark:ring-slate-700/60',
menuItemsClassName,
)}
>
{header ? (
- <p className='mb-1 p-2 text-sm font-medium text-gray-700 dark:text-gray-50'>
- {header}
- </p>
+ <>
+ <p className='px-2 pt-1.5 pb-1 text-xs font-medium tracking-wide text-gray-500 uppercase dark:text-gray-400'>
+ {header}
+ </p>
+ <div className='mb-1 h-px bg-gray-100 dark:bg-slate-800' />
+ </>
) : null}
{loading ? (
- <div className='px-4 py-2'>
- <Spin className='!ml-0' />
+ <div className='flex items-center justify-center px-4 py-3'>
+ <Spin className='mr-0! ml-0!' />
<span className='sr-only'>Loading...</span>
</div>
) : (
@@ -152,7 +158,7 @@ function Dropdown<T>({
>
<span
className={cn(
- 'block cursor-pointer rounded-md p-2 text-sm text-gray-700 transition-colors hover:bg-gray-100 dark:text-gray-50 dark:hover:bg-slate-800',
+ 'block cursor-pointer rounded-md px-2 py-1.5 text-sm text-gray-700 transition-colors duration-100 ease-out hover:bg-gray-100 hover:text-gray-900 data-focus:bg-gray-100 data-focus:text-gray-900 dark:text-gray-50 dark:hover:bg-slate-800 dark:hover:text-white dark:data-focus:bg-slate-800 dark:data-focus:text-white',
selectItemClassName,
)}
role='menuitem'
diff --git a/web/app/ui/FAQ.tsx b/web/app/ui/FAQ.tsx
index cd5e8ef64..d5f5b2a7a 100644
--- a/web/app/ui/FAQ.tsx
+++ b/web/app/ui/FAQ.tsx
@@ -44,19 +44,30 @@ export function FAQ({
>
<summary
className={cn(
- 'flex w-full cursor-pointer items-center justify-between py-4',
+ 'flex w-full cursor-pointer list-none items-center justify-between gap-x-4 py-4 transition-colors',
+ 'focus-visible:rounded-md focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:focus-visible:ring-slate-300',
withPadding && 'px-4',
)}
>
- <span className='text-base font-medium text-slate-900 group-hover:underline dark:text-white'>
+ <span className='text-base font-medium text-slate-900 transition-colors group-hover:text-slate-700 dark:text-white dark:group-hover:text-slate-200'>
{item.question}
</span>
- <CaretDownIcon className='size-4 shrink-0 text-slate-900 transition-transform group-open:rotate-180 dark:text-gray-200' />
+ <CaretDownIcon
+ className='size-4 shrink-0 text-slate-500 transition-transform duration-200 ease-out group-open:rotate-180 dark:text-slate-400'
+ aria-hidden='true'
+ />
</summary>
- <div className={cn('pb-4', withPadding && 'px-4')}>
- <p className='text-sm whitespace-pre-line text-slate-900 dark:text-gray-100'>
- {item.answer}
- </p>
+ <div
+ className={cn(
+ 'pb-4 text-sm whitespace-pre-line text-slate-700 dark:text-gray-300',
+ withPadding && 'px-4',
+ )}
+ >
+ {typeof item.answer === 'string' ? (
+ <p>{item.answer}</p>
+ ) : (
+ item.answer
+ )}
</div>
</details>
)
diff --git a/web/app/ui/FileUpload.tsx b/web/app/ui/FileUpload.tsx
index ac039337b..e6be1a1e0 100644
--- a/web/app/ui/FileUpload.tsx
+++ b/web/app/ui/FileUpload.tsx
@@ -76,12 +76,13 @@ export default function FileUpload({
<label
htmlFor={inputId}
className={cn(
- 'group relative flex cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-dashed p-6 text-center transition-colors',
+ 'group relative flex cursor-pointer flex-col items-center justify-center rounded-xl border-2 border-dashed p-6 text-center transition-[background-color,border-color,box-shadow] duration-200 ease-out',
+ 'focus-within:ring-2 focus-within:ring-slate-900 focus-within:ring-offset-2 dark:focus-within:ring-slate-300 dark:focus-within:ring-offset-slate-950',
isDisabled
- ? 'cursor-not-allowed border-gray-200 dark:border-slate-700'
+ ? 'cursor-not-allowed border-gray-200 bg-gray-50/50 dark:border-slate-800 dark:bg-slate-900/40'
: dragOver
- ? 'border-slate-900 bg-gray-50 dark:border-slate-400 dark:bg-slate-800/50'
- : 'border-gray-300 hover:border-gray-400 dark:border-slate-600 dark:hover:border-slate-500',
+ ? 'border-slate-900 bg-slate-50 dark:border-slate-300 dark:bg-slate-800/40'
+ : 'border-gray-300 hover:border-gray-400 hover:bg-gray-50/60 dark:border-slate-700 dark:hover:border-slate-600 dark:hover:bg-slate-900/40',
className,
)}
aria-disabled={isDisabled || undefined}
@@ -101,7 +102,7 @@ export default function FileUpload({
{loading ? (
<div className='space-y-2'>
- <SpinnerIcon className='mx-auto size-8 animate-spin text-gray-400' />
+ <SpinnerIcon className='mx-auto size-8 animate-spin text-gray-400 dark:text-gray-500' />
{label && (
<Text
as='p'
@@ -115,19 +116,26 @@ export default function FileUpload({
</div>
) : (
<div className='space-y-2'>
- <UploadIcon className='mx-auto size-8 text-gray-400 dark:text-gray-500' />
+ <div
+ className={cn(
+ 'mx-auto flex size-10 items-center justify-center rounded-lg bg-gray-100 text-gray-500 transition-colors duration-200 ease-out group-hover:bg-gray-200 group-hover:text-gray-700 dark:bg-slate-800/80 dark:text-gray-400 dark:group-hover:bg-slate-800 dark:group-hover:text-gray-200',
+ dragOver &&
+ 'bg-slate-200 text-slate-900 dark:bg-slate-700 dark:text-white',
+ )}
+ >
+ <UploadIcon
+ className='size-5'
+ weight='duotone'
+ aria-hidden='true'
+ />
+ </div>
{label && (
- <Text as='p' size='sm' colour='inherit'>
+ <Text as='p' size='sm' weight='medium' colour='primary'>
{label}
</Text>
)}
{hint && (
- <Text
- as='p'
- size='xs'
- colour='inherit'
- className='text-gray-500 dark:text-gray-400'
- >
+ <Text as='p' size='xs' colour='muted'>
{hint}
</Text>
)}
diff --git a/web/app/ui/Input.tsx b/web/app/ui/Input.tsx
index eb7b57318..4c3c8f57d 100644
--- a/web/app/ui/Input.tsx
+++ b/web/app/ui/Input.tsx
@@ -47,12 +47,16 @@ const Input = ({
const inputElement = (
<HeadlessInput
className={cx(
- 'w-full rounded-md border-0 ring-1 ring-inset focus:ring-slate-900 sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:placeholder-gray-400 dark:focus:ring-slate-300',
+ 'block w-full rounded-md border-0 bg-white px-3 py-2 text-sm text-gray-900 ring-1 transition-shadow duration-150 ease-out ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-slate-900 focus:outline-hidden dark:bg-slate-950 dark:text-gray-50 dark:placeholder:text-gray-500 dark:focus:ring-slate-300',
{
- 'text-red-900 placeholder-red-300 ring-red-600': isError,
- 'ring-gray-300 dark:ring-slate-700/80': !isError,
- 'cursor-text bg-gray-100 text-gray-700 dark:bg-slate-700 dark:text-gray-200':
- disabled || readOnly,
+ 'ring-red-500 placeholder:text-red-300 focus:ring-red-500 dark:ring-red-500/80 dark:focus:ring-red-400':
+ isError,
+ 'ring-gray-300 hover:ring-gray-400 dark:ring-slate-700/80 dark:hover:ring-slate-600':
+ !isError && !disabled && !readOnly,
+ 'cursor-not-allowed bg-gray-50 text-gray-500 ring-gray-200 dark:bg-slate-900 dark:text-gray-400 dark:ring-slate-800':
+ disabled,
+ 'cursor-default bg-gray-50 text-gray-700 ring-gray-200 dark:bg-slate-900/60 dark:text-gray-300 dark:ring-slate-800':
+ readOnly && !disabled,
'pr-10': isPassword,
},
classes?.input,
@@ -60,6 +64,7 @@ const Input = ({
disabled={disabled}
readOnly={readOnly}
invalid={isError}
+ aria-invalid={isError || undefined}
{...restWithoutType}
type={isPassword && showPassword ? 'text' : type}
/>
@@ -80,7 +85,7 @@ const Input = ({
</div>
) : null}
{hint && hintPosition === 'top' ? (
- <Description className='mt-1 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
+ <Description className='mt-1 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400'>
{hint}
</Description>
) : null}
@@ -90,12 +95,15 @@ const Input = ({
<button
type='button'
onClick={() => setShowPassword(!showPassword)}
- className='absolute inset-y-0 right-0 flex items-center pr-3 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'
+ aria-label={showPassword ? 'Hide password' : 'Show password'}
+ aria-pressed={showPassword}
+ tabIndex={disabled ? -1 : 0}
+ className='absolute inset-y-0 right-0 my-1 mr-1 flex items-center rounded-md px-2 text-gray-400 transition-colors hover:text-gray-700 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:text-gray-500 dark:hover:text-gray-200 dark:focus-visible:ring-slate-300'
>
{showPassword ? (
- <EyeSlashIcon className='size-5' />
+ <EyeSlashIcon className='size-4.5' />
) : (
- <EyeIcon className='size-5' />
+ <EyeIcon className='size-4.5' />
)}
</button>
</div>
@@ -103,10 +111,15 @@ const Input = ({
inputElement
)}
{isError ? (
- <p className='mt-2 text-sm text-red-600 dark:text-red-500'>{error}</p>
+ <p
+ className='mt-1.5 text-sm text-red-600 dark:text-red-400'
+ role='alert'
+ >
+ {error}
+ </p>
) : null}
{hint && hintPosition === 'bottom' ? (
- <Description className='mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
+ <Description className='mt-1.5 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400'>
{hint}
</Description>
) : null}
diff --git a/web/app/ui/Loader.tsx b/web/app/ui/Loader.tsx
index e74a01cb1..3393181fb 100644
--- a/web/app/ui/Loader.tsx
+++ b/web/app/ui/Loader.tsx
@@ -1,10 +1,19 @@
import Spin from './icons/Spin'
import { cn } from '~/utils/generic'
-const Loader = ({ className }: { className?: string }) => (
- <div className={cn('flex justify-center pt-10', className)}>
- <Spin />
- <span className='sr-only'>Loading...</span>
+interface LoaderProps {
+ className?: string
+ label?: string
+}
+
+const Loader = ({ className, label = 'Loading' }: LoaderProps) => (
+ <div
+ className={cn('flex items-center justify-center pt-10', className)}
+ role='status'
+ aria-live='polite'
+ >
+ <Spin className='mr-0! ml-0!' />
+ <span className='sr-only'>{label}</span>
</div>
)
diff --git a/web/app/ui/LoadingBar.tsx b/web/app/ui/LoadingBar.tsx
index 6911bacef..eb0fa6ddd 100644
--- a/web/app/ui/LoadingBar.tsx
+++ b/web/app/ui/LoadingBar.tsx
@@ -9,24 +9,26 @@ const LoadingBar: React.FC<LoadingBarProps> = ({ className }) => {
return (
<div
className={cx(
- 'fixed top-0 right-0 left-0 z-50 h-0.5 w-full overflow-hidden',
+ 'fixed top-0 right-0 left-0 z-50 h-0.5 w-full overflow-hidden bg-transparent',
className,
)}
+ role='progressbar'
+ aria-label='Loading'
>
<div
- className='absolute h-full rounded-full bg-gradient-to-r from-slate-700 to-slate-900 opacity-90 dark:from-slate-300 dark:to-white'
+ className='absolute h-full rounded-full bg-linear-to-r from-slate-400 via-slate-700 to-slate-900 dark:from-slate-500 dark:via-slate-200 dark:to-white'
style={{
animation:
- 'indeterminate1 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite',
+ 'indeterminate1 1.8s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite',
}}
/>
<div
- className='absolute h-full rounded-full bg-gradient-to-r from-slate-700 to-slate-900 opacity-75 dark:from-slate-300 dark:to-white'
+ className='absolute h-full rounded-full bg-linear-to-r from-slate-700 to-slate-900 opacity-70 dark:from-slate-300 dark:to-white'
style={{
animation:
- 'indeterminate2 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite',
- animationDelay: '1.15s',
+ 'indeterminate2 1.8s cubic-bezier(0.165, 0.84, 0.44, 1) infinite',
+ animationDelay: '1s',
}}
/>
</div>
diff --git a/web/app/ui/Modal.tsx b/web/app/ui/Modal.tsx
index 4779efb5a..82a09e325 100644
--- a/web/app/ui/Modal.tsx
+++ b/web/app/ui/Modal.tsx
@@ -5,7 +5,7 @@ import {
DialogTitle,
} from '@headlessui/react'
import {
- CheckIcon,
+ CheckCircleIcon,
WarningOctagonIcon,
InfoIcon,
UsersIcon,
@@ -16,7 +16,6 @@ import { useTranslation } from 'react-i18next'
import { cn } from '~/utils/generic'
-import Spin from './icons/Spin'
import Button from './Button'
interface ModalProps {
@@ -37,6 +36,37 @@ interface ModalProps {
overflowVisible?: boolean
}
+const TYPE_ICONS: Record<
+ NonNullable<ModalProps['type']>,
+ { Icon: React.ElementType; iconClass: string; tintClass: string }
+> = {
+ success: {
+ Icon: CheckCircleIcon,
+ iconClass: 'text-emerald-600 dark:text-emerald-400',
+ tintClass: 'bg-emerald-100/70 dark:bg-emerald-500/10',
+ },
+ error: {
+ Icon: WarningOctagonIcon,
+ iconClass: 'text-red-600 dark:text-red-400',
+ tintClass: 'bg-red-100/70 dark:bg-red-500/10',
+ },
+ info: {
+ Icon: InfoIcon,
+ iconClass: 'text-sky-600 dark:text-sky-400',
+ tintClass: 'bg-sky-100/70 dark:bg-sky-500/10',
+ },
+ warning: {
+ Icon: WarningOctagonIcon,
+ iconClass: 'text-amber-600 dark:text-amber-400',
+ tintClass: 'bg-amber-100/70 dark:bg-amber-500/10',
+ },
+ confirmed: {
+ Icon: UsersIcon,
+ iconClass: 'text-emerald-600 dark:text-emerald-400',
+ tintClass: 'bg-emerald-100/70 dark:bg-emerald-500/10',
+ },
+}
+
const Modal = ({
className,
type,
@@ -55,6 +85,7 @@ const Modal = ({
overflowVisible,
}: ModalProps) => {
const { t } = useTranslation()
+ const typeMeta = type ? TYPE_ICONS[type] : null
return (
<Dialog
@@ -64,62 +95,36 @@ const Modal = ({
>
<DialogBackdrop
transition
- className='fixed inset-0 bg-gray-500/75 transition-opacity data-closed:opacity-0 data-enter:ease-out data-leave:duration-200 data-leave:ease-in'
+ className='fixed inset-0 bg-gray-900/40 backdrop-blur-[2px] transition-opacity duration-200 data-closed:opacity-0 data-enter:ease-out data-leave:ease-in dark:bg-black/60'
/>
<div className='fixed inset-0 z-10 w-screen overflow-y-auto'>
- <div className='flex min-h-full items-center justify-center text-center'>
+ <div className='flex min-h-full items-center justify-center p-4 text-center sm:p-0'>
<DialogPanel
transition
className={cn(
- 'inline-block transform rounded-lg bg-white px-4 pt-5 pb-4 text-left align-bottom transition-all sm:my-8 sm:px-5 sm:py-4 sm:align-middle dark:bg-slate-950',
- 'transition-all data-closed:translate-y-4 data-closed:opacity-0 data-enter:ease-out data-leave:duration-200 data-leave:ease-in',
+ 'inline-block w-full transform rounded-xl bg-white px-5 pt-5 pb-4 text-left align-bottom shadow-2xl ring-1 ring-gray-200/80 transition-all sm:my-8 sm:align-middle dark:bg-slate-950 dark:ring-slate-700/60',
+ 'duration-200 data-closed:translate-y-2 data-closed:scale-[0.98] data-closed:opacity-0 data-enter:ease-out data-leave:ease-in',
{
- 'w-[90vw] md:w-full md:max-w-lg': size === 'regular',
- 'w-[90vw] max-w-2xl md:w-full': size === 'medium',
- 'w-[90vw] max-w-5xl md:w-full': size === 'large',
+ 'sm:max-w-lg': size === 'regular',
+ 'sm:max-w-2xl': size === 'medium',
+ 'sm:max-w-5xl': size === 'large',
'overflow-visible': overflowVisible,
'overflow-hidden': !overflowVisible,
},
)}
>
<div className='sm:flex sm:items-start'>
- {type === 'success' ? (
- <div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-green-100 sm:mr-3 sm:h-10 sm:w-10'>
- <CheckIcon
- className='h-6 w-6 text-green-600 dark:text-green-500'
- aria-hidden='true'
- />
- </div>
- ) : null}
- {type === 'error' ? (
- <div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-red-100 sm:mr-3 sm:h-10 sm:w-10'>
- <WarningOctagonIcon
- className='h-6 w-6 text-red-600 dark:text-red-500'
- aria-hidden='true'
- />
- </div>
- ) : null}
- {type === 'info' ? (
- <div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-blue-100 text-center sm:mr-3 sm:h-10 sm:w-10'>
- <InfoIcon
- className='h-6 w-6 text-blue-600 dark:text-blue-500'
- aria-hidden='true'
- />
- </div>
- ) : null}
- {type === 'warning' ? (
- <div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-orange-100 sm:mr-3 sm:h-10 sm:w-10'>
- <WarningOctagonIcon
- className='h-6 w-6 text-amber-600 dark:text-amber-500'
- aria-hidden='true'
- />
- </div>
- ) : null}
- {type === 'confirmed' ? (
- <div className='mx-auto flex h-12 w-12 shrink-0 items-center justify-center rounded-full bg-green-100 sm:mr-3 sm:h-10 sm:w-10'>
- <UsersIcon
- className='h-6 w-6 text-green-600 dark:text-green-500'
+ {typeMeta ? (
+ <div
+ className={cn(
+ 'mx-auto mb-3 flex size-10 shrink-0 items-center justify-center rounded-lg sm:mx-0 sm:mr-3 sm:mb-0 sm:size-9',
+ typeMeta.tintClass,
+ )}
+ >
+ <typeMeta.Icon
+ className={cn('size-5', typeMeta.iconClass)}
+ weight='duotone'
aria-hidden='true'
/>
</div>
@@ -129,14 +134,14 @@ const Modal = ({
<DialogTitle
as='h3'
className={cn(
- 'flex items-center text-lg leading-6 font-medium text-gray-900 dark:text-gray-50',
+ 'flex items-center text-base leading-6 font-semibold text-gray-900 dark:text-gray-50',
{
'justify-between': !closeText,
'justify-center sm:justify-start': closeText,
},
)}
>
- <div>{title}</div>
+ <div className='min-w-0'>{title}</div>
{!closeText ? (
<button
type='button'
@@ -146,52 +151,19 @@ const Modal = ({
onClose?.()
}}
aria-label={t('common.close')}
- className='rounded-md p-1.5 text-gray-800 transition-colors hover:bg-gray-100 hover:text-gray-900 dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-300'
+ className='ml-2 inline-flex shrink-0 items-center justify-center rounded-md p-1 text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-900 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:text-slate-400 dark:hover:bg-slate-800 dark:hover:text-slate-100 dark:focus-visible:ring-slate-300'
>
- <XIcon className='size-5' />
+ <XIcon className='size-4.5' />
</button>
) : null}
</DialogTitle>
) : null}
- <div className='mt-2 text-sm whitespace-pre-line text-gray-600 dark:text-gray-200'>
+ <div className='mt-2 text-sm whitespace-pre-line text-gray-600 dark:text-gray-300'>
{message}
</div>
</div>
</div>
- <div className='px-4 py-3 transition-colors sm:flex sm:flex-row-reverse sm:px-0 sm:pb-0'>
- {customButtons}
- {submitText ? (
- <button
- type='button'
- className={cn(
- 'inline-flex w-full justify-center rounded-md px-4 py-2 text-base font-medium transition-colors sm:ml-3 sm:w-auto sm:text-sm',
- {
- 'bg-slate-900 text-white hover:bg-slate-700 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white':
- submitType === 'regular' && !submitDisabled,
- 'bg-slate-900 text-white dark:bg-slate-100 dark:text-slate-900':
- submitType === 'regular' && submitDisabled,
- 'bg-red-600 text-white hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-500':
- submitType === 'danger' && !submitDisabled,
- 'bg-red-600 text-white dark:bg-red-600':
- submitType === 'danger' && submitDisabled,
- 'cursor-not-allowed opacity-70': submitDisabled,
- },
- )}
- onClick={onSubmit}
- >
- {isLoading ? (
- <Spin
- alwaysLight={submitType === 'danger'}
- className={
- submitType === 'regular'
- ? 'text-white dark:text-slate-900'
- : undefined
- }
- />
- ) : null}
- {submitText}
- </button>
- ) : null}
+ <div className='mt-5 flex flex-col-reverse gap-2 sm:mt-4 sm:flex-row sm:justify-end'>
{closeText ? (
<Button
onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
@@ -201,10 +173,25 @@ const Modal = ({
}}
secondary
large
+ className='w-full justify-center sm:w-auto'
>
{closeText}
</Button>
) : null}
+ {submitText ? (
+ <Button
+ onClick={onSubmit}
+ disabled={submitDisabled}
+ loading={isLoading}
+ primary={submitType === 'regular'}
+ danger={submitType === 'danger'}
+ large
+ className='w-full justify-center sm:w-auto'
+ >
+ {submitText}
+ </Button>
+ ) : null}
+ {customButtons}
</div>
</DialogPanel>
</div>
diff --git a/web/app/ui/MultiProgress.tsx b/web/app/ui/MultiProgress.tsx
index 585fb372d..a8866d954 100644
--- a/web/app/ui/MultiProgress.tsx
+++ b/web/app/ui/MultiProgress.tsx
@@ -22,9 +22,10 @@ const MultiProgress = ({ progress, className }: MultiProgressProps) => {
<div className='relative'>
<div
className={cx(
- 'flex h-5 overflow-hidden rounded-sm bg-gray-200 text-xs dark:bg-slate-900',
+ 'flex h-2.5 overflow-hidden rounded-full bg-gray-200 ring-1 ring-gray-200/40 ring-inset dark:bg-slate-800 dark:ring-slate-700/30',
className,
)}
+ role='progressbar'
>
{_map(progress, ({ value, lightColour, darkColour }) => (
<div
@@ -33,7 +34,7 @@ const MultiProgress = ({ progress, className }: MultiProgressProps) => {
width: `${value}%`,
backgroundColor: theme === 'dark' ? darkColour : lightColour,
}}
- className='flex flex-col justify-center text-center whitespace-nowrap text-white shadow-none'
+ className='h-full transition-[width] duration-300 ease-out'
/>
))}
</div>
diff --git a/web/app/ui/MultiSelect.tsx b/web/app/ui/MultiSelect.tsx
index 37e8887b8..e5b9e9f95 100644
--- a/web/app/ui/MultiSelect.tsx
+++ b/web/app/ui/MultiSelect.tsx
@@ -1,9 +1,9 @@
-import { CheckIcon, CaretUpDownIcon } from '@phosphor-icons/react'
+import { CheckIcon, CaretUpDownIcon, XIcon } from '@phosphor-icons/react'
import cx from 'clsx'
import _includes from 'lodash/includes'
import _isEmpty from 'lodash/isEmpty'
import _map from 'lodash/map'
-import { useState, useEffect, useRef } from 'react'
+import { useState, useEffect, useRef, useId, useMemo } from 'react'
interface MultiSelectProps {
className?: string
@@ -34,8 +34,11 @@ const MultiSelect = ({
}: MultiSelectProps) => {
const [isOpen, setIsOpen] = useState(false)
const [searchValue, setSearchValue] = useState('')
+ const [activeIndex, setActiveIndex] = useState(-1)
const dropdownRef = useRef<HTMLDivElement>(null)
const inputRef = useRef<HTMLInputElement>(null)
+ const listboxId = useId()
+ const optionIdPrefix = useId()
useEffect(() => {
const handleClickOutside = (event: MouseEvent) => {
@@ -45,6 +48,7 @@ const MultiSelect = ({
) {
setIsOpen(false)
setSearchValue('')
+ setActiveIndex(-1)
if (onSearch) {
onSearch('')
}
@@ -55,9 +59,23 @@ const MultiSelect = ({
return () => document.removeEventListener('mousedown', handleClickOutside)
}, [onSearch])
+ useEffect(() => {
+ if (!isOpen) {
+ setActiveIndex(-1)
+ }
+ }, [isOpen, items])
+
+ const itemKey = useMemo(
+ () => (item: any) =>
+ keyExtractor ? keyExtractor(item) : (itemExtractor?.(item) ?? item),
+ [keyExtractor, itemExtractor],
+ )
+
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value
setSearchValue(value)
+ setActiveIndex(value && items.length > 0 ? 0 : -1)
+ if (!isOpen) setIsOpen(true)
if (onSearch) {
onSearch(value)
}
@@ -67,25 +85,61 @@ const MultiSelect = ({
setIsOpen(true)
}
+ const handleSelectItem = (item: any) => {
+ onSelect(item)
+ setSearchValue('')
+ setActiveIndex(-1)
+ if (onSearch) {
+ onSearch('')
+ }
+ inputRef.current?.focus()
+ }
+
const handleKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Escape') {
setIsOpen(false)
setSearchValue('')
- if (onSearch) {
- onSearch('')
- }
+ setActiveIndex(-1)
+ if (onSearch) onSearch('')
inputRef.current?.blur()
+ return
}
- }
- const handleSelectItem = (item: any) => {
- onSelect(item)
- setSearchValue('')
- if (onSearch) {
- onSearch('')
+ if (e.key === 'ArrowDown') {
+ e.preventDefault()
+ if (!isOpen) setIsOpen(true)
+ if (items.length === 0) return
+ setActiveIndex((prev) => (prev + 1) % items.length)
+ return
+ }
+
+ if (e.key === 'ArrowUp') {
+ e.preventDefault()
+ if (!isOpen) setIsOpen(true)
+ if (items.length === 0) return
+ setActiveIndex((prev) => (prev <= 0 ? items.length - 1 : prev - 1))
+ return
+ }
+
+ if (e.key === 'Enter') {
+ if (activeIndex >= 0 && activeIndex < items.length) {
+ e.preventDefault()
+ handleSelectItem(items[activeIndex])
+ }
+ return
+ }
+
+ if (e.key === 'Backspace' && !searchValue && label.length > 0) {
+ e.preventDefault()
+ onRemove(label[label.length - 1])
}
}
+ const activeOptionId =
+ activeIndex >= 0 && items[activeIndex]
+ ? `${optionIdPrefix}-${itemKey(items[activeIndex])}`
+ : undefined
+
return (
<div
ref={dropdownRef}
@@ -95,25 +149,32 @@ const MultiSelect = ({
<input
ref={inputRef}
type='text'
- className='w-full cursor-text rounded-md border-0 bg-white py-2 pr-10 pl-3 text-sm font-medium ring-1 ring-gray-300 transition-colors ring-inset placeholder:text-gray-400 hover:bg-gray-50 focus:ring-2 focus:ring-slate-900 focus:outline-hidden dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:placeholder:text-gray-500 dark:hover:bg-slate-900 dark:focus:ring-slate-300'
+ role='combobox'
+ aria-expanded={isOpen}
+ aria-controls={listboxId}
+ aria-autocomplete='list'
+ aria-activedescendant={activeOptionId}
+ className='block w-full rounded-md border-0 bg-white py-2 pr-9 pl-3 text-sm font-medium text-gray-900 ring-1 ring-gray-300 transition-[background-color,box-shadow] duration-150 ease-out ring-inset placeholder:text-gray-400 hover:ring-gray-400 focus:ring-2 focus:ring-slate-900 focus:outline-hidden dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:placeholder:text-gray-500 dark:hover:ring-slate-600 dark:focus:ring-slate-300'
placeholder={placeholder}
value={searchValue}
onChange={handleInputChange}
onFocus={handleFocus}
onKeyDown={handleKeyDown}
/>
- <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>
- <CaretUpDownIcon
- className='h-5 w-5 text-gray-400'
- aria-hidden='true'
- />
+ <span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2 text-gray-400 dark:text-gray-500'>
+ <CaretUpDownIcon className='size-4' aria-hidden='true' />
</span>
<div
+ id={listboxId}
+ role='listbox'
+ aria-multiselectable='true'
className={cx(
- 'absolute top-full z-30 mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-sm ring-1 ring-black/10 focus:outline-hidden dark:bg-slate-950 dark:ring-slate-700/80',
- 'transition-opacity duration-100 ease-in',
- isOpen ? 'opacity-100' : 'pointer-events-none opacity-0',
+ 'absolute top-full z-30 mt-1.5 max-h-60 w-full overflow-auto rounded-lg bg-white py-1 text-sm shadow-lg ring-1 ring-gray-200/80 focus:outline-hidden dark:bg-slate-950 dark:ring-slate-700/60',
+ 'transition-[opacity,transform] duration-150 ease-out',
+ isOpen
+ ? 'translate-y-0 opacity-100'
+ : 'pointer-events-none -translate-y-0.5 opacity-0',
)}
>
{_isEmpty(items) ? (
@@ -121,33 +182,30 @@ const MultiSelect = ({
No options available
</div>
) : (
- _map(items, (item) => {
+ _map(items, (item, index) => {
const isSelected = _includes(label, item)
+ const isActive = index === activeIndex
+ const optionId = `${optionIdPrefix}-${itemKey(item)}`
return (
<button
type='button'
- key={
- keyExtractor
- ? `${keyExtractor(item)}select`
- : `${item}select`
- }
+ id={optionId}
+ role='option'
+ aria-selected={isSelected}
+ key={`${itemKey(item)}-select`}
onClick={() => handleSelectItem(item)}
+ onMouseEnter={() => setActiveIndex(index)}
className={cx(
- 'relative mx-1 flex w-[calc(100%-0.5rem)] cursor-pointer items-center rounded-md py-2 pr-4 pl-8 text-left text-sm transition-colors select-none',
+ 'relative mx-1 flex w-[calc(100%-0.5rem)] cursor-pointer items-center rounded-md py-2 pr-8 pl-3 text-left text-sm transition-colors duration-100 ease-out select-none',
{
- 'bg-gray-200 dark:bg-slate-900/80': isSelected,
- 'hover:bg-gray-100 dark:hover:bg-slate-900/80':
- !isSelected,
- 'text-gray-900 dark:text-white': isSelected,
- 'text-gray-700 dark:text-gray-50': !isSelected,
+ 'bg-gray-100 text-gray-900 dark:bg-slate-800/80 dark:text-white':
+ isActive,
+ 'text-gray-700 dark:text-gray-50':
+ !isActive && !isSelected,
+ 'text-gray-900 dark:text-white': isSelected && !isActive,
},
)}
>
- {isSelected ? (
- <span className='absolute inset-y-0 left-0 flex items-center pl-1.5 text-gray-600 dark:text-gray-300'>
- <CheckIcon className='h-5 w-5' aria-hidden='true' />
- </span>
- ) : null}
<span
className={cx('block truncate', {
'font-semibold': isSelected,
@@ -156,6 +214,15 @@ const MultiSelect = ({
>
{itemExtractor ? itemExtractor(item) : item}
</span>
+ {isSelected ? (
+ <span className='absolute inset-y-0 right-2 flex items-center text-slate-900 dark:text-slate-100'>
+ <CheckIcon
+ weight='bold'
+ className='size-4'
+ aria-hidden='true'
+ />
+ </span>
+ ) : null}
</button>
)
})
@@ -164,11 +231,11 @@ const MultiSelect = ({
</div>
{!_isEmpty(label) ? (
- <div className='mt-2 flex flex-wrap gap-2'>
+ <div className='mt-2 flex flex-wrap gap-1.5'>
{_map(label, (item) => (
<span
- key={keyExtractor ? keyExtractor(item) : item}
- className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 py-1.5 pr-2 pl-2.5 text-sm font-medium text-gray-700 dark:bg-slate-900 dark:text-gray-200'
+ key={itemKey(item)}
+ className='inline-flex items-center gap-1.5 rounded-md bg-gray-100 py-1 pr-1.5 pl-2.5 text-xs font-medium text-gray-800 ring-1 ring-gray-200/70 ring-inset dark:bg-slate-800/60 dark:text-gray-100 dark:ring-slate-700/60'
>
<span className='flex items-center gap-1.5'>
{labelExtractor ? labelExtractor(item) : item}
@@ -180,21 +247,10 @@ const MultiSelect = ({
e.stopPropagation()
onRemove(item)
}}
- className='inline-flex h-4 w-4 shrink-0 items-center justify-center rounded-full text-gray-400 transition-colors hover:bg-gray-200 hover:text-gray-600 focus:bg-gray-300 focus:text-gray-700 focus:outline-hidden dark:text-gray-400 dark:hover:bg-slate-800 dark:hover:text-gray-200'
+ aria-label={`Remove ${labelExtractor ? labelExtractor(item) : item}`}
+ className='inline-flex size-4 shrink-0 items-center justify-center rounded text-gray-500 transition-colors hover:bg-gray-200 hover:text-gray-800 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:text-gray-400 dark:hover:bg-slate-700 dark:hover:text-gray-100 dark:focus-visible:ring-slate-300'
>
- <span className='sr-only'>Remove</span>
- <svg
- className='h-2.5 w-2.5'
- stroke='currentColor'
- fill='none'
- viewBox='0 0 8 8'
- >
- <path
- strokeLinecap='round'
- strokeWidth='1.5'
- d='m1 1 6 6m0-6-6 6'
- />
- </svg>
+ <XIcon className='size-3' weight='bold' aria-hidden='true' />
</button>
</span>
))}
@@ -202,7 +258,7 @@ const MultiSelect = ({
) : null}
{hint ? (
- <p className='mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
+ <p className='mt-1.5 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400'>
{hint}
</p>
) : null}
diff --git a/web/app/ui/Pagination.tsx b/web/app/ui/Pagination.tsx
index 09d16bf4e..f23008492 100644
--- a/web/app/ui/Pagination.tsx
+++ b/web/app/ui/Pagination.tsx
@@ -19,6 +19,9 @@ interface PaginationProps {
onPageSizeChange?: (size: number) => void
}
+const navButtonClasses =
+ 'inline-flex size-8 items-center justify-center rounded-md text-gray-500 transition-[background-color,color,box-shadow] duration-150 ease-out hover:bg-gray-100 hover:text-gray-900 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent disabled:hover:text-gray-500 dark:text-gray-400 dark:hover:bg-slate-800/80 dark:hover:text-gray-50 dark:focus-visible:ring-slate-300'
+
const Pagination = ({
page,
setPage,
@@ -42,66 +45,54 @@ const Pagination = ({
return (
<div
className={cx(
- 'flex items-center justify-between border-t border-gray-200 py-3 dark:border-slate-700/80',
+ 'flex items-center justify-between border-t border-gray-200 py-3 dark:border-slate-700/60',
className,
)}
>
<div className='flex flex-1 justify-between sm:hidden'>
<button
type='button'
- onClick={() => {
- if (page === 1) {
- return
- }
-
- setPage(page - 1)
- }}
+ onClick={() => page > 1 && setPage(page - 1)}
disabled={page === 1}
className={cx(
- 'relative inline-flex items-center rounded-md border-0 bg-white px-4 py-2 text-sm font-medium text-gray-700 ring-1 ring-gray-300 ring-inset dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80',
- {
- 'cursor-not-allowed opacity-50': page === 1,
- 'hover:bg-gray-50 dark:hover:bg-slate-900': page !== 1,
- },
+ 'inline-flex items-center rounded-md bg-white px-3 py-1.5 text-sm font-medium text-gray-700 ring-1 ring-gray-300 transition-colors duration-150 ease-out ring-inset',
+ page === 1
+ ? 'cursor-not-allowed opacity-50'
+ : 'hover:bg-gray-50 dark:hover:bg-slate-900',
+ 'dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80',
)}
>
{t('project.prev')}
</button>
<button
type='button'
- onClick={() => {
- if (page === pageAmount) {
- return
- }
-
- setPage(page + 1)
- }}
+ onClick={() => page < pageAmount && setPage(page + 1)}
disabled={page === pageAmount}
className={cx(
- 'relative ml-3 inline-flex items-center rounded-md border-0 bg-white px-4 py-2 text-sm font-medium text-gray-700 ring-1 ring-gray-300 ring-inset dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80',
- {
- 'cursor-not-allowed opacity-50': page === pageAmount,
- 'hover:bg-gray-50 dark:hover:bg-slate-900': page !== pageAmount,
- },
+ 'ml-3 inline-flex items-center rounded-md bg-white px-3 py-1.5 text-sm font-medium text-gray-700 ring-1 ring-gray-300 transition-colors duration-150 ease-out ring-inset',
+ page === pageAmount
+ ? 'cursor-not-allowed opacity-50'
+ : 'hover:bg-gray-50 dark:hover:bg-slate-900',
+ 'dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80',
)}
>
{t('project.next')}
</button>
</div>
<div className='hidden w-full sm:flex sm:flex-wrap sm:items-center sm:justify-between sm:gap-y-4'>
- <p className='text-sm text-gray-700 dark:text-gray-200'>
+ <p className='text-sm text-gray-700 dark:text-gray-300'>
<Trans
t={t}
i18nKey='common.pagination'
values={{ start, end, total }}
>
- <span className='font-medium' />
+ <span className='font-medium text-gray-900 tabular-nums dark:text-gray-100' />
</Trans>
</p>
<div className='flex items-center gap-4'>
{pageSizeOptions && onPageSizeChange ? (
<div className='flex items-center gap-2'>
- <span className='text-sm text-gray-700 dark:text-gray-200'>
+ <span className='text-sm text-gray-700 dark:text-gray-300'>
{t('common.resultsPerPage')}
</span>
<Select<string>
@@ -116,36 +107,28 @@ const Pagination = ({
</div>
) : null}
<nav
- className='isolate inline-flex -space-x-px rounded-md'
+ className='inline-flex items-center gap-0.5'
aria-label='Pagination'
>
<button
type='button'
- onClick={() => {
- if (page === 1) {
- return
- }
-
- setPage(page - 1)
- }}
+ onClick={() => page > 1 && setPage(page - 1)}
disabled={page === 1}
- className={cx(
- 'relative inline-flex items-center rounded-l-md border border-gray-300 bg-white px-2 py-2 text-gray-400 focus:z-20 dark:border-slate-700/80 dark:bg-slate-950 dark:text-gray-500',
- {
- 'cursor-not-allowed opacity-50': page === 1,
- 'hover:bg-gray-50 dark:hover:bg-slate-900': page !== 1,
- },
- )}
+ className={navButtonClasses}
+ aria-label={t('project.prev')}
>
- <span className='sr-only'>{t('project.prev')}</span>
- <CaretLeftIcon className='h-5 w-5' aria-hidden='true' />
+ <CaretLeftIcon
+ className='size-4'
+ weight='bold'
+ aria-hidden='true'
+ />
</button>
{_map(paginationRange, (item, index) => {
if (item === DOTS) {
return (
<button
type='button'
- key={item + index}
+ key={`dots-${index}`}
onClick={() => {
const lastShownPage = paginationRange[index - 1] as number
const nextShownPage = paginationRange[index + 1] as number
@@ -155,26 +138,28 @@ const Pagination = ({
setPage(middlePage)
}}
- className='relative inline-flex items-center border border-gray-300 bg-white px-4 py-2 text-sm font-semibold text-gray-700 hover:bg-gray-50 dark:border-slate-700/80 dark:bg-slate-950 dark:text-gray-50 dark:hover:bg-slate-900'
+ className={cx(navButtonClasses, 'tabular-nums')}
+ aria-label={`Jump to page ${Math.floor(((paginationRange[index - 1] as number) + (paginationRange[index + 1] as number)) / 2)}`}
>
{DOTS}
</button>
)
}
+ const isActive = item === page
+
return (
<button
type='button'
key={item}
onClick={() => setPage(item)}
+ aria-current={isActive ? 'page' : undefined}
+ aria-label={`Page ${item}`}
className={cx(
- 'relative inline-flex items-center border border-gray-300 px-4 py-2 text-sm font-semibold focus:z-20 dark:border-slate-700/80',
- {
- 'z-10 bg-slate-900 text-white dark:bg-slate-100 dark:text-slate-900':
- item === page,
- 'bg-white text-gray-900 hover:bg-gray-50 dark:bg-slate-950 dark:text-gray-50 dark:hover:bg-slate-900':
- item !== page,
- },
+ 'inline-flex size-8 items-center justify-center rounded-md text-sm font-medium tabular-nums transition-[background-color,color,box-shadow] duration-150 ease-out focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:focus-visible:ring-slate-300',
+ isActive
+ ? 'bg-slate-900 text-white dark:bg-slate-100 dark:text-slate-900'
+ : 'text-gray-700 hover:bg-gray-100 hover:text-gray-900 dark:text-gray-300 dark:hover:bg-slate-800/80 dark:hover:text-gray-50',
)}
>
{item}
@@ -183,25 +168,16 @@ const Pagination = ({
})}
<button
type='button'
- onClick={() => {
- if (page === pageAmount) {
- return
- }
-
- setPage(page + 1)
- }}
+ onClick={() => page < pageAmount && setPage(page + 1)}
disabled={page === pageAmount}
- className={cx(
- 'relative inline-flex items-center rounded-r-md border border-gray-300 bg-white px-2 py-2 text-gray-400 focus:z-20 dark:border-slate-700/80 dark:bg-slate-950 dark:text-gray-500',
- {
- 'cursor-not-allowed opacity-50': page === pageAmount,
- 'hover:bg-gray-50 dark:hover:bg-slate-900':
- page !== pageAmount,
- },
- )}
+ className={navButtonClasses}
+ aria-label={t('project.next')}
>
- <span className='sr-only'>{t('project.next')}</span>
- <CaretRightIcon className='h-5 w-5' aria-hidden='true' />
+ <CaretRightIcon
+ className='size-4'
+ weight='bold'
+ aria-hidden='true'
+ />
</button>
</nav>
</div>
diff --git a/web/app/ui/PasswordStrength.tsx b/web/app/ui/PasswordStrength.tsx
index 5687f83df..7d3b89dc7 100644
--- a/web/app/ui/PasswordStrength.tsx
+++ b/web/app/ui/PasswordStrength.tsx
@@ -15,7 +15,7 @@ type StrengthLevel = 'empty' | 'weak' | 'fair' | 'good' | 'strong'
interface StrengthConfig {
label: string
color: string
- bgColor: string
+ textColor: string
segments: number
}
@@ -45,32 +45,32 @@ const PasswordStrength = ({ password, className }: PasswordStrengthProps) => {
() => ({
empty: {
label: '',
- color: 'bg-gray-300 dark:bg-slate-700',
- bgColor: 'bg-gray-200 dark:bg-slate-900',
+ color: 'bg-gray-200 dark:bg-slate-800',
+ textColor: '',
segments: 0,
},
weak: {
label: t('auth.passwordStrength.weak'),
color: 'bg-red-500',
- bgColor: 'bg-gray-200 dark:bg-slate-700',
+ textColor: 'text-red-600 dark:text-red-400',
segments: 1,
},
fair: {
label: t('auth.passwordStrength.fair'),
color: 'bg-amber-500',
- bgColor: 'bg-gray-200 dark:bg-slate-700',
+ textColor: 'text-amber-600 dark:text-amber-400',
segments: 2,
},
good: {
label: t('auth.passwordStrength.good'),
color: 'bg-yellow-500',
- bgColor: 'bg-gray-200 dark:bg-slate-700',
+ textColor: 'text-yellow-600 dark:text-yellow-500',
segments: 3,
},
strong: {
label: t('auth.passwordStrength.strong'),
color: 'bg-emerald-500',
- bgColor: 'bg-gray-200 dark:bg-slate-700',
+ textColor: 'text-emerald-600 dark:text-emerald-400',
segments: 4,
},
}),
@@ -79,33 +79,33 @@ const PasswordStrength = ({ password, className }: PasswordStrengthProps) => {
const currentConfig = config[strength]
const totalSegments = 4
+ const trackBg = 'bg-gray-200 dark:bg-slate-800'
return (
- <div className={cx('space-y-1.5', className)}>
- <div className='flex gap-1'>
+ <div
+ className={cx('space-y-1.5', className)}
+ role='progressbar'
+ aria-valuemin={0}
+ aria-valuemax={totalSegments}
+ aria-valuenow={currentConfig.segments}
+ aria-label={t('auth.passwordStrength.label', {
+ defaultValue: 'Password strength',
+ })}
+ >
+ <div className='flex gap-1.5'>
{Array.from({ length: totalSegments }).map((_, index) => (
<div
key={index}
className={cx(
- 'h-1 flex-1 rounded-full transition-colors duration-200',
- index < currentConfig.segments
- ? currentConfig.color
- : currentConfig.bgColor,
+ 'h-1.5 flex-1 rounded-full transition-colors duration-200 ease-out',
+ index < currentConfig.segments ? currentConfig.color : trackBg,
)}
/>
))}
</div>
{strength !== 'empty' && (
<div className='flex items-center justify-end gap-1'>
- <span
- className={cx(
- 'text-xs font-medium',
- strength === 'weak' && 'text-red-600 dark:text-red-400',
- strength === 'fair' && 'text-amber-600 dark:text-amber-400',
- strength === 'good' && 'text-yellow-600 dark:text-yellow-400',
- strength === 'strong' && 'text-emerald-600 dark:text-emerald-400',
- )}
- >
+ <span className={cx('text-xs font-medium', currentConfig.textColor)}>
{currentConfig.label}
</span>
<Tooltip
diff --git a/web/app/ui/ProgressRing.tsx b/web/app/ui/ProgressRing.tsx
index b3c5f4c03..4481d76c3 100644
--- a/web/app/ui/ProgressRing.tsx
+++ b/web/app/ui/ProgressRing.tsx
@@ -21,6 +21,8 @@ interface ProgressRingProps {
showValue?: boolean
/** Custom thresholds for colour coding. Default: { green: 80, amber: 40 } */
thresholds?: ColourThresholds
+ /** Accessible label for screen readers */
+ ariaLabel?: string
}
const DEFAULT_THRESHOLDS: ColourThresholds = {
@@ -31,8 +33,8 @@ const DEFAULT_THRESHOLDS: ColourThresholds = {
const getColourClasses = (value: number, thresholds: ColourThresholds) => {
if (value >= thresholds.green) {
return {
- stroke: 'stroke-green-500 dark:stroke-green-400',
- text: 'text-green-600 dark:text-green-400',
+ stroke: 'stroke-emerald-500 dark:stroke-emerald-400',
+ text: 'text-emerald-600 dark:text-emerald-400',
}
}
@@ -56,6 +58,7 @@ const ProgressRing = ({
className,
showValue = true,
thresholds = DEFAULT_THRESHOLDS,
+ ariaLabel,
}: ProgressRingProps) => {
const normalizedValue = useMemo(
() => Math.min(100, Math.max(0, value)),
@@ -80,6 +83,7 @@ const ProgressRing = ({
)
const center = size / 2
+ const rounded = Math.round(normalizedValue)
return (
<div
@@ -87,9 +91,13 @@ const ProgressRing = ({
'relative inline-flex items-center justify-center',
className,
)}
+ role='progressbar'
+ aria-valuemin={0}
+ aria-valuemax={100}
+ aria-valuenow={rounded}
+ aria-label={ariaLabel}
>
- <svg width={size} height={size} className='-rotate-90'>
- {/* Background circle */}
+ <svg width={size} height={size} className='-rotate-90' aria-hidden='true'>
<circle
cx={center}
cy={center}
@@ -98,7 +106,6 @@ const ProgressRing = ({
strokeWidth={strokeWidth}
className='stroke-gray-200 dark:stroke-slate-800'
/>
- {/* Progress circle */}
<circle
cx={center}
cy={center}
@@ -109,7 +116,7 @@ const ProgressRing = ({
strokeDasharray={circumference}
strokeDashoffset={strokeDashoffset}
className={cn(
- 'transition-all duration-300 ease-out',
+ 'transition-[stroke-dashoffset] duration-500 ease-out',
colourClasses.stroke,
)}
/>
@@ -117,12 +124,12 @@ const ProgressRing = ({
{showValue ? (
<span
className={cn(
- 'absolute text-center font-semibold',
+ 'absolute text-center font-semibold tabular-nums',
colourClasses.text,
)}
style={{ fontSize: size * 0.22 }}
>
- {Math.round(normalizedValue)}%
+ {rounded}%
</span>
) : null}
</div>
diff --git a/web/app/ui/RadioCardGroup.tsx b/web/app/ui/RadioCardGroup.tsx
new file mode 100644
index 000000000..d6cc31bad
--- /dev/null
+++ b/web/app/ui/RadioCardGroup.tsx
@@ -0,0 +1,152 @@
+import { Field, Label, Radio, RadioGroup } from '@headlessui/react'
+import _map from 'lodash/map'
+import { Fragment, type ReactNode } from 'react'
+
+import { cn } from '~/utils/generic'
+
+interface RadioCardOption<T extends string> {
+ value: T
+ label: ReactNode
+ description?: ReactNode
+}
+
+interface RadioCardGroupProps<T extends string> {
+ /** Field name. Used by `name` prop on the underlying `RadioGroup`. */
+ name?: string
+ label?: ReactNode
+ hint?: ReactNode
+ options: RadioCardOption<T>[]
+ value: T | null
+ onChange: (value: T) => void
+ error?: string | boolean | null
+ disabled?: boolean
+ className?: string
+ /** When true, options stack with shared borders. Otherwise each card stands alone. */
+ joined?: boolean
+}
+
+const RadioDot = ({ checked }: { checked: boolean }) => (
+ <span
+ aria-hidden='true'
+ className={cn(
+ 'relative grid size-4 shrink-0 place-items-center rounded-full ring-1 transition-colors duration-150 ease-out',
+ checked
+ ? 'bg-slate-900 ring-slate-900 dark:bg-slate-100 dark:ring-slate-100'
+ : 'ring-gray-300 group-hover:ring-gray-400 dark:ring-slate-700/80 dark:group-hover:ring-slate-600',
+ )}
+ >
+ <span
+ className={cn(
+ 'size-1.5 rounded-full bg-white transition-transform duration-150 ease-out dark:bg-slate-900',
+ checked ? 'scale-100' : 'scale-0',
+ )}
+ />
+ </span>
+)
+
+export function RadioCardGroup<T extends string>({
+ name,
+ label,
+ hint,
+ options,
+ value,
+ onChange,
+ error,
+ disabled,
+ className,
+ joined = true,
+}: RadioCardGroupProps<T>) {
+ const isError = !!error
+ const total = options.length
+
+ return (
+ <Field as='div' className={className} disabled={disabled}>
+ {label ? (
+ <Label className='mb-1 block text-sm font-medium text-gray-900 dark:text-gray-200'>
+ {label}
+ </Label>
+ ) : null}
+ <RadioGroup
+ name={name}
+ value={value ?? undefined}
+ onChange={onChange}
+ className={cn(
+ 'rounded-md',
+ joined ? '-space-y-px' : 'flex flex-col gap-2',
+ isError && 'ring-1 ring-red-500 dark:ring-red-500/80',
+ )}
+ >
+ {_map(options, (option, index) => {
+ const isFirst = index === 0
+ const isLast = index === total - 1
+
+ return (
+ <Radio key={option.value} value={option.value} as={Fragment}>
+ {({ checked, focus }) => (
+ <label
+ className={cn(
+ 'group relative flex cursor-pointer items-start gap-3 border p-4 transition-[background-color,box-shadow] duration-150 ease-out',
+ joined
+ ? cn(
+ isFirst && 'rounded-t-md',
+ isLast && 'rounded-b-md',
+ !isFirst && !isLast && 'rounded-none',
+ )
+ : 'rounded-md',
+ checked
+ ? 'z-10 border-slate-300 bg-slate-50 dark:border-slate-700 dark:bg-slate-900/60'
+ : 'border-gray-200 hover:border-gray-300 dark:border-slate-700/80 dark:hover:border-slate-700',
+ focus &&
+ 'z-10 ring-2 ring-slate-900 ring-offset-1 dark:ring-slate-300 dark:ring-offset-slate-950',
+ disabled && 'cursor-not-allowed opacity-60',
+ )}
+ >
+ <span className='mt-0.5'>
+ <RadioDot checked={checked} />
+ </span>
+ <span className='flex min-w-0 flex-col'>
+ <span
+ className={cn(
+ 'block text-sm font-medium',
+ checked
+ ? 'text-slate-900 dark:text-white'
+ : 'text-gray-700 dark:text-gray-200',
+ )}
+ >
+ {option.label}
+ </span>
+ {option.description ? (
+ <span
+ className={cn(
+ 'mt-0.5 block text-sm',
+ checked
+ ? 'text-slate-700 dark:text-slate-300'
+ : 'text-gray-500 dark:text-gray-400',
+ )}
+ >
+ {option.description}
+ </span>
+ ) : null}
+ </span>
+ </label>
+ )}
+ </Radio>
+ )
+ })}
+ </RadioGroup>
+ {isError && typeof error === 'string' ? (
+ <p
+ className='mt-1.5 text-sm text-red-600 dark:text-red-400'
+ role='alert'
+ >
+ {error}
+ </p>
+ ) : null}
+ {hint ? (
+ <p className='mt-1.5 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400'>
+ {hint}
+ </p>
+ ) : null}
+ </Field>
+ )
+}
diff --git a/web/app/ui/Select.tsx b/web/app/ui/Select.tsx
index 6d42a92c5..8d08c1a13 100644
--- a/web/app/ui/Select.tsx
+++ b/web/app/ui/Select.tsx
@@ -65,7 +65,6 @@ function Select<T>({
return item === selectedItem
}
- // When descriptions exist, options need extra padding so the description has room.
const hasDescriptions = !!descriptionExtractor
return (
@@ -75,7 +74,7 @@ function Select<T>({
{label ? (
<Label
className={cx(
- 'mb-1 block text-sm font-medium whitespace-pre-line text-gray-700 dark:text-gray-100',
+ 'mb-1 block text-sm font-medium whitespace-pre-line text-gray-900 dark:text-gray-200',
fieldLabelClassName,
)}
>
@@ -85,7 +84,7 @@ function Select<T>({
<div className={cx('relative', className)}>
<ListboxButton
className={cx(
- 'relative w-full rounded-md border-0 bg-white py-2 pr-10 pl-3 text-left font-medium ring-1 ring-gray-300 transition-colors ring-inset hover:bg-gray-50 focus:ring-2 focus:ring-slate-900 focus:outline-hidden sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:hover:bg-slate-900 dark:focus:ring-slate-300',
+ 'relative w-full rounded-md border-0 bg-white py-2 pr-9 pl-3 text-left text-sm font-medium text-gray-900 ring-1 ring-gray-300 transition-[background-color,box-shadow] duration-150 ease-out ring-inset hover:ring-gray-400 focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:outline-hidden dark:bg-slate-950 dark:text-gray-50 dark:ring-slate-700/80 dark:hover:ring-slate-600 dark:focus-visible:ring-slate-300',
buttonClassName,
)}
>
@@ -113,7 +112,7 @@ function Select<T>({
) : null}
<span className='pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2'>
<CaretUpDownIcon
- className='h-5 w-5 text-gray-400'
+ className='size-4 text-gray-400 dark:text-gray-500'
aria-hidden='true'
/>
</span>
@@ -122,17 +121,17 @@ function Select<T>({
<Transition
show={open}
as={Fragment}
- enter='transition ease-in duration-100'
- enterFrom='opacity-0'
- enterTo='opacity-100'
+ enter='transition ease-out duration-150'
+ enterFrom='opacity-0 -translate-y-0.5'
+ enterTo='opacity-100 translate-y-0'
leave='transition ease-in duration-100'
- leaveFrom='opacity-100'
- leaveTo='opacity-0'
+ leaveFrom='opacity-100 translate-y-0'
+ leaveTo='opacity-0 -translate-y-0.5'
>
<ListboxOptions
static
modal={false}
- className='absolute z-30 mt-1 max-h-72 w-full overflow-auto rounded-md bg-white py-1 text-base ring-1 ring-black/10 focus:outline-hidden sm:text-sm dark:bg-slate-950 dark:ring-slate-700/80'
+ className='absolute z-30 mt-1.5 max-h-72 w-full overflow-auto rounded-lg bg-white py-1 text-sm shadow-lg ring-1 ring-gray-200/80 focus:outline-hidden dark:bg-slate-950 dark:ring-slate-700/60'
>
{_map(items, (item, index) => {
const selected = isItemSelected(item)
@@ -146,12 +145,10 @@ function Select<T>({
}
className={({ focus }) =>
cx(
- 'relative mx-1 cursor-pointer rounded-md pr-4 pl-8 transition-colors select-none',
+ 'relative mx-1 cursor-pointer rounded-md pr-8 pl-3 transition-colors duration-100 ease-out select-none',
hasDescriptions ? 'py-2.5' : 'py-2',
{
- 'bg-gray-100 dark:bg-slate-900/80':
- focus && !selected,
- 'bg-gray-200 dark:bg-slate-900/80': selected,
+ 'bg-gray-100 dark:bg-slate-900': focus || selected,
'text-gray-700 dark:text-gray-50':
!focus && !selected,
'text-gray-900 dark:text-white': focus || selected,
@@ -161,9 +158,21 @@ function Select<T>({
value={item}
>
<>
+ {iconExtractor ? (
+ <span
+ className={cx(
+ 'absolute left-2 flex items-center',
+ hasDescriptions ? 'top-2.5' : 'inset-y-0',
+ )}
+ >
+ {iconExtractor(item, index)}
+ </span>
+ ) : null}
+
<span
className={cx(
'block wrap-break-word',
+ iconExtractor && 'pl-6',
{
'font-semibold': selected,
'font-normal': !selected,
@@ -181,31 +190,25 @@ function Select<T>({
<span
className={cx(
'mt-0.5 block text-xs leading-snug font-normal wrap-break-word text-gray-500 dark:text-gray-400',
+ iconExtractor && 'pl-6',
)}
>
{itemDescription}
</span>
) : null}
- {iconExtractor ? (
- <span
- className={cx(
- 'absolute left-0 flex items-center pl-1.5',
- hasDescriptions ? 'top-2.5' : 'inset-y-0',
- )}
- >
- {iconExtractor(item, index)}
- </span>
- ) : null}
-
- {selected && !iconExtractor ? (
+ {selected ? (
<span
className={cx(
- 'absolute left-0 flex items-center pl-1.5 text-gray-600 dark:text-gray-300',
+ 'absolute right-2 flex items-center text-slate-900 dark:text-slate-100',
hasDescriptions ? 'top-2.5' : 'inset-y-0',
)}
>
- <CheckIcon className='h-5 w-5' aria-hidden='true' />
+ <CheckIcon
+ weight='bold'
+ className='size-4'
+ aria-hidden='true'
+ />
</span>
) : null}
</>
@@ -218,7 +221,7 @@ function Select<T>({
{hint ? (
<p
className={cx(
- 'mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300',
+ 'mt-1.5 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400',
hintClassName,
)}
>
diff --git a/web/app/ui/StatusPage.tsx b/web/app/ui/StatusPage.tsx
index a3bb6be23..ba68725d5 100644
--- a/web/app/ui/StatusPage.tsx
+++ b/web/app/ui/StatusPage.tsx
@@ -38,30 +38,42 @@ interface StatusPageProps {
const iconMap: Record<StatusType, ReactNode> = {
success: (
<CheckCircleIcon
- className='size-8 text-green-500 dark:text-green-400'
+ className='size-6 text-emerald-600 dark:text-emerald-400'
+ weight='duotone'
aria-hidden='true'
/>
),
error: (
<XCircleIcon
- className='size-8 text-red-500 dark:text-red-400'
+ className='size-6 text-red-600 dark:text-red-400'
+ weight='duotone'
aria-hidden='true'
/>
),
info: (
<InfoIcon
- className='size-8 text-amber-500 dark:text-amber-400'
+ className='size-6 text-amber-600 dark:text-amber-400'
+ weight='duotone'
aria-hidden='true'
/>
),
}
const iconBgMap: Record<StatusType, string> = {
- success: 'bg-green-100 dark:bg-green-500/10',
- error: 'bg-red-100 dark:bg-red-500/10',
- info: 'bg-amber-100 dark:bg-amber-500/10',
+ success: 'bg-emerald-100/70 dark:bg-emerald-500/10',
+ error: 'bg-red-100/70 dark:bg-red-500/10',
+ info: 'bg-amber-100/70 dark:bg-amber-500/10',
}
+const baseActionClasses =
+ 'inline-flex items-center justify-center rounded-md px-4 py-2 text-sm font-medium transition-[background-color,color,transform] duration-150 ease-out active:scale-[0.985] focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-hidden'
+
+const primaryActionClasses =
+ 'bg-slate-900 text-white shadow-xs hover:bg-slate-700 focus-visible:ring-slate-900 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-950'
+
+const secondaryActionClasses =
+ 'bg-white text-gray-700 ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:ring-slate-900 dark:bg-slate-900 dark:text-gray-200 dark:ring-slate-700/80 dark:hover:bg-slate-800 dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-950'
+
const StatusPage = ({
loading,
type = 'success',
@@ -75,7 +87,11 @@ const StatusPage = ({
if (loading) {
return (
<div className='flex min-h-page items-center justify-center bg-gray-50 dark:bg-slate-950'>
- <div className='flex flex-col items-center'>
+ <div
+ className='flex flex-col items-center'
+ role='status'
+ aria-live='polite'
+ >
<Spin />
<span className='sr-only'>{t('common.loading')}</span>
</div>
@@ -90,7 +106,7 @@ const StatusPage = ({
<div className='mx-auto w-full max-w-md text-center'>
<div
className={cn(
- 'mx-auto mb-6 flex size-14 items-center justify-center rounded-xl',
+ 'mx-auto mb-5 flex size-12 items-center justify-center rounded-2xl',
iconBgMap[type],
)}
>
@@ -98,29 +114,39 @@ const StatusPage = ({
</div>
{title ? (
- <Text as='h1' size='xl' weight='semibold' className='tracking-tight'>
+ <Text
+ as='h1'
+ size='xl'
+ weight='semibold'
+ className='tracking-tight text-balance'
+ >
{title}
</Text>
) : null}
{description ? (
- <Text as='p' size='base' colour='secondary' className='mt-2'>
+ <Text
+ as='p'
+ size='base'
+ colour='secondary'
+ className='mt-2 text-pretty'
+ >
{description}
</Text>
) : null}
{actions && actions.length > 0 ? (
- <div className='mt-6 flex flex-wrap items-center justify-center gap-3'>
+ <div className='mt-6 flex flex-wrap items-center justify-center gap-2.5'>
{actions.map((action, index) =>
isActionLink(action) ? (
<Link
key={action.to}
to={action.to}
className={cn(
- 'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-hidden',
+ baseActionClasses,
action.primary
- ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-900 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'
- : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-slate-900 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900',
+ ? primaryActionClasses
+ : secondaryActionClasses,
)}
>
{action.label}
@@ -131,10 +157,10 @@ const StatusPage = ({
type='button'
onClick={action.onClick}
className={cn(
- 'inline-flex items-center rounded-md px-4 py-2 text-sm font-medium transition-colors focus:ring-2 focus:ring-offset-2 focus:outline-hidden',
+ baseActionClasses,
action.primary
- ? 'bg-slate-900 text-white hover:bg-slate-700 focus:ring-slate-900 dark:bg-slate-100 dark:text-slate-900 dark:hover:bg-white dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900'
- : 'bg-gray-100 text-gray-700 hover:bg-gray-200 focus:ring-slate-900 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800 dark:focus:ring-slate-300 dark:focus:ring-offset-slate-900',
+ ? primaryActionClasses
+ : secondaryActionClasses,
)}
>
{action.label}
diff --git a/web/app/ui/Switch.tsx b/web/app/ui/Switch.tsx
index 6fbf1689f..30e8a2a14 100644
--- a/web/app/ui/Switch.tsx
+++ b/web/app/ui/Switch.tsx
@@ -50,23 +50,21 @@ const SwitchTrack = ({
<span
aria-hidden='true'
className={cx(
- 'pointer-events-none inline-block size-3 transform rounded-full shadow-lg ring-0 transition duration-200 ease-in-out',
+ 'pointer-events-none inline-block size-3 transform rounded-full bg-white shadow-sm ring-0 transition-transform duration-200 ease-out',
{
'translate-x-3': checked,
'translate-x-0': !checked,
- 'bg-white dark:bg-slate-950': checked,
- 'bg-white': !checked,
},
)}
/>
)
const baseClassName =
- 'relative inline-flex h-4 w-7 shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out'
+ 'relative inline-flex h-4 w-7 shrink-0 items-center justify-start rounded-full border-2 border-transparent transition-colors duration-200 ease-out'
const stateClassName = cx({
'bg-slate-900 dark:bg-slate-200': checked,
- 'bg-gray-300 dark:bg-slate-600': !checked,
+ 'bg-gray-300 dark:bg-slate-700': !checked,
'cursor-not-allowed opacity-50': disabled,
})
@@ -88,7 +86,7 @@ const SwitchTrack = ({
onClick={onClick}
className={cx(
baseClassName,
- 'cursor-pointer focus:outline-none focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:ring-offset-2 dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-900',
+ 'cursor-pointer focus-visible:ring-2 focus-visible:ring-slate-900 focus-visible:ring-offset-2 focus-visible:outline-hidden dark:focus-visible:ring-slate-300 dark:focus-visible:ring-offset-slate-950',
stateClassName,
)}
>
@@ -112,7 +110,7 @@ const SwitchLabel = ({
size='sm'
colour='primary'
htmlFor={htmlFor}
- className={cx('ml-2', {
+ className={cx('ml-2 select-none', {
'cursor-pointer': !disabled,
'cursor-not-allowed opacity-50': disabled,
})}
@@ -127,7 +125,7 @@ const SwitchLabel = ({
as='span'
size='sm'
colour='primary'
- className={cx('ml-2', {
+ className={cx('ml-2 select-none', {
'opacity-50': disabled,
})}
>
diff --git a/web/app/ui/Text.tsx b/web/app/ui/Text.tsx
index dba9a74df..20820d42b 100644
--- a/web/app/ui/Text.tsx
+++ b/web/app/ui/Text.tsx
@@ -70,9 +70,9 @@ const weightClasses: Record<TextWeight, string> = {
const colourClasses: Record<TextColour, string> = {
primary: 'text-gray-900 dark:text-gray-50',
secondary: 'text-gray-700 dark:text-gray-200',
- muted: 'text-gray-600 dark:text-slate-300',
- success: 'text-green-600 dark:text-green-400',
- warning: 'text-yellow-600 dark:text-yellow-500',
+ muted: 'text-gray-500 dark:text-gray-400',
+ success: 'text-emerald-600 dark:text-emerald-400',
+ warning: 'text-amber-600 dark:text-amber-400',
error: 'text-red-600 dark:text-red-400',
inherit: '',
}
@@ -103,7 +103,7 @@ export const Text = ({
trackingClasses[tracking],
{ truncate },
code &&
- 'rounded bg-gray-200/80 px-1.5 py-0.5 font-mono dark:bg-slate-900',
+ 'rounded-md bg-gray-100 px-1.5 py-0.5 font-mono text-[0.92em] ring-1 ring-gray-200/70 ring-inset dark:bg-slate-900 dark:ring-slate-700/60',
className,
)}
{...props}
diff --git a/web/app/ui/Textarea.tsx b/web/app/ui/Textarea.tsx
index 1ab41dacd..3bd59fa11 100644
--- a/web/app/ui/Textarea.tsx
+++ b/web/app/ui/Textarea.tsx
@@ -44,7 +44,7 @@ const Textarea = memo(
return (
<Field as='div' className={classes?.container}>
{label ? (
- <Label className='flex text-sm font-medium text-gray-900 dark:text-gray-200'>
+ <Label className='mb-1 flex text-sm font-medium text-gray-900 dark:text-gray-200'>
{label}
</Label>
) : null}
@@ -53,12 +53,16 @@ const Textarea = memo(
rows={rows}
name={name}
className={cn(
- 'w-full rounded-md border-0 bg-white ring-1 ring-inset focus:ring-slate-900 sm:text-sm dark:bg-slate-950 dark:text-gray-50 dark:placeholder-gray-400 dark:focus:ring-slate-300',
+ 'block w-full resize-y rounded-md border-0 bg-white px-3 py-2 text-sm text-gray-900 ring-1 transition-shadow duration-150 ease-out ring-inset placeholder:text-gray-400 focus:ring-2 focus:ring-slate-900 focus:outline-hidden dark:bg-slate-950 dark:text-gray-50 dark:placeholder:text-gray-500 dark:focus:ring-slate-300',
{
- 'text-red-900 placeholder-red-300 ring-red-600': isError,
- 'ring-gray-300 dark:ring-slate-700/80': !isError,
- 'cursor-not-allowed bg-gray-100 text-gray-500 dark:bg-slate-700 dark:text-gray-400':
+ 'ring-red-500 placeholder:text-red-300 focus:ring-red-500 dark:ring-red-500/80 dark:focus:ring-red-400':
+ isError,
+ 'ring-gray-300 hover:ring-gray-400 dark:ring-slate-700/80 dark:hover:ring-slate-600':
+ !isError && !disabled && !readOnly,
+ 'cursor-not-allowed bg-gray-50 text-gray-500 ring-gray-200 dark:bg-slate-900 dark:text-gray-400 dark:ring-slate-800':
disabled,
+ 'cursor-default bg-gray-50 text-gray-700 ring-gray-200 dark:bg-slate-900/60 dark:text-gray-300 dark:ring-slate-800':
+ readOnly && !disabled,
},
classes?.textarea,
)}
@@ -68,15 +72,19 @@ const Textarea = memo(
disabled={disabled}
readOnly={readOnly}
invalid={isError}
+ aria-invalid={isError || undefined}
{...rest}
/>
{isError ? (
- <p className='mt-2 text-sm text-red-600 dark:text-red-500'>
+ <p
+ className='mt-1.5 text-sm text-red-600 dark:text-red-400'
+ role='alert'
+ >
{error}
</p>
) : null}
{hint ? (
- <Description className='mt-2 text-sm whitespace-pre-line text-gray-500 dark:text-gray-300'>
+ <Description className='mt-1.5 text-sm whitespace-pre-line text-gray-500 dark:text-gray-400'>
{hint}
</Description>
) : null}
diff --git a/web/app/ui/Tooltip.tsx b/web/app/ui/Tooltip.tsx
index 07adf26ac..025f6559f 100644
--- a/web/app/ui/Tooltip.tsx
+++ b/web/app/ui/Tooltip.tsx
@@ -11,23 +11,42 @@ const TooltipRoot = TooltipPrimitive.Root
const TooltipTrigger = TooltipPrimitive.Trigger
+interface TooltipContentExtraProps {
+ withArrow?: boolean
+}
+
const TooltipContent = forwardRef<
React.ElementRef<typeof TooltipPrimitive.Content>,
- React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className, sideOffset = 2, ...props }, ref) => (
- <TooltipPrimitive.Portal>
- <TooltipPrimitive.Content
- ref={ref}
- forceMount
- sideOffset={sideOffset}
- className={cn(
- 'tooltip-content z-50 max-w-80 overflow-hidden rounded-md bg-slate-800 px-3 py-1.5 text-xs text-white ring-1 ring-slate-900/80',
- className,
- )}
- {...props}
- />
- </TooltipPrimitive.Portal>
-))
+ React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> &
+ TooltipContentExtraProps
+>(
+ (
+ { className, sideOffset = 6, withArrow = true, children, ...props },
+ ref,
+ ) => (
+ <TooltipPrimitive.Portal>
+ <TooltipPrimitive.Content
+ ref={ref}
+ forceMount
+ sideOffset={sideOffset}
+ className={cn(
+ 'tooltip-content z-50 max-w-80 origin-(--radix-tooltip-content-transform-origin) overflow-hidden rounded-md bg-slate-900 px-2.5 py-1.5 text-xs leading-relaxed font-medium text-slate-50 shadow-lg ring-1 ring-white/10 dark:bg-slate-800 dark:ring-white/5',
+ className,
+ )}
+ {...props}
+ >
+ {children}
+ {withArrow ? (
+ <TooltipPrimitive.Arrow
+ className='fill-slate-900 dark:fill-slate-800'
+ width={10}
+ height={5}
+ />
+ ) : null}
+ </TooltipPrimitive.Content>
+ </TooltipPrimitive.Portal>
+ ),
+)
TooltipContent.displayName = TooltipPrimitive.Content.displayName
interface TooltipProps {