Skip to content

The open alternative to Salesforce, designed for AI.

Clean up twenty-ui overrides on lists, icons, navigation and chat (#28062)

Raphaël Bosia57daf67eced
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
index ba37ae73d32..8d4171fc85a 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
@@ -99,24 +99,6 @@ const StyledMessageText = styled.div<{ isUser?: boolean }>`
isUser ? '0' : themeCssVariables.spacing[1]};
}
- ul,
- ol {
- line-height: 1.4em;
- margin: ${themeCssVariables.spacing[1]} 0;
- padding-left: ${themeCssVariables.spacing[4]};
- }
-
- ul {
- list-style-type: disc;
- }
-
- li {
- line-height: 1.4em;
- margin: ${themeCssVariables.spacing['0.5']} 0;
- padding-bottom: ${themeCssVariables.spacing['0.5']};
- padding-top: ${themeCssVariables.spacing['0.5']};
- }
-
blockquote {
border-left: 3px solid ${themeCssVariables.border.color.medium};
color: ${themeCssVariables.font.color.secondary};
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
index 25bfdfb6752..f1b5e138b5d 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatQuestionCard.tsx
@@ -115,6 +115,11 @@ const StyledOptionRow = styled.div<{ isHighlighted: boolean }>`
&:hover {
background: ${themeCssVariables.background.transparent.light};
}
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
const StyledOptionLeft = styled.div`
diff --git a/packages/twenty-front/src/modules/ai/components/LazyMarkdownRendererStyledComponents.tsx b/packages/twenty-front/src/modules/ai/components/LazyMarkdownRendererStyledComponents.tsx
index 31430b5ded6..fe4f8764d45 100644
--- a/packages/twenty-front/src/modules/ai/components/LazyMarkdownRendererStyledComponents.tsx
+++ b/packages/twenty-front/src/modules/ai/components/LazyMarkdownRendererStyledComponents.tsx
@@ -25,7 +25,7 @@ export const StyledMarkdownContainer = styled.div`
}
.markdown-link:hover {
- text-decoration: underline !important;
+ text-decoration: underline;
}
strong,
@@ -36,7 +36,7 @@ export const StyledMarkdownContainer = styled.div`
h1,
h2,
h3 {
- font-weight: ${themeCssVariables.font.weight.semiBold} !important;
+ font-weight: ${themeCssVariables.font.weight.semiBold};
}
h1 {
@@ -82,28 +82,27 @@ export const StyledMarkdownContainer = styled.div`
}
hr {
- background-color: ${themeCssVariables.border.color.light} !important;
+ background-color: ${themeCssVariables.border.color.light};
border: none;
height: 1px;
margin: ${themeCssVariables.spacing[4]} 0;
}
- ol:first-of-type:not(.nested),
- ul:first-of-type:not(.nested) {
- margin-top: ${themeCssVariables.spacing[1]} !important;
+ ol,
+ ul {
+ line-height: 1.4em;
+ margin: ${themeCssVariables.spacing[1]} 0;
+ padding-left: ${themeCssVariables.spacing[4]};
}
- ol:last-of-type:not(.nested),
- ul:last-of-type:not(.nested) {
- margin-bottom: ${themeCssVariables.spacing[1]} !important;
+ ul {
+ list-style-type: disc;
}
li {
- line-height: 150%;
- margin-bottom: ${themeCssVariables.spacing['0.5']} !important;
- margin-top: ${themeCssVariables.spacing['0.5']} !important;
- padding-bottom: ${themeCssVariables.spacing['0.5']} !important;
- padding-top: ${themeCssVariables.spacing['0.5']} !important;
+ line-height: 1.4em;
+ margin: ${themeCssVariables.spacing['0.5']} 0;
+ padding: ${themeCssVariables.spacing['0.5']} 0;
}
:not(pre) > code {
@@ -127,22 +126,18 @@ export const StyledMarkdownContainer = styled.div`
}
.markdown-code-outer-container {
- border-radius: ${themeCssVariables.border.radius.md} !important;
+ border-radius: ${themeCssVariables.border.radius.md};
overflow: hidden;
}
.markdown-block-code {
background-color: ${themeCssVariables.background.secondary};
border: 1px solid ${themeCssVariables.border.color.medium};
- border-radius: ${themeCssVariables.border.radius.md} !important;
+ border-radius: ${themeCssVariables.border.radius.md};
overflow-x: auto;
}
- .markdown-block-code * {
- animation: none !important;
- }
-
- img {
+ .markdown-image {
height: auto;
max-width: 100%;
}
diff --git a/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx b/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
index 30b8bcb652e..ef38ed4ea15 100644
--- a/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
+++ b/packages/twenty-front/src/modules/ai/components/MarkdownCodeBlock.tsx
@@ -17,7 +17,7 @@ const StyledContainer = styled.div`
const StyledCopyButtonContainer = styled.div`
align-items: center;
- border-radius: ${themeCssVariables.border.radius.sm};
+ border-radius: ${themeCssVariables.border.radius.md};
display: flex;
opacity: 0;
position: absolute;
@@ -26,7 +26,8 @@ const StyledCopyButtonContainer = styled.div`
transition: opacity calc(${themeCssVariables.animation.duration.fast} * 1s)
ease;
- ${StyledContainer}:hover & {
+ ${StyledContainer}:hover &,
+ ${StyledContainer}:focus-within & {
opacity: 1;
}
diff --git a/packages/twenty-front/src/modules/ai/components/MarkdownRenderer.tsx b/packages/twenty-front/src/modules/ai/components/MarkdownRenderer.tsx
index 024fbb92422..726a7733c3a 100644
--- a/packages/twenty-front/src/modules/ai/components/MarkdownRenderer.tsx
+++ b/packages/twenty-front/src/modules/ai/components/MarkdownRenderer.tsx
@@ -87,6 +87,15 @@ const MARKDOWN_COMPONENTS = {
pre: ({ children }: { children?: React.ReactNode }) => (
<MarkdownCodeBlock>{children}</MarkdownCodeBlock>
),
+ img: ({
+ src,
+ alt,
+ title,
+ }: {
+ src?: string;
+ alt?: string;
+ title?: string;
+ }) => <img className="markdown-image" src={src} alt={alt} title={title} />,
};
const MARKDOWN_COMPONENTS_WITHOUT_IMAGES = {
diff --git a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
index 3339904a889..f7dfb35c5e6 100644
--- a/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
+++ b/packages/twenty-front/src/modules/ai/components/TerminalOutput.tsx
@@ -2,7 +2,11 @@ import { MONOSPACE_FONT_FAMILY } from '@/ui/theme/constants/MonospaceFontFamily'
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
-import { LightIconButton } from 'twenty-ui/components/input';
+import {
+ LightIconButton,
+ SegmentedControl,
+ type SegmentedControlOption,
+} from 'twenty-ui/components/input';
import { IconCopy, IconTerminal } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
@@ -32,39 +36,12 @@ const StyledHeaderLeft = styled.div`
gap: ${themeCssVariables.spacing[1]};
`;
-const StyledTabContainer = styled.div`
+const StyledHeaderRight = styled.div`
+ align-items: center;
display: flex;
gap: ${themeCssVariables.spacing[1]};
`;
-const StyledTab = styled.button<{ isActive: boolean; hasError?: boolean }>`
- background: ${({ isActive }) =>
- isActive ? themeCssVariables.background.secondary : 'transparent'};
- border: none;
- border-radius: ${themeCssVariables.border.radius.xs};
- color: ${({ isActive, hasError }) =>
- hasError
- ? themeCssVariables.color.red
- : isActive
- ? themeCssVariables.font.color.primary
- : themeCssVariables.font.color.tertiary};
- cursor: pointer;
- font-size: ${themeCssVariables.font.size.xs};
- font-weight: ${({ isActive }) =>
- isActive
- ? themeCssVariables.font.weight.medium
- : themeCssVariables.font.weight.regular};
- padding: ${themeCssVariables.spacing['0.5']} ${themeCssVariables.spacing[1]};
-
- &:hover {
- background: ${themeCssVariables.background.secondary};
- color: ${({ hasError }) =>
- hasError
- ? themeCssVariables.color.red
- : themeCssVariables.font.color.primary};
- }
-`;
-
const StyledOutputArea = styled.div<{ isError?: boolean }>`
background: ${themeCssVariables.background.tertiary};
color: ${({ isError }) =>
@@ -132,6 +109,11 @@ export const TerminalOutput = ({
const currentOutput = activeTab === 'stdout' ? stdout : stderr;
+ const outputStreamOptions: SegmentedControlOption<TabType>[] = [
+ { value: 'stdout', label: 'stdout' },
+ ...(hasStderr ? [{ value: 'stderr' as const, label: 'stderr' }] : []),
+ ];
+
return (
<StyledContainer>
<StyledHeader>
@@ -139,22 +121,14 @@ export const TerminalOutput = ({
<IconTerminal size={14} />
{t`Output`}
</StyledHeaderLeft>
- <StyledTabContainer>
- <StyledTab
- isActive={activeTab === 'stdout'}
- onClick={() => setUserSelectedTab('stdout')}
- >
- stdout
- </StyledTab>
- {hasStderr && (
- <StyledTab
- isActive={activeTab === 'stderr'}
- hasError
- onClick={() => setUserSelectedTab('stderr')}
- >
- stderr
- </StyledTab>
- )}
+ <StyledHeaderRight>
+ <SegmentedControl
+ aria-label={t`Output stream`}
+ itemWidth="content"
+ options={outputStreamOptions}
+ value={activeTab}
+ onValueChange={setUserSelectedTab}
+ />
<LightIconButton
onClick={() => copyToClipboard(currentOutput)}
title={t`Copy output`}
@@ -164,7 +138,7 @@ export const TerminalOutput = ({
>
<IconCopy />
</LightIconButton>
- </StyledTabContainer>
+ </StyledHeaderRight>
</StyledHeader>
<StyledOutputArea isError={activeTab === 'stderr'}>
{currentOutput ? (
diff --git a/packages/twenty-front/src/modules/ai/components/ThinkingToolStepRow.tsx b/packages/twenty-front/src/modules/ai/components/ThinkingToolStepRow.tsx
index 392d8911efe..91be4262ed3 100644
--- a/packages/twenty-front/src/modules/ai/components/ThinkingToolStepRow.tsx
+++ b/packages/twenty-front/src/modules/ai/components/ThinkingToolStepRow.tsx
@@ -134,17 +134,7 @@ const StyledToolJsonContent = styled.div`
`;
const StyledJsonTreeContainer = styled.div`
- font-size: ${themeCssVariables.font.size.md};
overflow-x: auto;
-
- li,
- span {
- line-height: 1;
- }
-
- ul {
- min-width: 0;
- }
`;
const StyledToolErrorText = styled.p`
diff --git a/packages/twenty-front/src/modules/ai/components/__stories__/TerminalOutput.stories.tsx b/packages/twenty-front/src/modules/ai/components/__stories__/TerminalOutput.stories.tsx
index 72cbd41050e..5f3fd1fc792 100644
--- a/packages/twenty-front/src/modules/ai/components/__stories__/TerminalOutput.stories.tsx
+++ b/packages/twenty-front/src/modules/ai/components/__stories__/TerminalOutput.stories.tsx
@@ -1,5 +1,5 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { expect, userEvent, within } from 'storybook/test';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
import { ComponentDecorator } from 'twenty-ui/testing';
import { TerminalOutput } from '@/ai/components/TerminalOutput';
@@ -52,10 +52,24 @@ export const WithStderr: Story = {
expect(await canvas.findByText(/Starting process/)).toBeVisible();
- const stderrTab = await canvas.findByText('stderr');
- await userEvent.click(stderrTab);
+ const outputStreams = within(
+ canvas.getByRole('radiogroup', { name: 'Output stream' }),
+ );
+ const stdoutStream = outputStreams.getByRole('radio', { name: 'stdout' });
+ const stderrStream = outputStreams.getByRole('radio', { name: 'stderr' });
+ expect(stdoutStream).toBeChecked();
+
+ await userEvent.click(stderrStream);
+
+ expect(stderrStream).toBeChecked();
expect(await canvas.findByText(/Connection timeout/)).toBeVisible();
+
+ await userEvent.keyboard('{ArrowLeft}');
+
+ await waitFor(() => expect(stdoutStream).toBeChecked());
+ expect(stdoutStream).toHaveFocus();
+ expect(await canvas.findByText(/Starting process/)).toBeVisible();
},
};
@@ -70,6 +84,7 @@ export const StderrOnlyAutoSwitch: Story = {
const canvas = within(canvasElement);
// When only stderr exists and no stdout, should auto-switch to stderr
expect(await canvas.findByText(/FileNotFoundError/)).toBeVisible();
+ expect(canvas.getByRole('radio', { name: 'stderr' })).toBeChecked();
},
};
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
index 041b7b760db..509de3abb1c 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AgentChatFilePreview.tsx
@@ -122,7 +122,6 @@ export const AgentChatFilePreview = ({
render={<span />}
text={content}
tooltipContent={displayName}
- style={{ minWidth: 0 }}
/>
</StyledPreviewButton>
}
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatQuestionOtherOption.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatQuestionOtherOption.tsx
index 86c73480823..1a592572a71 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatQuestionOtherOption.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatQuestionOtherOption.tsx
@@ -28,9 +28,15 @@ const StyledContainer = styled.div<{ isHighlighted: boolean }>`
const StyledLabelRow = styled.div`
align-items: center;
+ border-radius: ${themeCssVariables.border.radius.sm};
display: flex;
gap: ${themeCssVariables.spacing[2]};
height: 32px;
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
const StyledLabel = styled.span`
diff --git a/packages/twenty-front/src/modules/front-components/media-session/components/FrontComponentMediaSessionIndicator.tsx b/packages/twenty-front/src/modules/front-components/media-session/components/FrontComponentMediaSessionIndicator.tsx
index 729d3a12aa1..e7b9db29797 100644
--- a/packages/twenty-front/src/modules/front-components/media-session/components/FrontComponentMediaSessionIndicator.tsx
+++ b/packages/twenty-front/src/modules/front-components/media-session/components/FrontComponentMediaSessionIndicator.tsx
@@ -42,9 +42,7 @@ const StyledDot = styled.span<{ isCapturing: boolean }>`
width: ${themeCssVariables.spacing[2]};
`;
-const StyledContent = styled.div`
- display: flex;
- flex-direction: column;
+const StyledPopup = styled(Popover.Popup)`
gap: ${themeCssVariables.spacing[3]};
max-width: 300px;
min-width: 220px;
@@ -86,21 +84,19 @@ export const FrontComponentMediaSessionIndicator = () => {
</Popover.Trigger>
<Popover.Portal>
<Popover.Positioner side="bottom" align="start">
- <Popover.Popup initialFocus={false}>
- <StyledContent>
- <Popover.Title>{title}</Popover.Title>
- <StyledApplications role="list" aria-label={title}>
- {Object.entries(sessionsByApplication).map(
- ([applicationId, sessions]) => (
- <FrontComponentMediaSessionTooltipRow
- key={applicationId}
- sessions={sessions}
- />
- ),
- )}
- </StyledApplications>
- </StyledContent>
- </Popover.Popup>
+ <StyledPopup initialFocus={false}>
+ <Popover.Title>{title}</Popover.Title>
+ <StyledApplications role="list" aria-label={title}>
+ {Object.entries(sessionsByApplication).map(
+ ([applicationId, sessions]) => (
+ <FrontComponentMediaSessionTooltipRow
+ key={applicationId}
+ sessions={sessions}
+ />
+ ),
+ )}
+ </StyledApplications>
+ </StyledPopup>
</Popover.Positioner>
</Popover.Portal>
</Popover.Root>
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
index 8ed91f8c912..4d8ec2a0514 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/folder/components/NavigationMenuItemFolderChevronButton.tsx
@@ -5,22 +5,16 @@ import { LightIconButton } from 'twenty-ui/components/input';
import { IconChevronRight } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
-// Rotating a wrapper around the button keeps the icon component identity
-// stable: passing an inline component to LightIconButton's Icon prop remounts
-// the svg on every render, so the transition never runs.
-const StyledButtonContainer = styled.span<{ isOpen: boolean }>`
- display: inline-flex;
+const StyledChevronIcon = styled(IconChevronRight)`
+ transition: transform
+ calc(${themeCssVariables.animation.duration.normal} * 1s) ease;
- svg {
- transform: rotate(${({ isOpen }) => (isOpen ? 90 : 0)}deg);
- transition: transform
- calc(${themeCssVariables.animation.duration.normal} * 1s) ease;
+ &[data-open] {
+ transform: rotate(90deg);
}
@media (prefers-reduced-motion: reduce) {
- svg {
- transition: none;
- }
+ transition: none;
}
`;
@@ -36,16 +30,14 @@ export const NavigationMenuItemFolderChevronButton = ({
const { t } = useLingui();
return (
- <StyledButtonContainer isOpen={isOpen}>
- <LightIconButton
- size="sm"
- emphasis="subtle"
- aria-label={isOpen ? t`Collapse folder` : t`Expand folder`}
- onClick={onClick}
- aria-expanded={isOpen}
- >
- <IconChevronRight />
- </LightIconButton>
- </StyledButtonContainer>
+ <LightIconButton
+ size="sm"
+ emphasis="subtle"
+ aria-label={isOpen ? t`Collapse folder` : t`Expand folder`}
+ onClick={onClick}
+ aria-expanded={isOpen}
+ >
+ <StyledChevronIcon data-open={isOpen || undefined} />
+ </LightIconButton>
);
};
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx
index 633a15c3fc8..0b86c3f80ad 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx
@@ -28,22 +28,28 @@ const StyledEditor = styled.div`
const StyledIconPickerTrigger = styled.div`
align-items: center;
+ border-radius: ${themeCssVariables.border.radius.sm};
cursor: pointer;
display: flex;
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: 1px;
+ }
`;
const StyledButton = styled.button`
align-items: center;
- background: transparent;
- border: 0;
- color: inherit;
- cursor: pointer;
+ border-radius: ${themeCssVariables.border.radius.sm};
display: flex;
- font: inherit;
font-weight: ${themeCssVariables.font.weight.medium};
min-width: 0;
- padding: 0;
text-align: left;
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: 1px;
+ }
`;
const StyledLabelButton = styled(StyledButton)`
display: block;
@@ -51,6 +57,10 @@ const StyledLabelButton = styled(StyledButton)`
text-overflow: ellipsis;
white-space: nowrap;
width: 100%;
+
+ &:focus-visible {
+ outline-offset: -2px;
+ }
`;
const StyledNameInput = styled(TextInput)`
font-weight: ${themeCssVariables.font.weight.medium};
@@ -147,6 +157,7 @@ export const NavigationMenuItemInlineEditor = ({
isFolder && isNameInputVisible ? (
<StyledNameInput
instanceId={focusId}
+ aria-label={t`Folder name`}
autoFocus
selectOnFocus
copyButton={false}
@@ -170,6 +181,10 @@ export const NavigationMenuItemInlineEditor = ({
) : (
<StyledLabelButton
type="button"
+ aria-pressed={isFolder ? isSelected : undefined}
+ aria-description={
+ isFolder && isSelected ? t`Select again to rename` : undefined
+ }
onClick={(event) => {
event.stopPropagation();
if (!isFolder) {
diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
index e30ed5cd200..86815d77e5f 100644
--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx
@@ -91,6 +91,11 @@ const StyledMode = styled.button<{ isActive: boolean; isExpanded: boolean }>`
: themeCssVariables.background.transparent.lighter};
color: ${themeCssVariables.font.color.primary};
}
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: 1px;
+ }
`;
const StyledModeIcon = styled.span`
@@ -179,7 +184,7 @@ export const MainNavigationDrawerModeSwitcher = () => {
isActive={isActive}
isExpanded={isExpanded}
aria-label={isUnread ? t`${label}, unread` : label}
- aria-current={isActive}
+ aria-current={isActive || undefined}
aria-disabled={isDisabled}
onClick={() => {
if (isDisabled) {
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index 57a5aafeb21..b7558c09a5f 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -65,27 +65,18 @@ const StyledNavigationBar = styled.nav`
`;
const navigationButtonClassName = css`
- --tw-button-size: ${themeCssVariables.spacing[10]};
- --tw-icon-button-icon-size: ${themeCssVariables.icon.size.lg};
-
- border: none;
+ block-size: ${themeCssVariables.spacing[10]};
color: ${themeCssVariables.grayScale.gray10};
- transition: background-color
- calc(${themeCssVariables.animation.duration.fast} * 1s) ease;
+ inline-size: ${themeCssVariables.spacing[10]};
- &[aria-pressed='true'] {
+ &[aria-current='page'] {
background: ${themeCssVariables.background.transparent.medium};
}
+`;
- @media (hover: hover) {
- &:hover {
- background: ${themeCssVariables.background.transparent.light};
- }
- }
-
- @media (prefers-reduced-motion: reduce) {
- transition: none;
- }
+const navigationIconClassName = css`
+ block-size: calc(${themeCssVariables.icon.size.lg} * 1px);
+ inline-size: calc(${themeCssVariables.icon.size.lg} * 1px);
`;
export const MobileNavigationBar = () => {
@@ -118,11 +109,11 @@ export const MobileNavigationBar = () => {
variant="ghost"
shape="round"
aria-label={label}
- aria-pressed={activeItemName === name}
+ aria-current={activeItemName === name ? 'page' : undefined}
onClick={onClick}
tabIndex={isHidden ? -1 : 0}
>
- <Icon aria-hidden />
+ <Icon className={navigationIconClassName} aria-hidden />
</IconButton>
))}
</StyledNavigationBar>
diff --git a/packages/twenty-front/src/modules/navigation/components/__stories__/MobileNavigationBar.stories.tsx b/packages/twenty-front/src/modules/navigation/components/__stories__/MobileNavigationBar.stories.tsx
index 9970817acb0..1fb6b6387c4 100644
--- a/packages/twenty-front/src/modules/navigation/components/__stories__/MobileNavigationBar.stories.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/__stories__/MobileNavigationBar.stories.tsx
@@ -57,13 +57,20 @@ export const Default: Story = {
const canvas = within(canvasElement);
await expect(await canvas.findByRole('navigation')).toBeVisible();
- await expect(canvas.getByRole('button', { name: 'Home' })).toHaveAttribute(
- 'aria-pressed',
- 'true',
- );
- await expect(
- canvas.getByRole('button', { name: 'Search' }),
- ).toHaveAttribute('aria-pressed', 'false');
+
+ const home = canvas.getByRole('button', { name: 'Home' });
+ const search = canvas.getByRole('button', { name: 'Search' });
+
+ await expect(home).toHaveAttribute('aria-current', 'page');
+ await expect(home).not.toHaveAttribute('aria-pressed');
+ await expect(search).not.toHaveAttribute('aria-current');
+
+ await userEvent.tab();
+ await expect(home).toHaveFocus();
+ await expect(getComputedStyle(home).outlineStyle).toBe('solid');
+ await userEvent.tab();
+ await expect(search).toHaveFocus();
+ await expect(home).toHaveAttribute('aria-current', 'page');
},
};
@@ -92,7 +99,7 @@ export const HideAndReveal: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);
const home = await canvas.findByRole('button', { name: 'Home' });
- await expect(home).toHaveAttribute('aria-pressed', 'true');
+ await expect(home).toHaveAttribute('aria-current', 'page');
home.focus();
await expect(home).toHaveFocus();
diff --git a/packages/twenty-front/src/modules/navigation/components/__tests__/MobileNavigationBar.test.tsx b/packages/twenty-front/src/modules/navigation/components/__tests__/MobileNavigationBar.test.tsx
index 0b399b9b681..f65b13300da 100644
--- a/packages/twenty-front/src/modules/navigation/components/__tests__/MobileNavigationBar.test.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/__tests__/MobileNavigationBar.test.tsx
@@ -52,12 +52,13 @@ describe('MobileNavigationBar', () => {
'aria-hidden',
'true',
);
- expect(
- screen.getByRole('button', { name: 'Home', pressed: true }),
- ).toBeVisible();
- expect(
- screen.getByRole('button', { name: 'Search', pressed: false }),
- ).toBeVisible();
+ expect(screen.getByRole('button', { name: 'Home' })).toHaveAttribute(
+ 'aria-current',
+ 'page',
+ );
+ expect(screen.getByRole('button', { name: 'Search' })).not.toHaveAttribute(
+ 'aria-current',
+ );
});
it('activates an item by pointer, Enter, and Space', async () => {
diff --git a/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx
index 1a8458a9a9a..403119a4784 100644
--- a/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx
+++ b/packages/twenty-front/src/modules/object-core/components/CoreObjectTableAddNewRow.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { IconPlus } from 'twenty-ui/icon';
-import { themeCssVariables } from 'twenty-ui/theme';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
import { CORE_OBJECT_TABLE_CHECKBOX_COLUMN_GRID_TRACK } from '@/object-core/constants/CoreObjectTableCheckboxColumnGridTrack';
@@ -30,6 +30,11 @@ const StyledAddNewRow = styled.button<{ hasCheckboxColumn: boolean }>`
background-color: ${themeCssVariables.background.transparent.light};
color: ${themeCssVariables.font.color.secondary};
}
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
type CoreObjectTableAddNewRowProps = {
@@ -44,14 +49,18 @@ export const CoreObjectTableAddNewRow = ({
onClick,
disabled = false,
hasCheckboxColumn = false,
-}: CoreObjectTableAddNewRowProps) => (
- <StyledAddNewRow
- type="button"
- onClick={onClick}
- disabled={disabled}
- hasCheckboxColumn={hasCheckboxColumn}
- >
- <IconPlus size={14} />
- {label}
- </StyledAddNewRow>
-);
+}: CoreObjectTableAddNewRowProps) => {
+ const theme = useTheme();
+
+ return (
+ <StyledAddNewRow
+ type="button"
+ onClick={onClick}
+ disabled={disabled}
+ hasCheckboxColumn={hasCheckboxColumn}
+ >
+ <IconPlus size={theme.icon.size.sm} />
+ {label}
+ </StyledAddNewRow>
+ );
+};
diff --git a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardBodyContainer.tsx b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardBodyContainer.tsx
index 33c539a2fd8..fd16e95cb28 100644
--- a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardBodyContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardBodyContainer.tsx
@@ -1,6 +1,8 @@
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme';
+import { FIELD_DISPLAY_LEADING_ICON_CLASS_NAME } from '@/ui/field/display/constants/FieldDisplayLeadingIconClassName';
+
const StyledCardBodyContainer = styled.div<{ padding?: string }>`
display: flex;
flex-direction: column;
@@ -8,14 +10,9 @@ const StyledCardBodyContainer = styled.div<{ padding?: string }>`
padding: ${({ padding }) =>
padding ??
`0 ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[2]} 10px`};
- span:not(button *) {
- align-items: center;
- display: flex;
- flex-direction: row;
- svg:not(button svg) {
- color: ${themeCssVariables.font.color.tertiary};
- margin-right: ${themeCssVariables.spacing[2]};
- }
+
+ .${FIELD_DISPLAY_LEADING_ICON_CLASS_NAME} {
+ margin-right: ${themeCssVariables.spacing[2]};
}
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardHeaderContainer.tsx b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardHeaderContainer.tsx
index 231668557e0..963221e332c 100644
--- a/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardHeaderContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-card/components/RecordCardHeaderContainer.tsx
@@ -15,10 +15,6 @@ export const StyledBoardCardHeaderContainer = styled.div<{
padding ??
`${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[2]} ${isCompact ? themeCssVariables.spacing[2] : themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]}`};
transition: padding ease-in-out 160ms;
-
- img {
- object-fit: cover;
- }
`;
export { StyledBoardCardHeaderContainer as RecordCardHeaderContainer };
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer.tsx
index be68c66c313..070cc9890d9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/components/RecordDetailRecordsListItemContainer.tsx
@@ -5,7 +5,6 @@ import { PageLayoutType } from '~/generated-metadata/graphql';
const StyledListItem = styled.div<{
noHorizontalPadding?: boolean;
- isDropdownOpen?: boolean;
}>`
align-items: center;
display: flex;
@@ -18,30 +17,34 @@ const StyledListItem = styled.div<{
noHorizontalPadding ? 0 : themeCssVariables.spacing[2]};
.displayOnHover {
- opacity: ${({ isDropdownOpen }) => (isDropdownOpen ? 1 : 0)};
- pointer-events: ${({ isDropdownOpen }) =>
- isDropdownOpen ? 'auto' : 'none'};
+ opacity: 0;
+ pointer-events: none;
transition: opacity
calc(${themeCssVariables.animation.duration.instant} * 1s) ease;
}
&:hover .displayOnHover,
- &:focus-within .displayOnHover {
+ &:focus-within .displayOnHover,
+ &:has([data-popup-open]) .displayOnHover {
opacity: 1;
pointer-events: auto;
}
+
+ @media (prefers-reduced-motion: reduce) {
+ .displayOnHover {
+ transition: none;
+ }
+ }
`;
type RecordDetailRecordsListItemContainerProps = {
children: React.ReactNode;
className?: string;
- isDropdownOpen?: boolean;
};
export const RecordDetailRecordsListItemContainer = ({
children,
className,
- isDropdownOpen,
}: RecordDetailRecordsListItemContainerProps) => {
const layoutRenderingContext = useLayoutRenderingContext();
@@ -52,7 +55,6 @@ export const RecordDetailRecordsListItemContainer = ({
<StyledListItem
className={className}
noHorizontalPadding={isInRecordPageLayout}
- isDropdownOpen={isDropdownOpen}
>
{children}
</StyledListItem>
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
index fa1952b9ea5..df7dff3e16f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationRecordsListItem.tsx
@@ -19,8 +19,6 @@ import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -55,6 +53,10 @@ const StyledClickableZone = styled.div`
justify-content: flex-end;
`;
+const StyledHoverRevealedAction = styled.div`
+ display: flex;
+`;
+
const MotionIconChevronDown = motion.create(IconChevronDown);
const getDeleteRelationModalId = (recordId: string) =>
@@ -125,11 +127,6 @@ export const RecordDetailRelationRecordsListItem = ({
const dropdownInstanceId = `record-field-card-menu:${scopeInstanceId}:${relationFieldMetadataId}:${relationRecord.id}`;
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownInstanceId,
- );
-
const dropdownId = getRecordFieldCardRelationPickerDropdownId({
fieldDefinition,
recordId,
@@ -208,36 +205,32 @@ export const RecordDetailRelationRecordsListItem = ({
return (
<>
- <RecordDetailRecordsListItemContainer
- isDropdownOpen={isDropdownOpen}
- data-testid="record-detail-records-list-item"
- >
+ <RecordDetailRecordsListItemContainer data-testid="record-detail-records-list-item">
<RecordChip
record={relationRecord}
objectNameSingular={relationObjectMetadataItem.nameSingular}
/>
<StyledClickableZone onClick={handleClick} data-testid="expand-button">
- <LightIconButton
- className="displayOnHover"
- emphasis="subtle"
- aria-label={t`Expand relation`}
- >
- <AnimatedIconChevronDown />
- </LightIconButton>
+ <StyledHoverRevealedAction className="displayOnHover">
+ <LightIconButton emphasis="subtle" aria-label={t`Expand relation`}>
+ <AnimatedIconChevronDown />
+ </LightIconButton>
+ </StyledHoverRevealedAction>
</StyledClickableZone>
{!parentIsRecordFieldReadOnly && (
<DropdownRoot dropdownId={dropdownInstanceId} type="menu">
- <Dropdown.Trigger
- render={
- <LightIconButton
- className="displayOnHover"
- emphasis="subtle"
- aria-label={t`More options`}
- >
- <IconDotsVertical />
- </LightIconButton>
- }
- />
+ <StyledHoverRevealedAction className="displayOnHover">
+ <Dropdown.Trigger
+ render={
+ <LightIconButton
+ emphasis="subtle"
+ aria-label={t`More options`}
+ >
+ <IconDotsVertical />
+ </LightIconButton>
+ }
+ />
+ </StyledHoverRevealedAction>
<DropdownContent
side="right"
align="start"
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
index 4a145a30b91..6c5279fd61e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormArrayFieldInput.tsx
@@ -14,11 +14,9 @@ import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent
import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { isStandaloneVariableString } from 'twenty-shared/workflow';
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
@@ -66,7 +64,7 @@ const StyledDisplayModeContainer = styled.div`
width: 100%;
&:hover,
- &[data-open='true'] {
+ &[data-popup-open] {
background-color: ${themeCssVariables.background.transparent.lighter};
}
`;
@@ -130,10 +128,6 @@ export const FormArrayFieldInput = ({
const isAddingNewItem = itemToEditIndex === -1;
const dropdownId = `dropdown-${instanceId}`;
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownId,
- );
const accessibleLabel = isNonEmptyString(label) ? label : t`Items`;
@@ -388,9 +382,7 @@ export const FormArrayFieldInput = ({
) : (
<DropdownRoot dropdownId={dropdownId} type="panel">
<Dropdown.Trigger
- render={
- <StyledDisplayModeContainer data-open={isDropdownOpen} />
- }
+ render={<StyledDisplayModeContainer />}
nativeButton={false}
aria-label={accessibleLabel}
>
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
index 869bea31bcc..12207db5a25 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput.tsx
@@ -76,11 +76,6 @@ const StyledCustomPhoneInputWrapper = styled.div`
outline: none;
}
}
-
- & svg {
- border-radius: ${themeCssVariables.border.radius.xs};
- height: 12px;
- }
`;
export const PhonesFieldInput = () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupSectionHeader.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupSectionHeader.tsx
index 8c1a3fda2db..f2830100ff9 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupSectionHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/RecordGroupSectionHeader.tsx
@@ -17,6 +17,11 @@ const StyledSectionToggle = styled.button`
min-width: 0;
overflow: hidden;
padding: 0;
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
const StyledChevronContainer = styled.div<{ isExpanded: boolean }>`
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
index bcfdd974ad8..e407ba9faac 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
@@ -20,14 +20,6 @@ const StyledIconContainer = styled.div`
color: ${themeCssVariables.font.color.tertiary};
display: flex;
width: 16px;
-
- svg {
- align-items: center;
- display: flex;
- height: 16px;
- justify-content: center;
- width: 16px;
- }
`;
const StyledLabelAndIconContainer = styled.div`
@@ -113,7 +105,10 @@ export const RecordInlineCellContainer = () => {
<StyledLabelAndIconContainer>
{IconLabel && (
<StyledIconContainer>
- <IconLabel stroke={theme.icon.stroke.sm} />
+ <IconLabel
+ size={theme.icon.size.md}
+ stroke={theme.icon.stroke.sm}
+ />
</StyledIconContainer>
)}
{showLabel && (
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
index 07a014c84fb..9c1dcd5fde7 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
@@ -38,7 +38,6 @@ const StyledTabListContainer = styled.div`
const StyledContentContainer = styled.div`
background: ${themeCssVariables.background.primary};
- flex: 1;
overflow-y: auto;
`;
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
index 5a354a3d84f..de6c9556f39 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetJunctionAddNewRow.tsx
@@ -60,11 +60,7 @@ export const RecordTableWidgetJunctionAddNewRow = ({
return (
<DropdownRoot dropdownId={dropdownId} type="picker">
- <Dropdown.Trigger
- render={<div />}
- nativeButton={false}
- style={{ width: '100%' }}
- >
+ <Dropdown.Trigger render={<div />} nativeButton={false}>
<RecordTableActionRow LeftIcon={IconPlus} text={t`Add New`} />
</Dropdown.Trigger>
<DropdownContent align="start" width={GenericDropdownContentWidth.Medium}>
diff --git a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
index 26d4a43345f..c4404e6567c 100644
--- a/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table-widget/components/RecordTableWidgetNestedRelationAddNewRow.tsx
@@ -20,11 +20,7 @@ export const RecordTableWidgetNestedRelationAddNewRow = ({
onRelationRecordSelected,
}: RecordTableWidgetNestedRelationAddNewRowProps) => (
<DropdownRoot dropdownId={dropdownId} type="picker">
- <Dropdown.Trigger
- render={<div />}
- nativeButton={false}
- style={{ width: '100%' }}
- >
+ <Dropdown.Trigger render={<div />} nativeButton={false}>
<RecordTableActionRow LeftIcon={IconPlus} text={t`Add New`} />
</Dropdown.Trigger>
<DropdownContent align="start" width={GenericDropdownContentWidth.Medium}>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx
index e80cfce21c2..227a252da26 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellBaseContainer.tsx
@@ -35,15 +35,10 @@ const StyledBaseContainer = styled.div<{
isReadOnly ? fontColorSecondary : 'unset'};
outline: ${({ isReadOnly, fontColorMedium }) =>
isReadOnly ? `1px solid ${fontColorMedium}` : 'unset'};
+ }
- svg {
- color: ${({ isReadOnly, fontColorSecondary }) =>
- isReadOnly ? fontColorSecondary : 'unset'};
- }
-
- img {
- opacity: ${({ isReadOnly }) => (isReadOnly ? '0.64' : 'unset')};
- }
+ &[data-read-only]:hover img {
+ opacity: 0.64;
}
}
`;
@@ -81,6 +76,7 @@ export const RecordTableCellBaseContainer = ({
fontColorSecondary={theme.font.color.secondary}
fontColorMedium={theme.border.color.medium}
isReadOnly={isReadOnly ?? false}
+ data-read-only={isReadOnly || undefined}
id={getRecordTableCellId(
recordTableId,
cellPosition.column,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
index a3ce2060a6a..4ab4b02b7a2 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/components/RecordTableColumnHead.tsx
@@ -22,11 +22,6 @@ const StyledTitle = styled.div`
const StyledIcon = styled.div`
display: flex;
flex-shrink: 0;
-
- & > svg {
- height: ${themeCssVariables.icon.size.md}px;
- width: ${themeCssVariables.icon.size.md}px;
- }
`;
type RecordTableColumnHeadProps = {
diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx
index 1cac40cd1ad..103473344a1 100644
--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx
@@ -15,7 +15,7 @@ export const OnboardingCreditsRewardChip = ({
return (
<Badge size="md" color="inherit">
- <IconCoins size={12} aria-hidden />
+ <IconCoins aria-hidden />
{isRewardPerItem
? t`+${formattedCreditsReward} each`
: `+${formattedCreditsReward}`}
diff --git a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx
index 5b819b2ddc2..6b12ec7de57 100644
--- a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx
@@ -101,6 +101,10 @@ const StyledInfoPart = styled(StyledTriggerPart)`
}
`;
+const StyledPopup = styled(Popover.Popup)`
+ width: 300px;
+`;
+
const StyledTooltipContents = styled.div`
display: grid;
`;
@@ -245,12 +249,12 @@ export const OnboardingFreeCreditsPill = ({
</Popover.Trigger>
<Popover.Portal>
<Popover.Positioner side="bottom" align="end">
- <Popover.Popup aria-label={t`Free credits`}>
+ <StyledPopup aria-label={t`Free credits`}>
<OnboardingFreeCreditsPopoverContent
earnedCredits={earnedCredits}
earnedCreditsByStep={earnedCreditsByStep}
/>
- </Popover.Popup>
+ </StyledPopup>
</Popover.Positioner>
</Popover.Portal>
</Popover.Root>
diff --git a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPopoverContent.tsx b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPopoverContent.tsx
index 6cb5f4cecad..3c23486855d 100644
--- a/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPopoverContent.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPopoverContent.tsx
@@ -25,14 +25,6 @@ import { MetricRow } from 'twenty-ui/components/data-display';
import { Separator } from 'twenty-ui/primitives/layout';
import { themeCssVariables, useTheme } from 'twenty-ui/theme';
-const StyledContent = styled.div`
- display: flex;
- flex-direction: column;
- gap: ${themeCssVariables.spacing[1]};
- max-width: 100%;
- width: 284px;
-`;
-
const StyledSection = styled.div`
display: flex;
flex-direction: column;
@@ -97,7 +89,7 @@ export const OnboardingFreeCreditsPopoverContent = ({
});
return (
- <StyledContent>
+ <>
<StyledSection>
<StyledSectionTitle>{t`Free credits`}</StyledSectionTitle>
<MetricRow
@@ -181,6 +173,6 @@ export const OnboardingFreeCreditsPopoverContent = ({
<IconInfoCircle size={theme.icon.size.sm} />
{t`Stacks on top of your plan and never expires`}
</StyledFooter>
- </StyledContent>
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx b/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
index 68a3c4bd9a0..025ccb8793b 100644
--- a/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/__stories__/PageLayoutTabList.stories.tsx
@@ -328,7 +328,9 @@ export const Default: Story = {
const canvas = within(canvasElement);
const tabList = await canvas.findByRole('tablist');
- expect(getComputedStyle(tabList, '::after').display).toBe('none');
+ expect(tabList.getBoundingClientRect().bottom).toBe(
+ tabList.parentElement!.getBoundingClientRect().bottom,
+ );
expect(getComputedStyle(tabList.parentElement!, '::after').display).toBe(
args.presentation === 'identifier-bar' ? 'none' : 'block',
);
diff --git a/packages/twenty-front/src/modules/page-layout/components/dnd/PageLayoutTabWidgetDropTarget.tsx b/packages/twenty-front/src/modules/page-layout/components/dnd/PageLayoutTabWidgetDropTarget.tsx
index ce66ecc70ac..1a703686e58 100644
--- a/packages/twenty-front/src/modules/page-layout/components/dnd/PageLayoutTabWidgetDropTarget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/components/dnd/PageLayoutTabWidgetDropTarget.tsx
@@ -19,9 +19,6 @@ const StyledDropTarget = styled.div<{ isActive: boolean }>`
isActive ? `1px solid ${themeCssVariables.color.blue}` : 'none'};
outline-offset: -1px;
z-index: ${({ isActive }) => (isActive ? 1 : 'auto')};
- &[data-widget-hover] [data-active]::after {
- background-color: transparent;
- }
`;
type PageLayoutTabWidgetDropTargetProps = {
@@ -64,7 +61,6 @@ export const PageLayoutTabWidgetDropTarget = ({
<StyledDropTarget
ref={ref}
isActive={isActive}
- data-widget-hover={isActive || undefined}
{...{ [PAGE_LAYOUT_TAB_DROP_TARGET_DATA_ATTRIBUTE]: tabId }}
>
{children}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatAskQuestionsQuestion.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatAskQuestionsQuestion.tsx
index 2a6c5ae1551..ad96418626c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatAskQuestionsQuestion.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminChatAskQuestionsQuestion.tsx
@@ -6,7 +6,7 @@ import { type AskQuestionAnswer, type AskQuestionItem } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
import { Tag } from 'twenty-ui/primitives/data-display';
import { IconCheck } from 'twenty-ui/icon';
-import { themeCssVariables } from 'twenty-ui/theme';
+import { themeCssVariables, useTheme } from 'twenty-ui/theme';
import { TextWithChatReferences } from '@/ai/components/TextWithChatReferences';
@@ -68,11 +68,10 @@ const StyledOptionLabelRow = styled.div`
gap: ${themeCssVariables.spacing[1]};
line-height: 1.4;
overflow-wrap: anywhere;
+`;
- svg {
- color: ${themeCssVariables.color.blue};
- flex-shrink: 0;
- }
+const StyledSelectedIcon = styled(IconCheck)`
+ flex-shrink: 0;
`;
const StyledRecommended = styled.span`
@@ -91,6 +90,7 @@ export const SettingsAdminChatAskQuestionsQuestion = ({
question,
answer,
}: SettingsAdminChatAskQuestionsQuestionProps) => {
+ const theme = useTheme();
const selectedOptionIndices = new Set(answer?.selectedOptionIndices ?? []);
const freeText = answer?.freeText ?? '';
@@ -116,7 +116,9 @@ export const SettingsAdminChatAskQuestionsQuestion = ({
return (
<StyledOptionRow key={optionIndex} isSelected={isSelected}>
<StyledOptionLabelRow>
- {isSelected && <IconCheck size={14} />}
+ {isSelected && (
+ <StyledSelectedIcon size={14} color={theme.color.blue} />
+ )}
<TextWithChatReferences text={option.label} />
{option.isRecommended === true && (
<StyledRecommended>· {t`Recommended`}</StyledRecommended>
@@ -133,7 +135,7 @@ export const SettingsAdminChatAskQuestionsQuestion = ({
{isNonEmptyString(freeText) && (
<StyledOptionRow isSelected>
<StyledOptionLabelRow>
- <IconCheck size={14} />
+ <StyledSelectedIcon size={14} color={theme.color.blue} />
{t`Other`}
</StyledOptionLabelRow>
<StyledOptionDescription>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionDisplay.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionDisplay.tsx
index d31d92558b0..71c12019f79 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionDisplay.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminVersionDisplay.tsx
@@ -9,18 +9,10 @@ type SettingsAdminVersionDisplayProps = {
};
const StyledActionLink = styled.a`
- align-items: center;
color: ${themeCssVariables.font.color.primary};
- display: flex;
font-size: ${themeCssVariables.font.size.sm};
font-weight: ${themeCssVariables.font.weight.regular};
- gap: ${themeCssVariables.spacing[1]};
text-decoration: none;
-
- :hover {
- color: ${themeCssVariables.font.color.primary};
- cursor: pointer;
- }
`;
const StyledSpan = styled.span`
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
index ba0a9b5475a..4ea32e9b2bd 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceBillingContent.tsx
@@ -65,10 +65,6 @@ const StyledExternalLink = styled.a`
display: inline-flex;
gap: ${themeCssVariables.spacing[1]};
text-decoration: none;
-
- &:hover {
- color: ${themeCssVariables.font.color.primary};
- }
`;
const StyledMono = styled.span`
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
index bda0e4581fb..606dc9df145 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminJsonDataIndicatorHealthStatus.tsx
@@ -12,7 +12,6 @@ const StyledDetailsContainer = styled.div`
background-color: ${themeCssVariables.background.secondary};
border: 1px solid ${themeCssVariables.border.color.medium};
border-radius: ${themeCssVariables.border.radius.md};
- font-size: ${themeCssVariables.font.size.sm};
overflow-x: auto;
padding: ${themeCssVariables.spacing[4]};
`;
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotGallery.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotGallery.tsx
index c1ed32f2e88..97ba02b8ba7 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotGallery.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationScreenshotGallery.tsx
@@ -29,6 +29,11 @@ const StyledHeroButton = styled.button`
overflow: hidden;
padding: 0;
width: 100%;
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: 2px;
+ }
`;
const StyledHeroImage = styled.img`
@@ -46,13 +51,9 @@ const StyledThumbnails = styled.div`
overflow-x: auto;
`;
-const StyledThumbnail = styled.button<{ isSelected: boolean }>`
+const StyledThumbnail = styled.button`
background-color: ${themeCssVariables.background.secondary};
- border: 1px solid
- ${({ isSelected }) =>
- isSelected
- ? themeCssVariables.color.blue
- : themeCssVariables.border.color.medium};
+ border: 1px solid ${themeCssVariables.border.color.medium};
border-radius: ${themeCssVariables.border.radius.sm};
cursor: pointer;
flex: 0 0 88px;
@@ -61,8 +62,17 @@ const StyledThumbnail = styled.button<{ isSelected: boolean }>`
padding: 0;
&:hover {
+ border-color: ${themeCssVariables.border.color.strong};
+ }
+
+ &[aria-pressed='true'] {
border-color: ${themeCssVariables.color.blue};
}
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
const StyledThumbnailImage = styled.img`
@@ -131,7 +141,6 @@ export const SettingsApplicationScreenshotGallery = ({
<StyledThumbnail
key={screenshot}
type="button"
- isSelected={index === safeIndex}
aria-pressed={index === safeIndex}
aria-label={getScreenshotAltText(index)}
onClick={() => setSelectedScreenshot(screenshot)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
index 117639c412a..447da687b3d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectFormOptionRow.tsx
@@ -102,9 +102,6 @@ export const SettingsDataModelFieldSelectFormOptionRow = ({
<StyledRow className={className}>
<StyledIconGripVerticalContainer>
<IconGripVertical
- style={{
- minWidth: theme.icon.size.md,
- }}
size={theme.icon.size.md}
stroke={theme.icon.stroke.sm}
color={theme.font.color.extraLight}
diff --git a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
index d8d2b62c48d..2e10bc8b1cc 100644
--- a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
+++ b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
@@ -79,9 +79,7 @@ const StyledBenefitsContainer = styled.div`
`;
const StyledIntervalContainer = styled.div`
- display: flex;
flex-direction: row;
- gap: ${themeCssVariables.spacing[2]};
margin-bottom: ${themeCssVariables.spacing[8]};
width: 100%;
`;
diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/__stories__/EmailAlignmentInput.stories.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/__stories__/EmailAlignmentInput.stories.tsx
new file mode 100644
index 00000000000..b90546fca9b
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/__stories__/EmailAlignmentInput.stories.tsx
@@ -0,0 +1,75 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { useState } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import { EmailAlignmentInput } from '@/side-panel/pages/email-block-settings/components/EmailAlignmentInput';
+
+const ControlledEmailAlignmentInput = ({
+ initialValue,
+ onChange,
+}: {
+ initialValue: string;
+ onChange: (value: string) => void;
+}) => {
+ const [value, setValue] = useState(initialValue);
+
+ return (
+ <EmailAlignmentInput
+ label="Alignment"
+ value={value}
+ onChange={(nextValue) => {
+ setValue(nextValue);
+ onChange(nextValue);
+ }}
+ />
+ );
+};
+
+const meta: Meta<typeof ControlledEmailAlignmentInput> = {
+ title: 'Modules/SidePanel/EmailBlockSettings/EmailAlignmentInput',
+ component: ControlledEmailAlignmentInput,
+ decorators: [ComponentDecorator],
+ args: { initialValue: 'left', onChange: fn() },
+};
+
+export default meta;
+type Story = StoryObj<typeof ControlledEmailAlignmentInput>;
+
+export const KeyboardSelection: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const group = await canvas.findByRole('radiogroup', { name: 'Alignment' });
+ const left = within(group).getByRole('radio', { name: 'Align left' });
+ const center = within(group).getByRole('radio', { name: 'Align center' });
+
+ expect(left).toBeChecked();
+
+ await userEvent.tab();
+ expect(left).toHaveFocus();
+
+ await userEvent.keyboard('{ArrowRight}');
+ await waitFor(() => expect(center).toBeChecked());
+ expect(center).toHaveFocus();
+ expect(args.onChange).toHaveBeenLastCalledWith('center');
+
+ await userEvent.click(
+ within(group).getByRole('radio', { name: 'Align right' }),
+ );
+ expect(args.onChange).toHaveBeenLastCalledWith('right');
+ },
+};
+
+export const WithoutValue: Story = {
+ args: { initialValue: '' },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const radios = await canvas.findAllByRole('radio');
+
+ expect(radios).toHaveLength(3);
+
+ for (const radio of radios) {
+ expect(radio).not.toBeChecked();
+ }
+ },
+};
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
index ac3912fa7c5..1d4a44fe2ce 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/SelectSheetStep/SelectSheetStep.tsx
@@ -1,5 +1,4 @@
import { SpreadsheetImportStepBody } from '@/spreadsheet-import/components/SpreadsheetImportStepBody';
-import { styled } from '@linaria/react';
import { useCallback, useState } from 'react';
import { Heading } from '@/spreadsheet-import/components/Heading';
@@ -12,18 +11,8 @@ import { mapWorkbook } from '@/spreadsheet-import/utils/mapWorkbook';
import { useLingui } from '@lingui/react/macro';
import { Radio, RadioGroup } from 'twenty-ui/primitives/input';
-import { themeCssVariables } from 'twenty-ui/theme';
import { type WorkBook } from 'xlsx-ugnis';
-const StyledRadioContainer = styled.div`
- display: flex;
- flex-direction: column;
-`;
-
-const StyledRadioItemContainer = styled.div`
- margin-bottom: ${themeCssVariables.spacing[6]};
-`;
-
type SelectSheetStepProps = {
sheetNames: string[];
onBack: () => void;
@@ -107,15 +96,14 @@ export const SelectSheetStep = ({
>
<Heading title={t`Select the sheet to use`} />
<RadioGroup
- render={<StyledRadioContainer />}
aria-label={t`Select the sheet to use`}
value={value}
onValueChange={setValue}
>
{sheetNames.map((sheetName) => (
- <StyledRadioItemContainer key={sheetName}>
- <Radio value={sheetName}>{sheetName}</Radio>
- </StyledRadioItemContainer>
+ <Radio key={sheetName} value={sheetName}>
+ {sheetName}
+ </Radio>
))}
</RadioGroup>
</SpreadsheetImportStepBody>
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index 8f354e9a319..e71f1363086 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -12,6 +12,7 @@ import {
type FieldCurrencyValue,
} from '@/object-record/record-field/ui/types/FieldMetadata';
import { CURRENCY_CODE_ICONS } from '@/ui/input/components/internal/currency/constants/CurrencyCodeIcons';
+import { FIELD_DISPLAY_LEADING_ICON_CLASS_NAME } from '@/ui/field/display/constants/FieldDisplayLeadingIconClassName';
import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
@@ -67,7 +68,9 @@ export const CurrencyDisplay = ({
side="top"
positionMethod="fixed"
>
- <StyledCurrencyIconContainer>
+ <StyledCurrencyIconContainer
+ className={FIELD_DISPLAY_LEADING_ICON_CLASS_NAME}
+ >
<CurrencyIcon
color={theme.font.color.primary}
size={theme.icon.size.md}
diff --git a/packages/twenty-front/src/modules/ui/field/display/constants/FieldDisplayLeadingIconClassName.ts b/packages/twenty-front/src/modules/ui/field/display/constants/FieldDisplayLeadingIconClassName.ts
new file mode 100644
index 00000000000..315925f242e
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/field/display/constants/FieldDisplayLeadingIconClassName.ts
@@ -0,0 +1,2 @@
+export const FIELD_DISPLAY_LEADING_ICON_CLASS_NAME =
+ 'field-display-leading-icon';
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
index e95adcc9385..a31db77144a 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
@@ -46,13 +46,7 @@ const StyledContainer = styled.div`
const StyledIcon = styled.div`
align-items: center;
display: flex;
-
- & > svg {
- color: ${themeCssVariables.font.color.tertiary};
- height: ${themeCssVariables.icon.size.md}px;
- padding-left: ${themeCssVariables.spacing[1]};
- width: ${themeCssVariables.icon.size.md}px;
- }
+ padding-left: ${themeCssVariables.spacing[1]};
`;
export type CurrencyInputProps = {
@@ -135,7 +129,11 @@ export const CurrencyInput = ({
/>
<StyledIcon>
{isDefined(Icon) && (
- <Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />
+ <Icon
+ color={theme.font.color.tertiary}
+ size={theme.icon.size.md}
+ stroke={theme.icon.stroke.sm}
+ />
)}
</StyledIcon>
<StyledIMaskInput>
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
index 2f9de99ea5b..ddfadcfb516 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx
@@ -46,6 +46,7 @@ export type TextInputProps = {
shouldTrim?: boolean;
disabled?: boolean;
className?: string;
+ 'aria-label'?: string;
};
const getValue = (value: string, shouldTrim: boolean) => {
@@ -72,6 +73,7 @@ export const TextInput = ({
shouldTrim = true,
disabled,
className,
+ 'aria-label': ariaLabel,
}: TextInputProps) => {
const [internalText, setInternalText] = useState(value);
@@ -113,6 +115,7 @@ export const TextInput = ({
value={internalText}
disabled={disabled}
className={className}
+ aria-label={ariaLabel}
/>
{copyButton && (
<div ref={copyRef}>
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index 23edd7466d3..067607859a9 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -58,11 +58,11 @@ const StyledSearchRow = styled.div`
gap: ${themeCssVariables.spacing[1]};
padding-right: ${themeCssVariables.spacing[2]};
width: 100%;
+`;
- > :first-child {
- flex: 1;
- min-width: 0;
- }
+const StyledSearchContainer = styled.div`
+ flex: 1;
+ min-width: 0;
`;
const StyledPopupContent = styled.div`
@@ -187,12 +187,14 @@ export const IconPicker = ({
>
<StyledPopupContent data-click-outside-id={dropdownId}>
<StyledSearchRow>
- <Dropdown.Search
- aria-label={t`Search icon`}
- placeholder={t`Search icon`}
- value={searchString}
- onValueChange={setSearchString}
- />
+ <StyledSearchContainer>
+ <Dropdown.Search
+ aria-label={t`Search icon`}
+ placeholder={t`Search icon`}
+ value={searchString}
+ onValueChange={setSearchString}
+ />
+ </StyledSearchContainer>
{isDefined(iconColorPicker) && (
<DropdownRoot dropdownId={colorDropdownId} type="picker">
<Dropdown.Trigger
diff --git a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
index 85777d5ddae..dc51df700bb 100644
--- a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx
@@ -67,7 +67,6 @@ export const MultiSelectControl = ({
/>
}
color={firstSelectedOption.iconThemeColor}
- style={{ width: theme.icon.size.md, height: theme.icon.size.md }}
/>
) : (
<firstSelectedOption.Icon
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
index 252b2a8f83c..cb1e87ae175 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx
@@ -154,10 +154,6 @@ export const SelectControl = ({
/>
}
color={selectedOption.iconThemeColor}
- style={{
- width: theme.icon.size.md,
- height: theme.icon.size.md,
- }}
/>
) : (
<selectedOption.Icon
diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
index f47cd0d9662..f3991169683 100644
--- a/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/SelectOptionIcon.tsx
@@ -20,7 +20,6 @@ export const SelectOptionIcon = ({ Icon, color }: SelectOptionIconProps) => {
<TintedIconTile
icon={<Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />}
color={color}
- style={{ width: theme.icon.size.md, height: theme.icon.size.md }}
/>
);
}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
index 2da696490d8..8323595ad0d 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DatePickerInput.tsx
@@ -1,4 +1,5 @@
import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
import { useEffect, useState } from 'react';
import { useIMask } from 'react-imask';
@@ -24,26 +25,24 @@ const StyledInputContainer = styled.div<{
$variant === 'transparent'
? 'none'
: `1px solid ${themeCssVariables.border.color.light}`};
- border-top-left-radius: ${themeCssVariables.border.radius.md};
- border-top-right-radius: ${themeCssVariables.border.radius.md};
display: flex;
height: ${({ $variant }) =>
$variant === 'transparent'
? themeCssVariables.spacing[6]
: themeCssVariables.spacing[8]};
width: 100%;
+
+ &:focus-within {
+ box-shadow: inset 0 -1px 0 ${themeCssVariables.color.blue};
+ }
`;
const StyledInput = styled.input<{
- hasError?: boolean;
$variant: FormFieldInputVariant;
}>`
background: transparent;
border: none;
- color: ${({ hasError }) =>
- hasError
- ? themeCssVariables.color.red
- : themeCssVariables.font.color.primary};
+ color: ${themeCssVariables.font.color.primary};
font-size: ${themeCssVariables.font.size.md};
font-weight: ${({ $variant }) =>
$variant === 'transparent' ? themeCssVariables.font.weight.regular : 500};
@@ -65,6 +64,7 @@ export const DatePickerInput = ({
readonly = false,
variant = 'default',
}: DatePickerInputProps) => {
+ const { t } = useLingui();
const { dateFormat } = useDateTimeFormat();
const [internalDate, setInternalDate] = useState(date);
@@ -130,6 +130,7 @@ export const DatePickerInput = ({
<StyledInput
$variant={variant}
type="text"
+ aria-label={t`Date`}
disabled={readonly}
ref={ref as any}
value={value}
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
index 14dfdf84c12..c8568632a0f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePickerInput.tsx
@@ -1,4 +1,5 @@
import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
import { useIMask } from 'react-imask';
import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
@@ -25,19 +26,19 @@ const StyledInputContainer = styled.div<{
$variant: FormFieldInputVariant;
}>`
align-items: center;
-
- border-top-left-radius: ${themeCssVariables.border.radius.md};
- border-top-right-radius: ${themeCssVariables.border.radius.md};
display: flex;
height: ${({ $variant }) =>
$variant === 'transparent'
? themeCssVariables.spacing[6]
: themeCssVariables.spacing[8]};
width: 100%;
+
+ &:focus-within {
+ box-shadow: inset 0 -1px 0 ${themeCssVariables.color.blue};
+ }
`;
const StyledInput = styled.input<{
- hasError?: boolean;
$variant: FormFieldInputVariant;
}>`
background: transparent;
@@ -69,6 +70,7 @@ export const DateTimePickerInput = ({
timeZone,
variant = 'default',
}: DateTimePickerInputProps) => {
+ const { t } = useLingui();
const [internalDate, setInternalDate] = useState(date);
const { userTimezone } = useUserTimezone();
@@ -186,6 +188,7 @@ export const DateTimePickerInput = ({
$variant={variant}
disabled={shouldDisplayReadOnly}
type="text"
+ aria-label={t`Date and time`}
ref={ref as any}
onFocus={!shouldDisplayReadOnly ? onFocus : undefined}
/>
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
index 2684a01b1c7..0dd989fc693 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInnerSelect.tsx
@@ -8,6 +8,7 @@ import { useTheme, themeCssVariables } from 'twenty-ui/theme';
const StyledDropdownMenuInnerSelectDropdownButton = styled.div`
align-items: center;
+ border-radius: ${themeCssVariables.border.radius.sm};
box-sizing: border-box;
color: ${themeCssVariables.font.color.secondary};
cursor: pointer;
@@ -22,7 +23,17 @@ const StyledDropdownMenuInnerSelectDropdownButton = styled.div`
padding-left: ${themeCssVariables.spacing[2]};
padding-right: ${themeCssVariables.spacing[2]};
- width: 100%;
+
+ @media (hover: hover) {
+ &:hover {
+ background: ${themeCssVariables.background.transparent.light};
+ }
+ }
+
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: -2px;
+ }
`;
type DropdownMenuInnerSelectProps = {
@@ -53,11 +64,12 @@ export const DropdownMenuInnerSelect = ({
enableGlobalHotkeysConflictingWithKeyboard: false,
}}
>
- <Dropdown.Trigger render={<div />} nativeButton={false}>
- <StyledDropdownMenuInnerSelectDropdownButton>
- <span>{selectedOption.label}</span>
- <IconChevronDown size={theme.icon.size.sm} />
- </StyledDropdownMenuInnerSelectDropdownButton>
+ <Dropdown.Trigger
+ render={<StyledDropdownMenuInnerSelectDropdownButton />}
+ nativeButton={false}
+ >
+ <span>{selectedOption.label}</span>
+ <IconChevronDown size={theme.icon.size.sm} />
</Dropdown.Trigger>
<DropdownContent
width={widthInPixels}
diff --git a/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx b/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
index 1e52b291f65..dcd36306291 100644
--- a/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/hero/components/HeroPlayButton.tsx
@@ -1,11 +1,10 @@
import { styled } from '@linaria/react';
-import { t } from '@lingui/core/macro';
import { IconPlayerPlay } from 'twenty-ui/icon';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
type HeroPlayButtonProps = {
onClick?: () => void;
- ariaLabel?: string;
+ ariaLabel: string;
className?: string;
};
@@ -44,7 +43,7 @@ const StyledButton = styled.button`
export const HeroPlayButton = ({
onClick,
- ariaLabel = t`Play video`,
+ ariaLabel,
className,
}: HeroPlayButtonProps) => {
const theme = useTheme();
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListRow.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListRow.tsx
index ff876aecf5d..bbc071b173a 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListRow.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/TabListRow.tsx
@@ -12,10 +12,6 @@ const StyledContainer = styled.div<{ isScrollable: boolean }>`
overflow-x: ${({ isScrollable }) => (isScrollable ? 'auto' : 'hidden')};
position: relative;
${SCROLLABLE_TAB_ROW_CSS}
-
- &::after {
- display: none;
- }
`;
type TabListRowProps = {
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabListRow.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabListRow.stories.tsx
new file mode 100644
index 00000000000..bfc6ab9a5fe
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabListRow.stories.tsx
@@ -0,0 +1,105 @@
+import { styled } from '@linaria/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, waitFor, within } from 'storybook/test';
+import { TabButton } from 'twenty-ui/components/navigation';
+import { Tabs } from 'twenty-ui/primitives/navigation';
+import { ComponentDecorator } from 'twenty-ui/testing';
+
+import { TabListRow } from '@/ui/layout/tab-list/components/TabListRow';
+import { useScrollActiveTabIntoView } from '@/ui/layout/tab-list/hooks/useScrollActiveTabIntoView';
+
+const TAB_IDS = Array.from(
+ { length: 12 },
+ (_, index) => `section-${index + 1}`,
+);
+
+const ACTIVE_TAB_ID = 'section-11';
+
+const StyledNarrowFrame = styled.div`
+ width: 240px;
+`;
+
+const ScrollableTabListRow = ({
+ behaveAsLinks,
+}: {
+ behaveAsLinks: boolean;
+}) => {
+ const { tabRowRef } = useScrollActiveTabIntoView({
+ activeTabId: ACTIVE_TAB_ID,
+ isScrollable: true,
+ });
+
+ const tabs = TAB_IDS.map((tabId) =>
+ behaveAsLinks ? (
+ <TabButton
+ key={tabId}
+ active={tabId === ACTIVE_TAB_ID}
+ aria-current={tabId === ACTIVE_TAB_ID ? 'page' : undefined}
+ >
+ {tabId}
+ </TabButton>
+ ) : (
+ <Tabs.Tab key={tabId} value={tabId}>
+ {tabId}
+ </Tabs.Tab>
+ ),
+ );
+
+ return (
+ <StyledNarrowFrame>
+ <Tabs.Root value={ACTIVE_TAB_ID}>
+ <TabListRow
+ aria-label="Sections"
+ behaveAsLinks={behaveAsLinks}
+ isScrollable
+ ref={tabRowRef}
+ >
+ {tabs}
+ </TabListRow>
+ </Tabs.Root>
+ </StyledNarrowFrame>
+ );
+};
+
+const meta: Meta<typeof ScrollableTabListRow> = {
+ title: 'UI/Layout/TabList/TabListRow',
+ component: ScrollableTabListRow,
+ decorators: [ComponentDecorator],
+ args: { behaveAsLinks: false },
+};
+
+export default meta;
+type Story = StoryObj<typeof ScrollableTabListRow>;
+
+const expectTabFullyVisible = async (activeTab: HTMLElement) => {
+ const tabRow = activeTab.parentElement;
+
+ await waitFor(() => expect(tabRow?.scrollLeft).toBeGreaterThan(0));
+ expect(activeTab.offsetLeft).toBeGreaterThanOrEqual(tabRow?.scrollLeft ?? 0);
+ expect(activeTab.offsetLeft + activeTab.offsetWidth).toBeLessThanOrEqual(
+ (tabRow?.scrollLeft ?? 0) + (tabRow?.clientWidth ?? 0),
+ );
+};
+
+export const ScrollsSelectedTabIntoView: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const activeTab = await canvas.findByRole('tab', { name: ACTIVE_TAB_ID });
+
+ expect(activeTab).toHaveAttribute('aria-selected', 'true');
+ await expectTabFullyVisible(activeTab);
+ },
+};
+
+export const ScrollsCurrentLinkIntoView: Story = {
+ args: { behaveAsLinks: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const activeTab = await canvas.findByRole('button', {
+ name: ACTIVE_TAB_ID,
+ });
+
+ expect(activeTab).toHaveAttribute('aria-current', 'page');
+ await expectTabFullyVisible(activeTab);
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/hooks/useScrollActiveTabIntoView.ts b/packages/twenty-front/src/modules/ui/layout/tab-list/hooks/useScrollActiveTabIntoView.ts
index af3568900e9..78029dcec08 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/hooks/useScrollActiveTabIntoView.ts
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/hooks/useScrollActiveTabIntoView.ts
@@ -20,7 +20,9 @@ export const useScrollActiveTabIntoView = ({
}
const scrollActiveTabIntoView = () => {
- const activeTab = tabRow.querySelector('[data-active]');
+ const activeTab = tabRow.querySelector(
+ '[aria-selected="true"],[aria-current="page"]',
+ );
if (!(activeTab instanceof HTMLElement)) {
return;
diff --git a/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
index 797c230c9d7..04bf63496c5 100644
--- a/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/link/components/LinkChip/LinkChip.tsx
@@ -13,10 +13,6 @@ const styles = {
min-width: 0;
vertical-align: middle;
}
- & > a {
- min-width: 0;
- text-decoration: none;
- }
`,
};
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
index ee6a605b52e..7989678ade9 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownFieldSelectMenu.tsx
@@ -1,6 +1,3 @@
-import { styled } from '@linaria/react';
-import React from 'react';
-
import { objectFilterDropdownSearchInputComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputComponentState';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
@@ -16,6 +13,7 @@ import { ViewBarFilterDropdownFieldSelectMenuItem } from '@/views/components/Vie
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
@@ -24,33 +22,6 @@ import { DropdownComponentInstanceContext } from '@/ui/layout/dropdown/contexts/
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useLingui } from '@lingui/react/macro';
import { IconX } from 'twenty-ui/icon';
-import { themeCssVariables } from 'twenty-ui/theme';
-
-export const StyledInput = styled.input`
- background: transparent;
- border: none;
- border-bottom: 1px solid ${themeCssVariables.border.color.light};
- border-radius: 0;
- border-top: none;
- border-top-left-radius: ${themeCssVariables.border.radius.md};
- border-top-right-radius: ${themeCssVariables.border.radius.md};
- color: ${themeCssVariables.font.color.primary};
- font-family: inherit;
- font-size: ${themeCssVariables.font.size.sm};
- font-weight: inherit;
- margin: 0;
- max-width: 100%;
- min-height: 19px;
-
- outline: none;
- overflow: hidden;
- padding: ${themeCssVariables.spacing[2]};
- text-decoration: none;
-
- &::placeholder {
- color: ${themeCssVariables.font.color.light};
- }
-`;
export const ViewBarFilterDropdownFieldSelectMenu = () => {
const [objectFilterDropdownSearchInput, setObjectFilterDropdownSearchInput] =
@@ -106,14 +77,14 @@ export const ViewBarFilterDropdownFieldSelectMenu = () => {
{t`Filter`}
</DropdownMenuHeader>
<ScrollWrapper componentInstanceId="view-bar-dropdown-filter-field-select-menu">
- <StyledInput
+ <DropdownMenuSearchInput
value={objectFilterDropdownSearchInput}
- autoFocus
placeholder={t`Search fields`}
- onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+ onChange={(event) =>
setObjectFilterDropdownSearchInput(event.target.value)
}
/>
+ <DropdownMenuSeparator />
<SelectableList
selectableItemIdArray={selectableFieldMetadataItemIds}
selectableListInstanceId={`${dropdownId}-field-list`}
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
index d94932357b4..a3c6f9b41c3 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerListContent.tsx
@@ -1,5 +1,4 @@
import { ListItemButton } from 'twenty-ui/components/navigation';
-import { styled } from '@linaria/react';
import { type DraggableListDropResult } from '@/ui/layout/draggable-list/types/DraggableListDropResult';
import { type MouseEvent, useCallback } from 'react';
@@ -24,14 +23,9 @@ import { viewPickerReferenceViewIdComponentState } from '@/views/view-picker/sta
import { computeViewPickerVisibleViews } from '@/views/view-picker/utils/computeViewPickerVisibleViews';
import { useLingui } from '@lingui/react/macro';
import { IconPlus } from 'twenty-ui/icon';
-import { themeCssVariables } from 'twenty-ui/theme';
import { ViewVisibility } from '~/generated-metadata/graphql';
import { moveArrayItem } from '~/utils/array/moveArrayItem';
-const StyledBoldDropdownMenuItemsContainerWrapper = styled.div`
- font-weight: ${themeCssVariables.font.weight.regular};
-`;
-
export const ViewPickerListContent = () => {
const { t } = useLingui();
@@ -211,14 +205,12 @@ export const ViewPickerListContent = () => {
</>
)}
<DropdownMenuSeparator />
- <StyledBoldDropdownMenuItemsContainerWrapper>
- <DropdownMenuItemsContainer scrollable={false}>
- <ListItemButton
- onClick={handleAddViewButtonClick}
- startIcon={<IconPlus />}
- >{t`Add view`}</ListItemButton>
- </DropdownMenuItemsContainer>
- </StyledBoldDropdownMenuItemsContainerWrapper>
+ <DropdownMenuItemsContainer scrollable={false}>
+ <ListItemButton
+ onClick={handleAddViewButtonClick}
+ startIcon={<IconPlus />}
+ >{t`Add view`}</ListItemButton>
+ </DropdownMenuItemsContainer>
</LegacyDropdownContent>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
index 1bf286f32ee..c369257c00b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow.tsx
@@ -63,10 +63,6 @@ const StyledRightContent = styled.div`
const StyledIconContainer = styled.div`
align-items: center;
display: flex;
-
- svg {
- min-width: calc(${themeCssVariables.icon.size.sm} * 1px);
- }
`;
const StyledDisplayMessage = styled.span`
@@ -124,10 +120,6 @@ const StyledTab = styled.button<{ isActive: boolean }>`
const StyledJsonTreeContainer = styled.div`
overflow-x: auto;
-
- ul {
- min-width: 0;
- }
`;
const StyledErrorMessage = styled.div`
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablePicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablePicker.tsx
index 69afab1f9a7..5c3ce52c791 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablePicker.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablePicker.tsx
@@ -1,23 +1,17 @@
import { type VariablePickerComponent } from '@/ui/input/types/VariablePickerComponent';
-import { isDropdownOpenComponentState } from '@/ui/layout/dropdown/states/isDropdownOpenComponentState';
-import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { WorkflowVariablesDropdown } from '@/workflow/workflow-variables/components/WorkflowVariablesDropdown';
-import { SEARCH_VARIABLES_DROPDOWN_ID } from '@/workflow/workflow-variables/constants/SearchVariablesDropdownId';
import { styled } from '@linaria/react';
import { themeCssVariables } from 'twenty-ui/theme';
const StyledSearchVariablesDropdownContainer = styled.div<{
isReadonly?: boolean;
- isUnfolded?: boolean;
multiline?: boolean;
}>`
align-items: center;
- background-color: ${({ isUnfolded, multiline }) =>
- isUnfolded
- ? themeCssVariables.background.transparent.light
- : multiline
- ? 'transparent'
- : themeCssVariables.background.transparent.lighter};
+ background-color: ${({ multiline }) =>
+ multiline
+ ? 'transparent'
+ : themeCssVariables.background.transparent.lighter};
border: ${({ multiline }) =>
multiline ? 'none' : `1px solid ${themeCssVariables.border.color.medium}`};
@@ -42,18 +36,24 @@ const StyledSearchVariablesDropdownContainer = styled.div<{
width: ${({ multiline }) =>
multiline ? themeCssVariables.spacing[7] : 'auto'};
+ &:has([data-popup-open]) {
+ background-color: ${themeCssVariables.background.transparent.light};
+ }
+
&:hover {
- background-color: ${({ isReadonly, isUnfolded, multiline }) => {
+ background-color: ${({ isReadonly, multiline }) => {
if (isReadonly === true) {
return multiline
? 'transparent'
: themeCssVariables.background.transparent.lighter;
}
- return isUnfolded
- ? themeCssVariables.background.transparent.medium
- : themeCssVariables.background.transparent.light;
+ return themeCssVariables.background.transparent.light;
}};
}
+
+ &:has([data-popup-open]):hover {
+ background-color: ${themeCssVariables.background.transparent.medium};
+ }
`;
export const WorkflowVariablePicker: VariablePickerComponent = ({
@@ -65,16 +65,9 @@ export const WorkflowVariablePicker: VariablePickerComponent = ({
shouldDisplayRecordFields = true,
objectNameSingularsToSelect,
}) => {
- const dropdownId = `${SEARCH_VARIABLES_DROPDOWN_ID}-${instanceId}`;
- const isDropdownOpen = useAtomComponentStateValue(
- isDropdownOpenComponentState,
- dropdownId,
- );
-
return (
<StyledSearchVariablesDropdownContainer
isReadonly={disabled}
- isUnfolded={isDropdownOpen}
multiline={multiline}
>
<WorkflowVariablesDropdown
diff --git a/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx b/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
index 0491235ec1a..b225dd6aacd 100644
--- a/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
+++ b/packages/twenty-front/src/modules/workspace-member/components/WorkspaceMemberAvatarStack.tsx
@@ -1,8 +1,6 @@
-import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
import { AvatarGroup } from 'twenty-ui/components/data-display';
import { Avatar } from 'twenty-ui/primitives/data-display';
-import { themeCssVariables } from 'twenty-ui/theme';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
@@ -25,19 +23,6 @@ type WorkspaceMemberAvatarStackProps = {
workspaceMembers: WorkspaceMemberAvatarStackMember[];
};
-const StyledAvatarStackContainer = styled.div`
- align-items: center;
- display: flex;
- min-width: 0;
-`;
-
-const StyledAvatarContainer = styled.div`
- border: 1px solid ${themeCssVariables.background.secondary};
- border-radius: 50%;
- corner-shape: round;
- display: flex;
-`;
-
const getWorkspaceMemberDisplayName = ({
workspaceMember,
defaultAvatarName,
@@ -70,7 +55,6 @@ export const WorkspaceMemberAvatarStack = ({
}: WorkspaceMemberAvatarStackProps) => {
return (
<AvatarGroup
- render={<StyledAvatarStackContainer />}
avatars={workspaceMembers.map((workspaceMember) => {
const displayName = getWorkspaceMemberDisplayName({
workspaceMember,
@@ -78,16 +62,16 @@ export const WorkspaceMemberAvatarStack = ({
});
return (
- <StyledAvatarContainer key={workspaceMember.id}>
- <Avatar
- src={getAbsoluteImageUrl(workspaceMember.avatarUrl)}
- name={displayName}
- imageProps={{ alt: displayName }}
- colorSeed={workspaceMember.id}
- size="md"
- shape="circle"
- />
- </StyledAvatarContainer>
+ <Avatar
+ key={workspaceMember.id}
+ src={getAbsoluteImageUrl(workspaceMember.avatarUrl)}
+ name={displayName}
+ imageProps={{ alt: displayName }}
+ colorSeed={workspaceMember.id}
+ size="md"
+ shape="circle"
+ ring
+ />
);
})}
maxVisible={maxVisible}
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
index b346967dc53..d6a0dfc4444 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx
@@ -3,7 +3,7 @@ import { styled } from '@linaria/react';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
import { isDefined } from 'twenty-shared/utils';
-import { getIconTileColorShades } from 'twenty-ui/components/data-display';
+import { TintedIconTile } from 'twenty-ui/components/data-display';
import {
IconEdit,
IconPlus,
@@ -43,8 +43,6 @@ const getOperationIcon = (toolName: string): IconComponent | null => {
const StyledCompositeContainer = styled.div`
align-items: center;
- border-radius: ${themeCssVariables.border.radius.sm};
- box-sizing: border-box;
display: flex;
flex-shrink: 0;
height: 16px;
@@ -53,22 +51,6 @@ const StyledCompositeContainer = styled.div`
width: 16px;
`;
-const StyledMainIconWrapper = styled.div<{
- $backgroundColor: string;
- $borderColor?: string;
-}>`
- align-items: center;
- background-color: ${({ $backgroundColor }) => $backgroundColor};
- border: ${({ $borderColor }) =>
- $borderColor ? `1px solid ${$borderColor}` : 'none'};
- border-radius: ${themeCssVariables.border.radius.sm};
- box-sizing: border-box;
- display: flex;
- inset: 0;
- justify-content: center;
- position: absolute;
-`;
-
const StyledOperationOverlay = styled.div`
align-items: center;
background-color: ${themeCssVariables.grayScale.gray4};
@@ -123,23 +105,27 @@ export const SettingsToolIcon = ({
? objectMetadataItems.find((item) => item.nameSingular === objectName)
: undefined;
- const objectStyle = isDefined(objectMetadata)
- ? getIconTileColorShades(getObjectColorWithFallback(objectMetadata))
+ const objectColor = isDefined(objectMetadata)
+ ? getObjectColorWithFallback(objectMetadata)
: null;
+ const objectIconTile = isDefined(objectColor) ? (
+ <TintedIconTile
+ color={objectColor}
+ icon={<MainIcon size="14px" stroke={theme.icon.stroke.md} />}
+ />
+ ) : null;
+
if (isDefined(OperationIcon)) {
return (
<StyledCompositeContainer>
- <StyledMainIconWrapper
- $backgroundColor={objectStyle?.backgroundColor ?? 'transparent'}
- $borderColor={objectStyle?.borderColor}
- >
+ {objectIconTile ?? (
<MainIcon
size="14px"
stroke={theme.icon.stroke.md}
- color={objectStyle?.iconColor ?? theme.font.color.secondary}
+ color={theme.font.color.secondary}
/>
- </StyledMainIconWrapper>
+ )}
<StyledOperationOverlay>
<OperationIcon
size="12px"
@@ -151,21 +137,8 @@ export const SettingsToolIcon = ({
);
}
- if (isDefined(objectStyle)) {
- return (
- <StyledCompositeContainer>
- <StyledMainIconWrapper
- $backgroundColor={objectStyle.backgroundColor}
- $borderColor={objectStyle.borderColor}
- >
- <MainIcon
- size="14px"
- stroke={theme.icon.stroke.md}
- color={objectStyle.iconColor}
- />
- </StyledMainIconWrapper>
- </StyledCompositeContainer>
- );
+ if (isDefined(objectIconTile)) {
+ return objectIconTile;
}
return (
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx
index 0c2110fda75..95914badca5 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx
@@ -18,12 +18,23 @@ const StyledChoice = styled.label`
}
`;
-const StyledRadio = styled.div`
+const StyledTile = styled.div`
border-radius: ${themeCssVariables.border.radius.md};
+ cursor: pointer;
display: block;
position: relative;
width: 100%;
+ &:focus-visible {
+ outline: 2px solid ${themeCssVariables.color.blue};
+ outline-offset: 1px;
+ }
+
+ &[data-disabled] {
+ cursor: not-allowed;
+ opacity: 0.32;
+ }
+
@media (max-width: ${MOBILE_VIEWPORT}px) {
&:focus-visible {
outline-offset: -2px;
@@ -50,7 +61,7 @@ const StyledCheckmark = styled.div`
visibility: hidden;
width: ${themeCssVariables.spacing[5]};
- [data-checked] > & {
+ &[data-checked] {
opacity: 1;
transition:
opacity 0.3s ease-in-out,
@@ -60,7 +71,7 @@ const StyledCheckmark = styled.div`
@media (prefers-reduced-motion: reduce) {
&,
- [data-checked] > & {
+ &[data-checked] {
transition: none;
}
}
@@ -87,18 +98,16 @@ export const SettingsAppearanceOption = ({
return (
<StyledChoice>
- <Radio
+ <Radio.Root
value={colorScheme}
aria-labelledby={labelId}
- render={
- <StyledRadio>
- <SettingsAppearancePreview colorScheme={colorScheme} />
- <StyledCheckmark aria-hidden>
- <IconCheck size={theme.icon.size.sm} />
- </StyledCheckmark>
- </StyledRadio>
- }
- />
+ render={<StyledTile />}
+ >
+ <SettingsAppearancePreview colorScheme={colorScheme} />
+ <Radio.Indicator keepMounted aria-hidden render={<StyledCheckmark />}>
+ <IconCheck size={theme.icon.size.sm} />
+ </Radio.Indicator>
+ </Radio.Root>
<StyledLabel id={labelId}>{label}</StyledLabel>
</StyledChoice>
);
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx
index c6cf03b4f70..a5a923ca79c 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx
@@ -55,9 +55,11 @@ const StyledContent = styled.div`
height 0.1s ease-in-out,
font-size 0.1s ease-in-out;
- [role='radio']:not([data-disabled]):hover & {
- font-size: 22px;
- height: 61px;
+ @media (hover: hover) {
+ [role='radio']:not([data-disabled]):hover > ${StyledPreview} & {
+ font-size: 22px;
+ height: 61px;
+ }
}
@media (prefers-reduced-motion: reduce) {
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.interactions.stories.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.interactions.stories.tsx
index 4fa3007432e..9703688f41f 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.interactions.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.interactions.stories.tsx
@@ -79,6 +79,7 @@ export const SelectionAndKeyboard: Story = {
expect(canvas.getByRole('button', { name: 'Next setting' })).toHaveFocus();
await userEvent.tab({ shift: true });
expect(system).toHaveFocus();
+ expect(getComputedStyle(system).outlineStyle).toBe('solid');
await userEvent.keyboard('{ArrowRight}');
await waitFor(() => expect(light).toBeChecked());
expect(system).not.toBeChecked();
diff --git a/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts b/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts
index 69188eb5ab4..b6d50e81df7 100644
--- a/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts
+++ b/packages/twenty-oxlint-rules/rules/no-twenty-ui-override.exemptions.ts
@@ -24,6 +24,11 @@ export const TWENTY_UI_OVERRIDE_EXEMPTIONS = [
'packages/twenty-front/src/modules/auth/sign-in-up/components/SignInUpWorkspaceScopeForm.tsx',
reason: 'Separator spacing inside the sign-in form',
},
+ {
+ filePath:
+ 'packages/twenty-front/src/modules/front-components/media-session/components/FrontComponentMediaSessionIndicator.tsx',
+ reason: 'Popover.Popup sized and spaced for the recording sessions list',
+ },
{
filePath:
'packages/twenty-front/src/modules/log-console/components/LogConsoleDetailPanel.tsx',
@@ -44,6 +49,12 @@ export const TWENTY_UI_OVERRIDE_EXEMPTIONS = [
'packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx',
reason: 'LightButton pinned to the corner of the fullscreen dialog',
},
+ {
+ filePath:
+ 'packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx',
+ reason:
+ 'IconButton sized as a 40px touch target with the current page fill',
+ },
{
filePath:
'packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsForm.tsx',
@@ -54,6 +65,11 @@ export const TWENTY_UI_OVERRIDE_EXEMPTIONS = [
'packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialog.tsx',
reason: 'Dialog.Header centers the visual and anchors the close button',
},
+ {
+ filePath:
+ 'packages/twenty-front/src/modules/onboarding/components/free-credits/OnboardingFreeCreditsPill.tsx',
+ reason: 'Popover.Popup width for the free credits breakdown',
+ },
{
filePath:
'packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsPasswordController.tsx',
diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx
index 013f2e34f05..e1cbf7bc6ec 100644
--- a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx
+++ b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx
@@ -1,5 +1,7 @@
import { RadioGroup as RadioGroupPrimitive } from '@base-ui/react/radio-group';
+import { isNonEmptyString } from '@sniptt/guards';
import { clsx } from 'clsx';
+import { useId } from 'react';
import { Radio } from '@ui/primitives/input/Radio/Radio';
@@ -15,34 +17,59 @@ export const SegmentedControl = <TValue extends string>({
options,
size = 'md',
...props
-}: SegmentedControlProps<TValue>) => (
- <RadioGroupPrimitive
- {...props}
- className={mergeClassNames(clsx(styles.container, styles[size]), className)}
- data-item-width={itemWidth}
- >
- {options.map(
- ({ 'aria-label': ariaLabel, disabled, label, startIcon, value }) => (
- <Radio.Root
- key={value}
- value={value}
- disabled={disabled}
- aria-label={ariaLabel}
- className={clsx(
- styles.item,
- !isRenderableSlot(label) && styles.iconOnly,
- )}
- >
- {isRenderableSlot(startIcon) && (
- <span className={styles.icon} aria-hidden>
- {startIcon}
- </span>
- )}
- {isRenderableSlot(label) && (
- <span className={styles.label}>{label}</span>
- )}
- </Radio.Root>
- ),
- )}
- </RadioGroupPrimitive>
-);
+}: SegmentedControlProps<TValue>) => {
+ const optionNameIdPrefix = useId();
+
+ return (
+ <RadioGroupPrimitive
+ {...props}
+ className={mergeClassNames(
+ clsx(styles.container, styles[size]),
+ className,
+ )}
+ data-item-width={itemWidth}
+ >
+ {options.map(
+ (
+ { 'aria-label': ariaLabel, disabled, label, startIcon, value },
+ index,
+ ) => {
+ const optionNameId = `${optionNameIdPrefix}-${index}`;
+ const hasAriaLabel = isNonEmptyString(ariaLabel);
+
+ return (
+ <Radio.Root
+ key={value}
+ value={value}
+ disabled={disabled}
+ aria-labelledby={optionNameId}
+ className={clsx(
+ styles.item,
+ !isRenderableSlot(label) && styles.iconOnly,
+ )}
+ >
+ {isRenderableSlot(startIcon) && (
+ <span className={styles.icon} aria-hidden>
+ {startIcon}
+ </span>
+ )}
+ {isRenderableSlot(label) && (
+ <span
+ id={hasAriaLabel ? undefined : optionNameId}
+ className={styles.label}
+ >
+ {label}
+ </span>
+ )}
+ {hasAriaLabel && (
+ <span id={optionNameId} hidden>
+ {ariaLabel}
+ </span>
+ )}
+ </Radio.Root>
+ );
+ },
+ )}
+ </RadioGroupPrimitive>
+ );
+};
diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControlInteractions.stories.tsx b/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControlInteractions.stories.tsx
index f051f5d1b14..da739dc73ed 100644
--- a/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControlInteractions.stories.tsx
+++ b/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControlInteractions.stories.tsx
@@ -6,7 +6,8 @@ import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { IconComment, IconHome } from '@ui/icon';
import { DirectionProvider } from '@ui/primitives/layout/DirectionProvider/DirectionProvider';
import { Button } from '@ui/primitives/input/Button/Button';
-import { ComponentDecorator } from '@ui/testing';
+import { Field } from '@ui/primitives/input/Field/Field';
+import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';
import { SegmentedControl } from '../SegmentedControl';
import { type SegmentedControlProps } from '../types/SegmentedControlProps';
@@ -82,6 +83,26 @@ const FormExample = (props: SegmentedControlProps<string>) => {
);
};
+const FieldExample = (props: SegmentedControlProps<string>) => (
+ <>
+ <Field.Root>
+ <Field.Label>Appearance</Field.Label>
+ <SegmentedControl {...props} />
+ </Field.Root>
+ <Field.Root>
+ <Field.Label>Start page</Field.Label>
+ <SegmentedControl
+ aria-label="Start page"
+ defaultValue="home"
+ options={[
+ { startIcon: <IconHome />, 'aria-label': 'Home', value: 'home' },
+ { startIcon: <IconComment />, 'aria-label': 'Chat', value: 'chat' },
+ ]}
+ />
+ </Field.Root>
+ </>
+);
+
const meta: Meta<typeof SegmentedControl> = {
title: 'Components/Input/SegmentedControl/Interactions',
component: SegmentedControl,
@@ -441,3 +462,30 @@ export const RightToLeft: Story = {
await waitFor(() => expect(system).toBeChecked());
},
};
+
+export const InsideField: Story = {
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ render: (args) => <FieldExample {...args} />,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const appearance = within(
+ canvas.getByRole('radiogroup', { name: 'Appearance' }),
+ );
+ const startPage = within(
+ canvas.getByRole('radiogroup', { name: 'Start page' }),
+ );
+ const dark = appearance.getByRole('radio', { name: 'Dark' });
+ const chat = startPage.getByRole('radio', { name: 'Chat' });
+
+ await expect(
+ appearance.getByRole('radio', { name: 'System' }),
+ ).toBeChecked();
+ await expect(startPage.getByRole('radio', { name: 'Home' })).toBeChecked();
+
+ await userEvent.click(dark);
+ await userEvent.click(chat);
+
+ await expect(dark).toBeChecked();
+ await expect(chat).toBeChecked();
+ },
+};