The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[Onboarding 6/10] Add skip dialogs (#26781)
Thomas des Francse673ef205175
diff --git a/packages/twenty-docs/snippets/ui/generated/data-display/avatar.mdx b/packages/twenty-docs/snippets/ui/generated/data-display/avatar.mdxindex 20826d86cd8..4c8a35af98d 100644--- a/packages/twenty-docs/snippets/ui/generated/data-display/avatar.mdx+++ b/packages/twenty-docs/snippets/ui/generated/data-display/avatar.mdx@@ -59,6 +59,10 @@Accepts a `ReactElement` or a function that returns the element to render.</ParamField>+<ParamField body="ring" type="boolean" default="false">+ Surrounds the avatar with a background-colored ring so overlapping avatars stay distinct.+</ParamField>+<ParamField body="shape" type=""circle" | "rounded-square" | "square"" default="square">Shape of the avatar and its fallback.</ParamField>diff --git a/packages/twenty-docs/snippets/ui/generated/data-display/pill.mdx b/packages/twenty-docs/snippets/ui/generated/data-display/pill.mdxindex df6fbfb2536..9eb748d7a53 100644--- a/packages/twenty-docs/snippets/ui/generated/data-display/pill.mdx+++ b/packages/twenty-docs/snippets/ui/generated/data-display/pill.mdx@@ -15,6 +15,10 @@CSS class applied to the pill.</ParamField>+<ParamField body="color" type=""inherit" | "tertiary"" default="tertiary">+ Text color. `inherit` takes the parent color and font weight on a tinted background.+</ParamField>+<ParamField body="Icon" type="IconComponent">Icon component rendered before the label at 12px. Import icons from `twenty-ui/icon`.</ParamField>@@ -22,3 +26,7 @@<ParamField body="label" type="string">Short text displayed inside the pill.</ParamField>++<ParamField body="size" type=""md" | "sm"" default="sm">+ Pill size. `md` uses a larger font, height and icon.+</ParamField>diff --git a/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx b/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdxindex 3b3eb0d2dfd..8c950637193 100644--- a/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx+++ b/packages/twenty-docs/snippets/ui/generated/surfaces/dialog.mdx@@ -162,7 +162,7 @@Accepts a `ReactElement` or a function that returns the element to render.</ParamField>-<ParamField body="Popup.size" type=""fullscreen" | "lg" | "md" | "sm" | "xl"" default="md">+<ParamField body="Popup.size" type=""compact" | "fullscreen" | "lg" | "md" | "sm" | "xl"" default="md">Width of the dialog, or `fullscreen` to fill the viewport.</ParamField>diff --git a/packages/twenty-docs/snippets/ui/generated/tokens.mdx b/packages/twenty-docs/snippets/ui/generated/tokens.mdxindex d3f7dd2dfb5..04875d3bb44 100644--- a/packages/twenty-docs/snippets/ui/generated/tokens.mdx+++ b/packages/twenty-docs/snippets/ui/generated/tokens.mdx@@ -966,6 +966,7 @@| Token path | CSS variable | Light | Dark | Numeric || --- | --- | --- | --- | --- |+| modal.size.compact.width | --t-modal-size-compact-width | 360px | 360px | || modal.size.fullscreen.height | --t-modal-size-fullscreen-height | calc(100dvh / var(--t-zoom, 1)) | calc(100dvh / var(--t-zoom, 1)) | || modal.size.fullscreen.width | --t-modal-size-fullscreen-width | calc(100dvw / var(--t-zoom, 1)) | calc(100dvw / var(--t-zoom, 1)) | || modal.size.lg.width | --t-modal-size-lg-width | 53% | 53% | |diff --git a/packages/twenty-front/public/images/onboarding/import-preview/star.svg b/packages/twenty-front/public/images/onboarding/import-preview/star.svgnew file mode 100644index 00000000000..25c276c4b0e--- /dev/null+++ b/packages/twenty-front/public/images/onboarding/import-preview/star.svg@@ -0,0 +1,3 @@+<svg preserveAspectRatio="none" overflow="visible" style="display: block;" width="12.4976" height="11.8697" viewBox="0 0 12.4976 11.8697" fill="none" xmlns="http://www.w3.org/2000/svg">+<path id="Shape" d="M6.2488 8.73778L9.07394 10.4429L8.32423 7.22921L10.8202 5.06693L7.53337 4.78807L6.2488 1.75721L4.96423 4.78807L1.67737 5.06693L4.17337 7.22921L3.42366 10.4429L6.2488 8.73778Z" stroke="#B3B3B3" stroke-width="1.37143"/>+</svg>diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsxnew file mode 100644index 00000000000..4738de6dc38--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingCreditsRewardChip.tsx@@ -0,0 +1,17 @@+import { IconCoins } from 'twenty-ui/icon';+import { Pill } from 'twenty-ui/primitives/data-display';++type OnboardingCreditsRewardChipProps = {+ formattedCreditsReward: string;+};++export const OnboardingCreditsRewardChip = ({+ formattedCreditsReward,+}: OnboardingCreditsRewardChipProps) => (+ <Pill+ Icon={IconCoins}+ label={`+${formattedCreditsReward}`}+ size="md"+ color="inherit"+ />+);diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingRewardMainButton.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingRewardMainButton.tsxnew file mode 100644index 00000000000..20d7fe0f020--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingRewardMainButton.tsx@@ -0,0 +1,54 @@+import { useNumberFormat } from '@/localization/hooks/useNumberFormat';+import { OnboardingCreditsRewardChip } from '@/onboarding/components/OnboardingCreditsRewardChip';+import { type OnboardingRewardAction } from '@/onboarding/types/OnboardingRewardAction';+import { formatOnboardingCredits } from '@/onboarding/utils/formatOnboardingCredits';+import { getOnboardingCreditsRewardAriaLabel } from '@/onboarding/utils/getOnboardingCreditsRewardAriaLabel';+import { type Ref } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { MainButton } from 'twenty-ui/components';+import { useTheme } from 'twenty-ui/theme';++type OnboardingRewardMainButtonProps = OnboardingRewardAction & {+ creditsReward: number;+ ref?: Ref<HTMLButtonElement>;+};++export const OnboardingRewardMainButton = ({+ label,+ Icon,+ creditsReward,+ onClick,+ ref,+}: OnboardingRewardMainButtonProps) => {+ const theme = useTheme();+ const { numberFormat } = useNumberFormat();+ const formattedCreditsReward = formatOnboardingCredits(+ creditsReward,+ numberFormat,+ );++ return (+ <MainButton+ ref={ref}+ fullWidth+ onClick={onClick}+ startIcon={+ isDefined(Icon) ? <Icon size={theme.icon.size.md} /> : undefined+ }+ endIcon={+ creditsReward > 0 ? (+ <OnboardingCreditsRewardChip+ formattedCreditsReward={formattedCreditsReward}+ />+ ) : undefined+ }+ aria-label={getOnboardingCreditsRewardAriaLabel({+ label,+ creditsReward,+ formattedCreditsReward,+ })}+ >+ {label}+ </MainButton>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialog.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialog.tsxnew file mode 100644index 00000000000..46a21b53e1c--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialog.tsx@@ -0,0 +1,111 @@+import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { OnboardingRewardMainButton } from '@/onboarding/components/OnboardingRewardMainButton';+import { type OnboardingRewardAction } from '@/onboarding/types/OnboardingRewardAction';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { type ReactNode, useRef } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { IconButton } from 'twenty-ui/components';+import { IconX } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/primitives/input';+import { Dialog } from 'twenty-ui/primitives/surfaces';+import { themeCssVariables } from 'twenty-ui/theme';++const StyledHeader = styled(Dialog.Header)`+ align-items: center;+ position: relative;+ text-align: center;+`;++const StyledCloseButton = styled.div`+ position: absolute;+ right: ${themeCssVariables.spacing[3]};+ top: ${themeCssVariables.spacing[3]};+`;++const StyledVisual = styled.div`+ margin-bottom: ${themeCssVariables.spacing[2]};+`;++type OnboardingSkipDialogProps = {+ dialogId: string;+ visual: ReactNode;+ title: string;+ description?: string;+ actions: OnboardingRewardAction[];+ creditsReward: number;+ onSkip: () => void;+};++export const OnboardingSkipDialog = ({+ dialogId,+ visual,+ title,+ description,+ actions,+ creditsReward,+ onSkip,+}: OnboardingSkipDialogProps) => {+ const { t } = useLingui();+ const { closeDialog } = useDialog();+ const firstActionRef = useRef<HTMLButtonElement>(null);++ const runAction = (action: OnboardingRewardAction) => {+ closeDialog(dialogId);+ action.onClick();+ };++ return (+ <DialogInstance dialogId={dialogId} dismissible renderInDocumentBody>+ {({ container, backdrop, viewportProps, onKeyDown }) => (+ <Dialog.Popup+ {...{ container, backdrop, viewportProps, onKeyDown }}+ size="compact"+ initialFocus={firstActionRef}+ data-globally-prevent-click-outside+ >+ <StyledHeader>+ <StyledCloseButton>+ <IconButton+ variant="ghost"+ size="sm"+ aria-label={t`Close`}+ onClick={() => closeDialog(dialogId)}+ >+ <IconX />+ </IconButton>+ </StyledCloseButton>+ <StyledVisual>{visual}</StyledVisual>+ <Dialog.Title>{title}</Dialog.Title>+ {isDefined(description) && (+ <Dialog.Description>{description}</Dialog.Description>+ )}+ </StyledHeader>+ <Dialog.Footer>+ {actions.map((action, index) => (+ <OnboardingRewardMainButton+ key={action.label}+ ref={index === 0 ? firstActionRef : undefined}+ label={action.label}+ Icon={action.Icon}+ creditsReward={creditsReward}+ onClick={() => runAction(action)}+ />+ ))}+ <Button+ variant="ghost"+ fullWidth+ onClick={() => {+ closeDialog(dialogId);+ onSkip();+ }}+ >+ {t`Skip anyway`}+ </Button>+ </Dialog.Footer>+ </Dialog.Popup>+ )}+ </DialogInstance>+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialogAvatars.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialogAvatars.tsxnew file mode 100644index 00000000000..64cdd50b583--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingSkipDialogAvatars.tsx@@ -0,0 +1,58 @@+import { styled } from '@linaria/react';+import { motion, useReducedMotion } from 'framer-motion';+import { AvatarGroup } from 'twenty-ui/components';+import { Avatar, type AvatarShape } from 'twenty-ui/primitives/data-display';++const MAX_VISIBLE_AVATARS = 5;++const StyledItem = styled(motion.div)`+ display: flex;+`;++type OnboardingSkipDialogAvatar = {+ id: string;+ name: string;+ src?: string | null;+ shape: AvatarShape;+};++type OnboardingSkipDialogAvatarsProps = {+ avatars: OnboardingSkipDialogAvatar[];+};++export const OnboardingSkipDialogAvatars = ({+ avatars,+}: OnboardingSkipDialogAvatarsProps) => {+ const shouldReduceMotion = useReducedMotion();++ const visibleAvatars = avatars.slice(0, MAX_VISIBLE_AVATARS);++ return (+ <AvatarGroup+ maxVisible={visibleAvatars.length}+ overlapOffset="4px"+ avatars={visibleAvatars.map((avatar, index) => (+ <StyledItem+ key={avatar.id}+ initial={{ opacity: 0, scale: shouldReduceMotion ? 1 : 0.6 }}+ animate={{ opacity: 1, scale: 1 }}+ transition={{+ type: 'spring',+ stiffness: 420,+ damping: 22,+ delay: index * 0.05,+ }}+ >+ <Avatar+ src={avatar.src}+ name={avatar.name}+ colorSeed={avatar.id}+ size="lg"+ shape={avatar.shape}+ ring+ />+ </StyledItem>+ ))}+ />+ );+};diff --git a/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingCreditsRewardChip.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingCreditsRewardChip.stories.tsxnew file mode 100644index 00000000000..8977f191b92--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingCreditsRewardChip.stories.tsx@@ -0,0 +1,21 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, within } from 'storybook/test';+import { ComponentDecorator } from 'twenty-ui/testing';++import { OnboardingCreditsRewardChip } from '@/onboarding/components/OnboardingCreditsRewardChip';++const meta: Meta<typeof OnboardingCreditsRewardChip> = {+ title: 'Modules/Onboarding/OnboardingCreditsRewardChip',+ component: OnboardingCreditsRewardChip,+ decorators: [ComponentDecorator],+ args: { formattedCreditsReward: '2' },+};++export default meta;+type Story = StoryObj<typeof OnboardingCreditsRewardChip>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ await expect(await within(canvasElement).findByText('+2')).toBeVisible();+ },+};diff --git a/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialog.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialog.stories.tsxnew file mode 100644index 00000000000..3281b495768--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialog.stories.tsx@@ -0,0 +1,116 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { type ComponentProps } from 'react';+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';+import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/primitives/input';+import { ComponentDecorator } from 'twenty-ui/testing';++import { OnboardingSkipDialog } from '@/onboarding/components/OnboardingSkipDialog';+import { OnboardingSkipDialogAvatars } from '@/onboarding/components/OnboardingSkipDialogAvatars';+import { ONBOARDING_NETWORK_PREVIEW_PEOPLE } from '@/onboarding/constants/OnboardingNetworkPreviewPeople';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { RootDecorator } from '~/testing/decorators/RootDecorator';++const DIALOG_ID = 'onboarding-skip-dialog-story';++type OnboardingSkipDialogExampleProps = Omit<+ ComponentProps<typeof OnboardingSkipDialog>,+ 'dialogId'+>;++const OnboardingSkipDialogExample = (+ props: OnboardingSkipDialogExampleProps,+) => {+ const { openDialog } = useDialog();++ return (+ <>+ <Button onClick={() => openDialog(DIALOG_ID)}>Open dialog</Button>+ <OnboardingSkipDialog {...props} dialogId={DIALOG_ID} />+ </>+ );+};++const openSkipDialog = async (canvasElement: HTMLElement) => {+ await userEvent.click(+ within(canvasElement).getByRole('button', { name: 'Open dialog' }),+ );++ return within(canvasElement.ownerDocument.body).findByRole('dialog', {+ name: 'Start with your whole network',+ });+};++const meta: Meta<typeof OnboardingSkipDialogExample> = {+ title: 'Modules/Onboarding/OnboardingSkipDialog',+ component: OnboardingSkipDialogExample,+ decorators: [RootDecorator, ComponentDecorator],+ args: {+ visual: (+ <OnboardingSkipDialogAvatars+ avatars={ONBOARDING_NETWORK_PREVIEW_PEOPLE.map((person) => ({+ id: person.id,+ name: '',+ src: person.avatarUrl,+ shape: 'circle',+ }))}+ />+ ),+ title: 'Start with your whole network',+ description:+ 'Twenty adds the people you email and meet, and keeps them up to date without manual data entry.',+ actions: [+ {+ label: 'Continue with Microsoft',+ Icon: IconMicrosoft,+ onClick: fn(),+ },+ {+ label: 'Continue with Google',+ Icon: IconGoogle,+ onClick: fn(),+ },+ ],+ creditsReward: 2,+ onSkip: fn(),+ },+};++export default meta;+type Story = StoryObj<typeof OnboardingSkipDialogExample>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ const dialog = await openSkipDialog(canvasElement);++ await expect(+ within(dialog).getByRole('button', {+ name: 'Continue with Google, earn 2 free credits',+ }),+ ).toHaveTextContent('+2');+ },+};++export const WithoutCreditsReward: Story = {+ args: { creditsReward: 0 },+ play: async ({ canvasElement }) => {+ const dialog = await openSkipDialog(canvasElement);++ await expect(+ within(dialog).getByRole('button', { name: 'Continue with Google' }),+ ).toHaveTextContent(/^Continue with Google$/);+ },+};++export const SkipAnyway: Story = {+ play: async ({ canvasElement, args }) => {+ const dialog = await openSkipDialog(canvasElement);++ await userEvent.click(+ within(dialog).getByRole('button', { name: 'Skip anyway' }),+ );++ await waitFor(() => expect(dialog).not.toBeInTheDocument());+ await expect(args.onSkip).toHaveBeenCalledTimes(1);+ },+};diff --git a/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialogAvatars.stories.tsx b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialogAvatars.stories.tsxnew file mode 100644index 00000000000..1d21f01cabb--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/components/__stories__/OnboardingSkipDialogAvatars.stories.tsx@@ -0,0 +1,47 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, waitFor, within } from 'storybook/test';+import { ComponentDecorator } from 'twenty-ui/testing';++import { OnboardingSkipDialogAvatars } from '@/onboarding/components/OnboardingSkipDialogAvatars';+import { ONBOARDING_NETWORK_PREVIEW_PEOPLE } from '@/onboarding/constants/OnboardingNetworkPreviewPeople';++const meta: Meta<typeof OnboardingSkipDialogAvatars> = {+ title: 'Modules/Onboarding/OnboardingSkipDialogAvatars',+ component: OnboardingSkipDialogAvatars,+ decorators: [ComponentDecorator],+ args: {+ avatars: ONBOARDING_NETWORK_PREVIEW_PEOPLE.map((person) => ({+ id: person.id,+ name: '',+ src: person.avatarUrl,+ shape: 'circle',+ })),+ },+};++export default meta;+type Story = StoryObj<typeof OnboardingSkipDialogAvatars>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ await waitFor(() =>+ expect(within(canvasElement).getAllByRole('presentation')).toHaveLength(+ ONBOARDING_NETWORK_PREVIEW_PEOPLE.length,+ ),+ );+ },+};++export const CapsVisibleAvatars: Story = {+ args: {+ avatars: ['Alice', 'Bruno', 'Chloe', 'David', 'Emma', 'Farid'].map(+ (name) => ({ id: name, name, shape: 'circle' }),+ ),+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await expect(await canvas.findByText('E')).toBeInTheDocument();+ await expect(canvas.queryByText('F')).not.toBeInTheDocument();+ },+};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.tsxindex 23752c12e77..29933c1fc57 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@@ -9,6 +9,9 @@ import { useOnboardingFreeCreditsTooltipContent } from '@/onboarding/hooks/useOnimport { useOnboardingNewlyEarnedCredits } from '@/onboarding/hooks/useOnboardingNewlyEarnedCredits';import { type OnboardingCreditsProgress } from '@/onboarding/types/OnboardingCreditsProgress';import { formatOnboardingCredits } from '@/onboarding/utils/formatOnboardingCredits';+import { currentFocusedItemSelector } from '@/ui/utilities/focus/states/currentFocusedItemSelector';+import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';import { plural } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';@@ -120,6 +123,10 @@ export const OnboardingFreeCreditsPill = ({const shouldReduceMotion = useReducedMotion();const { numberFormat } = useNumberFormat();const [isPopoverShown, setIsPopoverShown] = useState(false);+ const currentFocusedItem = useAtomStateValue(currentFocusedItemSelector);+ const isModalFocused =+ currentFocusedItem?.componentInstance.componentType ===+ FocusComponentType.MODAL;const [hasTrackGrown, setHasTrackGrown] = useState(shouldReduceMotion ?? false,);@@ -233,7 +240,9 @@ export const OnboardingFreeCreditsPill = ({</Popover.Popup></Popover.Root></StyledPillAnchor>- <Tooltip.Root open={!isPopoverShown && isDefined(tooltipContent)}>+ <Tooltip.Root+ open={!isPopoverShown && !isModalFocused && isDefined(tooltipContent)}+ ><Tooltip.Popupanchor={pillRef}side="bottom"diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsxindex a7540767d6e..d7b120b99b9 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreview.tsx@@ -10,7 +10,7 @@ const PREVIEW_HEIGHT = 198;const StyledCard = styled.div`align-items: center;- background-color: ${themeCssVariables.background.primary};+ background-color: ${themeCssVariables.background.secondary};border: 1px solid ${themeCssVariables.border.color.medium};border-radius: 12px;box-sizing: border-box;@@ -19,7 +19,7 @@ const StyledCard = styled.div`gap: ${themeCssVariables.spacing[3]};max-width: 100%;overflow: hidden;- padding-bottom: ${themeCssVariables.spacing[3]};+ padding-bottom: calc(${themeCssVariables.spacing[3]} - 1px);width: ${ONBOARDING_CONTENT_BLOCK_WIDTH}px;`;diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewCompanies.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewCompanies.tsxindex 09c38f9e38a..ef963c212a7 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewCompanies.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewCompanies.tsx@@ -43,6 +43,20 @@ const StyledHeaderTitle = styled.div`font-weight: ${themeCssVariables.font.weight.medium};gap: ${themeCssVariables.spacing[1]};min-width: 0;+ padding-left: ${themeCssVariables.spacing[2]};+`;++const StyledHeaderAction = styled.div`+ align-items: center;+ display: flex;+ height: ${themeCssVariables.spacing[6]};+ justify-content: center;+ width: ${themeCssVariables.spacing[6]};+`;++const StyledCompanyCell = styled.div`+ display: flex;+ padding-left: ${themeCssVariables.spacing[2]};`;export const OnboardingImportPreviewCompanies = () => {@@ -60,33 +74,36 @@ export const OnboardingImportPreviewCompanies = () => {/>{t`Companies`}</StyledHeaderTitle>- <IconPlus- size={theme.icon.size.md}- color={themeCssVariables.font.color.tertiary}- />+ <StyledHeaderAction>+ <IconPlus+ size={theme.icon.size.md}+ color={themeCssVariables.font.color.tertiary}+ />+ </StyledHeaderAction></StyledRow>{IMPORT_CONTACTS_PREVIEW_COMPANIES.map((company) => (<StyledRow key={company.id}><Checkbox checked={false} hoverable />- <Chip- size="sm"- variant="ghost"- color="primary"- startElement={- <Avatar- shape="square"- size="md"- name={company.name}- colorSeed={company.id}- src={getAbsoluteImageUrl(- getLogoUrlFromDomainName(company.domainName),- )}- />- }- style={{ paddingInlineStart: 0 }}- >- {company.name}- </Chip>+ <StyledCompanyCell>+ <Chip+ size="sm"+ variant="soft"+ color="primary"+ startElement={+ <Avatar+ shape="square"+ size="sm"+ name={company.name}+ colorSeed={company.id}+ src={getAbsoluteImageUrl(+ getLogoUrlFromDomainName(company.domainName),+ )}+ />+ }+ >+ {company.name}+ </Chip>+ </StyledCompanyCell></StyledRow>))}</StyledColumn>diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsxindex f6963516bb9..a57a4627c35 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewEmails.tsx@@ -7,12 +7,17 @@ import {IMPORT_CONTACTS_PREVIEW_EMAILS,} from '@/onboarding/constants/ImportContactsPreviewEmails';import { styled } from '@linaria/react';-import { IconStar } from 'twenty-ui/icon';+import { isDefined } from 'twenty-shared/utils';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';-const EMAIL_ROW_HEIGHT = 32;-const EMAIL_CHECKBOX_SIZE = 12;-const EMAIL_STAR_SIZE = 11;+const EVENT_CARD_WIDTH = 160;++const SENDER_COLORS: Record<ImportContactsPreviewEmail['senderColor'], string> =+ {+ primary: themeCssVariables.font.color.primary,+ secondary: themeCssVariables.font.color.secondary,+ tertiary: themeCssVariables.font.color.tertiary,+ };const StyledColumn = styled.div`background-color: ${themeCssVariables.border.color.light};@@ -27,73 +32,105 @@ const StyledColumn = styled.div`position: relative;`;-const StyledEmailRow = styled.div<{ isUnread: boolean }>`+const StyledEmailRow = styled.div`align-items: center;background-color: ${themeCssVariables.background.primary};box-sizing: border-box;- color: ${({ isUnread }) =>- isUnread- ? themeCssVariables.font.color.primary- : themeCssVariables.font.color.tertiary};display: flex;flex-shrink: 0;font-size: ${themeCssVariables.font.size.sm};- gap: ${themeCssVariables.spacing[2]};- height: ${EMAIL_ROW_HEIGHT}px;+ gap: ${themeCssVariables.spacing[3]};+ height: ${themeCssVariables.spacing[8]};padding: 0 ${themeCssVariables.spacing[3]};white-space: nowrap;`;const StyledEmailCheckbox = styled.div`border: 1px solid ${themeCssVariables.font.color.light};- border-radius: 1px;+ border-radius: ${themeCssVariables.border.radius.xs};box-sizing: border-box;flex-shrink: 0;- height: ${EMAIL_CHECKBOX_SIZE}px;- width: ${EMAIL_CHECKBOX_SIZE}px;+ height: ${themeCssVariables.spacing[3]};+ width: ${themeCssVariables.spacing[3]};++ &[data-selected='true'] {+ border-color: ${themeCssVariables.font.color.primary};+ }`;-const StyledEmailStar = styled.div`- align-items: center;- display: flex;+const StyledEmailStar = styled.span`+ background-color: ${themeCssVariables.font.color.light};flex-shrink: 0;+ height: ${themeCssVariables.spacing[3]};+ mask: url('/images/onboarding/import-preview/star.svg') center / contain+ no-repeat;+ width: ${themeCssVariables.spacing[3]};++ &[data-selected='true'] {+ background-color: ${themeCssVariables.font.color.primary};+ }`;-const StyledEmailSender = styled.span<{ isUnread: boolean }>`- font-weight: ${({ isUnread }) =>- isUnread- ? themeCssVariables.font.weight.medium- : themeCssVariables.font.weight.regular};+const StyledEmailSender = styled.span`+ flex-shrink: 0;+ font-weight: ${themeCssVariables.font.weight.regular};+ overflow: hidden;+ text-overflow: ellipsis;+ width: ${themeCssVariables.spacing[30]};++ &[data-medium='true'] {+ font-weight: ${themeCssVariables.font.weight.medium};+ }`;const StyledEmailSubject = styled.span`color: ${themeCssVariables.font.color.secondary};`;-const StyledEventCard = styled.div<{ color: 'orange' | 'sky' }>`- background-color: ${({ color }) =>- color === 'orange'- ? themeCssVariables.color.orange3- : themeCssVariables.color.sky3};- border-left: 2px solid- ${({ color }) =>- color === 'orange'- ? themeCssVariables.color.orange11- : themeCssVariables.color.sky11};+const StyledEventCard = styled.div`+ animation: onboardingImportPreviewEventCardIn 900ms+ cubic-bezier(0.22, 1, 0.36, 1) both;border-radius: ${themeCssVariables.border.radius.md};box-shadow: ${themeCssVariables.boxShadow.strong};box-sizing: border-box;- color: ${({ color }) =>- color === 'orange'- ? themeCssVariables.color.orange11- : themeCssVariables.color.sky11};display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[1]};line-height: 1.1;+ overflow: hidden;padding: ${themeCssVariables.spacing[2]};position: absolute;- width: 160px;+ transform: var(--event-card-transform);+ width: ${EVENT_CARD_WIDTH}px;++ @keyframes onboardingImportPreviewEventCardIn {+ from {+ opacity: 0;+ transform: var(--event-card-entry-transform);+ }+ to {+ opacity: 1;+ transform: var(--event-card-transform);+ }+ }++ @media (prefers-reduced-motion: reduce) {+ animation: none;+ }++ &[data-color='orange'] {+ animation-delay: 300ms;+ background-color: ${themeCssVariables.color.orange3};+ border-left: 2px solid ${themeCssVariables.color.orange11};+ color: ${themeCssVariables.color.orange11};+ }++ &[data-color='sky'] {+ animation-delay: 150ms;+ background-color: ${themeCssVariables.color.sky3};+ border-left: 2px solid ${themeCssVariables.color.sky11};+ color: ${themeCssVariables.color.sky11};+ }@media (max-width: ${MOBILE_VIEWPORT}px) {display: none;@@ -106,30 +143,45 @@ const StyledEventTitle = styled.span``;const StyledEventTime = styled.span`- font-size: 10px;+ font-size: ${themeCssVariables.font.size.xs};`;const EVENT_CARD_POSITIONS: Record<ImportContactsPreviewCalendarEvent['color'],- { top: number; left: number; rotate: number }+ {+ top: number;+ left: number;+ rotate: number;+ entry: { x: number; y: number; rotate: number; scale: number };+ }> = {- orange: { top: 160, left: 22, rotate: -7 },- sky: { top: -4, left: 44, rotate: 10 },+ orange: {+ top: 159,+ left: 21,+ rotate: -7,+ entry: { x: 8, y: -10, rotate: -2, scale: 0.94 },+ },+ sky: {+ top: -5,+ left: 43,+ rotate: 10,+ entry: { x: 8, y: 10, rotate: 5, scale: 0.94 },+ },};const EmailRow = ({ email }: { email: ImportContactsPreviewEmail }) => (- <StyledEmailRow isUnread={email.isUnread}>- <StyledEmailCheckbox />- <StyledEmailStar>- <IconStar- size={EMAIL_STAR_SIZE}- color={themeCssVariables.font.color.light}- />- </StyledEmailStar>- <StyledEmailSender isUnread={email.isUnread}>+ <StyledEmailRow>+ <StyledEmailCheckbox data-selected={email.isSelected} />+ <StyledEmailStar data-selected={email.isSelected} />+ <StyledEmailSender+ data-medium={email.isSenderMedium}+ style={{ color: SENDER_COLORS[email.senderColor] }}+ >{email.sender}</StyledEmailSender>- <StyledEmailSubject>{email.subject}</StyledEmailSubject>+ {isDefined(email.subject) && (+ <StyledEmailSubject>{email.subject}</StyledEmailSubject>+ )}</StyledEmailRow>);@@ -142,12 +194,15 @@ const EventCard = ({return (<StyledEventCard- color={event.color}- style={{- top: position.top,- left: position.left,- transform: `rotate(${position.rotate}deg)`,- }}+ data-color={event.color}+ style={+ {+ top: position.top,+ left: position.left,+ '--event-card-transform': `rotate(${position.rotate}deg)`,+ '--event-card-entry-transform': `translate(${position.entry.x}px, ${position.entry.y}px) rotate(${position.entry.rotate}deg) scale(${position.entry.scale})`,+ } as React.CSSProperties+ }><StyledEventTitle>{event.title}</StyledEventTitle><StyledEventTime>{event.time}</StyledEventTime>diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsxindex d7916ac9c10..e5c4abe5d38 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPreviewSyncBadge.tsx@@ -22,6 +22,27 @@ const StyledBadge = styled.div`transform: translateX(-50%);`;+const StyledArrow = styled.span`+ animation: onboardingImportPreviewArrowIn 800ms cubic-bezier(0.22, 1, 0.36, 1)+ 450ms both;+ display: flex;++ @keyframes onboardingImportPreviewArrowIn {+ from {+ opacity: 0.3;+ transform: translateX(-6px);+ }+ to {+ opacity: 1;+ transform: translateX(0);+ }+ }++ @media (prefers-reduced-motion: reduce) {+ animation: none;+ }+`;+const StyledDivider = styled.div`align-self: stretch;background-color: ${themeCssVariables.border.color.medium};@@ -42,10 +63,12 @@ export const OnboardingImportPreviewSyncBadge = () => {<IconGoogle size={theme.icon.size.md} /><IconMicrosoft size={theme.icon.size.md} /><StyledDivider />- <IconArrowRight- size={theme.icon.size.md}- color={themeCssVariables.font.color.tertiary}- />+ <StyledArrow>+ <IconArrowRight+ size={theme.icon.size.md}+ color={themeCssVariables.font.color.tertiary}+ />+ </StyledArrow><StyledTwentyLogo src="/images/integrations/twenty-logo.svg" alt="" /></StyledBadge>);diff --git a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsxindex 342108402a9..b5e03d4b4c0 100644--- a/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/import-contacts/OnboardingImportPrivacyNote.tsx@@ -15,6 +15,7 @@ const StyledNote = styled.div`const StyledNoteText = styled.span`line-height: 1.4;+ margin-block: calc((${PRIVACY_NOTE_ICON_SIZE}px - 1.4em) / 2);`;export const OnboardingImportPrivacyNote = () => {diff --git a/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewEmails.ts b/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewEmails.tsindex d8b08432089..cc821defc78 100644--- a/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewEmails.ts+++ b/packages/twenty-front/src/modules/onboarding/constants/ImportContactsPreviewEmails.ts@@ -1,9 +1,10 @@export type ImportContactsPreviewEmail = {id: string;sender: string;- subject: string;- date: string;- isUnread: boolean;+ subject?: string;+ senderColor: 'primary' | 'secondary' | 'tertiary';+ isSenderMedium: boolean;+ isSelected: boolean;};export const IMPORT_CONTACTS_PREVIEW_EMAILS = [@@ -11,44 +12,48 @@ export const IMPORT_CONTACTS_PREVIEW_EMAILS = [id: 'acme',sender: 'Acme Inc.',subject: 'Insights: The latest in industrial equipment and tools',- date: 'Feb, 26',- isUnread: false,+ senderColor: 'secondary',+ isSenderMedium: true,+ isSelected: false,},{id: 'dylan-field',sender: 'Dylan Field',subject:'Lorem ipsum dolor sit amet consectetur. Ac eget eu eget ullamcorper tellus sem scelerisque sit ante.',- date: '12/12/23',- isUnread: false,+ senderColor: 'primary',+ isSenderMedium: false,+ isSelected: false,},{id: 'dario-amodei',sender: 'Dario Amodei',- subject:- 'Delta Weekly News: Learn about important safety tips before you fly!',- date: 'Jan, 26',- isUnread: true,+ senderColor: 'primary',+ isSenderMedium: true,+ isSelected: true,},{id: 'ivan-zhao',sender: 'Ivan Zhao',subject: 'Our latest Adventures and Destinations',- date: 'March, 26',- isUnread: false,+ senderColor: 'tertiary',+ isSenderMedium: true,+ isSelected: false,},{id: 'brian-chesky',sender: 'Brian Chesky',subject: 'Insights: Industry trends and best practices',- date: 'Jan, 26',- isUnread: false,+ senderColor: 'tertiary',+ isSenderMedium: true,+ isSelected: false,},{id: 'stewart-butterfield',sender: 'Stewart Butterfield',subject: 'Our Complete list of Recipe Ideas and Restaurant Reviews!',- date: 'Jan, 26',- isUnread: false,+ senderColor: 'secondary',+ isSenderMedium: true,+ isSelected: false,},] satisfies ImportContactsPreviewEmail[];diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingNetworkPreviewPeople.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingNetworkPreviewPeople.tsnew file mode 100644index 00000000000..3ae9d3c6fe5--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingNetworkPreviewPeople.ts@@ -0,0 +1,6 @@+export const ONBOARDING_NETWORK_PREVIEW_PEOPLE = [3, 5, 22, 20, 34].map(+ (imageNumber) => ({+ id: `network-preview-person-${imageNumber}`,+ avatarUrl: `https://twentyhq.github.io/placeholder-images/people/image-${imageNumber}.png`,+ }),+);diff --git a/packages/twenty-front/src/modules/onboarding/constants/OnboardingSkipDialogIds.ts b/packages/twenty-front/src/modules/onboarding/constants/OnboardingSkipDialogIds.tsnew file mode 100644index 00000000000..4cbb41d725d--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/constants/OnboardingSkipDialogIds.ts@@ -0,0 +1,3 @@+export const ONBOARDING_SKIP_DIALOG_IDS = {+ syncEmails: 'onboarding-sync-emails-skip-dialog',+} as const;diff --git a/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStepEnterHotkey.ts b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStepEnterHotkey.tsnew file mode 100644index 00000000000..7c7409d70ed--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/hooks/useOnboardingStepEnterHotkey.ts@@ -0,0 +1,23 @@+import { type PageFocusId } from '@/types/PageFocusId';+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { Key } from 'ts-key-enum';++export const useOnboardingStepEnterHotkey = ({+ focusId,+ onEnter,+}: {+ focusId: PageFocusId;+ onEnter: () => void;+}) =>+ useHotkeysOnFocusedElement({+ keys: Key.Enter,+ callback: (keyboardEvent) => {+ if (keyboardEvent.target instanceof HTMLButtonElement) {+ return;+ }+ onEnter();+ },+ focusId,+ dependencies: [onEnter],+ options: { preventDefault: false },+ });diff --git a/packages/twenty-front/src/modules/onboarding/types/OnboardingRewardAction.ts b/packages/twenty-front/src/modules/onboarding/types/OnboardingRewardAction.tsnew file mode 100644index 00000000000..eec2149d850--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/types/OnboardingRewardAction.ts@@ -0,0 +1,7 @@+import { type IconComponent } from 'twenty-ui/icon';++export type OnboardingRewardAction = {+ label: string;+ Icon?: IconComponent;+ onClick: () => void;+};diff --git a/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsRewardAriaLabel.test.ts b/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsRewardAriaLabel.test.tsnew file mode 100644index 00000000000..96b20b29c13--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/utils/__tests__/getOnboardingCreditsRewardAriaLabel.test.ts@@ -0,0 +1,43 @@+import { getOnboardingCreditsRewardAriaLabel } from '@/onboarding/utils/getOnboardingCreditsRewardAriaLabel';++describe('getOnboardingCreditsRewardAriaLabel', () => {+ it('should name the reward after the action', () => {+ expect(+ getOnboardingCreditsRewardAriaLabel({+ label: 'Continue with Google',+ creditsReward: 1,+ formattedCreditsReward: '1',+ }),+ ).toBe('Continue with Google, earn 1 free credit');+ });++ it('should use the plural for fractional rewards', () => {+ expect(+ getOnboardingCreditsRewardAriaLabel({+ label: 'Install all 2 apps',+ creditsReward: 0.5,+ formattedCreditsReward: '0.5',+ }),+ ).toBe('Install all 2 apps, earn 0.5 free credits');+ });++ it('should announce the amount as it is displayed', () => {+ expect(+ getOnboardingCreditsRewardAriaLabel({+ label: 'Continue with Google',+ creditsReward: 2.5,+ formattedCreditsReward: '2,5',+ }),+ ).toBe('Continue with Google, earn 2,5 free credits');+ });++ it('should leave the label alone without a reward', () => {+ expect(+ getOnboardingCreditsRewardAriaLabel({+ label: 'Continue',+ creditsReward: 0,+ formattedCreditsReward: '0',+ }),+ ).toBeUndefined();+ });+});diff --git a/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsRewardAriaLabel.ts b/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsRewardAriaLabel.tsnew file mode 100644index 00000000000..083e6ca6fc1--- /dev/null+++ b/packages/twenty-front/src/modules/onboarding/utils/getOnboardingCreditsRewardAriaLabel.ts@@ -0,0 +1,22 @@+import { plural } from '@lingui/core/macro';++type GetOnboardingCreditsRewardAriaLabelArgs = {+ label: string;+ creditsReward: number;+ formattedCreditsReward: string;+};++export const getOnboardingCreditsRewardAriaLabel = ({+ label,+ creditsReward,+ formattedCreditsReward,+}: GetOnboardingCreditsRewardAriaLabelArgs) => {+ if (creditsReward <= 0) {+ return undefined;+ }++ return plural(creditsReward, {+ one: `${label}, earn ${formattedCreditsReward} free credit`,+ other: `${label}, earn ${formattedCreditsReward} free credits`,+ });+};diff --git a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsxindex 7050f77ac52..8454e5e3fab 100644--- a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx+++ b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx@@ -1,20 +1,18 @@+import { OnboardingRewardMainButton } from '@/onboarding/components/OnboardingRewardMainButton';+import { type OnboardingRewardAction } from '@/onboarding/types/OnboardingRewardAction';import { OnboardingSkipButton } from '@/onboarding/components/OnboardingSkipButton';import { OnboardingStepAnimatedItem } from '@/onboarding/components/OnboardingStepAnimatedItem';import { StyledOnboardingStepHeading } from '@/onboarding/components/StyledOnboardingStepHeading';import { StyledOnboardingStepPage } from '@/onboarding/components/StyledOnboardingStepPage';import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnboardingStepSubtitle';-import { StyledOnboardingStepTagsRow } from '@/onboarding/components/StyledOnboardingStepTagsRow';import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';-import { OnboardingCreditsRewardTag } from '@/onboarding/components/import-contacts/OnboardingCreditsRewardTag';import { OnboardingImportPreview } from '@/onboarding/components/import-contacts/OnboardingImportPreview';import { OnboardingTrustBadges } from '@/onboarding/components/import-contacts/OnboardingTrustBadges';import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/OnboardingContentBlockWidth';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';-import { MainButton } from 'twenty-ui/components';-import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';-import { themeCssVariables, useTheme } from 'twenty-ui/theme';+import { themeCssVariables } from 'twenty-ui/theme';const StyledOnboardingStep = styled(StyledOnboardingStepPage)`gap: ${themeCssVariables.spacing[8]};@@ -49,20 +47,17 @@ const StyledButtons = styled.div``;type ImportContactsProps = {- creditsReward?: number;- onContinueWithGoogle?: () => void;- onContinueWithMicrosoft?: () => void;+ providerActions: OnboardingRewardAction[];onSkip?: () => void;+ creditsReward?: number;};export const ImportContacts = ({- creditsReward,- onContinueWithGoogle,- onContinueWithMicrosoft,+ providerActions,onSkip,+ creditsReward = 0,}: ImportContactsProps) => {const { t } = useLingui();- const theme = useTheme();return (<StyledOnboardingStep>@@ -75,39 +70,27 @@ export const ImportContacts = ({{t`Connect your email and calendar to see your entire network instantly. Takes only 30 seconds.`}</StyledSubtitle></OnboardingStepAnimatedItem>- {isDefined(creditsReward) && (- <OnboardingStepAnimatedItem index={2}>- <StyledOnboardingStepTagsRow>- <OnboardingCreditsRewardTag amount={creditsReward} />- </StyledOnboardingStepTagsRow>- </OnboardingStepAnimatedItem>- )}</StyledOnboardingStepHeading>- <OnboardingStepAnimatedItem index={3}>+ <OnboardingStepAnimatedItem index={2}><StyledMiddle><OnboardingTrustBadges /><OnboardingImportPreview /></StyledMiddle></OnboardingStepAnimatedItem>- <OnboardingStepAnimatedItem index={4}>+ <OnboardingStepAnimatedItem index={3}><StyledFooter><StyledButtons>- {isDefined(onContinueWithMicrosoft) && (- <MainButton- fullWidth- onClick={onContinueWithMicrosoft}- startIcon={<IconMicrosoft size={theme.icon.size.md} />}- >{t`Continue with Microsoft`}</MainButton>- )}- {isDefined(onContinueWithGoogle) && (- <MainButton- fullWidth- onClick={onContinueWithGoogle}- startIcon={<IconGoogle size={theme.icon.size.md} />}- >{t`Continue with Google`}</MainButton>- )}+ {providerActions.map((providerAction) => (+ <OnboardingRewardMainButton+ key={providerAction.label}+ label={providerAction.label}+ Icon={providerAction.Icon}+ creditsReward={creditsReward}+ onClick={providerAction.onClick}+ />+ ))}</StyledButtons>{isDefined(onSkip) && <OnboardingSkipButton onClick={onSkip} />}</StyledFooter>diff --git a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsxindex fdeb4d2a468..a40ce55b840 100644--- a/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx+++ b/packages/twenty-front/src/pages/onboarding/SyncEmails.tsx@@ -6,15 +6,24 @@ import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMeimport { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';import { onboardingConfigState } from '@/client-config/states/onboardingConfigState';+import { OnboardingSkipDialog } from '@/onboarding/components/OnboardingSkipDialog';+import { OnboardingSkipDialogAvatars } from '@/onboarding/components/OnboardingSkipDialogAvatars';+import { ONBOARDING_NETWORK_PREVIEW_PEOPLE } from '@/onboarding/constants/OnboardingNetworkPreviewPeople';+import { ONBOARDING_SKIP_DIALOG_IDS } from '@/onboarding/constants/OnboardingSkipDialogIds';import { SyncEmailsAutoSkipEffect } from '@/onboarding/effect-components/SyncEmailsAutoSkipEffect';+import { useOnboardingStepEnterHotkey } from '@/onboarding/hooks/useOnboardingStepEnterHotkey';import { useSetOnboardingStepFreeCredits } from '@/onboarding/hooks/useSetOnboardingStepFreeCredits';import { useSkipSyncEmailOnboardingStep } from '@/onboarding/hooks/useSkipSyncEmailOnboardingStep';import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';+import { PageFocusId } from '@/types/PageFocusId';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useLingui } from '@lingui/react/macro';import { useCallback, useState } from 'react';import { AppPath, ConnectedAccountProvider } from 'twenty-shared/types';import { PermissionFlagType } from '~/generated-metadata/graphql';+import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';import { ImportContacts } from '~/pages/onboarding/ImportContacts';import {CalendarChannelVisibility,@@ -22,6 +31,13 @@ import {} from '~/generated/graphql';export const SyncEmails = () => {+ const { t } = useLingui();+ const { openDialog } = useDialog();+ const onboardingConfig = useAtomStateValue(onboardingConfigState);+ const currentUser = useAtomStateValue(currentUserState);+ const importContactsCreditsReward = currentUser?.isWorkspaceCreator+ ? (onboardingConfig?.importContactsCreditsReward ?? 0)+ : 0;const { triggerApisOAuth } = useTriggerApisOAuth();const skipSyncEmailOnboardingStep = useSkipSyncEmailOnboardingStep();const setOnboardingStepFreeCredits = useSetOnboardingStepFreeCredits();@@ -55,15 +71,9 @@ export const SyncEmails = () => {const isClientConfigLoaded = useAtomStateValue(clientConfigApiStatusState,).isLoadedOnce;- const onboardingConfig = useAtomStateValue(onboardingConfigState);- const currentUser = useAtomStateValue(currentUserState);-- const creditsReward = currentUser?.isWorkspaceCreator- ? onboardingConfig?.importContactsCreditsReward- : undefined;const connectWithProvider = async (provider: ConnectedAccountProvider) => {- setOnboardingStepFreeCredits('importContacts', creditsReward ?? 0);+ setOnboardingStepFreeCredits('importContacts', importContactsCreditsReward);try {await triggerApisOAuth(provider, {@@ -79,12 +89,42 @@ export const SyncEmails = () => {}};- const handleSkip = async () => {+ const providerActions = [+ {+ isEnabled: isMicrosoftProviderEnabled,+ label: t`Continue with Microsoft`,+ Icon: IconMicrosoft,+ onClick: () => connectWithProvider(ConnectedAccountProvider.MICROSOFT),+ },+ {+ isEnabled: isGoogleProviderEnabled,+ label: t`Continue with Google`,+ Icon: IconGoogle,+ onClick: () => connectWithProvider(ConnectedAccountProvider.GOOGLE),+ },+ ].filter((providerAction) => providerAction.isEnabled);++ const handleSkipConfirm = async () => {await skipSyncEmailOnboardingStep({ isAutoSkipped: false });setOnboardingStepFreeCredits('importContacts', 0);};+ const handleSkip = () => {+ if (!hasProviderEnabled) {+ void handleSkipConfirm();++ return;+ }++ openDialog(ONBOARDING_SKIP_DIALOG_IDS.syncEmails);+ };++ useOnboardingStepEnterHotkey({+ focusId: PageFocusId.SyncEmail,+ onEnter: handleSkip,+ });+const handleAutoSkipError = useCallback(() => {setHasAutoSkipFailed(true);}, []);@@ -98,19 +138,30 @@ export const SyncEmails = () => {}return (- <ImportContacts- creditsReward={creditsReward}- onContinueWithGoogle={- isGoogleProviderEnabled- ? () => connectWithProvider(ConnectedAccountProvider.GOOGLE)- : undefined- }- onContinueWithMicrosoft={- isMicrosoftProviderEnabled- ? () => connectWithProvider(ConnectedAccountProvider.MICROSOFT)- : undefined- }- onSkip={handleSkip}- />+ <>+ <ImportContacts+ providerActions={providerActions}+ onSkip={handleSkip}+ creditsReward={importContactsCreditsReward}+ />+ <OnboardingSkipDialog+ dialogId={ONBOARDING_SKIP_DIALOG_IDS.syncEmails}+ visual={+ <OnboardingSkipDialogAvatars+ avatars={ONBOARDING_NETWORK_PREVIEW_PEOPLE.map((person) => ({+ id: person.id,+ name: '',+ src: person.avatarUrl,+ shape: 'circle',+ }))}+ />+ }+ title={t`Start with your whole network`}+ description={t`Twenty adds the people you email and meet, and keeps them up to date without manual data entry.`}+ actions={providerActions}+ creditsReward={importContactsCreditsReward}+ onSkip={() => void handleSkipConfirm()}+ />+ </>);};diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/ImportContacts.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/ImportContacts.stories.tsxindex 74625a05ea4..59c2b9574ae 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/ImportContacts.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/ImportContacts.stories.tsx@@ -2,6 +2,7 @@ import { styled } from '@linaria/react';import { type Meta, type StoryObj } from '@storybook/react-vite';import { action } from 'storybook/actions';import { within } from 'storybook/test';+import { IconGoogle, IconMicrosoft } from 'twenty-ui/icon';import { ImportContacts } from '~/pages/onboarding/ImportContacts';@@ -18,8 +19,18 @@ const meta: Meta<typeof ImportContacts> = {parameters: { layout: 'fullscreen' },args: {creditsReward: 2,- onContinueWithGoogle: action('continue-with-google'),- onContinueWithMicrosoft: action('continue-with-microsoft'),+ providerActions: [+ {+ label: 'Continue with Microsoft',+ Icon: IconMicrosoft,+ onClick: action('continue-with-microsoft'),+ },+ {+ label: 'Continue with Google',+ Icon: IconGoogle,+ onClick: action('continue-with-google'),+ },+ ],onSkip: action('skip'),},decorators: [diff --git a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsxindex 7099499487a..67a586bbe6f 100644--- a/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx+++ b/packages/twenty-front/src/pages/onboarding/__stories__/SyncEmails.stories.tsx@@ -117,7 +117,7 @@ export const Default: Story = {play: async ({ canvasElement }) => {const canvas = within(canvasElement.ownerDocument.body);await canvas.findByText('Import your contacts');- await canvas.findByText('Earn +2');+ expect(await canvas.findAllByText('+2')).toHaveLength(2);},};@@ -130,7 +130,7 @@ export const InvitedUser: Story = {await canvas.findByText('Import your contacts');await canvas.findByRole('button', { name: 'Continue with Google' });await canvas.findByRole('button', { name: 'Continue with Microsoft' });- expect(canvas.queryByText('Earn +2')).not.toBeInTheDocument();+ expect(canvas.queryByText('+2')).not.toBeInTheDocument();expect(jotaiStore.get(currentUserState.atom)?.onboardingStatus).toBe(OnboardingStatus.SYNC_EMAIL,);diff --git a/packages/twenty-ui/design-tokens/modal.ts b/packages/twenty-ui/design-tokens/modal.tsindex 2f4d109e5b0..291fd8dcc70 100644--- a/packages/twenty-ui/design-tokens/modal.ts+++ b/packages/twenty-ui/design-tokens/modal.ts@@ -5,6 +5,9 @@ export const MODAL_TOKENS = {sm: {width: token('300px'),},+ compact: {+ width: token('360px'),+ },md: {width: token('400px'),},diff --git a/packages/twenty-ui/docs/avatarPropDescriptions.ts b/packages/twenty-ui/docs/avatarPropDescriptions.tsindex 5a69ddddd33..6b8517f1fae 100644--- a/packages/twenty-ui/docs/avatarPropDescriptions.ts+++ b/packages/twenty-ui/docs/avatarPropDescriptions.ts@@ -12,6 +12,7 @@ export const AVATAR_PROP_DESCRIPTIONS = {backgroundColor: 'Background color override for a first-letter fallback.',borderColor: 'Border color override for the outline fallback.',pulsing: 'Animates the avatar opacity. Respects reduced-motion preferences.',+ ring: 'Surrounds the avatar with a background-colored ring so overlapping avatars stay distinct.',disabled:'Applies disabled styling and disables activation when `onClick` is supplied.',nativeButton:diff --git a/packages/twenty-ui/docs/pillPropDescriptions.ts b/packages/twenty-ui/docs/pillPropDescriptions.tsindex 39b0d8a0cb8..9253f54fdc5 100644--- a/packages/twenty-ui/docs/pillPropDescriptions.ts+++ b/packages/twenty-ui/docs/pillPropDescriptions.ts@@ -6,4 +6,7 @@ export const PILL_PROP_DESCRIPTIONS = {label: 'Short text displayed inside the pill.',Icon: 'Icon component rendered before the label at 12px. Import icons from `twenty-ui/icon`.',className: 'CSS class applied to the pill.',+ size: 'Pill size. `md` uses a larger font, height and icon.',+ color:+ 'Text color. `inherit` takes the parent color and font weight on a tinted background.',} satisfies Partial<Record<keyof ComponentProps<typeof Pill>, string>>;diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.jsonindex f2401c10f60..863f3ba29e0 100644--- a/packages/twenty-ui/generated/components.docs.json+++ b/packages/twenty-ui/generated/components.docs.json@@ -60,6 +60,13 @@"defaultValue": null,"description": "CSS class applied to the pill."},+ {+ "name": "color",+ "type": "\"inherit\" | \"tertiary\"",+ "required": false,+ "defaultValue": "tertiary",+ "description": "Text color. `inherit` takes the parent color and font weight on a tinted background."+ },{"name": "Icon","type": "IconComponent",@@ -73,6 +80,13 @@"required": false,"defaultValue": null,"description": "Short text displayed inside the pill."+ },+ {+ "name": "size",+ "type": "\"md\" | \"sm\"",+ "required": false,+ "defaultValue": "sm",+ "description": "Pill size. `md` uses a larger font, height and icon."}]},@@ -3712,7 +3726,7 @@},{"name": "size",- "type": "\"fullscreen\" | \"lg\" | \"md\" | \"sm\" | \"xl\"",+ "type": "\"compact\" | \"fullscreen\" | \"lg\" | \"md\" | \"sm\" | \"xl\"","required": false,"defaultValue": "md","description": "Width of the dialog, or `fullscreen` to fill the viewport."@@ -6357,6 +6371,13 @@"defaultValue": null,"description": "Allows you to replace the component's HTML element\nwith a different tag, or compose it with another component.\n\nAccepts a `ReactElement` or a function that returns the element to render."},+ {+ "name": "ring",+ "type": "boolean",+ "required": false,+ "defaultValue": "false",+ "description": "Surrounds the avatar with a background-colored ring so overlapping avatars stay distinct."+ },{"name": "shape","type": "\"circle\" | \"rounded-square\" | \"square\"",diff --git a/packages/twenty-ui/generated/tokens.docs.json b/packages/twenty-ui/generated/tokens.docs.jsonindex 02dd35c65b6..dd1a0c72e38 100644--- a/packages/twenty-ui/generated/tokens.docs.json+++ b/packages/twenty-ui/generated/tokens.docs.json@@ -6096,6 +6096,13 @@"dark": "2147483647","isNumber": true},+ {+ "path": "modal.size.compact.width",+ "cssVariable": "--t-modal-size-compact-width",+ "light": "360px",+ "dark": "360px",+ "isNumber": false+ },{"path": "modal.size.fullscreen.height","cssVariable": "--t-modal-size-fullscreen-height",diff --git a/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx b/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsxindex 993f84397fa..b5a8d235a68 100644--- a/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx+++ b/packages/twenty-ui/src/components/data-display/AvatarGroup/__stories__/AvatarGroup.stories.tsx@@ -63,6 +63,25 @@ export const WithOverflowCount: Story = {},};+export const WithRing: Story = {+ decorators: [ComponentDecorator],+ render: () => (+ <AvatarGroup+ avatars={getAvatars({ shape: 'circle', size: 'lg', ring: true })}+ maxVisible={5}+ overlap="left"+ overlapOffset="4px"+ />+ ),+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ await expect(await canvas.findByText('S')).toBeVisible();+ await expect(canvas.getByText('L')).toBeVisible();+ await expect(canvas.getAllByText('J')).toHaveLength(2);+ },+};+export const Catalog: Story = {parameters: {a11y: A11Y_DEFER_COLOR_CONTRAST,diff --git a/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.module.scss b/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.module.scssindex 2086ca1cfd2..4e357564338 100644--- a/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.module.scss+++ b/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.module.scss@@ -24,6 +24,12 @@corner-shape: round;}+ &[data-ring] {+ box-shadow:+ 0 0 0 1px var(--t-border-color-light),+ 0 0 0 2px var(--t-background-primary);+ }+&[data-clickable]:not([data-disabled]) {cursor: pointer;}diff --git a/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.tsx b/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.tsxindex 33d48a8072b..5fb5786f5f2 100644--- a/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.tsx+++ b/packages/twenty-ui/src/primitives/data-display/Avatar/Avatar.tsx@@ -22,6 +22,7 @@ export const Avatar = ({backgroundColor,borderColor,pulsing = false,+ ring = false,disabled = false,nativeButton = true,onClick,@@ -71,6 +72,7 @@ export const Avatar = ({data-size={size}data-shape={shape}data-pulsing={pulsing || undefined}+ data-ring={ring || undefined}data-disabled={disabled || undefined}data-clickable={isInteractive || undefined}className={mergeClassNames(styles.root, className)}diff --git a/packages/twenty-ui/src/primitives/data-display/Avatar/types/AvatarProps.ts b/packages/twenty-ui/src/primitives/data-display/Avatar/types/AvatarProps.tsindex 1e81a7de53f..521f377737a 100644--- a/packages/twenty-ui/src/primitives/data-display/Avatar/types/AvatarProps.ts+++ b/packages/twenty-ui/src/primitives/data-display/Avatar/types/AvatarProps.ts@@ -16,6 +16,7 @@ export type AvatarProps = Omit<AvatarPrimitive.Root.Props, 'children'> & {backgroundColor?: string;borderColor?: string;pulsing?: boolean;+ ring?: boolean;disabled?: boolean;nativeButton?: boolean;};diff --git a/packages/twenty-ui/src/primitives/data-display/Pill/Pill.module.scss b/packages/twenty-ui/src/primitives/data-display/Pill/Pill.module.scssindex cf98896ba48..c72eb611826 100644--- a/packages/twenty-ui/src/primitives/data-display/Pill/Pill.module.scss+++ b/packages/twenty-ui/src/primitives/data-display/Pill/Pill.module.scss@@ -13,4 +13,23 @@justify-content: flex-end;line-height: var(--t-text-line-height-lg);padding: 0 var(--t-spacing-2);++ &[data-size='md'] {+ font-size: var(--t-font-size-sm);+ gap: var(--t-spacing-0_5);+ height: calc(var(--t-spacing-4) + var(--t-spacing-0_5));+ padding: 0 var(--t-spacing-1_5);++ & > svg {+ block-size: calc(var(--t-icon-size-sm) * 1px);+ inline-size: calc(var(--t-icon-size-sm) * 1px);+ }+ }++ &[data-color='inherit'] {+ background: color-mix(in srgb, currentColor 16%, transparent);+ color: inherit;+ font-variant-numeric: tabular-nums;+ font-weight: inherit;+ }}diff --git a/packages/twenty-ui/src/primitives/data-display/Pill/Pill.tsx b/packages/twenty-ui/src/primitives/data-display/Pill/Pill.tsxindex dc856d6431e..b6bab7b3d99 100644--- a/packages/twenty-ui/src/primitives/data-display/Pill/Pill.tsx+++ b/packages/twenty-ui/src/primitives/data-display/Pill/Pill.tsx@@ -7,11 +7,23 @@ type PillProps = {className?: string;label?: string;Icon?: IconComponent;+ size?: 'sm' | 'md';+ color?: 'tertiary' | 'inherit';};-export const Pill = ({ className, label, Icon }: PillProps) => {+export const Pill = ({+ className,+ label,+ Icon,+ size = 'sm',+ color = 'tertiary',+}: PillProps) => {return (- <span className={clsx(styles.pill, className)}>+ <span+ className={clsx(styles.pill, className)}+ data-size={size}+ data-color={color}+ >{Icon && <Icon size={12} />}{label}</span>diff --git a/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts b/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.tsindex 3700321e0d3..3a34862bba0 100644--- a/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts+++ b/packages/twenty-ui/src/primitives/data-display/Pill/__stories__/Pill.stories.ts@@ -1,12 +1,18 @@import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, within } from 'storybook/test';+import { IconCoins } from '@ui/icon';import { Pill } from '@ui/primitives/data-display/Pill/Pill';-import { A11Y_DEFER_COLOR_CONTRAST, ComponentDecorator } from '@ui/testing';+import {+ A11Y_DEFER_COLOR_CONTRAST,+ CatalogDecorator,+ type CatalogStory,+ ComponentDecorator,+} from '@ui/testing';const meta: Meta<typeof Pill> = {title: 'UI/Data Display/Pill',component: Pill,- decorators: [ComponentDecorator],args: {label: 'Soon',},@@ -16,5 +22,37 @@ export default meta;type Story = StoryObj<typeof Pill>;export const Default: Story = {+ decorators: [ComponentDecorator],parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },};++export const Catalog: CatalogStory<Story, typeof Pill> = {+ args: { label: '+2', Icon: IconCoins },+ parameters: {+ a11y: A11Y_DEFER_COLOR_CONTRAST,+ catalog: {+ dimensions: [+ {+ name: 'sizes',+ values: ['sm', 'md'],+ props: (size: 'sm' | 'md') => ({ size }),+ },+ {+ name: 'colors',+ values: ['tertiary', 'inherit'],+ props: (color: 'tertiary' | 'inherit') => ({ color }),+ },+ ],+ },+ },+ decorators: [CatalogDecorator],+ play: async ({ canvasElement }) => {+ const pills = await within(canvasElement).findAllByText('+2');++ await expect(pills).toHaveLength(4);++ for (const pill of pills) {+ await expect(pill).toBeVisible();+ }+ },+};diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scssindex b1a2dd1eafe..1f9b4a349f7 100644--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/DialogTitle.module.scss@@ -1,4 +1,4 @@.title {- margin-block-end: var(--t-spacing-4);+ margin-block-end: var(--tw-dialog-title-margin-block-end, var(--t-spacing-4));text-align: center;}diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsxindex 91b988a0956..28eb3c92009 100644--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.stories.tsx@@ -14,7 +14,7 @@ const meta: Meta<typeof DialogExample> = {argTypes: {size: {control: 'select',- options: ['sm', 'md', 'lg', 'xl', 'fullscreen'],+ options: ['sm', 'compact', 'md', 'lg', 'xl', 'fullscreen'],},},};@@ -76,6 +76,10 @@ export const Small: Story = {...Default,args: { defaultOpen: true, size: 'sm' },};+export const Compact: Story = {+ ...Default,+ args: { defaultOpen: true, size: 'compact' },+};export const Large: Story = {...Default,args: { defaultOpen: true, size: 'lg' },diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.titles.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.titles.stories.tsxindex a44522e9d32..ec2c242374a 100644--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.titles.stories.tsx+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/__stories__/Dialog.titles.stories.tsx@@ -43,7 +43,7 @@ export const TitleTypography: Story = {expect(title).toHaveAttribute('data-size', 'lg');expect(title).toHaveAttribute('data-color', 'primary');- expect(titleStyle.marginBlockEnd).toBe('16px');+ expect(titleStyle.marginBlockEnd).toBe('0px');expect(titleStyle.textAlign).toBe('center');expect(dialog).toHaveAttribute('aria-labelledby', title.id);},diff --git a/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogSize.ts b/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogSize.tsindex b776b9d4c07..418b3835ebd 100644--- a/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogSize.ts+++ b/packages/twenty-ui/src/primitives/surfaces/Dialog/types/DialogSize.ts@@ -1 +1 @@-export type DialogSize = 'sm' | 'md' | 'lg' | 'xl' | 'fullscreen';+export type DialogSize = 'sm' | 'compact' | 'md' | 'lg' | 'xl' | 'fullscreen';diff --git a/packages/twenty-ui/src/primitives/surfaces/internal/Dialog.module.scss b/packages/twenty-ui/src/primitives/surfaces/internal/Dialog.module.scssindex c80b49e0e5c..4094c10409e 100644--- a/packages/twenty-ui/src/primitives/surfaces/internal/Dialog.module.scss+++ b/packages/twenty-ui/src/primitives/surfaces/internal/Dialog.module.scss@@ -72,6 +72,10 @@inline-size: var(--t-modal-size-sm-width);}+ &[data-size='compact'] {+ inline-size: var(--t-modal-size-compact-width);+ }+&[data-size='lg'] {inline-size: max(var(--t-modal-size-md-width),@@ -93,6 +97,7 @@}.header {+ --tw-dialog-title-margin-block-end: 0;display: flex;flex-direction: column;flex-shrink: 0;diff --git a/packages/twenty-ui/src/theme/constants/ThemeCommon.ts b/packages/twenty-ui/src/theme/constants/ThemeCommon.tsindex bc87d29ce48..e1e7551cbef 100644--- a/packages/twenty-ui/src/theme/constants/ThemeCommon.ts+++ b/packages/twenty-ui/src/theme/constants/ThemeCommon.ts@@ -21,6 +21,9 @@ export const THEME_COMMON = {sm: {width: '300px',},+ compact: {+ width: '360px',+ },md: {width: '400px',},diff --git a/packages/twenty-ui/src/theme/constants/ThemeDark.ts b/packages/twenty-ui/src/theme/constants/ThemeDark.tsindex d862a32c3da..11360517f8f 100644--- a/packages/twenty-ui/src/theme/constants/ThemeDark.ts+++ b/packages/twenty-ui/src/theme/constants/ThemeDark.ts@@ -22,6 +22,9 @@ export const THEME_DARK: typeof THEME_LIGHT = {sm: {width: '300px',},+ compact: {+ width: '360px',+ },md: {width: '400px',},diff --git a/packages/twenty-ui/src/theme/constants/ThemeLight.ts b/packages/twenty-ui/src/theme/constants/ThemeLight.tsindex fd8d94f95ea..5a774042055 100644--- a/packages/twenty-ui/src/theme/constants/ThemeLight.ts+++ b/packages/twenty-ui/src/theme/constants/ThemeLight.ts@@ -21,6 +21,9 @@ export const THEME_LIGHT = {sm: {width: '300px',},+ compact: {+ width: '360px',+ },md: {width: '400px',},diff --git a/packages/twenty-ui/src/theme/theme-dark.css b/packages/twenty-ui/src/theme/theme-dark.cssindex c55d0863a95..c5fe0877d5c 100644--- a/packages/twenty-ui/src/theme/theme-dark.css+++ b/packages/twenty-ui/src/theme/theme-dark.css@@ -10,6 +10,7 @@--t-icon-stroke-md: 2;--t-icon-stroke-lg: 2.5;--t-modal-size-sm-width: 300px;+ --t-modal-size-compact-width: 360px;--t-modal-size-md-width: 400px;--t-modal-size-lg-width: 53%;--t-modal-size-xl-width: 1200px;diff --git a/packages/twenty-ui/src/theme/theme-light.css b/packages/twenty-ui/src/theme/theme-light.cssindex b6b42c74986..814668ebc05 100644--- a/packages/twenty-ui/src/theme/theme-light.css+++ b/packages/twenty-ui/src/theme/theme-light.css@@ -10,6 +10,7 @@--t-icon-stroke-md: 2;--t-icon-stroke-lg: 2.5;--t-modal-size-sm-width: 300px;+ --t-modal-size-compact-width: 360px;--t-modal-size-md-width: 400px;--t-modal-size-lg-width: 53%;--t-modal-size-xl-width: 1200px;diff --git a/packages/twenty-ui/src/theme/themeCssVariables.ts b/packages/twenty-ui/src/theme/themeCssVariables.tsindex c36db29cc70..e5680103700 100644--- a/packages/twenty-ui/src/theme/themeCssVariables.ts+++ b/packages/twenty-ui/src/theme/themeCssVariables.ts@@ -19,6 +19,9 @@ export const themeCssVariables = {sm: {width: 'var(--t-modal-size-sm-width)',},+ compact: {+ width: 'var(--t-modal-size-compact-width)',+ },md: {width: 'var(--t-modal-size-md-width)',},diff --git a/packages/twenty-ui/src/theme/themeTypes.ts b/packages/twenty-ui/src/theme/themeTypes.tsindex 54004e37440..e4e4e3d6a5c 100644--- a/packages/twenty-ui/src/theme/themeTypes.ts+++ b/packages/twenty-ui/src/theme/themeTypes.ts@@ -19,6 +19,9 @@ export type ThemeType = {sm: {width: string;};+ compact: {+ width: string;+ };md: {width: string;};