mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-21 23:43:35 +00:00
* feat: Let a theme reshape the sign-in field and button The sign-in floating-label field, the submit button and their shared corner read the new authFieldHeight, authButtonHeight and authControlRadius appearance roles, whose defaults reproduce the 44px field, 48px button and 16px corner. The corner follows radius2xl when a theme names only that. The ClickHouse theme draws them at Click UI's single field and button size with the button's square corner. * fix: Size the sign-in button by its height role alone A fixed height with vertical padding left a short theme height less room than the label. Specs now expect the role classes on the sign-in field. * fix: Keep the reset label and password controls inside a themed field height The reset request label rests in the middle of the field instead of 12px from its top, and the password field's reveal and copy buttons size from the sign-in field height, 4px off its edges and never under 24px. Both keep their stock positions and sizes. * fix: Hold the password field controls inside the padding it reserves The reveal and copy buttons stop growing at the stock 2.25rem, so a taller sign-in field keeps them clear of the typed value. * feat: Let a theme reshape the second-factor and reset-success actions The 2FA verify and reset-success continue buttons read authActionHeight and authActionRadius, which follow the sign-in button's height and corner when a theme names those and otherwise the Button height and radiusLg they drew, so the stock screens are unchanged and ClickHouse draws them at 32px with its 4px corner. * test: Reach the second-factor screen through a pending sign-in * fix: Rest the reset label inside a minimum-height field and keep the action corner on radiusLg The reset request label rests from an inset that centers it 2px low as before but never past the field's bottom edge, and the other sign-in actions resolve their corner before the sign-in corner is derived from radius2xl, so a theme that names only radius2xl keeps radiusLg on them.
440 lines
18 KiB
TypeScript
440 lines
18 KiB
TypeScript
import '@testing-library/jest-dom';
|
||
import { render, screen } from '@testing-library/react';
|
||
import { Button, buttonVariants } from './Button';
|
||
import OGDialogTemplate from './OGDialogTemplate';
|
||
import { OGDialog } from './OriginalDialog';
|
||
import { cn } from '~/utils';
|
||
|
||
jest.mock('react-i18next', () => ({
|
||
useTranslation: () => ({ t: (key: string) => key }),
|
||
}));
|
||
|
||
describe('Button', () => {
|
||
it('keeps a confirming destructive button solid in every theme', () => {
|
||
const destructive = cn(buttonVariants({ variant: 'destructive' }));
|
||
|
||
expect(destructive).toContain('bg-surface-destructive');
|
||
expect(destructive).toContain('text-text-on-status');
|
||
expect(destructive).not.toContain('theme-destructive-soft:');
|
||
});
|
||
|
||
it('paints an inline destructive button solid and tints it only when the theme asks', () => {
|
||
const destructive = cn(buttonVariants({ variant: 'destructive-soft' }));
|
||
|
||
expect(destructive).toContain('bg-surface-destructive');
|
||
expect(destructive).toContain('text-text-on-status');
|
||
expect(destructive).toContain('theme-destructive-soft:bg-surface-destructive/10');
|
||
expect(destructive).toContain('theme-destructive-soft:text-text-destructive');
|
||
// The ink stays at 4.5:1 over the light-theme tint only below a 20% hover and pressed share.
|
||
expect(destructive).toContain('theme-destructive-soft:hover:bg-surface-destructive/14');
|
||
expect(destructive).toContain('theme-destructive-soft:hover:active:bg-surface-destructive/17');
|
||
});
|
||
|
||
it('rests a quiet button in the secondary ink and raises it to the primary one on hover', () => {
|
||
const quiet = cn(buttonVariants({ variant: 'quiet' }));
|
||
const ghost = cn(buttonVariants({ variant: 'ghost' }));
|
||
|
||
expect(quiet).toContain('text-text-secondary');
|
||
expect(quiet).toContain('hover:text-text-primary');
|
||
expect(quiet).toContain('hover:bg-surface-hover');
|
||
expect(ghost).not.toContain('text-text-secondary');
|
||
});
|
||
|
||
it('marks the current nav destination with aria-pressed and the theme navigation roles', () => {
|
||
const nav = cn(buttonVariants({ variant: 'nav', size: 'icon' }));
|
||
expect(nav).toContain('text-text-secondary');
|
||
expect(nav).toContain('hover:bg-surface-nav-hover');
|
||
expect(nav).toContain('aria-pressed:bg-surface-nav-selected');
|
||
expect(nav).toContain('aria-pressed:text-text-primary');
|
||
expect(nav).toContain('size-theme-button');
|
||
});
|
||
|
||
it('presses the message action to the pressed fill like ghost and keeps the carousel arrows on the fixed surface', () => {
|
||
expect(cn(buttonVariants({ variant: 'message-action' }))).toContain(
|
||
'hover:active:bg-surface-pressed',
|
||
);
|
||
expect(cn(buttonVariants({ variant: 'carousel-nav' }))).not.toContain('bg-surface-pressed');
|
||
});
|
||
|
||
it('offers the message, link, carousel and toolbar roles as variants', () => {
|
||
expect(cn(buttonVariants({ variant: 'message-action' }))).toContain('text-text-secondary-alt');
|
||
expect(cn(buttonVariants({ variant: 'message-action' }))).toContain('p-1.5');
|
||
expect(cn(buttonVariants({ variant: 'inline-link' }))).toContain('hover:bg-transparent');
|
||
expect(cn(buttonVariants({ variant: 'inline-link' }))).toContain('focus-visible:ring-offset-0');
|
||
expect(cn(buttonVariants({ variant: 'carousel-nav' }))).toContain('bg-surface-fixed');
|
||
expect(cn(buttonVariants({ variant: 'carousel-nav' }))).toContain(
|
||
'hover:bg-surface-fixed-hover',
|
||
);
|
||
expect(cn(buttonVariants({ variant: 'toolbar' }))).toContain('text-xs');
|
||
expect(cn(buttonVariants({ variant: 'toolbar' }))).toContain('hover:bg-surface-hover');
|
||
});
|
||
|
||
it('lets the message, link, carousel and toolbar roles keep their own box at the default size', () => {
|
||
expect(cn(buttonVariants({ variant: 'message-action' }))).not.toContain('px-4');
|
||
expect(cn(buttonVariants({ variant: 'inline-link' }))).not.toContain('h-theme-button');
|
||
expect(cn(buttonVariants({ variant: 'carousel-nav' }))).toContain('p-2');
|
||
expect(cn(buttonVariants({ variant: 'carousel-nav' }))).not.toContain('px-4');
|
||
expect(cn(buttonVariants({ variant: 'toolbar' }))).toContain('py-1');
|
||
expect(cn(buttonVariants({ variant: 'toolbar' }))).not.toContain('py-2');
|
||
});
|
||
|
||
it('gives a floating control a surface only when its chrome outline is gone', () => {
|
||
const floating = cn(buttonVariants({ variant: 'floating', size: 'icon-theme' }));
|
||
|
||
expect(floating).toContain('border-border-chrome');
|
||
expect(floating).toContain('bg-surface-chat/90');
|
||
expect(floating).toContain('theme-chrome-quiet:bg-surface-chat');
|
||
expect(floating).toContain('theme-chrome-quiet:shadow-md');
|
||
expect(floating).toContain('theme-chrome-quiet:hover:active:bg-surface-pressed');
|
||
});
|
||
|
||
it('outlines a toggle in the control border', () => {
|
||
expect(cn(buttonVariants({ variant: 'outline-toggle' }))).toContain('border-border-control');
|
||
});
|
||
|
||
it('outlines an icon button in the chrome border and a text button in the light one', () => {
|
||
const icon = cn(buttonVariants({ variant: 'outline', size: 'icon-theme' }));
|
||
const text = cn(buttonVariants({ variant: 'outline', size: 'dense' }));
|
||
|
||
expect(icon).toContain('border-border-chrome');
|
||
expect(icon).not.toContain('border-border-light');
|
||
expect(text).toContain('border-border-light');
|
||
expect(text).not.toContain('border-border-chrome');
|
||
});
|
||
|
||
it('outlines a subtle icon button in the chrome border as well', () => {
|
||
expect(cn(buttonVariants({ variant: 'subtle', size: 'icon' }))).toContain(
|
||
'border-border-chrome',
|
||
);
|
||
expect(cn(buttonVariants({ variant: 'subtle', size: 'dense' }))).toContain(
|
||
'border-border-light',
|
||
);
|
||
});
|
||
|
||
it('owns dense action padding without changing the default-height recipe', () => {
|
||
render(
|
||
<Button variant="outline" size="dense">
|
||
Copy link
|
||
</Button>,
|
||
);
|
||
|
||
const button = screen.getByRole('button', { name: 'Copy link' });
|
||
expect(button).toHaveClass('h-theme-button', 'px-3', 'py-2');
|
||
expect(button).not.toHaveClass('px-4');
|
||
});
|
||
|
||
it('owns compact filter geometry, immediate motion and semantic pressed-state fills', () => {
|
||
const { rerender } = render(
|
||
<Button variant="outline-toggle" size="compact" aria-pressed={false}>
|
||
My agents
|
||
</Button>,
|
||
);
|
||
|
||
const button = screen.getByRole('button', { name: 'My agents' });
|
||
expect(button).toHaveClass(
|
||
'h-theme-button-compact',
|
||
'gap-1.5',
|
||
'px-2.5',
|
||
'text-xs',
|
||
'transition-none',
|
||
'aria-pressed:border-border-heavy',
|
||
'aria-pressed:bg-surface-active-alt',
|
||
'aria-pressed:hover:bg-surface-active-alt',
|
||
);
|
||
expect(button).not.toHaveClass('gap-2', 'px-4', 'text-sm', 'h-theme-button');
|
||
expect(button).toHaveAttribute('aria-pressed', 'false');
|
||
|
||
rerender(
|
||
<Button variant="outline-toggle" size="compact" aria-pressed>
|
||
My agents
|
||
</Button>,
|
||
);
|
||
expect(button).toHaveAttribute('aria-pressed', 'true');
|
||
});
|
||
|
||
it('exposes theme-owned shape and density recipes', () => {
|
||
render(
|
||
<Button size="theme" shape="theme">
|
||
Continue
|
||
</Button>,
|
||
);
|
||
|
||
expect(screen.getByRole('button', { name: 'Continue' })).toHaveClass(
|
||
'h-theme-control',
|
||
'rounded-theme-control',
|
||
'gap-theme-control-gap',
|
||
'px-theme-control-x',
|
||
);
|
||
});
|
||
|
||
it('draws its label, height, fills, focus and states from theme roles', () => {
|
||
render(<Button>Save</Button>);
|
||
|
||
expect(screen.getByRole('button', { name: 'Save' })).toHaveClass(
|
||
'font-theme-control',
|
||
'h-theme-button',
|
||
'bg-button-primary',
|
||
'hover:bg-button-primary-hover',
|
||
'hover:active:bg-surface-inverted-pressed',
|
||
'focus-visible:ring-focus-control',
|
||
'disabled:opacity-50',
|
||
'theme-disabled:bg-surface-disabled',
|
||
);
|
||
expect(cn(buttonVariants({ size: 'sm' }))).toContain('h-theme-button-sm');
|
||
expect(cn(buttonVariants({ variant: 'outline' }))).toContain('hover:active:bg-surface-pressed');
|
||
});
|
||
|
||
it('lets a caller replace the themed label weight and height', () => {
|
||
const classes = cn(buttonVariants({ size: 'sm' }), 'h-9 font-semibold');
|
||
|
||
expect(classes).not.toContain('h-theme-button-sm');
|
||
expect(classes).not.toContain('font-theme-control');
|
||
});
|
||
|
||
/** The base `gap-2` and the default size's `px-4` would otherwise survive beside the roles and
|
||
* leave the winner to stylesheet order, and a caller's own padding must still win. */
|
||
it('lets the control spacing roles replace the base gap and a caller replace them', () => {
|
||
const themed = cn(buttonVariants({ size: 'theme' }));
|
||
expect(themed).not.toMatch(/(^|\s)gap-2(\s|$)/);
|
||
expect(cn(themed, 'px-2')).not.toContain('px-theme-control-x');
|
||
expect(cn(themed, 'gap-1')).not.toContain('gap-theme-control-gap');
|
||
});
|
||
|
||
it('offers the composer action row geometry as a size and a shape', () => {
|
||
render(
|
||
<Button size="icon-theme" shape="round" aria-label="Scroll to bottom">
|
||
v
|
||
</Button>,
|
||
);
|
||
|
||
expect(screen.getByRole('button', { name: 'Scroll to bottom' })).toHaveClass(
|
||
'size-theme-control',
|
||
'p-0',
|
||
'rounded-theme-control-round',
|
||
);
|
||
});
|
||
|
||
it('renders the header-action toggle from semantic tokens', () => {
|
||
render(<Button variant="header-action">Toggle</Button>);
|
||
|
||
/** Opaque: the chat header is a gradient that fades to nothing with the
|
||
* conversation scrolling under it, so a transparent toggle shows message
|
||
* text through itself while every neighbour sits on `bg-presentation`. */
|
||
expect(screen.getByRole('button', { name: 'Toggle' })).toHaveClass(
|
||
'bg-presentation',
|
||
'border-border-chrome',
|
||
'rounded-xl',
|
||
'duration-0',
|
||
'hover:bg-surface-active-alt',
|
||
);
|
||
});
|
||
|
||
/** `size: 'sm'` carries `rounded-lg`, which is emitted after the variant and
|
||
* would otherwise win the merge, squaring off a text-bearing header control
|
||
* next to the icon-sized ones sharing its row. A caller that names a shape
|
||
* still outranks that repair, the way it does for `subtle`. */
|
||
it('keeps the header-action corner at every size', () => {
|
||
const { rerender } = render(
|
||
<Button variant="header-action" size="sm">
|
||
Back
|
||
</Button>,
|
||
);
|
||
|
||
const button = screen.getByRole('button', { name: 'Back' });
|
||
expect(button).toHaveClass('rounded-xl', 'h-theme-button-sm', 'bg-presentation');
|
||
expect(button).not.toHaveClass('rounded-lg');
|
||
|
||
rerender(
|
||
<Button variant="header-action" size="sm" shape="theme">
|
||
Back
|
||
</Button>,
|
||
);
|
||
|
||
expect(button).toHaveClass('rounded-theme-control', 'h-theme-button-sm');
|
||
expect(button).not.toHaveClass('rounded-xl');
|
||
});
|
||
|
||
it('preserves variant geometry until a shape is explicitly selected', () => {
|
||
const { rerender } = render(<Button variant="subtle">Subtle</Button>);
|
||
const button = screen.getByRole('button', { name: 'Subtle' });
|
||
|
||
expect(button).toHaveClass('rounded-xl');
|
||
expect(button).not.toHaveClass('rounded-lg');
|
||
|
||
rerender(
|
||
<Button variant="subtle" shape="theme">
|
||
Subtle
|
||
</Button>,
|
||
);
|
||
|
||
expect(button).toHaveClass('rounded-theme-control');
|
||
expect(button).not.toHaveClass('rounded-xl');
|
||
});
|
||
|
||
it('preserves subtle geometry through the exported variant helper', () => {
|
||
expect(buttonVariants({ variant: 'subtle' })).toContain('rounded-xl');
|
||
expect(buttonVariants({ variant: 'subtle', shape: null })).toContain('rounded-xl');
|
||
|
||
const themedSubtle = buttonVariants({ variant: 'subtle', shape: 'theme' });
|
||
expect(themedSubtle).toContain('rounded-theme-control');
|
||
expect(themedSubtle).not.toContain('rounded-xl');
|
||
});
|
||
|
||
it('provides compact row actions with a distinct hover surface', () => {
|
||
render(
|
||
<Button variant="row-action" size="icon-sm">
|
||
Open
|
||
</Button>,
|
||
);
|
||
|
||
const button = screen.getByRole('button', { name: 'Open' });
|
||
|
||
expect(button).toHaveClass(
|
||
'size-theme-icon-button-sm',
|
||
'p-0',
|
||
'rounded-md',
|
||
'hover:bg-surface-hover-alt',
|
||
);
|
||
expect(button).not.toHaveClass('rounded-lg');
|
||
});
|
||
|
||
/**
|
||
* Section actions sit close enough to their heading and to each other that
|
||
* the default offset ring crosses a neighbour, so this variant has to win
|
||
* both radius and ring.
|
||
*/
|
||
it('gives section actions an inset ring and a tighter radius', () => {
|
||
render(
|
||
<Button variant="section-action" size="icon-xs" aria-label="Filter">
|
||
<span />
|
||
</Button>,
|
||
);
|
||
const button = screen.getByRole('button', { name: 'Filter' });
|
||
|
||
expect(button).toHaveClass('size-theme-button-xs', 'rounded-md', 'focus-visible:ring-inset');
|
||
expect(button).not.toHaveClass('rounded-lg', 'focus-visible:ring-offset-2');
|
||
});
|
||
|
||
/**
|
||
* `buttonVariants` returns raw recipe output, so conflicting utilities from
|
||
* the base survive it. Call sites applying the recipe to a non-Button element
|
||
* have to merge it themselves, and this is what breaks if they forget.
|
||
*/
|
||
it('leaves overridden base utilities in the unmerged variant helper', () => {
|
||
const sectionAction = buttonVariants({ variant: 'section-action', size: 'icon-xs' });
|
||
|
||
expect(sectionAction).toContain('rounded-md');
|
||
expect(sectionAction).toContain('rounded-lg');
|
||
expect(cn(sectionAction)).not.toContain('rounded-lg');
|
||
});
|
||
|
||
/**
|
||
* Every other variant is given a size by its call sites, but a section
|
||
* heading is sized by its own text and all three headers ask for the recipe
|
||
* alone. The default size recipe is emitted after the variant, so without an
|
||
* opt out it wins the merge and puts a 40px control in a 32px header row.
|
||
*/
|
||
it('keeps section headers out of the default size recipe', () => {
|
||
const header = cn(buttonVariants({ variant: 'section-header' }));
|
||
|
||
expect(header).toContain('px-1');
|
||
expect(header).toContain('h-auto');
|
||
expect(header).not.toContain('h-theme-button');
|
||
expect(header).not.toContain('px-4');
|
||
/** A heading is not a control: nothing fills under the pointer. */
|
||
/** Only the disabled recipe's `theme-disabled:hover:` pin may name a hover fill. */
|
||
expect(header).not.toMatch(/(^|\s)hover:bg-/);
|
||
});
|
||
|
||
/** A tool call's fold header reads as its own label: holding the pointer
|
||
* down on it must not flash the ghost pressed fill. */
|
||
it('gives a disclosure header no hover or pressed fill and no default size', () => {
|
||
const header = cn(buttonVariants({ variant: 'disclosure' }));
|
||
|
||
expect(header).toContain('h-auto');
|
||
expect(header).toContain('p-0');
|
||
expect(header).toContain('rounded-none');
|
||
expect(header).not.toContain('h-theme-button');
|
||
expect(header).not.toMatch(/(^|\s)hover:bg-/);
|
||
expect(header).not.toMatch(/(^|\s)(hover:)?active:bg-/);
|
||
});
|
||
|
||
it('gives an option row an instant fill, a slow disabled fade and its own height', () => {
|
||
const row = cn(buttonVariants({ variant: 'option' }));
|
||
|
||
/** Only opacity eases while enabled, so the hover fill stays instant. */
|
||
expect(row).toContain('transition-opacity');
|
||
expect(row).toContain('enabled:duration-500');
|
||
expect(row).toContain('disabled:duration-500');
|
||
/** Reduced motion drops both fades, the disabled one included. */
|
||
expect(row).toContain('motion-reduce:transition-none');
|
||
expect(row).toContain('motion-reduce:disabled:transition-none');
|
||
expect(row).toContain('h-auto');
|
||
expect(row).not.toContain('h-theme-button');
|
||
expect(row).not.toMatch(/(^|\s)transition-colors(\s|$)/);
|
||
});
|
||
|
||
it('still takes a size when a caller asks for one', () => {
|
||
expect(cn(buttonVariants({ variant: 'section-header', size: 'sm' }))).toContain(
|
||
'h-theme-button-sm',
|
||
);
|
||
});
|
||
|
||
/** A templated dialog's legacy `selection` action sits beside the shared cancel Button, so it
|
||
* has to take the same height and primary fill roles or the two part under a theme. */
|
||
it('draws a templated dialog’s legacy confirm action from the Button roles', () => {
|
||
render(
|
||
<OGDialog open={true}>
|
||
<OGDialogTemplate
|
||
title="Delete"
|
||
selection={{ selectHandler: jest.fn(), selectText: 'Delete' }}
|
||
/>
|
||
</OGDialog>,
|
||
);
|
||
|
||
const cancel = screen.getByRole('button', { name: 'com_ui_cancel' });
|
||
const confirm = screen.getByRole('button', { name: 'Delete' });
|
||
expect(cancel).toHaveClass('h-theme-button');
|
||
expect(confirm).toHaveClass(
|
||
'h-theme-button',
|
||
'bg-button-primary',
|
||
'hover:bg-button-primary-hover',
|
||
);
|
||
expect(confirm).not.toHaveClass('h-10');
|
||
});
|
||
|
||
/** The spinner stood in text-primary on the primary fill, dark on dark; it now paints in the
|
||
* action's own foreground, whatever fill the caller gives it. */
|
||
it('draws a templated dialog’s legacy loading spinner in the action’s own ink', () => {
|
||
render(
|
||
<OGDialog open={true}>
|
||
<OGDialogTemplate
|
||
title="Delete"
|
||
selection={{ selectHandler: jest.fn(), selectText: 'Delete', isLoading: true }}
|
||
/>
|
||
</OGDialog>,
|
||
);
|
||
|
||
const spinner = document.querySelector('svg.spinner');
|
||
expect(spinner).not.toBeNull();
|
||
expect(spinner?.getAttribute('class')).not.toMatch(/\btext-/);
|
||
expect(spinner?.closest('button')).toHaveClass('text-text-inverted');
|
||
spinner
|
||
?.querySelectorAll('circle')
|
||
.forEach((circle) => expect(circle).toHaveAttribute('stroke', 'currentColor'));
|
||
});
|
||
|
||
it('offers the sign-in sizes, shape and link variants as roles rather than caller classes', () => {
|
||
expect(cn(buttonVariants({ shape: 'soft' }))).toContain('rounded-theme-auth-control');
|
||
expect(cn(buttonVariants({ shape: 'soft' }))).not.toContain('rounded-lg');
|
||
expect(cn(buttonVariants({ size: 'auth' }))).toContain('h-theme-auth-button');
|
||
expect(cn(buttonVariants({ size: 'auth-action' }))).toContain('h-theme-auth-action');
|
||
expect(cn(buttonVariants({ shape: 'auth-action' }))).toContain('rounded-theme-auth-action');
|
||
expect(cn(buttonVariants({ shape: 'auth-action' }))).not.toContain('rounded-lg');
|
||
expect(cn(buttonVariants({ size: 'snug' }))).toContain('p-1');
|
||
expect(cn(buttonVariants({ size: 'wide' }))).toContain('px-8');
|
||
expect(cn(buttonVariants({ size: 'bare' }))).toContain('p-0');
|
||
expect(cn(buttonVariants({ variant: 'link-accent' }))).toContain('text-accent-primary');
|
||
expect(cn(buttonVariants({ variant: 'hyperlink' }))).toContain('text-link');
|
||
});
|
||
});
|