c53a13417e
## Summary
Eliminates all ~350 `styled(Component)` usages across `twenty-front` and
`twenty-ui` (212 files changed). Each was replaced following these
rules:
- **Margin/layout CSS** (margin, padding, flex, align-self, width) →
wrapped in a `styled.div`/`styled.span` parent container
- **Third-party components** (Link, TextareaAutosize,
ReactPhoneNumberInput, Handle, etc.) → parent container with child CSS
selectors (`> a`, `> textarea`, `> input`, etc.)
- **Intrinsic behavior via existing props** (TableRow
`gridTemplateColumns`, TableCell `color`/`align`) → replaced
`styled(TableRow)` / `styled(TableCell)` with direct prop usage
- **Other visual overrides on twenty-ui components** (Card, Section,
TabList, Button, MenuItem, ScrollWrapper, etc.) → parent wrappers with
`> div` / `> *` child selectors
- **Extending styled.div/span** → merged all CSS into a single
`styled.div`/`styled.span`
Also adds `overflow: hidden` to parent containers wrapping
`ScrollWrapper` so scroll activates correctly with the new wrapper
structure.
### Migration patterns
| Before | After |
|--------|-------|
| `styled(Avatar)` with `margin-right` | `<StyledAvatarContainer><Avatar
/></StyledAvatarContainer>` |
| `styled(Link)` with `text-decoration: none` |
`<StyledLinkContainer><Link /></StyledLinkContainer>` with `> a { ... }`
|
| `styled(TableRow)` with `grid-template-columns` | `<TableRow
gridTemplateColumns="..." />` |
| `styled(TableCell)` with `color` / `align` | `<TableCell color={...}
align="right" />` |
| `styled(Card)` with `margin-top` | `<StyledCardContainer><Card
/></StyledCardContainer>` |
| `styled(TabList)` with `background` |
`<StyledTabListContainer><TabList /></StyledTabListContainer>` with `>
div { ... }` |
| `styled(StyledBase)` extending a `styled.div` | Single merged
`styled.div` with all styles inlined |
108 lines
3.0 KiB
TypeScript
108 lines
3.0 KiB
TypeScript
import { styled } from '@linaria/react';
|
|
import { type ComponentType, useContext } from 'react';
|
|
|
|
import { SettingsListSkeletonCard } from '@/settings/components/SettingsListSkeletonCard';
|
|
|
|
import { type IconComponent, IconPlus } from 'twenty-ui/display';
|
|
import { Card, CardFooter } from 'twenty-ui/layout';
|
|
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
|
|
import { SettingsListItemCardContent } from './SettingsListItemCardContent';
|
|
|
|
const StyledFooterContainer = styled.div`
|
|
> * {
|
|
align-items: center;
|
|
display: flex;
|
|
padding: ${themeCssVariables.spacing[1]};
|
|
}
|
|
`;
|
|
|
|
const StyledButton = styled.button`
|
|
align-items: center;
|
|
background: ${themeCssVariables.background.primary};
|
|
border: none;
|
|
border-radius: ${themeCssVariables.border.radius.sm};
|
|
color: ${themeCssVariables.font.color.secondary};
|
|
gap: ${themeCssVariables.spacing[2]};
|
|
padding: 0 ${themeCssVariables.spacing[1]};
|
|
padding-left: ${themeCssVariables.spacing[2]};
|
|
cursor: pointer;
|
|
display: flex;
|
|
flex: 1 0 0;
|
|
height: ${themeCssVariables.spacing[8]};
|
|
width: 100%;
|
|
|
|
&:hover {
|
|
background: ${themeCssVariables.background.transparent.light};
|
|
}
|
|
`;
|
|
|
|
type SettingsListCardProps<ListItem extends { id: string }> = {
|
|
items: ListItem[];
|
|
getItemLabel: (item: ListItem) => string;
|
|
getItemDescription?: (item: ListItem) => string;
|
|
hasFooter?: boolean;
|
|
isLoading?: boolean;
|
|
onRowClick?: (item: ListItem) => void;
|
|
RowIcon?: IconComponent;
|
|
RowIconFn?: (item: ListItem) => IconComponent;
|
|
RowIconColor?: string;
|
|
RowRightComponent: ComponentType<{ item: ListItem }>;
|
|
footerButtonLabel?: string;
|
|
onFooterButtonClick?: () => void;
|
|
to?: (item: ListItem) => string;
|
|
rounded?: boolean;
|
|
};
|
|
|
|
export const SettingsListCard = <
|
|
ListItem extends { id: string } = {
|
|
id: string;
|
|
},
|
|
>({
|
|
items,
|
|
getItemLabel,
|
|
getItemDescription,
|
|
hasFooter,
|
|
isLoading,
|
|
onRowClick,
|
|
RowIcon,
|
|
RowIconFn,
|
|
RowIconColor,
|
|
RowRightComponent,
|
|
onFooterButtonClick,
|
|
footerButtonLabel,
|
|
to,
|
|
rounded,
|
|
}: SettingsListCardProps<ListItem>) => {
|
|
const { theme } = useContext(ThemeContext);
|
|
|
|
if (isLoading === true) return <SettingsListSkeletonCard />;
|
|
|
|
return (
|
|
<Card rounded={rounded}>
|
|
{items.map((item, index) => (
|
|
<SettingsListItemCardContent
|
|
key={item.id}
|
|
LeftIcon={RowIconFn ? RowIconFn(item) : RowIcon}
|
|
LeftIconColor={RowIconColor}
|
|
label={getItemLabel(item)}
|
|
description={getItemDescription?.(item)}
|
|
rightComponent={<RowRightComponent item={item} />}
|
|
divider={index < items.length - 1}
|
|
onClick={onRowClick ? () => onRowClick?.(item) : undefined}
|
|
to={to?.(item)}
|
|
/>
|
|
))}
|
|
{hasFooter && (
|
|
<StyledFooterContainer>
|
|
<CardFooter divider={!!items.length}>
|
|
<StyledButton onClick={onFooterButtonClick}>
|
|
<IconPlus size={theme.icon.size.md} />
|
|
{footerButtonLabel}
|
|
</StyledButton>
|
|
</CardFooter>
|
|
</StyledFooterContainer>
|
|
)}
|
|
</Card>
|
|
);
|
|
};
|