Skip to content

The open alternative to Salesforce, designed for AI.

Migrate buttons to Base UI (#25888)

Raphaël Bosi91f18c1fa6d0
diff --git a/packages/twenty-companion/src/renderer/components/CompanionApp.tsx b/packages/twenty-companion/src/renderer/components/CompanionApp.tsx
index 10ba646c580..4b7ce7ac26f 100644
--- a/packages/twenty-companion/src/renderer/components/CompanionApp.tsx
+++ b/packages/twenty-companion/src/renderer/components/CompanionApp.tsx
@@ -65,18 +65,20 @@ export const CompanionApp = () => {
{!onboarding && (
<div className="button-group">
<Button
- variant="primary"
- accent="blue"
- size="medium"
+ variant="solid"
+ color="accent"
+ size="md"
+ elevated
disabled={
isPending('record') ||
!!state.activeRecording ||
!state.updatedAt
}
onClick={() => void command({ type: 'record' })}
- Icon={IconCircleDot}
- title={i18n._('New recording')}
- />
+ startIcon={<IconCircleDot />}
+ >
+ {i18n._('New recording')}
+ </Button>
</div>
)}
</header>
diff --git a/packages/twenty-companion/src/renderer/components/Home.tsx b/packages/twenty-companion/src/renderer/components/Home.tsx
index bb3fead8f53..b785be1aeea 100644
--- a/packages/twenty-companion/src/renderer/components/Home.tsx
+++ b/packages/twenty-companion/src/renderer/components/Home.tsx
@@ -82,16 +82,15 @@ const UpcomingMeetings = ({ state, isPending, command }: ActionProps) => {
{meetings.length > 3 && (
<div>
<Button
- variant="tertiary"
+ variant="ghost"
className="see-more"
- ariaExpanded={showAllMeetings}
+ aria-expanded={showAllMeetings}
onClick={() => setShowAllMeetings(!showAllMeetings)}
- size="medium"
- title={
- showAllMeetings ? i18n._('Show less') : i18n._('See more')
- }
- Icon={IconChevronRight}
- />
+ size="md"
+ startIcon={<IconChevronRight />}
+ >
+ {showAllMeetings ? i18n._('Show less') : i18n._('See more')}
+ </Button>
</div>
)}
</>
@@ -120,11 +119,12 @@ const UpcomingMeetings = ({ state, isPending, command }: ActionProps) => {
{!state.calendarConnected && (
<Button
onClick={() => void command({ type: 'open-calendar-settings' })}
- variant="secondary"
- size="medium"
- title={i18n._('Connect calendar')}
- Icon={IconArrowUpRight}
- />
+ variant="outline"
+ size="md"
+ startIcon={<IconArrowUpRight />}
+ >
+ {i18n._('Connect calendar')}
+ </Button>
)}
</SettingsCardContent>
</Card>
@@ -145,12 +145,13 @@ export const Home = ({ state, command, isPending }: ActionProps) => {
title={i18n._('Recordings')}
adornment={
<Button
- variant="tertiary"
- title={i18n._('View all in Twenty')}
- Icon={IconArrowUpRight}
+ variant="ghost"
+ startIcon={<IconArrowUpRight />}
disabled={isPending('open-recordings')}
onClick={() => void command({ type: 'open-recordings' })}
- />
+ >
+ {i18n._('View all in Twenty')}
+ </Button>
}
/>
<RecordingList state={state} isPending={isPending} command={command} />
diff --git a/packages/twenty-companion/src/renderer/components/MeetingRow.tsx b/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
index a1231d56d9d..9fb8978a400 100644
--- a/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
+++ b/packages/twenty-companion/src/renderer/components/MeetingRow.tsx
@@ -115,11 +115,12 @@ export const MeetingRow = ({
meetingId: meeting.id,
})
}
- variant="secondary"
- size="medium"
- title={i18n._('Join')}
- Icon={IconArrowUpRight}
- />
+ variant="outline"
+ size="md"
+ startIcon={<IconArrowUpRight />}
+ >
+ {i18n._('Join')}
+ </Button>
</div>
</div>
);
diff --git a/packages/twenty-companion/src/renderer/components/Notice.tsx b/packages/twenty-companion/src/renderer/components/Notice.tsx
index f78f5f386f5..ad249d13e64 100644
--- a/packages/twenty-companion/src/renderer/components/Notice.tsx
+++ b/packages/twenty-companion/src/renderer/components/Notice.tsx
@@ -25,13 +25,14 @@ export const Notice = ({ state, command }: ActionProps) =>
</span>
{state.error?.recovery && (
<Button
- title={i18n._('Install Desktop Recorder')}
- variant="secondary"
- inverted
+ className="notice-recovery"
+ variant="outline"
onClick={() =>
state.error?.recovery && void command(state.error.recovery)
}
- />
+ >
+ {i18n._('Install Desktop Recorder')}
+ </Button>
)}
<IconButton
className="notice-close"
diff --git a/packages/twenty-companion/src/renderer/components/Onboarding.tsx b/packages/twenty-companion/src/renderer/components/Onboarding.tsx
index be1ef8861a2..367a7deb0b8 100644
--- a/packages/twenty-companion/src/renderer/components/Onboarding.tsx
+++ b/packages/twenty-companion/src/renderer/components/Onboarding.tsx
@@ -3,7 +3,7 @@ import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { useState } from 'react';
import { type CompanionState } from '../../shared/types/CompanionState';
import { Field } from '@ui/primitives/input/Field/Field';
-import { MainButton } from '@ui/primitives/input/MainButton/MainButton';
+import { MainButton } from '@ui/components/MainButton/MainButton';
import { IconArrowUpRight, IconRefresh } from 'twenty-ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
import { type ActionProps } from '../types/ActionProps';
@@ -49,13 +49,12 @@ const Welcome = ({ state, isPending, command }: ActionProps) => {
fullWidth
type="submit"
disabled={isPending('connect') || (!window.companion && !IS_PREVIEW)}
- title={
- state.connection === 'connecting'
- ? i18n._('Waiting for your browser…')
- : i18n._('Connect to Twenty')
- }
- Icon={IconArrowUpRight}
- />
+ startIcon={<IconArrowUpRight />}
+ >
+ {state.connection === 'connecting'
+ ? i18n._('Waiting for your browser…')
+ : i18n._('Connect to Twenty')}
+ </MainButton>
</form>
</section>
);
@@ -89,10 +88,11 @@ const OnboardingContent = ({ state, isPending, command }: ActionProps) => {
<Button
disabled={isPending('refresh')}
onClick={() => void command({ type: 'refresh' })}
- variant="secondary"
- size="medium"
- title={i18n._('Try again')}
- />
+ variant="outline"
+ size="md"
+ >
+ {i18n._('Try again')}
+ </Button>
}
>
<p>
diff --git a/packages/twenty-companion/src/renderer/components/Permissions.tsx b/packages/twenty-companion/src/renderer/components/Permissions.tsx
index 2b33fd38360..fa28b6d9d96 100644
--- a/packages/twenty-companion/src/renderer/components/Permissions.tsx
+++ b/packages/twenty-companion/src/renderer/components/Permissions.tsx
@@ -1,7 +1,7 @@
import { i18n } from '@lingui/core';
import { THEME_COMMON } from '@ui/theme/constants/ThemeCommon';
import { Card } from '@ui/primitives/surfaces/Card/Card';
-import { MainButton } from '@ui/primitives/input/MainButton/MainButton';
+import { MainButton } from '@ui/components/MainButton/MainButton';
import {
IconMicrophone,
IconHeadphones,
@@ -59,7 +59,7 @@ const PermissionChecklist = ({ state, isPending, command }: ActionProps) => (
</span>
) : (
<Button
- variant="secondary"
+ variant="outline"
disabled={isPending('permission') || !state.updatedAt}
onClick={() =>
void command({
@@ -67,10 +67,11 @@ const PermissionChecklist = ({ state, isPending, command }: ActionProps) => (
permission,
})
}
- size="medium"
- title={denied ? i18n._('Open settings') : button}
- Icon={denied ? IconArrowUpRight : undefined}
- />
+ size="md"
+ startIcon={denied ? <IconArrowUpRight /> : undefined}
+ >
+ {denied ? i18n._('Open settings') : button}
+ </Button>
)}
</div>
);
@@ -112,9 +113,10 @@ export const Permissions = ({
})
: onContinue()
}
- Icon={intentToRecord ? IconCircleDot : undefined}
- title={intentToRecord ? i18n._('Start recording') : i18n._('Finish')}
- />
+ startIcon={intentToRecord ? <IconCircleDot /> : undefined}
+ >
+ {intentToRecord ? i18n._('Start recording') : i18n._('Finish')}
+ </MainButton>
</section>
);
};
diff --git a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
index 0feb4e4df15..5f4b4ed5f94 100644
--- a/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
+++ b/packages/twenty-companion/src/renderer/components/RecordingControls.tsx
@@ -1,5 +1,8 @@
import { Avatar } from '@ui/primitives/data-display/Avatar/Avatar';
-import { H1Title, H1TitleFontColor } from '@ui/primitives/typography/H1Title/H1Title';
+import {
+ H1Title,
+ H1TitleFontColor,
+} from '@ui/primitives/typography/H1Title/H1Title';
import { Card } from '@ui/primitives/surfaces/Card/Card';
import { i18n } from '@lingui/core';
import { Button } from '@ui/primitives/input/Button/Button';
@@ -58,22 +61,24 @@ export const RecordingControls = ({
isPending('pause', 'resume', 'stop', 'record') || transitional
}
onClick={() => void command({ type: paused ? 'resume' : 'pause' })}
- variant="secondary"
- size="medium"
- Icon={paused ? IconPlayerPlay : IconPlayerPause}
- title={paused ? i18n._('Resume') : i18n._('Pause')}
- />
+ variant="outline"
+ size="md"
+ startIcon={paused ? <IconPlayerPlay /> : <IconPlayerPause />}
+ >
+ {paused ? i18n._('Resume') : i18n._('Pause')}
+ </Button>
<Button
disabled={
isPending('pause', 'resume', 'stop', 'record') || transitional
}
onClick={() => void command({ type: 'stop' })}
- variant="secondary"
- accent="danger"
- size="medium"
- Icon={IconPlayerStop}
- title={i18n._('Finish recording')}
- />
+ variant="outline"
+ color="danger"
+ size="md"
+ startIcon={<IconPlayerStop />}
+ >
+ {i18n._('Finish recording')}
+ </Button>
</div>
</Card>
);
diff --git a/packages/twenty-companion/src/renderer/components/Settings.tsx b/packages/twenty-companion/src/renderer/components/Settings.tsx
index 318de3bca30..533e7ecfeec 100644
--- a/packages/twenty-companion/src/renderer/components/Settings.tsx
+++ b/packages/twenty-companion/src/renderer/components/Settings.tsx
@@ -203,14 +203,13 @@ export const Settings = ({ state, isPending, command }: ActionProps) => (
permission: 'accessibility',
})
}
- variant="secondary"
- size="medium"
- title={
- state.permissions.accessibility === 'denied'
- ? i18n._('Open settings')
- : i18n._('Enable')
- }
- />
+ variant="outline"
+ size="md"
+ >
+ {state.permissions.accessibility === 'denied'
+ ? i18n._('Open settings')
+ : i18n._('Enable')}
+ </Button>
)}
</SettingsCardContent>
<button
@@ -273,10 +272,11 @@ export const Settings = ({ state, isPending, command }: ActionProps) => (
<Button
disabled={isPending('disconnect') || !!state.activeRecording}
onClick={() => void command({ type: 'disconnect' })}
- variant="secondary"
- size="medium"
- title={i18n._('Disconnect')}
- />
+ variant="outline"
+ size="md"
+ >
+ {i18n._('Disconnect')}
+ </Button>
</SettingsCardContent>
</Card>
</section>
diff --git a/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx b/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
index ba848e51447..9285891e63f 100644
--- a/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
+++ b/packages/twenty-companion/src/renderer/components/ShortcutSetting.tsx
@@ -65,20 +65,19 @@ export const ShortcutSetting = ({ state, isPending, command }: ActionProps) => {
}}
>
<Button
- ariaLabel={i18n._('Change open companion shortcut')}
+ aria-label={i18n._('Change open companion shortcut')}
disabled={isPending('settings')}
onClick={() => setCapturing(true)}
- variant="secondary"
- size="medium"
- title={
- capturing
- ? i18n._('Press shortcut…')
- : formatShortcut(
- state.settings.openShortcut,
- navigator.platform.startsWith('Mac'),
- )
- }
- />
+ variant="outline"
+ size="md"
+ >
+ {capturing
+ ? i18n._('Press shortcut…')
+ : formatShortcut(
+ state.settings.openShortcut,
+ navigator.platform.startsWith('Mac'),
+ )}
+ </Button>
</div>
</div>
</SettingsCardContent>
diff --git a/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx b/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
index 318cff0b832..710c9610b5d 100644
--- a/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
+++ b/packages/twenty-companion/src/renderer/components/__tests__/sharedControls.test.tsx
@@ -24,7 +24,7 @@ it('keeps the legacy accessible name when both name props are supplied', () => {
});
it('places the disclosure state on the actual button', () => {
- render(<Button title="See more" ariaExpanded={false} />);
+ render(<Button aria-expanded={false}>See more</Button>);
expect(
screen
.getByRole('button', { name: /See more/ })
diff --git a/packages/twenty-companion/src/renderer/style.css b/packages/twenty-companion/src/renderer/style.css
index 05e6355d5f8..1dd7b8daaec 100644
--- a/packages/twenty-companion/src/renderer/style.css
+++ b/packages/twenty-companion/src/renderer/style.css
@@ -160,7 +160,8 @@ p {
text-align: center;
margin-left: var(--t-spacing-8);
}
-.notice .notice-close {
+.notice .notice-close,
+.notice .notice-recovery {
color: var(--t-font-color-inverted);
}
.preview-label {
diff --git a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
index 852fcb3b7c5..1809b702be6 100644
--- a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
+++ b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
@@ -740,7 +740,7 @@ import { Status, Tag } from 'twenty-ui/primitives/data-display';
const StyledWidget = () => {
return (
<div style={{ padding: '16px', display: 'flex', gap: '8px' }}>
- <Button title="Click me" onClick={() => alert('Clicked!')} />
+ <Button onClick={() => alert('Clicked!')}>Click me</Button>
<Tag color="green">Active</Tag>
<Status color="green">Online</Status>
</div>
diff --git a/packages/twenty-docs/docs.json b/packages/twenty-docs/docs.json
index dcdc87488e1..de1d3dfa2f1 100644
--- a/packages/twenty-docs/docs.json
+++ b/packages/twenty-docs/docs.json
@@ -526,6 +526,8 @@
{
"group": "Forms",
"pages": [
+ "ui/primitives/input/button",
+ "ui/primitives/input/button-group",
"ui/primitives/input/field",
"ui/primitives/input/input",
"ui/primitives/input/input-group",
@@ -570,7 +572,9 @@
{
"group": "Components",
"pages": [
- "ui/components/overview"
+ "ui/components/overview",
+ "ui/components/input/main-button",
+ "ui/components/input/light-button"
]
}
]
diff --git a/packages/twenty-docs/navigation/base-structure.json b/packages/twenty-docs/navigation/base-structure.json
index 13b5c00be1f..5973d09f890 100644
--- a/packages/twenty-docs/navigation/base-structure.json
+++ b/packages/twenty-docs/navigation/base-structure.json
@@ -537,6 +537,8 @@
"key": "uiForms",
"label": "Forms",
"pages": [
+ "ui/primitives/input/button",
+ "ui/primitives/input/button-group",
"ui/primitives/input/field",
"ui/primitives/input/input",
"ui/primitives/input/input-group",
@@ -581,7 +583,11 @@
{
"key": "uiComponents",
"label": "Components",
- "pages": ["ui/components/overview"]
+ "pages": [
+ "ui/components/overview",
+ "ui/components/input/main-button",
+ "ui/components/input/light-button"
+ ]
}
]
}
diff --git a/packages/twenty-docs/snippets/ui/generated/data-display/chip.mdx b/packages/twenty-docs/snippets/ui/generated/data-display/chip.mdx
index 97651374594..bf55ccf970f 100644
--- a/packages/twenty-docs/snippets/ui/generated/data-display/chip.mdx
+++ b/packages/twenty-docs/snippets/ui/generated/data-display/chip.mdx
@@ -82,7 +82,7 @@
Position of the string-label tooltip.
</ParamField>
-<ParamField body="variant" type="&quot;solid&quot; | &quot;soft&quot; | &quot;ghost&quot;" default="ghost">
+<ParamField body="variant" type="&quot;solid&quot; | &quot;ghost&quot; | &quot;soft&quot;" default="ghost">
Background treatment of the chip.
</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/data-display/tag.mdx b/packages/twenty-docs/snippets/ui/generated/data-display/tag.mdx
index b4db8ae0149..b9c8cf9c535 100644
--- a/packages/twenty-docs/snippets/ui/generated/data-display/tag.mdx
+++ b/packages/twenty-docs/snippets/ui/generated/data-display/tag.mdx
@@ -46,7 +46,7 @@
Decorative icon before the label. Hidden from assistive technology.
</ParamField>
-<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;soft&quot; | &quot;ghost&quot;" default="soft">
+<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;ghost&quot; | &quot;soft&quot;" default="soft">
Visual treatment of the tag background and border.
</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/input/button-group.mdx b/packages/twenty-docs/snippets/ui/generated/input/button-group.mdx
new file mode 100644
index 00000000000..e877faee74c
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/input/button-group.mdx
@@ -0,0 +1,31 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+<ParamField body="color" type="&quot;neutral&quot; | &quot;accent&quot; | &quot;danger&quot; | &quot;success&quot;">
+ Shared semantic color that overrides the color of buttons in the group.
+</ParamField>
+
+<ParamField body="render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, {}&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="size" type="&quot;sm&quot; | &quot;md&quot;">
+ Shared button height that overrides the size of buttons in the group.
+</ParamField>
+
+<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;ghost&quot; | &quot;soft&quot;">
+ Shared surface treatment that overrides the variant of buttons in the group.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/input/button.mdx b/packages/twenty-docs/snippets/ui/generated/input/button.mdx
new file mode 100644
index 00000000000..df45febe745
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/input/button.mdx
@@ -0,0 +1,83 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+<ParamField body="className" type="string | ((state: ButtonState) =&gt; string | undefined)">
+ CSS class applied to the element, or a function that
+ returns a class based on the component's state.
+</ParamField>
+
+<ParamField body="color" type="&quot;neutral&quot; | &quot;accent&quot; | &quot;danger&quot; | &quot;success&quot;" default="neutral">
+ Semantic color of the button.
+</ParamField>
+
+<ParamField body="elevated" type="boolean" default="false">
+ Adds a shadow to the button.
+</ParamField>
+
+<ParamField body="endIcon" type="ReactNode">
+ Decorative content displayed after the label.
+</ParamField>
+
+<ParamField body="focusableWhenDisabled" type="boolean" default="false">
+ Whether the button should be focusable when disabled.
+</ParamField>
+
+<ParamField body="fullWidth" type="boolean" default="false">
+ Expands the button to fill its container width.
+</ParamField>
+
+<ParamField body="hotkeys" type="string[]">
+ Keyboard shortcut hints displayed on non-mobile screens.
+</ParamField>
+
+<ParamField body="loading" type="boolean" default="false">
+ Shows a loading indicator and disables activation while preserving the button width.
+</ParamField>
+
+<ParamField body="nativeButton" type="boolean" default="true">
+ Whether the component renders a native `<button>` element when replacing it
+ via the `render` prop.
+ Set to `false` if the rendered element is not a button (for example, `<div>`).
+</ParamField>
+
+<ParamField body="render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, ButtonState&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="size" type="&quot;sm&quot; | &quot;md&quot;" default="md">
+ Button height: `sm` (24px) or `md` (32px).
+</ParamField>
+
+<ParamField body="soon" type="boolean" default="false">
+ Displays a coming-soon label and disables activation.
+</ParamField>
+
+<ParamField body="soonLabel" type="string">
+ Text for the coming-soon label.
+</ParamField>
+
+<ParamField body="startIcon" type="ReactNode">
+ Decorative content displayed before the label.
+</ParamField>
+
+<ParamField body="style" type="CSSProperties | ((state: ButtonState) =&gt; CSSProperties | undefined)">
+ Style applied to the element, or a function that
+ returns a style object based on the component's state.
+</ParamField>
+
+<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;ghost&quot; | &quot;soft&quot;" default="outline">
+ Visual treatment of the button surface.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/input/light-button.mdx b/packages/twenty-docs/snippets/ui/generated/input/light-button.mdx
new file mode 100644
index 00000000000..e705f8cbceb
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/input/light-button.mdx
@@ -0,0 +1,87 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+<ParamField body="className" type="string | ((state: ButtonState) =&gt; string | undefined)">
+ CSS class applied to the element, or a function that
+ returns a class based on the component's state.
+</ParamField>
+
+<ParamField body="color" type="&quot;neutral&quot; | &quot;accent&quot; | &quot;danger&quot; | &quot;success&quot;">
+ Semantic color of the button.
+</ParamField>
+
+<ParamField body="elevated" type="boolean">
+ Adds a shadow to the button.
+</ParamField>
+
+<ParamField body="emphasis" type="&quot;standard&quot; | &quot;subtle&quot;" default="standard">
+ Uses secondary or tertiary text for neutral buttons. Semantic colors and solid surfaces retain their contrast treatment.
+</ParamField>
+
+<ParamField body="endIcon" type="ReactNode">
+ Decorative content displayed after the label.
+</ParamField>
+
+<ParamField body="focusableWhenDisabled" type="boolean" default="false">
+ Whether the button should be focusable when disabled.
+</ParamField>
+
+<ParamField body="fullWidth" type="boolean">
+ Expands the button to fill its container width.
+</ParamField>
+
+<ParamField body="hotkeys" type="string[]">
+ Keyboard shortcut hints displayed on non-mobile screens.
+</ParamField>
+
+<ParamField body="loading" type="boolean">
+ Shows a loading indicator and disables activation while preserving the button width.
+</ParamField>
+
+<ParamField body="nativeButton" type="boolean" default="true">
+ Whether the component renders a native `<button>` element when replacing it
+ via the `render` prop.
+ Set to `false` if the rendered element is not a button (for example, `<div>`).
+</ParamField>
+
+<ParamField body="render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, ButtonState&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="size" type="&quot;sm&quot; | &quot;md&quot;" default="sm">
+ Button height: `sm` (24px) or `md` (32px).
+</ParamField>
+
+<ParamField body="soon" type="boolean">
+ Displays a coming-soon label and disables activation.
+</ParamField>
+
+<ParamField body="soonLabel" type="string">
+ Text for the coming-soon label.
+</ParamField>
+
+<ParamField body="startIcon" type="ReactNode">
+ Decorative content displayed before the label.
+</ParamField>
+
+<ParamField body="style" type="CSSProperties | ((state: ButtonState) =&gt; CSSProperties | undefined)">
+ Style applied to the element, or a function that
+ returns a style object based on the component's state.
+</ParamField>
+
+<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;ghost&quot; | &quot;soft&quot;" default="ghost">
+ Visual treatment of the button surface.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/input/main-button.mdx b/packages/twenty-docs/snippets/ui/generated/input/main-button.mdx
new file mode 100644
index 00000000000..257ae0c694f
--- /dev/null
+++ b/packages/twenty-docs/snippets/ui/generated/input/main-button.mdx
@@ -0,0 +1,83 @@
+{/*
+ * _____ _
+ *|_ _|_ _____ _ __ | |_ _ _
+ * | | \ \ /\ / / _ \ '_ \| __| | | | Auto-generated file
+ * | | \ V V / __/ | | | |_| |_| | DO NOT EDIT - changes will be overwritten
+ * |_| \_/\_/ \___|_| |_|\__|\__, | Generated by: npx nx generate:ui twenty-docs
+ * |___/
+ *
+ * This file is generated from the documentation data in packages/twenty-ui/generated.
+ * To update it, edit the component prop types or design tokens in twenty-ui and run:
+ * npx nx generate:ui twenty-docs
+ */}
+
+<ParamField body="className" type="string | ((state: ButtonState) =&gt; string | undefined)">
+ CSS class applied to the element, or a function that
+ returns a class based on the component's state.
+</ParamField>
+
+<ParamField body="color" type="&quot;neutral&quot; | &quot;accent&quot; | &quot;danger&quot; | &quot;success&quot;">
+ Semantic color of the button.
+</ParamField>
+
+<ParamField body="elevated" type="boolean" default="true">
+ Adds a shadow to the button.
+</ParamField>
+
+<ParamField body="endIcon" type="ReactNode">
+ Decorative content displayed after the label.
+</ParamField>
+
+<ParamField body="focusableWhenDisabled" type="boolean" default="false">
+ Whether the button should be focusable when disabled.
+</ParamField>
+
+<ParamField body="fullWidth" type="boolean">
+ Expands the button to fill its container width.
+</ParamField>
+
+<ParamField body="hotkeys" type="string[]">
+ Keyboard shortcut hints displayed on non-mobile screens.
+</ParamField>
+
+<ParamField body="loading" type="boolean">
+ Shows a loading indicator and disables activation while preserving the button width.
+</ParamField>
+
+<ParamField body="nativeButton" type="boolean" default="true">
+ Whether the component renders a native `<button>` element when replacing it
+ via the `render` prop.
+ Set to `false` if the rendered element is not a button (for example, `<div>`).
+</ParamField>
+
+<ParamField body="render" type="ReactElement&lt;unknown, string | JSXElementConstructor&lt;any&gt;&gt; | ComponentRenderFn&lt;HTMLProps, ButtonState&gt;">
+ Allows you to replace the component's HTML element
+ with a different tag, or compose it with another component.
+
+ Accepts a `ReactElement` or a function that returns the element to render.
+</ParamField>
+
+<ParamField body="size" type="&quot;sm&quot; | &quot;md&quot;">
+ Button height: `sm` (24px) or `md` (32px).
+</ParamField>
+
+<ParamField body="soon" type="boolean">
+ Displays a coming-soon label and disables activation.
+</ParamField>
+
+<ParamField body="soonLabel" type="string">
+ Text for the coming-soon label.
+</ParamField>
+
+<ParamField body="startIcon" type="ReactNode">
+ Decorative content displayed before the label.
+</ParamField>
+
+<ParamField body="style" type="CSSProperties | ((state: ButtonState) =&gt; CSSProperties | undefined)">
+ Style applied to the element, or a function that
+ returns a style object based on the component's state.
+</ParamField>
+
+<ParamField body="variant" type="&quot;solid&quot; | &quot;outline&quot; | &quot;ghost&quot; | &quot;soft&quot;" default="solid">
+ Visual treatment of the button surface.
+</ParamField>
diff --git a/packages/twenty-docs/snippets/ui/generated/input/slider.mdx b/packages/twenty-docs/snippets/ui/generated/input/slider.mdx
index eafcfe13cf2..d773a2948ae 100644
--- a/packages/twenty-docs/snippets/ui/generated/input/slider.mdx
+++ b/packages/twenty-docs/snippets/ui/generated/input/slider.mdx
@@ -126,7 +126,7 @@
- `edge-client-only`: Same as `edge` but renders after React hydration on the client, reducing bundle size in return
</ParamField>
-<ParamField body="Root.thumbCollisionBehavior" type="&quot;push&quot; | &quot;none&quot; | &quot;swap&quot;" default="push">
+<ParamField body="Root.thumbCollisionBehavior" type="&quot;none&quot; | &quot;push&quot; | &quot;swap&quot;" default="push">
Controls how thumbs behave when they collide during pointer interactions.
- `'push'` (default): Thumbs push each other without restoring their previous positions when dragged back.
diff --git a/packages/twenty-docs/ui/components/input/light-button.mdx b/packages/twenty-docs/ui/components/input/light-button.mdx
new file mode 100644
index 00000000000..5af289b33b9
--- /dev/null
+++ b/packages/twenty-docs/ui/components/input/light-button.mdx
@@ -0,0 +1,47 @@
+---
+title: LightButton
+description: Present lightweight actions with standard or subtle emphasis.
+---
+
+import LightButtonReference from '/snippets/ui/generated/input/light-button.mdx';
+
+Use the shared `LightButton` component for a lightweight action. It composes
+[Button](/ui/primitives/input/button) with a ghost surface, small size, regular
+font weight, and no elevation.
+
+## State ownership
+
+`LightButton` uses Button's state model and adds no state of its own. Your application supplies `loading`, `disabled`, and `soon`; `emphasis` only changes appearance. See [Button's state ownership example](/ui/primitives/input/button#state-ownership) for managing an asynchronous action. There are no controlled and uncontrolled selection modes.
+
+## Usage
+
+```tsx
+import { LightButton } from 'twenty-ui/components';
+import { IconPlus } from 'twenty-ui/icon';
+
+export const FilterActions = () => (
+ <LightButton emphasis="subtle" startIcon={<IconPlus />}>
+ Add filter
+ </LightButton>
+);
+```
+
+The default `emphasis="standard"` uses secondary neutral text.
+`emphasis="subtle"` uses tertiary neutral text on ghost, outline, and soft
+surfaces. Semantic colors and solid surfaces retain their contrast treatment.
+
+Override `variant`, `color`, `size`, or `elevated` when needed.
+[ButtonGroup](/ui/primitives/input/button-group) can set a shared size, surface,
+and color; subtle emphasis does not replace the group's semantic color.
+
+## Interaction
+
+`LightButton` accepts Button's native attributes, refs, event handlers, icon
+slots, loading and disabled states, and render composition. Its native default
+is `type="button"`. Set `type="submit"` for submission or use `href` for a link.
+Router links use `render`, `nativeButton={false}`, and `role="link"` at the
+application routing seam. Consumer classes and state functions pass through.
+
+## Props
+
+<LightButtonReference />
diff --git a/packages/twenty-docs/ui/components/input/main-button.mdx b/packages/twenty-docs/ui/components/input/main-button.mdx
new file mode 100644
index 00000000000..94e2271e7a6
--- /dev/null
+++ b/packages/twenty-docs/ui/components/input/main-button.mdx
@@ -0,0 +1,46 @@
+---
+title: MainButton
+description: Present prominent actions with shared design defaults.
+---
+
+import MainButtonReference from '/snippets/ui/generated/input/main-button.mdx';
+
+Use the shared `MainButton` component for a prominent action. It composes
+[Button](/ui/primitives/input/button) with a solid surface, elevation, semibold
+text, and 12px horizontal padding. Its default color is neutral and size is `md`.
+
+## State ownership
+
+`MainButton` uses Button's state model and adds no state of its own. Your application supplies `loading`, `disabled`, and `soon`; there are no controlled and uncontrolled selection modes. See [Button's state ownership example](/ui/primitives/input/button#state-ownership) for managing an asynchronous action.
+
+## Usage
+
+```tsx
+import { MainButton } from 'twenty-ui/components';
+
+export const SaveProfile = () => (
+ <MainButton type="submit" fullWidth>
+ Save profile
+ </MainButton>
+);
+```
+
+Width follows the content unless you set `fullWidth` or provide application
+layout styling. Override `variant`, `color`, `size`, and `elevated` as needed;
+for example, use `variant="outline"` and `elevated={false}` for an outlined action.
+Keep page layout in your application's styling.
+
+## Interaction
+
+`MainButton` accepts Button's native attributes, event handlers, refs, icon slots,
+`loading`, `disabled`, and `soon` props. Buttons default to `type="button"`;
+set `type="submit"` explicitly for form submission.
+
+Use `href` for a link or compose a router link through `render`,
+`nativeButton={false}`, and `role="link"`. Routing belongs to the application.
+[ButtonGroup](/ui/primitives/input/button-group) can set a shared size, surface,
+and color. Consumer classes, including state functions, pass through to the root.
+
+## Props
+
+<MainButtonReference />
diff --git a/packages/twenty-docs/ui/components/overview.mdx b/packages/twenty-docs/ui/components/overview.mdx
index 645f2738408..f6c2c75e7c8 100644
--- a/packages/twenty-docs/ui/components/overview.mdx
+++ b/packages/twenty-docs/ui/components/overview.mdx
@@ -1,9 +1,16 @@
---
title: Components
sidebarTitle: Overview
-description: Reusable app building blocks composed from Twenty UI primitives.
+description: Shared design presets and reusable app building blocks composed from Twenty UI primitives.
---
-Components combine [primitives](/ui/primitives/overview) into reusable app building blocks, such as tables, boards, and pickers. Like primitives, they receive data and callbacks from your application.
+Components combine [primitives](/ui/primitives/overview) into recurring design presets and reusable app building blocks. Like primitives, they receive data and callbacks from your application.
-The `twenty-ui/components` entry point is reserved for this layer. It does not export any components yet. All currently available controls are documented under [Primitives](/ui/primitives/overview).
+Import shared components from `twenty-ui/components`. See [Getting started](/ui/getting-started) for installation and theme setup.
+
+## Browse components
+
+| Component | Purpose |
+| ------------------------------------------------ | --------------------------------------------------------------------- |
+| [MainButton](/ui/components/input/main-button) | Prominent actions with a solid surface, elevation, and semibold text. |
+| [LightButton](/ui/components/input/light-button) | Lightweight actions with standard or subtle emphasis. |
diff --git a/packages/twenty-docs/ui/getting-started.mdx b/packages/twenty-docs/ui/getting-started.mdx
index 48e5573bc33..b42a6bd4ec7 100644
--- a/packages/twenty-docs/ui/getting-started.mdx
+++ b/packages/twenty-docs/ui/getting-started.mdx
@@ -52,17 +52,22 @@ The component stylesheet includes a global reset. Review its effect when adding
Import components from their public subpath to keep imports focused:
Primitives are foundational controls, including compound controls such as Select,
-Menu, and AlertDialog. Higher-level components combine primitives into reusable
-app building blocks, such as tables, boards, and pickers. Both receive data and
-callbacks from the application.
+Menu, and AlertDialog. Shared components combine primitives into recurring
+design presets and reusable app building blocks. Both receive data and callbacks
+from the application.
-All existing UI components live in `primitives/`, including controls still being
-migrated to the new API. The `components/` folder is reserved for higher-level
-app building blocks. Each primitive family has a matching public entry point,
-such as `twenty-ui/primitives/input`.
+Use [MainButton](/ui/components/input/main-button) for prominent actions and
+[LightButton](/ui/components/input/light-button) for lightweight actions. Both
+come from `twenty-ui/components` and share the foundational
+[Button](/ui/primitives/input/button) interaction contract. Routing and page
+layout remain in the application.
+
+Each primitive family has a matching public entry point, such as
+`twenty-ui/primitives/input`.
| Import | Contents |
| -------------------------------------- | ------------------------------------------------------------ |
+| `twenty-ui/components` | Shared design presets and reusable app building blocks |
| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
| `twenty-ui/primitives/data-display` | Avatars, chips, tags, status indicators, and display helpers |
| `twenty-ui/primitives/feedback` | Toasts, banners, progress bars, and loaders |
@@ -85,4 +90,4 @@ Import individual icons, such as `IconCheck`, from `twenty-ui/icon`. The dynamic
## Browse the library
- [Primitives](/ui/primitives/overview): foundational controls grouped by family, with usage examples and API references.
-- [Components](/ui/components/overview): reusable app building blocks composed from primitives.
+- [Components](/ui/components/overview): shared design presets and reusable app building blocks composed from primitives.
diff --git a/packages/twenty-docs/ui/primitives/input/button-group.mdx b/packages/twenty-docs/ui/primitives/input/button-group.mdx
new file mode 100644
index 00000000000..d325edff901
--- /dev/null
+++ b/packages/twenty-docs/ui/primitives/input/button-group.mdx
@@ -0,0 +1,31 @@
+---
+title: ButtonGroup
+description: Group related buttons with joined borders and shared appearance.
+---
+
+import ButtonGroupReference from '/snippets/ui/generated/input/button-group.mdx';
+
+Give a group an accessible name and place related buttons inside it. The group joins adjacent borders and can apply a shared size, variant, and color. Buttons retain their own tab stops.
+
+## State ownership
+
+`ButtonGroup` coordinates appearance, not selection. It has no controlled or uncontrolled selection mode. Each button receives its own action handler and application state; see [Button's state ownership example](/ui/primitives/input/button#state-ownership) for loading behavior.
+
+For a mutually exclusive choice, use [RadioGroup](/ui/primitives/input/radio-group), which owns selection for its radio controls.
+
+## Usage
+
+```tsx
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
+
+export const RecordActions = () => (
+ <ButtonGroup aria-label="Record actions" size="sm">
+ <Button>Edit</Button>
+ <Button>Duplicate</Button>
+ </ButtonGroup>
+);
+```
+
+## Props
+
+<ButtonGroupReference />
diff --git a/packages/twenty-docs/ui/primitives/input/button.mdx b/packages/twenty-docs/ui/primitives/input/button.mdx
new file mode 100644
index 00000000000..0208e81e023
--- /dev/null
+++ b/packages/twenty-docs/ui/primitives/input/button.mdx
@@ -0,0 +1,91 @@
+---
+title: Button
+description: Trigger actions or navigate with styled buttons.
+---
+
+import ButtonReference from '/snippets/ui/generated/input/button.mdx';
+
+Use `Button` for an action. Supply its visible label as children, and give icon-only buttons an `aria-label`.
+
+For recurring design defaults, use [MainButton](/ui/components/input/main-button)
+or [LightButton](/ui/components/input/light-button) from `twenty-ui/components`.
+Both share Button's native props, refs, state, and rendering behavior.
+
+## State ownership
+
+`Button` triggers an action and does not manage a selected value, so it has no controlled or uncontrolled selection mode. Its native `value` prop supplies form data, not selection state.
+
+Your application owns `loading`, `disabled`, and `soon`, which default to `false`. Clicking a button does not change these props or automatically show loading while an asynchronous handler runs. Pass the current application state explicitly.
+
+```tsx
+import { useState } from 'react';
+import { Button } from 'twenty-ui/primitives/input';
+
+type SaveRecordProps = { onSave: () => Promise<void> };
+
+export const SaveRecord = ({ onSave }: SaveRecordProps) => {
+ const [loading, setLoading] = useState(false);
+ const [hasError, setHasError] = useState(false);
+
+ const handleSave = async () => {
+ setLoading(true);
+ setHasError(false);
+
+ try {
+ await onSave();
+ } catch {
+ setHasError(true);
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ return (
+ <>
+ <Button loading={loading} onClick={handleSave}>
+ Save record
+ </Button>
+ {hasError && <p role="alert">Unable to save the record. Try again.</p>}
+ </>
+ );
+};
+```
+
+The application starts and clears loading around the save operation. The button prevents activation while loading and becomes available again when the operation finishes, including after an error. `MainButton` and `LightButton` use the same state model.
+
+## Appearance
+
+```tsx
+import { Button } from 'twenty-ui/primitives/input';
+import { IconPlus } from 'twenty-ui/icon';
+
+export const CreateRecord = () => (
+ <Button variant="solid" color="accent" size="sm" startIcon={<IconPlus />}>
+ Create record
+ </Button>
+);
+```
+
+Choose `solid`, `outline`, `soft`, or `ghost` independently of the `neutral`, `accent`, `danger`, or `success` color. Sizes are `sm` and `md`; the defaults are `outline`, `neutral`, and `md`. `fullWidth` fills the available width. `startIcon` and `endIcon` accept elements and are decorative. `elevated` adds a shadow. `hotkeys` displays keyboard hints on larger screens; bind the shortcuts in your application.
+
+`disabled`, `loading`, and `soon` prevent activation. Loading keeps the label accessible and preserves the button's width while showing a spinner. Customize the upcoming-feature label with `soonLabel`.
+
+## Links and forms
+
+```tsx
+import { Button } from 'twenty-ui/primitives/input';
+
+export const DocumentationLink = () => (
+ <Button href="https://twenty.com" target="_blank" rel="noreferrer">
+ Read documentation
+ </Button>
+);
+```
+
+`href` renders an anchor with link semantics. For a router link, use `render={<Link to="/settings" />}`, `nativeButton={false}`, and `role="link"`. Disabled links cannot activate.
+
+Buttons default to `type="button"`. Set `type="submit"` or `type="reset"` explicitly for forms. Native props, event handlers, refs, and Base UI's `render` prop pass through to the root.
+
+## Props
+
+<ButtonReference />
diff --git a/packages/twenty-docs/ui/primitives/input/input-group.mdx b/packages/twenty-docs/ui/primitives/input/input-group.mdx
index a8283dcdbab..a13cb232a8c 100644
--- a/packages/twenty-docs/ui/primitives/input/input-group.mdx
+++ b/packages/twenty-docs/ui/primitives/input/input-group.mdx
@@ -71,12 +71,13 @@ export const PasswordField = () => {
endElement={
<Button
type="button"
- title={visible ? 'Hide' : 'Show'}
- ariaLabel={visible ? 'Hide password' : 'Show password'}
- variant="tertiary"
- size="small"
+ aria-label={visible ? 'Hide password' : 'Show password'}
+ variant="ghost"
+ size="sm"
onClick={() => setVisible(!visible)}
- />
+ >
+ {visible ? 'Hide' : 'Show'}
+ </Button>
}
>
<Input
diff --git a/packages/twenty-docs/ui/primitives/navigation/list-item.mdx b/packages/twenty-docs/ui/primitives/navigation/list-item.mdx
index cfc4b22b2e8..0839538fef4 100644
--- a/packages/twenty-docs/ui/primitives/navigation/list-item.mdx
+++ b/packages/twenty-docs/ui/primitives/navigation/list-item.mdx
@@ -100,12 +100,13 @@ export const ContactRow = ({ onOpen }: ContactRowProps) => (
actions={
<Button
type="button"
- title="Open"
- ariaLabel="Open Alex Morgan's profile"
- variant="tertiary"
- size="small"
+ aria-label="Open Alex Morgan's profile"
+ variant="ghost"
+ size="sm"
onClick={onOpen}
- />
+ >
+ Open
+ </Button>
}
>
Alex Morgan
diff --git a/packages/twenty-docs/ui/primitives/overview.mdx b/packages/twenty-docs/ui/primitives/overview.mdx
index 0b7544a80c9..2d62e2da4c4 100644
--- a/packages/twenty-docs/ui/primitives/overview.mdx
+++ b/packages/twenty-docs/ui/primitives/overview.mdx
@@ -8,7 +8,7 @@ Primitives are the foundational controls in Twenty UI. They include inputs, disp
Import primitives from a family entry point, such as `twenty-ui/primitives/input`. See [Getting started](/ui/getting-started) for installation and theme setup.
-All existing UI controls belong to the primitives layer, including controls still being migrated to the new API. [Components](/ui/components/overview) are reserved for larger, reusable app building blocks composed from these primitives.
+[Components](/ui/components/overview) combine these primitives into shared design presets and reusable app building blocks.
## State ownership
@@ -61,18 +61,18 @@ import { Popover } from 'twenty-ui/primitives/surfaces';
type HelpButtonProps = ComponentPropsWithRef<typeof Button>;
const HelpButton = ({ ref, ...props }: HelpButtonProps) => (
- <Button {...props} ref={ref} variant="secondary" />
+ <Button {...props} ref={ref} variant="outline" />
);
export const ImportHelp = () => (
<Popover.Root>
- <Popover.Trigger render={<HelpButton title="Import help" />} />
+ <Popover.Trigger render={<HelpButton>Import help</HelpButton>} />
<Popover.Popup>
<Popover.Title>Import a CSV file</Popover.Title>
<Popover.Description>
Use a header row to identify your columns.
</Popover.Description>
- <Popover.Close render={<Button title="Got it" />} />
+ <Popover.Close render={<Button>Got it</Button>} />
</Popover.Popup>
</Popover.Root>
);
@@ -86,11 +86,11 @@ Use a native button for button-like parts. On parts that expose `nativeButton`,
Each page includes usage examples, interaction guidance, and a generated API reference.
-| Family | Primitives |
-| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Data display | [Avatar](/ui/primitives/data-display/avatar), [Chip](/ui/primitives/data-display/chip), [Tag](/ui/primitives/data-display/tag), [Status](/ui/primitives/data-display/status) |
-| Forms | [Field](/ui/primitives/input/field), [Input](/ui/primitives/input/input), [InputGroup](/ui/primitives/input/input-group), [Textarea](/ui/primitives/input/textarea), [Checkbox](/ui/primitives/input/checkbox), [Radio](/ui/primitives/input/radio), [RadioGroup](/ui/primitives/input/radio-group), [Select](/ui/primitives/input/select), [Slider](/ui/primitives/input/slider), [Switch](/ui/primitives/input/switch) |
-| Navigation | [ListItem](/ui/primitives/navigation/list-item), [Tabs](/ui/primitives/navigation/tabs) |
-| Surfaces | [AlertDialog](/ui/primitives/surfaces/alert-dialog), [Menu](/ui/primitives/surfaces/menu), [Popover](/ui/primitives/surfaces/popover) |
-| Feedback | [Toast](/ui/primitives/feedback/toast) |
-| Typography | [Text](/ui/primitives/typography/text) |
+| Family | Primitives |
+| ------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Data display | [Avatar](/ui/primitives/data-display/avatar), [Chip](/ui/primitives/data-display/chip), [Tag](/ui/primitives/data-display/tag), [Status](/ui/primitives/data-display/status) |
+| Forms | [Button](/ui/primitives/input/button), [ButtonGroup](/ui/primitives/input/button-group), [Field](/ui/primitives/input/field), [Input](/ui/primitives/input/input), [InputGroup](/ui/primitives/input/input-group), [Textarea](/ui/primitives/input/textarea), [Checkbox](/ui/primitives/input/checkbox), [Radio](/ui/primitives/input/radio), [RadioGroup](/ui/primitives/input/radio-group), [Select](/ui/primitives/input/select), [Slider](/ui/primitives/input/slider), [Switch](/ui/primitives/input/switch) |
+| Navigation | [ListItem](/ui/primitives/navigation/list-item), [Tabs](/ui/primitives/navigation/tabs) |
+| Surfaces | [AlertDialog](/ui/primitives/surfaces/alert-dialog), [Menu](/ui/primitives/surfaces/menu), [Popover](/ui/primitives/surfaces/popover) |
+| Feedback | [Toast](/ui/primitives/feedback/toast) |
+| Typography | [Text](/ui/primitives/typography/text) |
diff --git a/packages/twenty-docs/ui/primitives/surfaces/alert-dialog.mdx b/packages/twenty-docs/ui/primitives/surfaces/alert-dialog.mdx
index 7414d5d5c8a..b401f48bf84 100644
--- a/packages/twenty-docs/ui/primitives/surfaces/alert-dialog.mdx
+++ b/packages/twenty-docs/ui/primitives/surfaces/alert-dialog.mdx
@@ -124,7 +124,7 @@ type DeleteConfirmationProps = { onDelete: () => void };
export const DeleteConfirmation = ({ onDelete }: DeleteConfirmationProps) => (
<AlertDialog.Root>
<AlertDialog.Trigger
- render={<Button title="Delete record" accent="danger" />}
+ render={<Button color="danger">Delete record</Button>}
/>
<AlertDialog.Popup>
<AlertDialog.Header>
@@ -134,12 +134,10 @@ export const DeleteConfirmation = ({ onDelete }: DeleteConfirmationProps) => (
</AlertDialog.Description>
</AlertDialog.Header>
<AlertDialog.Footer>
- <AlertDialog.Close
- render={<Button title="Cancel" variant="secondary" />}
- />
+ <AlertDialog.Close render={<Button variant="outline">Cancel</Button>} />
<AlertDialog.Close
onClick={onDelete}
- render={<Button title="Delete" accent="danger" />}
+ render={<Button color="danger">Delete</Button>}
/>
</AlertDialog.Footer>
</AlertDialog.Popup>
diff --git a/packages/twenty-docs/ui/primitives/surfaces/menu.mdx b/packages/twenty-docs/ui/primitives/surfaces/menu.mdx
index 943e2db153a..b1c0bf366b8 100644
--- a/packages/twenty-docs/ui/primitives/surfaces/menu.mdx
+++ b/packages/twenty-docs/ui/primitives/surfaces/menu.mdx
@@ -199,9 +199,7 @@ type RecordMenuProps = { onDuplicate: () => void; onDelete: () => void };
export const RecordMenu = ({ onDuplicate, onDelete }: RecordMenuProps) => (
<Menu.Root>
- <Menu.Trigger
- render={<Button title="Record actions" variant="secondary" />}
- />
+ <Menu.Trigger render={<Button variant="outline">Record actions</Button>} />
<Menu.Popup>
<Menu.Item startIcon={<IconCopy />} onClick={onDuplicate}>
Duplicate
diff --git a/packages/twenty-docs/ui/primitives/surfaces/popover.mdx b/packages/twenty-docs/ui/primitives/surfaces/popover.mdx
index 5ecf6319e68..9eadf4ddf0a 100644
--- a/packages/twenty-docs/ui/primitives/surfaces/popover.mdx
+++ b/packages/twenty-docs/ui/primitives/surfaces/popover.mdx
@@ -100,15 +100,13 @@ import { Popover } from 'twenty-ui/primitives/surfaces';
export const ImportHelp = () => (
<Popover.Root>
- <Popover.Trigger
- render={<Button title="Import help" variant="secondary" />}
- />
+ <Popover.Trigger render={<Button variant="outline">Import help</Button>} />
<Popover.Popup arrow>
<Popover.Title>Import a CSV file</Popover.Title>
<Popover.Description>
Use a header row to identify your columns.
</Popover.Description>
- <Popover.Close render={<Button title="Got it" />} />
+ <Popover.Close render={<Button>Got it</Button>} />
</Popover.Popup>
</Popover.Root>
);
diff --git a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
index 1bb4e9d02e7..f454f4000ff 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx
@@ -1,3 +1,4 @@
+import { buttonControlsTest } from '@/__stories__/twenty-ui-gallery/utils/buttonControlsTest';
import { type Meta } from '@storybook/react-vite';
import {
@@ -385,6 +386,18 @@ export const TagControlsPreact: Story = createGalleryStory({
play: tagControlsTest,
});
+export const ButtonControlsReact: Story = createGalleryStory({
+ frontComponentBundleName: 'twenty-ui-button-controls',
+ runtime: 'react',
+ play: buttonControlsTest,
+});
+
+export const ButtonControlsPreact: Story = createGalleryStory({
+ frontComponentBundleName: 'twenty-ui-button-controls',
+ runtime: 'preact',
+ play: buttonControlsTest,
+});
+
export const AvatarControlsReact: Story = createGalleryStory({
frontComponentBundleName: 'twenty-ui-avatar-controls',
runtime: 'react',
diff --git a/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
index a06e09da87e..5b0d3ac0dd0 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/showcase/twenty-ui-example.front-component.tsx
@@ -64,15 +64,15 @@ const TwentyUiComponent = () => {
</p>
<div style={ROW_STYLE}>
<Button
- title="Increment"
- accent="blue"
onClick={() => setCount((previous) => previous + 1)}
- />
- <Button
- title="Reset"
- variant="secondary"
- onClick={() => setCount(0)}
- />
+ variant="solid"
+ color="accent"
+ >
+ {'Increment'}
+ </Button>
+ <Button onClick={() => setCount(0)} variant="outline">
+ {'Reset'}
+ </Button>
</div>
</div>
</ThemeProvider>
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx
new file mode 100644
index 00000000000..c4433af2d42
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-button-controls.front-component.tsx
@@ -0,0 +1,49 @@
+import { useState } from 'react';
+import { defineFrontComponent } from 'twenty-sdk/define';
+import { LightButton, MainButton } from 'twenty-ui/components';
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
+import { IconPlus } from 'twenty-ui/icon';
+import { ThemeProvider } from 'twenty-ui/theme-constants';
+import 'twenty-ui/style.css';
+
+const ButtonControls = () => {
+ const [activations, setActivations] = useState(0);
+ const [loading, setLoading] = useState(false);
+ const handleClick = () => setActivations((count) => count + 1);
+ return (
+ <ThemeProvider colorScheme="light">
+ <Button
+ color="accent"
+ variant="solid"
+ startIcon={<IconPlus />}
+ onClick={handleClick}
+ >
+ Create record
+ </Button>
+ <Button disabled onClick={handleClick}>
+ Disabled button
+ </Button>
+ <MainButton loading={loading} onClick={() => setLoading(true)}>
+ Save changes
+ </MainButton>
+ <LightButton onClick={() => setLoading(false)}>
+ Complete request
+ </LightButton>
+ <Button href="https://twenty.com" target="_blank" rel="noreferrer">
+ Documentation
+ </Button>
+ <ButtonGroup aria-label="Actions" size="sm">
+ <Button onClick={handleClick}>First action</Button>
+ <Button onClick={handleClick}>Second action</Button>
+ </ButtonGroup>
+ <output aria-label="Activations">{activations}</output>
+ </ThemeProvider>
+ );
+};
+
+export default defineFrontComponent({
+ universalIdentifier: '42d01c10-861e-4596-9178-d219f2800764',
+ name: 'twenty-ui-button-controls',
+ description: 'Button rendering and interactions in the sandbox',
+ component: ButtonControls,
+});
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
index ef62a632a4f..928bb84fedf 100644
--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-input-gallery.front-component.tsx
@@ -1,4 +1,5 @@
import { defineFrontComponent } from 'twenty-sdk/define';
+import { LightButton, MainButton } from 'twenty-ui/components';
import { IconPlus, IconSearch, IconStar, IconTrash } from 'twenty-ui/icon';
import {
AnimatedButton,
@@ -17,10 +18,8 @@ import {
IconButtonGroup,
IconListViewGrip,
InsideButton,
- LightButton,
LightIconButton,
LightIconButtonGroup,
- MainButton,
RoundedIconButton,
SearchInput,
SegmentedControl,
@@ -57,13 +56,13 @@ const INPUT_ENTRIES: GalleryEntry[] = [
},
{
name: 'Button',
- node: <Button title="Button" onClick={() => {}} />,
+ node: <Button onClick={() => {}}>{'Button'}</Button>,
},
{
name: 'ButtonGroup',
node: (
<ButtonGroup>
- {[<Button key="a" title="A" />, <Button key="b" title="B" />]}
+ {[<Button key="a">{'A'}</Button>, <Button key="b">{'B'}</Button>]}
</ButtonGroup>
),
},
@@ -158,7 +157,7 @@ const INPUT_ENTRIES: GalleryEntry[] = [
},
{
name: 'LightButton',
- node: <LightButton title="Light" />,
+ node: <LightButton>{'Light'}</LightButton>,
},
{
name: 'LightIconButton',
@@ -174,7 +173,7 @@ const INPUT_ENTRIES: GalleryEntry[] = [
},
{
name: 'MainButton',
- node: <MainButton title="Main" />,
+ node: <MainButton>{'Main'}</MainButton>,
},
{
name: 'Radio',
@@ -259,7 +258,7 @@ const INPUT_ENTRIES: GalleryEntry[] = [
const InputGallery = () => (
<ThemeProvider colorScheme="light">
<ComponentGallery
- title="twenty-ui/primitives/input"
+ title="twenty-ui/primitives/input + twenty-ui/components"
entries={INPUT_ENTRIES}
/>
</ThemeProvider>
@@ -269,6 +268,6 @@ export default defineFrontComponent({
universalIdentifier: 'test-20ui0-0000-0000-0000-000000000107',
name: 'twenty-ui-input-gallery',
description:
- 'Renders every twenty-ui/primitives/input component (except monaco CodeEditor) in the sandbox',
+ 'Renders input primitives and shared button presets in the sandbox',
component: InputGallery,
});
diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts
new file mode 100644
index 00000000000..8bea36ae4e0
--- /dev/null
+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/buttonControlsTest.ts
@@ -0,0 +1,42 @@
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';
+
+export const buttonControlsTest: TwentyUiGalleryPlayFunction = async (
+ context,
+) => {
+ const canvas = within(context.canvasElement);
+ const button = await canvas.findByRole(
+ 'button',
+ { name: 'Create record' },
+ { timeout: 10000 },
+ );
+ await userEvent.click(button);
+ button.focus();
+ await userEvent.keyboard('{Enter} ');
+ await waitFor(() =>
+ expect(canvas.getByLabelText('Activations')).toHaveTextContent('3'),
+ );
+ const disabled = canvas.getByRole('button', { name: 'Disabled button' });
+ await expect(disabled).toBeDisabled();
+ await userEvent.click(disabled);
+ await waitFor(() =>
+ expect(canvas.getByLabelText('Activations')).toHaveTextContent('3'),
+ );
+ const save = canvas.getByRole('button', { name: 'Save changes' });
+ await expect(getComputedStyle(save).fontWeight).toBe('600');
+ await expect(getComputedStyle(save).paddingInlineStart).toBe('12px');
+ await userEvent.click(save);
+ await waitFor(() => expect(save).toBeDisabled());
+ const complete = canvas.getByRole('button', { name: 'Complete request' });
+ await expect(getComputedStyle(complete).fontWeight).toBe('400');
+ await expect(complete.getBoundingClientRect().height).toBe(24);
+ await userEvent.click(complete);
+ await waitFor(() => expect(save).toBeEnabled());
+ await expect(
+ canvas.getByRole('link', { name: 'Documentation' }),
+ ).toHaveAttribute('href', 'https://twenty.com');
+ await userEvent.click(canvas.getByRole('button', { name: 'Second action' }));
+ await waitFor(() =>
+ expect(canvas.getByLabelText('Activations')).toHaveTextContent('4'),
+ );
+};
diff --git a/packages/twenty-front/.oxlintrc.json b/packages/twenty-front/.oxlintrc.json
index 88cbdac1004..19a4ade75c6 100644
--- a/packages/twenty-front/.oxlintrc.json
+++ b/packages/twenty-front/.oxlintrc.json
@@ -142,6 +142,12 @@
]
},
"overrides": [
+ {
+ "files": ["src/modules/ui/input/components/NavigationButton.tsx"],
+ "rules": {
+ "react/jsx-props-no-spreading": "off"
+ }
+ },
{
"files": ["**/constants/*.ts", "**/*.constants.ts"],
"rules": {
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
index d161b57edc9..b70af52bc3c 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmptyInboxPlaceholder.tsx
@@ -29,12 +29,11 @@ export const EmptyInboxPlaceholder = () => {
</AnimatedPlaceholderEmptySubTitle>
</AnimatedPlaceholderEmptyTextContainer>
<Button
- Icon={IconMail}
- title={t`Send Email`}
- variant="secondary"
+ startIcon={<IconMail />}
onClick={openComposer}
disabled={loading}
- />
+ variant="outline"
+ >{t`Send Email`}</Button>
</AnimatedPlaceholderEmptyContainer>
);
};
diff --git a/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx b/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
index f9fc9cacf0c..947c1b81207 100644
--- a/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/DocumentViewer.tsx
@@ -294,12 +294,11 @@ export const DocumentViewer = ({
</Trans>
</StyledLightMessage>
<Button
- Icon={IconDownload}
- title={t`Download`}
+ startIcon={<IconDownload />}
onClick={() => downloadFile(documentUrl, documentName)}
- variant="secondary"
- size="small"
- />
+ size="sm"
+ variant="outline"
+ >{t`Download`}</Button>
</StyledUnavailablePreviewContainer>
</StyledDocumentViewerContainer>
);
diff --git a/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
index 93b6f84be01..061ddaa0a00 100644
--- a/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/FilesCardContent.tsx
@@ -78,11 +78,10 @@ export const FilesCardContent = ({
<AttachmentUploadTrigger targetableObject={targetRecord}>
{({ openFilePicker }) => (
<Button
- Icon={IconPlus}
- title={t`Add file`}
- variant="secondary"
+ startIcon={<IconPlus />}
onClick={openFilePicker}
- />
+ variant="outline"
+ >{t`Add file`}</Button>
)}
</AttachmentUploadTrigger>
)}
diff --git a/packages/twenty-front/src/modules/activities/files/components/UnavailableFilePreview.tsx b/packages/twenty-front/src/modules/activities/files/components/UnavailableFilePreview.tsx
index d72bbad6161..4989c038b87 100644
--- a/packages/twenty-front/src/modules/activities/files/components/UnavailableFilePreview.tsx
+++ b/packages/twenty-front/src/modules/activities/files/components/UnavailableFilePreview.tsx
@@ -49,11 +49,10 @@ export const UnavailableFilePreview = ({
</StyledTitle>
<StyledMessage>{message}</StyledMessage>
<Button
- Icon={IconDownload}
- title={t`Download File`}
+ startIcon={<IconDownload />}
onClick={() => downloadFile(fileUrl, fileName)}
- variant="secondary"
- />
+ variant="outline"
+ >{t`Download File`}</Button>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
index 8686b282f3d..b5d5e19cef0 100644
--- a/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/notes/components/NotesCardContent.tsx
@@ -56,11 +56,10 @@ export const NotesCardContent = ({
</AnimatedPlaceholderEmptyTextContainer>
{isDefined(onCreateNote) && (
<Button
- Icon={IconPlus}
- title={t`New note`}
- variant="secondary"
+ startIcon={<IconPlus />}
onClick={onCreateNote}
- />
+ variant="outline"
+ >{t`New note`}</Button>
)}
</AnimatedPlaceholderEmptyContainer>
);
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
index 8ff0d96ed94..bc26080f279 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx
@@ -62,11 +62,10 @@ export const TaskGroupsContent = ({
</AnimatedPlaceholderEmptyTextContainer>
{isDefined(onCreateTask) && (
<Button
- Icon={IconPlus}
- title={t`New task`}
- variant="secondary"
+ startIcon={<IconPlus />}
onClick={onCreateTask}
- />
+ variant="outline"
+ >{t`New task`}</Button>
)}
</AnimatedPlaceholderEmptyContainer>
);
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
index dd1a0d2f7ea..a2e2cd26843 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorInsertRail.tsx
@@ -316,10 +316,9 @@ export const AdvancedTextEditorInsertRail = ({
{t`Paste a link to a hosted image`}
</StyledImageHint>
<Button
- title={t`Insert image`}
- size="small"
+ size="sm"
onClick={handleInsertImage}
- />
+ >{t`Insert image`}</Button>
</StyledImageForm>
</StyledPopover>
)}
diff --git a/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx b/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
index 10512c10253..3ba431ab6f4 100644
--- a/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AIChatNoMoreBillingCreditsBanner.tsx
@@ -110,7 +110,7 @@ export const AIChatNoMoreBillingCreditsBanner = () => {
subtitle={t`Upgrade to ${nextResourceCreditsAmount ?? ''} credits for $${nextResourceCreditPrice ?? ''}/${nextTierInterval ?? ''}.`}
onConfirmClick={upgradeCreditPlan}
confirmButtonText={t`Upgrade`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isUpgrading}
/>
)}
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
index f513deb356c..0edfeba22cc 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatErrorMessage.tsx
@@ -75,12 +75,11 @@ export const AiChatErrorMessage = ({
</StyledErrorContent>
{isDefined(onRetry) && (
<Button
- variant="secondary"
- size="small"
- Icon={IconRefresh}
+ size="sm"
+ startIcon={<IconRefresh />}
onClick={onRetry}
- title={t`Retry`}
- />
+ variant="outline"
+ >{t`Retry`}</Button>
)}
</StyledErrorContainer>
);
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx b/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
index 7008f0c6fe3..a2c455c7188 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatPageThreadHeader.tsx
@@ -102,13 +102,12 @@ export const AiChatPageThreadHeader = ({
<StyledActions>
{hasConversation && (
<Button
- Icon={IconPlus}
- title={t`New chat`}
- size="small"
- variant="primary"
- accent="blue"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={() => switchToNewChat()}
- />
+ variant="solid"
+ color="accent"
+ >{t`New chat`}</Button>
)}
<AiChatThreadItemMenu
threadId={thread.id}
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatThreadDeleteConfirmationModal.tsx b/packages/twenty-front/src/modules/ai/components/AiChatThreadDeleteConfirmationModal.tsx
index b2767714353..111ca6eb72d 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatThreadDeleteConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatThreadDeleteConfirmationModal.tsx
@@ -48,7 +48,7 @@ export const AiChatThreadDeleteConfirmationModal = ({
onConfirmClick={handleDelete}
onClose={() => setAiChatThreadPendingDelete(null)}
confirmButtonText={t`Delete`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx b/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
index 9d6a77c9b2c..206e60c4273 100644
--- a/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
@@ -6,7 +6,7 @@ import {
AUTO_SELECT_WORKSPACE_DEFAULT_MODEL_ID,
} from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
-import { LightButton } from 'twenty-ui/primitives/input';
+import { LightButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AiModelTierSlider } from '@/ai/components/AiModelTierSlider';
@@ -94,10 +94,9 @@ export const AiModelPicker = ({
</StyledHint>
{!isAdvancedOpen && !disabled && (
<LightButton
- title={t`Advanced`}
- accent="tertiary"
+ emphasis="subtle"
onClick={() => setIsAdvancedOpen(true)}
- />
+ >{t`Advanced`}</LightButton>
)}
</StyledFooter>
{isAdvancedOpen && (
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
index 2b8df1f001a..66d78feae8a 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
@@ -239,11 +239,12 @@ export const AiChatContextUsageButton = () => {
<HorizontalSeparator noMargin />
<StyledFooter>
<Button
- title={showDetails ? t`Less` : t`More`}
- size="small"
- variant="secondary"
+ size="sm"
+ variant="outline"
onClick={() => setShowDetails(!showDetails)}
- />
+ >
+ {showDetails ? t`Less` : t`More`}
+ </Button>
</StyledFooter>
</>
)}
diff --git a/packages/twenty-front/src/modules/ai/components/suggested-prompts/AiChatSuggestedPrompts.tsx b/packages/twenty-front/src/modules/ai/components/suggested-prompts/AiChatSuggestedPrompts.tsx
index 408e386293b..cc082a9ec02 100644
--- a/packages/twenty-front/src/modules/ai/components/suggested-prompts/AiChatSuggestedPrompts.tsx
+++ b/packages/twenty-front/src/modules/ai/components/suggested-prompts/AiChatSuggestedPrompts.tsx
@@ -1,7 +1,9 @@
+import { isDefined } from 'twenty-shared/utils';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
-import { Button, LightButton } from 'twenty-ui/primitives/input';
+import { LightButton } from 'twenty-ui/components';
+import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { getAiChatSuggestedPrompts } from '@/ai/components/suggested-prompts/getAiChatSuggestedPrompts';
@@ -85,19 +87,28 @@ export const AiChatSuggestedPrompts = ({
isCentered ? (
<Button
key={suggestedPrompt.id}
- Icon={suggestedPrompt.Icon}
- title={resolveMessage(suggestedPrompt.label)}
- variant="secondary"
+ startIcon={
+ isDefined(suggestedPrompt.Icon) ? (
+ <suggestedPrompt.Icon />
+ ) : undefined
+ }
onClick={() => handleClick(suggestedPrompt)}
- />
+ variant="outline"
+ >
+ {resolveMessage(suggestedPrompt.label)}
+ </Button>
) : (
<LightButton
key={suggestedPrompt.id}
- Icon={suggestedPrompt.Icon}
- title={resolveMessage(suggestedPrompt.label)}
- accent="secondary"
+ startIcon={
+ isDefined(suggestedPrompt.Icon) ? (
+ <suggestedPrompt.Icon />
+ ) : undefined
+ }
onClick={() => handleClick(suggestedPrompt)}
- />
+ >
+ {resolveMessage(suggestedPrompt.label)}
+ </LightButton>
),
)}
</StyledPromptList>
diff --git a/packages/twenty-front/src/modules/applications/components/AuthorizeActionButtons.tsx b/packages/twenty-front/src/modules/applications/components/AuthorizeActionButtons.tsx
index 5acfe1c4ce6..be55322b07a 100644
--- a/packages/twenty-front/src/modules/applications/components/AuthorizeActionButtons.tsx
+++ b/packages/twenty-front/src/modules/applications/components/AuthorizeActionButtons.tsx
@@ -1,6 +1,6 @@
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
type AuthorizeActionButtonsProps = {
@@ -20,14 +20,6 @@ const StyledButtonContainer = styled.div`
width: 100%;
`;
-const StyledAuthorizeButton = styled(MainButton)`
- box-shadow: none;
-`;
-
-const StyledCancelButton = styled(MainButton)`
- box-shadow: none;
-`;
-
export const AuthorizeActionButtons = ({
onAuthorize,
onCancel,
@@ -37,19 +29,21 @@ export const AuthorizeActionButtons = ({
return (
<StyledButtonContainer>
- <StyledCancelButton
- title={t`Cancel`}
- variant="secondary"
+ <MainButton
+ elevated={false}
onClick={onCancel}
fullWidth
disabled={isLoading}
- />
- <StyledAuthorizeButton
- title={isLoading ? t`Authorizing...` : t`Authorize`}
+ variant="outline"
+ >{t`Cancel`}</MainButton>
+ <MainButton
+ elevated={false}
onClick={onAuthorize}
disabled={isLoading}
fullWidth
- />
+ >
+ {isLoading ? t`Authorizing...` : t`Authorize`}
+ </MainButton>
</StyledButtonContainer>
);
};
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
index 5b96f9ead14..fa62b47d5a5 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/EmailVerificationSent.tsx
@@ -10,8 +10,8 @@ import {
import { OnboardingModalCircularIcon } from '@/onboarding/components/OnboardingModalCircularIcon';
import { t } from '@lingui/core/macro';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
+import { MainButton } from 'twenty-ui/components';
import { IconGmail, IconMail, IconMailX, IconMicrosoft } from 'twenty-ui/icon';
-import { MainButton } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
@@ -119,34 +119,32 @@ export const EmailVerificationSent = ({
const mainButtons = isError ? (
<>
<MainButton
- title={t`Try with another email`}
onClick={handleChangeEmail}
- variant="secondary"
fullWidth
- />
+ variant="outline"
+ >{t`Try with another email`}</MainButton>
<MainButton
- title={isLoading ? t`Sending...` : t`Resend email`}
onClick={handleResendEmailVerificationToken(email)}
disabled={isLoading}
fullWidth
- />
+ >
+ {isLoading ? t`Sending...` : t`Resend email`}
+ </MainButton>
</>
) : (
<>
<MainButton
- title={t`Open Gmail`}
onClick={handleOpenGmail}
- Icon={IconGmail}
- variant="secondary"
+ startIcon={<IconGmail />}
fullWidth
- />
+ variant="outline"
+ >{t`Open Gmail`}</MainButton>
<MainButton
- title={t`Open Outlook`}
onClick={handleOpenOutlook}
- Icon={IconMicrosoft}
- variant="secondary"
+ startIcon={<IconMicrosoft />}
fullWidth
- />
+ variant="outline"
+ >{t`Open Outlook`}</MainButton>
</>
);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsx
index 3300eb3a07f..e794546b7cf 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpSsoIdentityProviderSelection.tsx
@@ -7,8 +7,8 @@ import { guessSsoIdentityProviderIconByUrl } from '@/settings/security/utils/gue
import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthProvidersState';
import React from 'react';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
-import { MainButton } from 'twenty-ui/primitives/input';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
export const SignInUpSsoIdentityProviderSelection = () => {
@@ -20,17 +20,24 @@ export const SignInUpSsoIdentityProviderSelection = () => {
<>
<StyledOnboardingContentContainer>
{isDefined(workspaceAuthProviders?.sso) &&
- workspaceAuthProviders?.sso.map((idp) => (
- <React.Fragment key={idp.id}>
- <MainButton
- title={idp.name}
- onClick={() => redirectToSsoLoginPage(idp.id)}
- Icon={guessSsoIdentityProviderIconByUrl(idp.issuer)}
- fullWidth
- />
- <HorizontalSeparator visible={false} />
- </React.Fragment>
- ))}
+ workspaceAuthProviders?.sso.map((identityProvider) => {
+ const IdentityProviderIcon = guessSsoIdentityProviderIconByUrl(
+ identityProvider.issuer,
+ );
+
+ return (
+ <React.Fragment key={identityProvider.id}>
+ <MainButton
+ onClick={() => redirectToSsoLoginPage(identityProvider.id)}
+ startIcon={<IdentityProviderIcon />}
+ fullWidth
+ >
+ {identityProvider.name}
+ </MainButton>
+ <HorizontalSeparator visible={false} />
+ </React.Fragment>
+ );
+ })}
</StyledOnboardingContentContainer>
</>
);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
index c7c9f87de69..85040e3e84f 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationProvision.tsx
@@ -14,9 +14,9 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import QRCodeModule from 'react-qr-code';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
+import { MainButton } from 'twenty-ui/components';
import { IconCopy } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
import { useContext } from 'react';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -90,12 +90,7 @@ export const SignInUpTwoFactorAuthenticationProvision = () => {
</StyledCopySetupKeyLink>
)}
</StyledTwoFactorMainContent>
- <MainButton
- title={t`Next`}
- onClick={handleClick}
- variant="primary"
- fullWidth
- />
+ <MainButton onClick={handleClick} fullWidth>{t`Next`}</MainButton>
</StyledForm>
</>
);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
index 1185d84b525..03509b2f720 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpTwoFactorAuthenticationVerification.tsx
@@ -23,7 +23,7 @@ import { OTPInput, type SlotProps } from 'input-otp';
import { useState } from 'react';
import { Controller } from 'react-hook-form';
import { AppPath } from 'twenty-shared/types';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useNavigateApp } from '~/hooks/useNavigateApp';
@@ -264,12 +264,10 @@ export const SignInUpTOTPVerification = () => {
/>
</StyledTwoFactorMainContent>
<MainButton
- title={t`Submit`}
type="submit"
- variant="primary"
fullWidth
disabled={isLoading}
- />
+ >{t`Submit`}</MainButton>
<StyledActionBackLinkContainer>
<ClickToActionLink onClick={handleBack}>
<Trans>Back</Trans>
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
index 8e2212c4de8..561c8054f62 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithCredentials.tsx
@@ -21,8 +21,9 @@ import { useLingui } from '@lingui/react/macro';
import { useMemo, useState } from 'react';
import { useFormContext } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { MainButton, InputHint } from 'twenty-ui/primitives/input';
+import { InputHint } from 'twenty-ui/primitives/input';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -162,15 +163,14 @@ export const SignInUpWithCredentials = ({
)}
<StyledSsoButtonContainer>
<MainButton
- title={buttonTitle}
type="submit"
- variant={
- signInUpStep === SignInUpStep.Init ? 'secondary' : 'primary'
- }
- Icon={() => (form.formState.isSubmitting ? <Loader /> : null)}
+ startIcon={form.formState.isSubmitting ? <Loader /> : null}
disabled={isSubmitButtonDisabled}
fullWidth
- />
+ variant={signInUpStep === SignInUpStep.Init ? 'outline' : 'solid'}
+ >
+ {buttonTitle}
+ </MainButton>
{isLastUsed && <LastUsedPill />}
{isSignUpBlockedByDDLLock && (
<InputHint>{t`Sign-up is temporarily unavailable during maintenance.`}</InputHint>
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
index 41bf91295d3..29a66ed1c45 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithGoogle.tsx
@@ -1,3 +1,4 @@
+import { isDefined } from 'twenty-shared/utils';
import { useHasMultipleAuthMethods } from '@/auth/sign-in-up/hooks/useHasMultipleAuthMethods';
import { useSignInWithGoogle } from '@/auth/sign-in-up/hooks/useSignInWithGoogle';
import { lastAuthenticatedMethodState } from '@/auth/states/lastAuthenticatedMethodState';
@@ -9,14 +10,15 @@ import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';
import { useLingui } from '@lingui/react/macro';
import { memo, useContext } from 'react';
+import { MainButton } from 'twenty-ui/components';
import { IconGoogle } from 'twenty-ui/icon';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
-import { MainButton } from 'twenty-ui/primitives/input';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { LastUsedPill } from './LastUsedPill';
import { StyledSsoButtonContainer } from './SignInUpSsoButtonStyles';
import { ThemeContext } from 'twenty-ui/theme-constants';
+
const GoogleIcon = memo(() => {
const { theme } = useContext(ThemeContext);
return <IconGoogle size={theme.icon.size.md} />;
@@ -48,12 +50,11 @@ export const SignInUpWithGoogle = ({
<>
<StyledSsoButtonContainer>
<MainButton
- Icon={GoogleIcon}
- title={t`Continue with Google`}
+ startIcon={isDefined(GoogleIcon) ? <GoogleIcon /> : undefined}
onClick={handleClick}
- variant={signInUpStep === SignInUpStep.Init ? undefined : 'secondary'}
fullWidth
- />
+ variant={signInUpStep === SignInUpStep.Init ? 'solid' : 'outline'}
+ >{t`Continue with Google`}</MainButton>
{isLastUsed && (isGlobalScope || hasMultipleAuthMethods) && (
<LastUsedPill />
)}
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
index 62999d81e79..18d859e1a6c 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithMicrosoft.tsx
@@ -9,9 +9,9 @@ import { AuthenticatedMethod } from '@/auth/types/AuthenticatedMethod.enum';
import { type SocialSsoSignInUpActionType } from '@/auth/types/socialSsoSignInUp.type';
import { useLingui } from '@lingui/react/macro';
import { useContext } from 'react';
+import { MainButton } from 'twenty-ui/components';
import { IconMicrosoft } from 'twenty-ui/icon';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
-import { MainButton } from 'twenty-ui/primitives/input';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { LastUsedPill } from './LastUsedPill';
@@ -46,12 +46,11 @@ export const SignInUpWithMicrosoft = ({
<>
<StyledSsoButtonContainer>
<MainButton
- Icon={() => <IconMicrosoft size={theme.icon.size.md} />}
- title={t`Continue with Microsoft`}
+ startIcon={<IconMicrosoft size={theme.icon.size.md} />}
onClick={handleClick}
- variant={signInUpStep === SignInUpStep.Init ? undefined : 'secondary'}
fullWidth
- />
+ variant={signInUpStep === SignInUpStep.Init ? 'solid' : 'outline'}
+ >{t`Continue with Microsoft`}</MainButton>
{isLastUsed && (isGlobalScope || hasMultipleAuthMethods) && (
<LastUsedPill />
)}
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsx
index 6ebed04ff63..96d1aab3e9f 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWithSso.tsx
@@ -12,9 +12,9 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { IconLock } from 'twenty-ui/icon';
import { HorizontalSeparator } from 'twenty-ui/primitives/layout';
-import { MainButton } from 'twenty-ui/primitives/input';
import { LastUsedPill } from './LastUsedPill';
import { StyledSsoButtonContainer } from './SignInUpSsoButtonStyles';
import { useContext } from 'react';
@@ -51,12 +51,11 @@ export const SignInUpWithSso = () => {
<>
<StyledSsoButtonContainer>
<MainButton
- Icon={() => <IconLock size={theme.icon.size.md} />}
- title={t`Single sign-on (SSO)`}
+ startIcon={<IconLock size={theme.icon.size.md} />}
onClick={signInWithSso}
- variant={signInUpStep === SignInUpStep.Init ? undefined : 'secondary'}
fullWidth
- />
+ variant={signInUpStep === SignInUpStep.Init ? 'solid' : 'outline'}
+ >{t`Single sign-on (SSO)`}</MainButton>
{isLastUsed && hasMultipleAuthMethods && <LastUsedPill />}
</StyledSsoButtonContainer>
<HorizontalSeparator visible={false} />
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
index 5cbb8593547..99b5e4b414f 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/internal/SignInUpWorkspaceCreationForm.tsx
@@ -15,13 +15,10 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useEffect, useRef, useState } from 'react';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconTrash, IconUpload } from 'twenty-ui/icon';
-import {
- Button,
- LightIconButton,
- MainButton,
-} from 'twenty-ui/primitives/input';
+import { Button, LightIconButton } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContentContainer = styled.div`
@@ -275,11 +272,10 @@ export const SignInUpWorkspaceCreationForm = () => {
/>
<StyledLogoButtons>
<Button
- Icon={IconUpload}
- title={t`Upload logo`}
- variant="secondary"
+ startIcon={<IconUpload />}
onClick={openFilePicker}
- />
+ variant="outline"
+ >{t`Upload logo`}</Button>
<LightIconButton
Icon={IconTrash}
accent="tertiary"
@@ -347,11 +343,10 @@ export const SignInUpWorkspaceCreationForm = () => {
</StyledFormSection>
<OnboardingStepAnimatedItem index={isMultiWorkspaceEnabled ? 5 : 4}>
<MainButton
- title={t`Create workspace`}
onClick={handleSubmit}
disabled={isContinueDisabled}
fullWidth
- />
+ >{t`Create workspace`}</MainButton>
</OnboardingStepAnimatedItem>
</StyledContentContainer>
);
diff --git a/packages/twenty-front/src/modules/blocknote-editor/blocks/FileBlock.tsx b/packages/twenty-front/src/modules/blocknote-editor/blocks/FileBlock.tsx
index d5b8a18d76e..36a8df5e2b9 100644
--- a/packages/twenty-front/src/modules/blocknote-editor/blocks/FileBlock.tsx
+++ b/packages/twenty-front/src/modules/blocknote-editor/blocks/FileBlock.tsx
@@ -113,10 +113,7 @@ export const FileBlock = createReactBlockSpec(
onChange={handleFileChange}
type="file"
/>
- <Button
- onClick={handleUploadFileClick}
- title={t`Upload File`}
- ></Button>
+ <Button onClick={handleUploadFileClick}>{t`Upload File`}</Button>
</StyledUploadFileContainer>
);
},
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelWidgetCommandMenuItems.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelWidgetCommandMenuItems.tsx
index 40cd01beada..ffb1e4ab92f 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelWidgetCommandMenuItems.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordPageSidePanelWidgetCommandMenuItems.tsx
@@ -1,3 +1,4 @@
+import { isDefined } from 'twenty-shared/utils';
import { sidePanelWidgetFooterCommandMenuItemsState } from '@/ui/layout/side-panel/states/sidePanelWidgetFooterCommandMenuItemsState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Button } from 'twenty-ui/primitives/input';
@@ -17,15 +18,20 @@ export const RecordPageSidePanelWidgetCommandMenuItems = () => {
{pinnedWidgetCommandMenuItems.map((commandMenuItem) => (
<Button
key={commandMenuItem.id}
- size="small"
- variant="primary"
- accent={commandMenuItem.isPrimaryCTA ? 'blue' : 'default'}
- title={commandMenuItem.label}
- Icon={commandMenuItem.Icon}
+ size="sm"
+ startIcon={
+ isDefined(commandMenuItem.Icon) ? (
+ <commandMenuItem.Icon />
+ ) : undefined
+ }
hotkeys={commandMenuItem.hotkeys}
onClick={commandMenuItem.onClick}
disabled={commandMenuItem.disabled}
- />
+ variant={commandMenuItem.isPrimaryCTA ? 'solid' : 'outline'}
+ color={commandMenuItem.isPrimaryCTA ? 'accent' : 'neutral'}
+ >
+ {commandMenuItem.label}
+ </Button>
))}
</>
);
diff --git a/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager.tsx b/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager.tsx
index 4e4b8904ac1..c57b7dda59a 100644
--- a/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/components/CommandMenuConfirmationModalManager.tsx
@@ -1,3 +1,7 @@
+import { styled } from '@linaria/react';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { COMMAND_MENU_CONFIRMATION_MODAL_INSTANCE_ID } from '@/command-menu-item/confirmation-modal/constants/CommandMenuItemConfirmationModalId';
import { COMMAND_MENU_CONFIRMATION_MODAL_RESULT_BROWSER_EVENT_NAME } from 'twenty-shared/constants';
import { commandMenuItemConfirmationModalConfigState } from '@/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState';
@@ -5,16 +9,18 @@ import {
type CommandMenuConfirmationModalResult,
type CommandMenuConfirmationModalResultBrowserEventDetail,
} from 'twenty-shared/types';
-import {
- ConfirmationModal,
- StyledCenteredButton,
-} from '@/ui/layout/modal/components/ConfirmationModal';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { isDefined } from 'twenty-shared/utils';
+const StyledCenteredNavigationButton = styled(NavigationButton)`
+ box-sizing: border-box;
+ margin-top: ${themeCssVariables.spacing[2]};
+`;
+
export const CommandMenuConfirmationModalManager = () => {
const commandMenuItemConfirmationModalConfig = useAtomStateValue(
commandMenuItemConfirmationModalConfigState,
@@ -67,19 +73,19 @@ export const CommandMenuConfirmationModalManager = () => {
confirmButtonText={
commandMenuItemConfirmationModalConfig.confirmButtonText
}
- confirmButtonAccent={
- commandMenuItemConfirmationModalConfig.confirmButtonAccent
+ confirmButtonColor={
+ commandMenuItemConfirmationModalConfig.confirmButtonColor
}
AdditionalButtons={
isDefined(linkButton) ? (
- <StyledCenteredButton
+ <StyledCenteredNavigationButton
to={linkButton.to}
onClick={() => emitConfirmationResult('cancel')}
- variant="secondary"
- title={linkButton.title}
fullWidth
- justify="center"
- />
+ variant="outline"
+ >
+ {linkButton.title}
+ </StyledCenteredNavigationButton>
) : undefined
}
/>
diff --git a/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState.ts b/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState.ts
index c613cc042b9..b102215bb12 100644
--- a/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState.ts
+++ b/packages/twenty-front/src/modules/command-menu-item/confirmation-modal/states/commandMenuItemConfirmationModalState.ts
@@ -2,7 +2,7 @@ import { type ReactNode } from 'react';
import { type ConfirmationModalCaller } from 'twenty-shared/types';
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-import { type ButtonAccent } from 'twenty-ui/primitives/input';
+import { type ButtonColor } from 'twenty-ui/primitives/input';
export type CommandMenuItemConfirmationModalLinkButton = {
title: string;
@@ -14,7 +14,7 @@ export type CommandMenuItemConfirmationModalConfig = {
title: string;
subtitle: ReactNode;
confirmButtonText?: string;
- confirmButtonAccent?: ButtonAccent;
+ confirmButtonColor?: ButtonColor;
linkButton?: CommandMenuItemConfirmationModalLinkButton;
};
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
index aa013dccd66..c18fe5177ec 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/components/HeadlessConfirmationModalEngineCommandEffect.tsx
@@ -8,13 +8,13 @@ import { type CommandMenuConfirmationModalResultBrowserEventDetail } from 'twent
import { useUnmountCommand } from '@/command-menu-item/engine-command/hooks/useUnmountEngineCommand';
import { CommandComponentInstanceContext } from '@/command-menu-item/engine-command/states/contexts/CommandComponentInstanceContext';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { type ButtonAccent } from 'twenty-ui/primitives/input';
+import { type ButtonColor } from 'twenty-ui/primitives/input';
export type HeadlessConfirmationModalEngineCommandEffectProps = {
title: string;
subtitle: ReactNode;
confirmButtonText: string;
- confirmButtonAccent?: ButtonAccent;
+ confirmButtonColor?: ButtonColor;
linkButton?: CommandMenuItemConfirmationModalLinkButton;
execute: () => void | Promise<unknown>;
};
@@ -23,7 +23,7 @@ export const HeadlessConfirmationModalEngineCommandEffect = ({
title,
subtitle,
confirmButtonText,
- confirmButtonAccent = 'danger',
+ confirmButtonColor = 'danger',
linkButton,
execute,
}: HeadlessConfirmationModalEngineCommandEffectProps) => {
@@ -48,7 +48,7 @@ export const HeadlessConfirmationModalEngineCommandEffect = ({
title,
subtitle,
confirmButtonText,
- confirmButtonAccent,
+ confirmButtonColor,
linkButton,
});
}, [
@@ -59,7 +59,7 @@ export const HeadlessConfirmationModalEngineCommandEffect = ({
title,
subtitle,
confirmButtonText,
- confirmButtonAccent,
+ confirmButtonColor,
linkButton,
]);
diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx
index a216d01b5cb..c60a683c9dc 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/RestoreRecordsCommand.tsx
@@ -88,7 +88,7 @@ export const RestoreRecordsCommand = () => {
title={title}
subtitle={subtitle}
confirmButtonText={title}
- confirmButtonAccent="default"
+ confirmButtonColor="neutral"
execute={handleExecute}
/>
);
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
index bd333c6a7ab..6431f24f450 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuButton.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { type MouseEvent, useId } from 'react';
import { type Nullable } from 'twenty-shared/types';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
@@ -7,7 +9,7 @@ import {
TooltipDelay,
TooltipPosition,
} from 'twenty-ui/primitives/surfaces';
-import { Button, IconButton } from 'twenty-ui/primitives/input';
+import { IconButton } from 'twenty-ui/primitives/input';
export type CommandMenuButtonProps = {
command: {
@@ -51,18 +53,19 @@ export const CommandMenuButton = ({
return (
<div data-tooltip-id={tooltipId}>
{resolvedShortLabel !== undefined ? (
- <Button
+ <NavigationButton
id={tooltipId}
- Icon={command.Icon}
- size="small"
- variant="primary"
- accent={buttonAccent}
+ startIcon={isDefined(command.Icon) ? <command.Icon /> : undefined}
+ size="sm"
to={to}
onClick={onClick}
disabled={disabled}
- title={resolvedShortLabel}
- ariaLabel={command.label}
- />
+ aria-label={command.label}
+ variant={buttonAccent === 'blue' ? 'solid' : 'outline'}
+ color={buttonAccent === 'blue' ? 'accent' : 'neutral'}
+ >
+ {resolvedShortLabel}
+ </NavigationButton>
) : (
<IconButton
id={tooltipId}
diff --git a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
index 5399f94ed7a..3a1c752d4f3 100644
--- a/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
+++ b/packages/twenty-front/src/modules/error-handler/components/internal/AppErrorDisplay.tsx
@@ -24,11 +24,10 @@ export const AppErrorDisplay = ({
</AnimatedPlaceholderEmptySubTitle>
</AnimatedPlaceholderEmptyTextContainer>
<Button
- Icon={IconRefresh}
- title={t`Reload`}
- variant="secondary"
+ startIcon={<IconRefresh />}
onClick={resetErrorBoundary}
- />
+ variant="outline"
+ >{t`Reload`}</Button>
</AnimatedPlaceholderEmptyContainer>
);
};
diff --git a/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx b/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
index 93933338ea2..45f22c4aaf7 100644
--- a/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
+++ b/packages/twenty-front/src/modules/error-handler/utils/getToastOptionsFromError.tsx
@@ -1,9 +1,9 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { isErrorLike } from '@apollo/client/errors';
import { t } from '@lingui/core/macro';
import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { type ToastOptions } from 'twenty-ui/primitives/feedback';
-import { Button } from 'twenty-ui/primitives/input';
import { getConflictingRecordFromApolloError } from '~/utils/get-conflicting-record-from-apollo-error.util';
import { getErrorMessageFromApolloError } from '~/utils/get-error-message-from-apollo-error.util';
@@ -36,16 +36,16 @@ export const getToastOptionsFromError = ({
action:
options.action ??
(isDefined(conflictingRecord) ? (
- <Button
+ <NavigationButton
to={getAppPath(AppPath.RecordShowPage, {
objectNameSingular: conflictingRecord.conflictingObjectNameSingular,
objectRecordId: conflictingRecord.conflictingRecordId,
})}
- title={t`View existing record`}
- ariaLabel={t`View existing record`}
- variant="tertiary"
- size="small"
- />
+ variant="ghost"
+ size="sm"
+ >
+ {t`View existing record`}
+ </NavigationButton>
) : undefined),
variant: 'error',
};
diff --git a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
index e5f85b4cf82..6e1ad8522a1 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
+++ b/packages/twenty-front/src/modules/front-components/hooks/__tests__/useFrontComponentExecutionContext.test.tsx
@@ -752,33 +752,43 @@ describe('useFrontComponentExecutionContext', () => {
});
describe('openCommandConfirmationModal', () => {
- it('should call openConfirmationModal with frontComponent caller', async () => {
- const { result } = renderUseFrontComponentExecutionContext({
- frontComponentId: FRONT_COMPONENT_ID,
- });
+ it.each([
+ { confirmButtonAccent: 'danger' as const, confirmButtonColor: 'danger' },
+ { confirmButtonAccent: 'blue' as const, confirmButtonColor: 'accent' },
+ {
+ confirmButtonAccent: 'default' as const,
+ confirmButtonColor: 'neutral',
+ },
+ ])(
+ 'maps the $confirmButtonAccent SDK confirmation accent',
+ async ({ confirmButtonAccent, confirmButtonColor }) => {
+ const { result } = renderUseFrontComponentExecutionContext({
+ frontComponentId: FRONT_COMPONENT_ID,
+ });
- await act(async () => {
- await result.current.frontComponentHostCommunicationApi.openCommandConfirmationModal(
- {
- title: 'Confirm?',
- subtitle: 'Are you sure?',
- confirmButtonText: 'Yes',
- confirmButtonAccent: 'danger',
- },
- );
- });
+ await act(async () => {
+ await result.current.frontComponentHostCommunicationApi.openCommandConfirmationModal(
+ {
+ title: 'Confirm?',
+ subtitle: 'Are you sure?',
+ confirmButtonText: 'Yes',
+ confirmButtonAccent,
+ },
+ );
+ });
- expect(mockOpenConfirmationModal).toHaveBeenCalledWith({
- caller: {
- type: 'frontComponent',
- frontComponentId: FRONT_COMPONENT_ID,
- },
- title: 'Confirm?',
- subtitle: 'Are you sure?',
- confirmButtonText: 'Yes',
- confirmButtonAccent: 'danger',
- });
- });
+ expect(mockOpenConfirmationModal).toHaveBeenCalledWith({
+ caller: {
+ type: 'frontComponent',
+ frontComponentId: FRONT_COMPONENT_ID,
+ },
+ title: 'Confirm?',
+ subtitle: 'Are you sure?',
+ confirmButtonText: 'Yes',
+ confirmButtonColor,
+ });
+ },
+ );
it('should preserve danger as the default confirmation accent', async () => {
const { result } = renderUseFrontComponentExecutionContext({
@@ -802,7 +812,7 @@ describe('useFrontComponentExecutionContext', () => {
title: 'Confirm?',
subtitle: 'Are you sure?',
confirmButtonText: undefined,
- confirmButtonAccent: 'danger',
+ confirmButtonColor: 'danger',
});
});
});
diff --git a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
index 578e87fc900..199a32e2083 100644
--- a/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
+++ b/packages/twenty-front/src/modules/front-components/hooks/useFrontComponentExecutionContext.ts
@@ -58,6 +58,12 @@ const FRONT_COMPONENT_CLIPBOARD_RATE_LIMIT_MS = 1000;
const FRONT_COMPONENT_UPLOAD_FILE_NAME_MAX_LENGTH = 200;
+const CONFIRM_BUTTON_ACCENT_TO_COLOR = {
+ blue: 'accent',
+ default: 'neutral',
+ danger: 'danger',
+} as const;
+
type OpenSidePanelPageParams = Parameters<
FrontComponentHostCommunicationApi['openSidePanelPage']
>[0];
@@ -389,7 +395,7 @@ export const useFrontComponentExecutionContext = ({
title,
subtitle,
confirmButtonText,
- confirmButtonAccent,
+ confirmButtonColor: CONFIRM_BUTTON_ACCENT_TO_COLOR[confirmButtonAccent],
});
};
diff --git a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
index c79d62ddf37..6f1297e6136 100644
--- a/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/InformationBanner.tsx
@@ -1,3 +1,5 @@
+import { isDefined } from 'twenty-shared/utils';
+import { BUTTON_INVERTED_CLASS_NAME } from '@/ui/input/styles/ButtonInvertedClassName';
import { InformationBannerComponentInstanceContext } from '@/information-banner/states/contexts/InformationBannerComponentInstanceContext';
import { informationBannerIsOpenComponentState } from '@/information-banner/states/informationBannerIsOpenComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -36,7 +38,7 @@ export const InformationBanner = ({
color = 'blue',
variant = 'primary',
buttonTitle,
- buttonIcon,
+ buttonIcon: ButtonIcon,
buttonOnClick,
isButtonDisabled = false,
onClose,
@@ -78,15 +80,16 @@ export const InformationBanner = ({
</StyledText>
{buttonTitle && buttonOnClick && (
<Button
- variant="secondary"
- accent={buttonAccent}
- title={buttonTitle}
- Icon={buttonIcon}
- size="small"
- inverted={isPrimary}
+ className={isPrimary ? BUTTON_INVERTED_CLASS_NAME : undefined}
+ startIcon={isDefined(ButtonIcon) ? <ButtonIcon /> : undefined}
+ size="sm"
onClick={buttonOnClick}
disabled={isButtonDisabled}
- />
+ variant="outline"
+ color={buttonAccent === 'blue' ? 'accent' : 'danger'}
+ >
+ {buttonTitle}
+ </Button>
)}
</StyledContent>
{onClose &&
diff --git a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
index 9fbeabc6052..d1667ebcd48 100644
--- a/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
+++ b/packages/twenty-front/src/modules/information-banner/components/billing/InformationBannerNoMoreCredits.tsx
@@ -73,7 +73,7 @@ export const InformationBannerNoMoreCredits = () => {
subtitle={t`Upgrade to ${nextResourceCreditsAmount ?? ''} credits for $${nextResourceCreditPrice ?? ''}/${nextTierInterval ?? ''}.`}
onConfirmClick={upgradeCreditPlan}
confirmButtonText={t`Upgrade`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isUpgrading}
/>
)}
diff --git a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarResetConfirmationModal.tsx b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarResetConfirmationModal.tsx
index 3469053de9b..0eef825595b 100644
--- a/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarResetConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/layout-customization/components/LayoutCustomizationBarResetConfirmationModal.tsx
@@ -30,7 +30,7 @@ export const LayoutCustomizationBarResetConfirmationModal = ({
subtitle={t`This action cannot be undone.`}
onConfirmClick={handleConfirmReset}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx b/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
index 4f4731c9981..eabf6645395 100644
--- a/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
+++ b/packages/twenty-front/src/modules/marketplace/components/SettingsApplicationInstallPermissionValidationModal.tsx
@@ -9,8 +9,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useMemo } from 'react';
import { type RoleManifest } from 'twenty-shared/application';
+import { LightButton } from 'twenty-ui/components';
import { IconChevronLeft } from 'twenty-ui/icon';
-import { LightButton } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { StyledAppModal } from '~/pages/settings/applications/components/SettingsAppModalLayout';
@@ -126,10 +126,9 @@ export const SettingsApplicationInstallPermissionValidationModal = ({
>
<StyledFullscreenContainer>
<StyledLightButton
- Icon={IconChevronLeft}
- title={t`Back to settings`}
+ startIcon={<IconChevronLeft />}
onClick={handleClose}
- />
+ >{t`Back to settings`}</StyledLightButton>
<StyledContent>
<StyledAppConnectionHeaderContainer>
diff --git a/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionRestoreButton.tsx b/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionRestoreButton.tsx
index 4542e3e2648..e6bf0aa8588 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionRestoreButton.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/versions/components/CoreWorkflowVersionRestoreButton.tsx
@@ -38,13 +38,12 @@ export const CoreWorkflowVersionRestoreButton = ({
return (
<>
<Button
- title={t`Restore`}
- variant="primary"
- accent="blue"
- size="small"
+ size="sm"
disabled={isRestoring || isLoadingCoreWorkflowVersions}
onClick={handleRestoreClick}
- />
+ variant="solid"
+ color="accent"
+ >{t`Restore`}</Button>
<ConfirmationModal
modalInstanceId={RESTORE_CORE_WORKFLOW_VERSION_MODAL_ID}
title={t`A draft already exists`}
diff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
index e45611dc2d3..be75b11069f 100644
--- a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelCreateRootFilterButton.tsx
@@ -82,14 +82,12 @@ export const AdvancedFilterSidePanelCreateRootFilterButton = ({
return (
<Button
- Icon={IconFilter}
- size="small"
- variant="secondary"
- accent="default"
+ startIcon={<IconFilter />}
+ size="sm"
onClick={addRootRecordFilterGroup}
- ariaLabel={t`Add filter`}
- title={t`Add filter`}
+ aria-label={t`Add filter`}
disabled={readonly}
- />
+ variant="outline"
+ >{t`Add filter`}</Button>
);
};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
index d9663a74cf5..9e4bbdf2bb8 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
@@ -90,7 +90,7 @@ export const RecordCalendarAddNew = ({
return (
<StyledButtonContainer>
<Button
- ariaLabel={t`Create record`}
+ aria-label={t`Create record`}
onClick={async (event) => {
event.stopPropagation();
@@ -106,10 +106,10 @@ export const RecordCalendarAddNew = ({
[calendarFieldMetadataItem.name]: startValue,
});
}}
- size="medium"
+ size="md"
type="button"
- variant="tertiary"
- Icon={() => <IconPlus size={theme.icon.size.sm} />}
+ startIcon={<IconPlus size={theme.icon.size.sm} />}
+ variant="ghost"
/>
</StyledButtonContainer>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
index 0ae502446ab..0126cce558e 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
@@ -203,26 +203,25 @@ export const RecordCalendarTopBar = () => {
<StyledNavigationSection>
<StyledNavigationButtonContainer>
<Button
- ariaLabel={t`Previous period`}
- size="small"
- variant="tertiary"
- Icon={IconChevronLeft}
+ aria-label={t`Previous period`}
+ size="sm"
+ startIcon={<IconChevronLeft />}
onClick={handlePreviousPeriod}
+ variant="ghost"
/>
</StyledNavigationButtonContainer>
<Button
- size="small"
- variant="tertiary"
- title={t`Today`}
+ size="sm"
onClick={handleTodayClick}
- />
+ variant="ghost"
+ >{t`Today`}</Button>
<StyledNavigationButtonContainer>
<Button
- ariaLabel={t`Next period`}
- size="small"
- variant="tertiary"
- Icon={IconChevronRight}
+ aria-label={t`Next period`}
+ size="sm"
+ startIcon={<IconChevronRight />}
onClick={handleNextPeriod}
+ variant="ghost"
/>
</StyledNavigationButtonContainer>
</StyledNavigationSection>
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
index 829761f9947..e2802774ede 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/__tests__/RecordCalendarTopBar.test.tsx
@@ -2,6 +2,7 @@ import { fireEvent, render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { enUS } from 'date-fns/locale';
import { Temporal } from 'temporal-polyfill';
+import { type ButtonProps } from 'twenty-ui/primitives/input';
import { RecordCalendarTopBar } from '@/object-record/record-calendar/components/RecordCalendarTopBar';
import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState';
@@ -92,16 +93,12 @@ jest.mock('@/views/hooks/useUpdateCurrentView', () => ({
}));
jest.mock('twenty-ui/primitives/input', () => ({
Button: ({
- ariaLabel,
+ 'aria-label': ariaLabel,
+ children,
onClick,
- title,
- }: {
- ariaLabel?: string;
- onClick: () => void;
- title?: string;
- }) => (
+ }: Pick<ButtonProps, 'aria-label' | 'children' | 'onClick'>) => (
<button aria-label={ariaLabel} onClick={onClick}>
- {title}
+ {children}
</button>
),
}));
diff --git a/packages/twenty-front/src/modules/object-record/record-group/components/AddRecordGroupButton.tsx b/packages/twenty-front/src/modules/object-record/record-group/components/AddRecordGroupButton.tsx
index 0da4ce73750..6a076b64d14 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/components/AddRecordGroupButton.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-group/components/AddRecordGroupButton.tsx
@@ -10,8 +10,8 @@ import { useGetCurrentViewOnly } from '@/views/hooks/useGetCurrentViewOnly';
import { t } from '@lingui/core/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
+import { LightButton } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { LightButton } from 'twenty-ui/primitives/input';
type AddRecordGroupButtonProps = {
fieldMetadataItem: FieldMetadataItem;
@@ -58,7 +58,10 @@ export const AddRecordGroupButton = ({
dropdownPlacement="bottom-start"
dropdownOffset={dropdownOffset}
clickableComponent={
- <LightButton Icon={IconPlus} title={t`New group`} accent="tertiary" />
+ <LightButton
+ emphasis="subtle"
+ startIcon={<IconPlus />}
+ >{t`New group`}</LightButton>
}
dropdownComponents={
<SingleRecordPicker
diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
index 2e532ff6b5b..87d3dd18d67 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexEmptyStateDisplay.tsx
@@ -46,11 +46,12 @@ export const RecordIndexEmptyStateDisplay = ({
</AnimatedPlaceholderEmptyTextContainer>
{isDefined(onButtonClick) && (
<Button
- Icon={ButtonIcon}
- title={buttonTitle}
- variant="secondary"
+ startIcon={isDefined(ButtonIcon) ? <ButtonIcon /> : undefined}
onClick={onButtonClick}
- />
+ variant="outline"
+ >
+ {buttonTitle}
+ </Button>
)}
</AnimatedPlaceholderEmptyContainer>
</StyledEmptyStateContainer>
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
index eaf9fb4f56a..2466fda31f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsFooter.tsx
@@ -50,15 +50,16 @@ export const MergeRecordsFooter = ({
<StyledFooterContainer>
<StyledFooterActions>
<Button
- title={isMerging ? t`Merging...` : t`Merge`}
- variant="primary"
- accent="blue"
- size="medium"
- Icon={IconArrowMerge}
+ size="md"
+ startIcon={<IconArrowMerge />}
hotkeys={isMerging ? undefined : ['⌘', '⏎']}
onClick={handleMergeRecords}
disabled={isMerging}
- />
+ variant="solid"
+ color="accent"
+ >
+ {isMerging ? t`Merging...` : t`Merge`}
+ </Button>
</StyledFooterActions>
</StyledFooterContainer>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
index 3c406a83bb5..2e5f74fc45e 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsContainer.tsx
@@ -126,7 +126,7 @@ export const UpdateMultipleRecordsContainer = ({
subtitle={t`This will modify ${contextStoreNumberOfSelectedRecords} records. This action cannot be undone.`}
onConfirmClick={handleConfirmedUpdate}
confirmButtonText={t`Update records`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
/>
</SidePanelProvider>
);
diff --git a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
index d6e39840409..231539f9106 100644
--- a/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-update-multiple/components/UpdateMultipleRecordsFooter.tsx
@@ -59,22 +59,22 @@ export const UpdateMultipleRecordsFooter = ({
<StyledFooterContainer>
<StyledFooterActions>
<Button
- title={t`Cancel`}
- variant="secondary"
- size="small"
+ size="sm"
onClick={onCancel}
- />
+ variant="outline"
+ >{t`Cancel`}</Button>
<Button
- title={isUpdating ? t`Apply${progressText}` : t`Apply`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconBoxMultiple}
- isLoading={isUpdating && !progressText}
+ size="sm"
+ startIcon={<IconBoxMultiple />}
+ loading={isUpdating && !progressText}
hotkeys={isUpdating ? undefined : ['⌘', '⏎']}
onClick={onUpdate}
disabled={isUpdating || isUpdateDisabled}
- />
+ variant="solid"
+ color="accent"
+ >
+ {isUpdating ? t`Apply${progressText}` : t`Apply`}
+ </Button>
</StyledFooterActions>
</StyledFooterContainer>
);
diff --git a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/ChooseYourPlanErrorState.tsx b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/ChooseYourPlanErrorState.tsx
index 6afe41f9770..fe3608c70e7 100644
--- a/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/ChooseYourPlanErrorState.tsx
+++ b/packages/twenty-front/src/modules/onboarding/components/upgrade-free-trial/ChooseYourPlanErrorState.tsx
@@ -7,7 +7,7 @@ import { StyledOnboardingStepSubtitle } from '@/onboarding/components/StyledOnbo
import { StyledOnboardingStepTitle } from '@/onboarding/components/StyledOnboardingStepTitle';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -43,7 +43,7 @@ export const ChooseYourPlanErrorState = ({
<OnboardingStepAnimatedItem index={2}>
<StyledFooter>
- <MainButton title={t`Try again`} onClick={onRetry} fullWidth />
+ <MainButton onClick={onRetry} fullWidth>{t`Try again`}</MainButton>
<ClickToActionLink onClick={signOut}>
<Trans>Log out</Trans>
</ClickToActionLink>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingAudioPlayer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingAudioPlayer.tsx
index e7697bb4524..db6eb4d4bec 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingAudioPlayer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingAudioPlayer.tsx
@@ -173,13 +173,12 @@ export const CallRecordingAudioPlayer = ({
<>
<StyledTrack role="status">{t`Playback failed`}</StyledTrack>
<Button
- title={t`Retry`}
- variant="secondary"
- size="small"
+ size="sm"
disabled={isRetrying}
- isLoading={isRetrying}
+ loading={isRetrying}
onClick={handleRetry}
- />
+ variant="outline"
+ >{t`Retry`}</Button>
</>
) : (
<>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingVideoPlayer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingVideoPlayer.tsx
index e910b1743e8..efae75eab18 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingVideoPlayer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingVideoPlayer.tsx
@@ -134,12 +134,11 @@ export const CallRecordingVideoPlayer = ({
{t`The recording could not be loaded.`}
</StyledPlaybackErrorDescription>
<Button
- title={t`Retry`}
- variant="secondary"
disabled={isRetrying}
- isLoading={isRetrying}
+ loading={isRetrying}
onClick={handleRetry}
- />
+ variant="outline"
+ >{t`Retry`}</Button>
</StyledPlaybackErrorState>
</StyledVideoViewport>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
index b3a4268e138..05a77200904 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages.tsx
@@ -38,11 +38,10 @@ export const EmailThreadIntermediaryMessages = ({
) : (
<StyledButtonContainer>
<Button
- Icon={IconArrowsVertical}
- title={t`${messagesLength} emails`}
- size="small"
+ startIcon={<IconArrowsVertical />}
+ size="sm"
onClick={() => setAreMessagesOpen(true)}
- />
+ >{t`${messagesLength} emails`}</Button>
</StyledButtonContainer>
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx
index 60fcb33094c..420d6fd2a06 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsConfigurationGroupRenameInput.tsx
@@ -65,12 +65,11 @@ export const FieldsConfigurationGroupRenameInput = ({
placeholder={t`Group name`}
/>
<Button
- variant="primary"
- accent="blue"
- size="small"
- title={t`Done`}
+ size="sm"
onClick={handleSave}
- />
+ variant="solid"
+ color="accent"
+ >{t`Done`}</Button>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
index a5ae500a574..307a5a24451 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsBlocklistInput.tsx
@@ -138,7 +138,7 @@ export const SettingsAccountsBlocklistInput = ({
)}
/>
</StyledLinkContainer>
- <Button title={t`Add to blocklist`} type="submit" />
+ <Button type="submit">{t`Add to blocklist`}</Button>
</StyledContainer>
</form>
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
index 173b40976a8..3d76e6f7664 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsConnectedAccountsListCard.tsx
@@ -56,12 +56,11 @@ export const SettingsAccountsConnectedAccountsListCard = ({
<StyledAddAccountSectionContainer>
<Section>
<Button
- Icon={IconPlus}
- title={t`Add account`}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={() => navigateSettings(SettingsPath.NewAccount)}
- />
+ variant="outline"
+ >{t`Add account`}</Button>
</Section>
</StyledAddAccountSectionContainer>
</Section>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index 523db768721..dcc044928b5 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useToast } from 'twenty-ui/primitives/feedback';
import { useMemo, useState } from 'react';
@@ -7,8 +8,6 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { AI_MODEL_TIERS, type AiModelTier } from 'twenty-shared/ai';
import { IconMessage } from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { H2Title } from 'twenty-ui/primitives/typography';
import { Section } from 'twenty-ui/primitives/layout';
import { Card } from 'twenty-ui/primitives/surfaces';
@@ -238,14 +237,12 @@ export const SettingsAdminAI = () => {
title={t`Chats`}
description={t`Browse AI chat threads across all workspaces, including onboarding chats`}
/>
- <UndecoratedLink to={getSettingsPath(SettingsPath.AdminPanelChats)}>
- <Button
- Icon={IconMessage}
- title={t`View all chats`}
- size="small"
- variant="secondary"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.AdminPanelChats)}
+ startIcon={<IconMessage />}
+ size="sm"
+ variant="outline"
+ >{t`View all chats`}</NavigationButton>
</Section>
<Section>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
index d925c3309e4..c8cf4ed02dd 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx
@@ -193,14 +193,13 @@ export const SettingsAdminApps = () => {
description={t`Manage the marketplace application catalog`}
/>
<Button
- Icon={IconRefresh}
- title={t`Synchronize catalog`}
- size="small"
- variant="secondary"
+ startIcon={<IconRefresh />}
+ size="sm"
onClick={handleSyncCatalog}
- isLoading={isSyncing}
+ loading={isSyncing}
disabled={isSyncing}
- />
+ variant="outline"
+ >{t`Synchronize catalog`}</Button>
</Section>
<Section>
<H2Title
@@ -321,13 +320,12 @@ export const SettingsAdminApps = () => {
{hasMore && (
<StyledShowMoreContainer>
<Button
- title={t`Show more`}
- Icon={IconDotsVertical}
+ startIcon={<IconDotsVertical />}
onClick={handleShowMore}
disabled={loading}
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ >{t`Show more`}</Button>
</StyledShowMoreContainer>
)}
</Section>
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
index 5b9412f9620..9b9b02c562f 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminServerAdminAccess.tsx
@@ -225,7 +225,7 @@ export const SettingsAdminServerAdminAccess = ({
<ConfirmationModal
modalInstanceId={SERVER_ADMIN_ACCESS_CONFIRMATION_MODAL_ID}
title={pendingChange?.isRevoking ? t`Revoke access` : t`Grant access`}
- confirmButtonAccent={pendingChange?.isRevoking ? 'danger' : 'blue'}
+ confirmButtonColor={pendingChange?.isRevoking ? 'danger' : 'accent'}
confirmButtonText={t`Confirm`}
onConfirmClick={handleConfirm}
onClose={() => {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
index 585f7db9fe0..44d7df3fa67 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceCreditGrantModal.tsx
@@ -227,20 +227,16 @@ export const SettingsAdminWorkspaceCreditGrantModal = ({
<StyledModalActions>
<Button
onClick={handleClose}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- justify="center"
- />
+ variant="outline"
+ >{t`Cancel`}</Button>
<Button
onClick={handleSubmit}
- variant="primary"
- accent="blue"
- title={t`Grant`}
disabled={!isAmountValid || loading}
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Grant`}</Button>
</StyledModalActions>
</ModalStatefulWrapper>
);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
index 5d4466f62e6..e09d5748577 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableFilterDropdown.tsx
@@ -40,11 +40,10 @@ export const ConfigVariableFilterDropdown = ({
<Dropdown
clickableComponent={
<Button
- variant="secondary"
- size="medium"
- title={t`Options`}
- Icon={IconSettings}
- />
+ size="md"
+ startIcon={<IconSettings />}
+ variant="outline"
+ >{t`Options`}</Button>
}
dropdownId="env-var-options-dropdown"
dropdownOffset={{ x: 0, y: 10 }}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminDeleteJobsConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminDeleteJobsConfirmationModal.tsx
index f404950b88e..f67dbb2a3f8 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminDeleteJobsConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminDeleteJobsConfirmationModal.tsx
@@ -32,7 +32,7 @@ export const SettingsAdminDeleteJobsConfirmationModal = ({
onConfirmClick={onConfirm}
onClose={onClose}
confirmButtonText={t`Delete`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
index c9b17e67785..2cab31e4280 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminQueueJobsTable.tsx
@@ -228,40 +228,41 @@ export const SettingsAdminQueueJobsTable = ({
<StyledButtonGroup>
{selectedCount > 0 && (
<Button
- Icon={IconTrash}
- title={plural(selectedCount, {
+ startIcon={<IconTrash />}
+ onClick={handleDeleteSelected}
+ disabled={isDeleting || loading}
+ size="sm"
+ variant="outline"
+ color="danger"
+ >
+ {plural(selectedCount, {
one: `Delete ${selectedCount} Job`,
other: `Delete ${selectedCount} Jobs`,
})}
- onClick={handleDeleteSelected}
- disabled={isDeleting || loading}
- size="small"
- variant="secondary"
- accent="danger"
- />
+ </Button>
)}
{allSelectedAreFailed && (
<Button
- Icon={IconRefresh}
- title={plural(selectedCount, {
+ startIcon={<IconRefresh />}
+ onClick={handleRetrySelected}
+ disabled={isRetrying || loading}
+ size="sm"
+ variant="outline"
+ >
+ {plural(selectedCount, {
one: `Retry ${selectedCount} Job`,
other: `Retry ${selectedCount} Jobs`,
})}
- onClick={handleRetrySelected}
- disabled={isRetrying || loading}
- size="small"
- variant="secondary"
- />
+ </Button>
)}
{failedJobs.length > 0 && selectedCount === 0 && (
<Button
- Icon={IconRefresh}
- title={t`Retry All Failed`}
+ startIcon={<IconRefresh />}
onClick={handleRetrySelected}
disabled={isRetrying || loading}
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ >{t`Retry All Failed`}</Button>
)}
</StyledButtonGroup>
</StyledControlsContainer>
@@ -368,23 +369,21 @@ export const SettingsAdminQueueJobsTable = ({
<StyledPaginationContainer>
<Button
- title={t`Previous`}
onClick={() => setPage((p) => Math.max(0, p - 1))}
disabled={page === 0 || loading}
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ >{t`Previous`}</Button>
<div>
{t`Page`} {page + 1} {totalCount > 0 ? t`of` : ''}{' '}
{totalCount > 0 ? Math.max(1, Math.ceil(totalCount / LIMIT)) : ''}
</div>
<Button
- title={t`Next`}
onClick={() => setPage((p) => p + 1)}
disabled={!hasMore || loading}
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ >{t`Next`}</Button>
</StyledPaginationContainer>
</>
)}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminRetryJobsConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminRetryJobsConfirmationModal.tsx
index d37fdca29ac..277626ae2d7 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminRetryJobsConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminRetryJobsConfirmationModal.tsx
@@ -32,7 +32,7 @@ export const SettingsAdminRetryJobsConfirmationModal = ({
onConfirmClick={onConfirm}
onClose={onClose}
confirmButtonText={t`Retry`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
/>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
index cc3a44cb3f7..03c9124a7ea 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerQueueMetricsSection.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { WidgetSkeletonLoader } from '@/page-layout/widgets/components/WidgetSkeletonLoader';
import { WORKER_QUEUE_METRICS_SELECT_OPTIONS } from '@/settings/admin-panel/health-status/constants/WorkerQueueMetricsSelectOptions';
import { Select } from '@/ui/input/components/Select';
@@ -8,7 +10,6 @@ import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconList } from 'twenty-ui/icon';
import { H2Title } from 'twenty-ui/primitives/typography';
-import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
@@ -55,15 +56,14 @@ export const SettingsAdminWorkerQueueMetricsSection = ({
<StyledControlsContainer>
<H2Title title={queue.queueName} description={t`Queue performance`} />
<StyledRightControls>
- <Button
- Icon={IconList}
- title={t`View Jobs`}
- size="small"
- variant="secondary"
+ <NavigationButton
+ startIcon={<IconList />}
+ size="sm"
to={getSettingsPath(SettingsPath.AdminPanelQueueDetail, {
queueName: queue.queueName,
})}
- />
+ variant="outline"
+ >{t`View Jobs`}</NavigationButton>
<Select
dropdownId={`timerange-${queue.queueName}`}
value={timeRange}
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminRevokeSigningKeyConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminRevokeSigningKeyConfirmationModal.tsx
index fc6782ed034..791baef9d83 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminRevokeSigningKeyConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminRevokeSigningKeyConfirmationModal.tsx
@@ -26,7 +26,7 @@ export const SettingsAdminRevokeSigningKeyConfirmationModal = ({
onConfirmClick={onConfirm}
onClose={onClose}
confirmButtonText={t`Revoke`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
index b57ef335ebf..e570ae9fb94 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/signing-keys/components/SettingsAdminSigningKeysTable.tsx
@@ -123,13 +123,13 @@ export const SettingsAdminSigningKeysTable = () => {
alwaysShowTooltip
/>
<Button
- Icon={IconCopy}
- size="small"
- variant="tertiary"
- ariaLabel={t`Copy key ID`}
+ startIcon={<IconCopy />}
+ size="sm"
+ aria-label={t`Copy key ID`}
onClick={() =>
copyToClipboard(signingKey.id, t`Key ID copied`)
}
+ variant="ghost"
/>
</TableCell>
<TableCell>
@@ -153,10 +153,7 @@ export const SettingsAdminSigningKeysTable = () => {
</TableCell>
<TableCell align="right">
<Button
- title={t`Revoke`}
- size="small"
- variant="secondary"
- accent="danger"
+ size="sm"
disabled={isRevoked || isRevoking}
onClick={() =>
handleRevokeClick({
@@ -164,7 +161,9 @@ export const SettingsAdminSigningKeysTable = () => {
isCurrent: signingKey.isCurrent,
})
}
- />
+ variant="outline"
+ color="danger"
+ >{t`Revoke`}</Button>
</TableCell>
</TableRow>
);
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
index 38cf0274b9b..4f00deae08a 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationAboutSidebar.tsx
@@ -255,12 +255,11 @@ export const SettingsApplicationAboutSidebar = ({
</StyledIdentity>
{isDefined(onShare) && (
<Button
- Icon={IconShare2}
- title={t`Share`}
- variant="secondary"
- size="small"
+ startIcon={<IconShare2 />}
+ variant="outline"
+ size="sm"
onClick={onShare}
- />
+ >{t`Share`}</Button>
)}
</StyledHeader>
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
index 9cdc7da521c..01396687b4a 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
@@ -46,32 +46,32 @@ export const SettingsApplicationActionButton = ({
if (!isInstalled || isInstalling) {
return (
<Button
- Icon={IconDownload}
- title={isInstalling ? t`Installing...` : t`Install`}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconDownload />}
+ variant="solid"
+ color="accent"
+ size="sm"
onClick={onInstall}
disabled={isInstalling}
- />
+ >
+ {isInstalling ? t`Installing...` : t`Install`}
+ </Button>
);
}
if (hasUpdate) {
return (
<Button
- Icon={IconUpload}
- title={
- isUpgrading
- ? t`Upgrading...`
- : t`Upgrade to ${latestAvailableVersion ?? ''}`
- }
- variant="secondary"
- accent="blue"
- size="small"
+ startIcon={<IconUpload />}
+ variant="outline"
+ color="accent"
+ size="sm"
onClick={onUpgrade}
disabled={isUpgrading}
- />
+ >
+ {isUpgrading
+ ? t`Upgrading...`
+ : t`Upgrade to ${latestAvailableVersion ?? ''}`}
+ </Button>
);
}
@@ -79,14 +79,15 @@ export const SettingsApplicationActionButton = ({
return (
<>
<Button
- Icon={IconTrash}
- title={isUninstalling ? t`Uninstalling...` : t`Uninstall`}
- variant="secondary"
- accent="danger"
- size="small"
+ startIcon={<IconTrash />}
+ variant="outline"
+ color="danger"
+ size="sm"
onClick={() => openModal(uninstallModalId)}
disabled={isUninstalling}
- />
+ >
+ {isUninstalling ? t`Uninstalling...` : t`Uninstall`}
+ </Button>
<ConfirmationModal
confirmationPlaceholder={confirmationValue}
confirmationValue={confirmationValue}
@@ -108,12 +109,10 @@ export const SettingsApplicationActionButton = ({
return (
<Button
- Icon={IconCheck}
- title={t`Installed`}
- variant="secondary"
- accent="default"
- size="small"
+ startIcon={<IconCheck />}
+ variant="outline"
+ size="sm"
disabled
- />
+ >{t`Installed`}</Button>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
index d8a69d82339..f24b34acfd6 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/AddCreditCardModal.tsx
@@ -77,11 +77,9 @@ export const AddCreditCardModal = ({
<StyledCancelButtonContainer>
<Button
onClick={() => closeModal(modalInstanceId)}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- justify="center"
- />
+ variant="outline"
+ >{t`Cancel`}</Button>
</StyledCancelButtonContainer>
</ModalStatefulWrapper>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
index 9abd5b13cd2..8c51fd33a43 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/AddPaymentMethodForm.tsx
@@ -148,15 +148,13 @@ const AddPaymentMethodFormContent = ({
}}
/>
<Button
- title={t`Add credit card`}
onClick={handleSubmit}
- variant="secondary"
- accent="blue"
fullWidth
- justify="center"
- isLoading={isSubmitting}
+ loading={isSubmitting}
disabled={!isStripeReady || isSubmitting}
- />
+ variant="outline"
+ color="accent"
+ >{t`Add credit card`}</Button>
</StyledFormContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
index 048536d4c16..cf55f1f8d45 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingContent.tsx
@@ -95,12 +95,11 @@ export const SettingsBillingContent = () => {
description={t`Edit payment method, see your invoices and more`}
/>
<Button
- Icon={IconCreditCard}
- title={t`View billing details`}
- variant="secondary"
+ startIcon={<IconCreditCard />}
onClick={openBillingPortal}
disabled={isBillingPortalSessionDisabled}
- />
+ variant="outline"
+ >{t`View billing details`}</Button>
</Section>
{canCancelCurrentSubscription && (
<Section>
@@ -109,13 +108,12 @@ export const SettingsBillingContent = () => {
description={t`Your workspace will be disabled`}
/>
<Button
- Icon={IconCircleX}
- title={t`Cancel Plan`}
- variant="secondary"
- accent="danger"
+ startIcon={<IconCircleX />}
onClick={openBillingPortal}
disabled={isBillingPortalSessionDisabled}
- />
+ variant="outline"
+ color="danger"
+ >{t`Cancel Plan`}</Button>
</Section>
)}
{shouldAddPaymentMethodInProduct && (
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
index 6927eba2ce6..82c885d7cc0 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingCreditsSection.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { type CurrentWorkspace } from '@/auth/states/currentWorkspaceState';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { ResourceCreditPriceSelector } from '@/settings/billing/components/internal/ResourceCreditPriceSelector';
@@ -30,7 +32,6 @@ import {
import { ProgressBar } from 'twenty-ui/primitives/feedback';
import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { H2Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import {
@@ -304,19 +305,15 @@ export const SettingsBillingCreditsSection = ({
</StyledCreditsCardBody>
</StyledSettingsBillingCard>
<StyledCreditUsageFooterActions>
- <UndecoratedLink to={getSettingsPath(SettingsPath.Usage)}>
- <Button
- Icon={IconChartBar}
- title={t`View usage`}
- variant="secondary"
- size="small"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.Usage)}
+ startIcon={<IconChartBar />}
+ size="sm"
+ variant="outline"
+ >{t`View usage`}</NavigationButton>
<Button
- Icon={IconExternalLink}
- title={t`How credits work`}
- variant="secondary"
- size="small"
+ startIcon={<IconExternalLink />}
+ size="sm"
onClick={() =>
window.open(
creditsDocumentationUrl,
@@ -324,7 +321,8 @@ export const SettingsBillingCreditsSection = ({
'noopener,noreferrer',
)
}
- />
+ variant="outline"
+ >{t`How credits work`}</Button>
</StyledCreditUsageFooterActions>
</Section>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
index 59f660519ee..9f94c1a34a6 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingLimitEditForm.tsx
@@ -134,14 +134,13 @@ export const SettingsBillingLimitEditForm = ({
description={t`Spending stays capped by your plan allowance and the other limits.`}
/>
<Button
- Icon={IconTrash}
- title={t`Delete limit`}
- variant="secondary"
- accent="danger"
- size="small"
+ startIcon={<IconTrash />}
+ size="sm"
disabled={isDeleting}
onClick={() => openModal(DELETE_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete limit`}</Button>
<ConfirmationModal
modalInstanceId={DELETE_MODAL_ID}
title={t`Delete this limit?`}
diff --git a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
index 48f80024675..d65d40813be 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/SettingsBillingPlansErrorState.tsx
@@ -30,11 +30,10 @@ export const SettingsBillingPlansErrorState = ({
</AnimatedPlaceholderErrorSubTitle>
</AnimatedPlaceholderErrorTextContainer>
<Button
- Icon={IconRefresh}
- title={t`Try again`}
- variant="secondary"
+ startIcon={<IconRefresh />}
onClick={onRetry}
- />
+ variant="outline"
+ >{t`Try again`}</Button>
</AnimatedPlaceholderErrorContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/billing/components/StartSubscriptionConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/StartSubscriptionConfirmationModal.tsx
index 527eabf7c75..73ed2293496 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/StartSubscriptionConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/StartSubscriptionConfirmationModal.tsx
@@ -29,7 +29,7 @@ export const StartSubscriptionConfirmationModal = ({
}
onConfirmClick={onConfirmClick}
confirmButtonText={needsCreditCard ? t`Add credit card` : t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={loading}
/>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
index 673a35e791c..a82671f537a 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/UpdatePaymentMethodModal.tsx
@@ -95,11 +95,9 @@ export const UpdatePaymentMethodModal = ({
<StyledCancelButtonContainer>
<Button
onClick={() => closeModal(modalInstanceId)}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- justify="center"
- />
+ variant="outline"
+ >{t`Cancel`}</Button>
</StyledCancelButtonContainer>
</ModalStatefulWrapper>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
index b369a8e1da6..5a3c3d3206f 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPackagePickerModal.tsx
@@ -413,20 +413,16 @@ export const ResourceCreditPackagePickerModal = ({
<StyledModalActions>
<Button
onClick={onCancel}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- justify="center"
- />
+ variant="outline"
+ >{t`Cancel`}</Button>
<Button
onClick={onConfirm}
- variant="primary"
- accent="blue"
- title={t`Confirm`}
fullWidth
- justify="center"
disabled={isConfirmDisabled}
- />
+ variant="solid"
+ color="accent"
+ >{t`Confirm`}</Button>
</StyledModalActions>
</ModalStatefulWrapper>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
index c875c01aace..c674372ce5a 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/ResourceCreditPriceSelector.tsx
@@ -357,13 +357,12 @@ export const ResourceCreditPriceSelector = ({
<StyledActionContainer>
{canCancelCreditPackSwitch && (
<Button
- Icon={IconCircleX}
- title={t`Cancel credit pack switching`}
- variant="secondary"
- size="small"
+ startIcon={<IconCircleX />}
+ size="sm"
onClick={onCancelCreditPackSwitch}
disabled={isUpdating}
- />
+ variant="outline"
+ >{t`Cancel credit pack switching`}</Button>
)}
{!isTrialing &&
!canCancelCreditPackSwitch &&
@@ -375,31 +374,23 @@ export const ResourceCreditPriceSelector = ({
return (
<Button
key={price.stripePriceId}
- Icon={IconArrowUp}
- title={t`Increase to $${priceDisplay}`}
- variant="secondary"
- size="small"
+ startIcon={<IconArrowUp />}
+ size="sm"
onClick={() => openConfirmationForPrice(price)}
disabled={
isUpdating ||
(shouldRedirectToManageBilling && isManageBillingDisabled)
}
- />
+ variant="outline"
+ >{t`Increase to $${priceDisplay}`}</Button>
);
})}
{shouldShowPrimaryAction && (
<Button
- Icon={PrimaryActionIcon}
- title={
- shouldRedirectToUpdatePayment
- ? t`Update payment`
- : shouldRedirectToManageBilling
- ? t`Manage billing`
- : t`Manage`
+ startIcon={
+ isDefined(PrimaryActionIcon) ? <PrimaryActionIcon /> : undefined
}
- variant="primary"
- accent="green"
- size="small"
+ size="sm"
onClick={handlePrimaryActionClick}
disabled={
isUpdating ||
@@ -410,7 +401,15 @@ export const ResourceCreditPriceSelector = ({
!isTrialing &&
!hasAlternativeResourceCreditPrice)
}
- />
+ variant="solid"
+ color="success"
+ >
+ {shouldRedirectToUpdatePayment
+ ? t`Update payment`
+ : shouldRedirectToManageBilling
+ ? t`Manage billing`
+ : t`Manage`}
+ </Button>
)}
</StyledActionContainer>
<ResourceCreditPackagePickerModal
@@ -444,7 +443,7 @@ export const ResourceCreditPriceSelector = ({
: t`Confirm changing your current resource credit allocation.`
}
confirmButtonText={isUpgrade() ? t`Upgrade` : t`Downgrade`}
- confirmButtonAccent={isUpgrade() ? 'blue' : 'danger'}
+ confirmButtonColor={isUpgrade() ? 'accent' : 'danger'}
loading={isUpdating}
onConfirmClick={handleConfirmClick}
/>
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlanComparisonTable.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlanComparisonTable.tsx
index 974e4d499f1..c82d4c603da 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlanComparisonTable.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlanComparisonTable.tsx
@@ -1,3 +1,4 @@
+import { isDefined } from 'twenty-shared/utils';
import { AnimatedFormattedNumber } from '@/settings/billing/components/internal/AnimatedFormattedNumber';
import { SettingsBillingPlanComparisonTableRow } from '@/settings/billing/components/internal/SettingsBillingPlanComparisonTableRow';
import { SETTINGS_BILLING_COMPARED_PLAN_KEYS } from '@/settings/billing/constants/SettingsBillingComparedPlanKeys';
@@ -217,15 +218,18 @@ export const SettingsBillingPlanComparisonTable = ({
</StyledHeaderText>
<StyledActionSlot>
<Button
- Icon={action.Icon}
- title={action.title}
- variant={action.variant}
- accent={action.accent ?? 'default'}
- size="small"
+ startIcon={
+ isDefined(action.Icon) ? <action.Icon /> : undefined
+ }
+ size="sm"
disabled={action.disabled}
- isLoading={action.isLoading}
+ loading={action.isLoading}
onClick={action.onClick}
- />
+ variant={action.variant}
+ color={action.color}
+ >
+ {action.title}
+ </Button>
</StyledActionSlot>
</StyledHeaderCell>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithSubscription.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithSubscription.tsx
index f0835c5bbc9..daa22981c6b 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithSubscription.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithSubscription.tsx
@@ -48,7 +48,7 @@ export const SettingsBillingPlansWithSubscription = ({
subtitle={confirmationModalSwitchToOrganizationMessage()}
onConfirmClick={() => switchBillingPlan(BillingPlanKey.ENTERPRISE)}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isSwitchingPlan}
/>
<ConfirmationModal
@@ -57,7 +57,7 @@ export const SettingsBillingPlansWithSubscription = ({
subtitle={confirmationModalSwitchToProMessage()}
onConfirmClick={() => switchBillingPlan(BillingPlanKey.PRO)}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isSwitchingPlan}
/>
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithoutSubscription.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithoutSubscription.tsx
index 3ff85a67604..e86ee1dd023 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithoutSubscription.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingPlansWithoutSubscription.tsx
@@ -53,12 +53,12 @@ export const SettingsBillingPlansWithoutSubscription = ({
isDisabled: boolean;
isLoading: boolean;
}): SettingsBillingPlanAction => ({
- accent: 'blue',
+ color: 'accent',
disabled: isDisabled,
isLoading,
onClick: handleCheckoutSession,
title: t`Choose plan`,
- variant: 'primary',
+ variant: 'solid',
});
const isAnyCheckoutSessionSubmitting =
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCardHeaderActions.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCardHeaderActions.tsx
index 36f17a839f7..57d1785655e 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCardHeaderActions.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoCardHeaderActions.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
@@ -51,28 +53,26 @@ export const SettingsBillingSubscriptionInfoCardHeaderActions = ({
if (isCancellationScheduled) {
return (
<Button
- Icon={IconCreditCard}
- title={t`Manage billing`}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconCreditCard />}
+ size="sm"
onClick={onManageBilling}
disabled={isManageBillingDisabled}
- />
+ variant="solid"
+ color="accent"
+ >{t`Manage billing`}</Button>
);
}
if (shouldUpdatePayment) {
return (
<Button
- Icon={IconArrowUp}
- title={t`Update payment`}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconArrowUp />}
+ size="sm"
onClick={onUpdatePayment}
disabled={isUpdatePaymentDisabled}
- />
+ variant="solid"
+ color="accent"
+ >{t`Update payment`}</Button>
);
}
@@ -80,44 +80,40 @@ export const SettingsBillingSubscriptionInfoCardHeaderActions = ({
<>
{canCancelIntervalSwitch && (
<Button
- Icon={IconCircleX}
- title={t`Cancel interval switching`}
- variant="secondary"
- size="small"
+ startIcon={<IconCircleX />}
+ size="sm"
onClick={onCancelIntervalSwitch}
disabled={isSubscriptionActionDisabled}
- />
+ variant="outline"
+ >{t`Cancel interval switching`}</Button>
)}
{canComparePlans && (
- <Button
- Icon={IconColorSwatch}
- title={t`Compare plans`}
- variant={isComparePlansActionPrimary ? 'primary' : 'secondary'}
- accent={isComparePlansActionPrimary ? 'blue' : 'default'}
- size="small"
+ <NavigationButton
+ startIcon={<IconColorSwatch />}
+ size="sm"
to={getSettingsPath(SettingsPath.BillingPlans)}
- />
+ variant={isComparePlansActionPrimary ? 'solid' : 'outline'}
+ color={isComparePlansActionPrimary ? 'accent' : 'neutral'}
+ >{t`Compare plans`}</NavigationButton>
)}
{canStartSubscription && (
<Button
- Icon={IconArrowUp}
- title={t`Subscribe Now`}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconArrowUp />}
+ size="sm"
onClick={onEndTrialPeriod}
disabled={isEndTrialPeriodDisabled}
- />
+ variant="solid"
+ color="accent"
+ >{t`Subscribe Now`}</Button>
)}
{canCancelPlanSwitch && (
<Button
- Icon={IconCircleX}
- title={t`Cancel plan switching`}
- variant="secondary"
- size="small"
+ startIcon={<IconCircleX />}
+ size="sm"
onClick={onCancelPlanSwitch}
disabled={isSubscriptionActionDisabled}
- />
+ variant="outline"
+ >{t`Cancel plan switching`}</Button>
)}
</>
);
diff --git a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoModals.tsx b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoModals.tsx
index 1018a822414..050ae35e2f8 100644
--- a/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoModals.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/components/internal/SettingsBillingSubscriptionInfoModals.tsx
@@ -52,7 +52,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={switchToYearlySubtitle}
onConfirmClick={onSwitchInterval}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isSwitchingInterval}
/>
<ConfirmationModal
@@ -61,7 +61,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={switchToMonthlySubtitle}
onConfirmClick={onSwitchInterval}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isSwitchingInterval}
/>
<ConfirmationModal
@@ -70,7 +70,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={cancelIntervalSwitchingSubtitle}
onConfirmClick={onCancelIntervalSwitching}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isCancellingIntervalSwitch}
/>
<ConfirmationModal
@@ -79,7 +79,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={cancelPlanSwitchingSubtitle}
onConfirmClick={onCancelPlanSwitching}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isCancellingPlanSwitch}
/>
{billingHasPaymentMethod === false ? (
@@ -94,7 +94,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={startSubscriptionSubtitle}
onConfirmClick={onEndTrialPeriod}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isEndTrialPeriodLoading}
/>
)}
@@ -104,7 +104,7 @@ export const SettingsBillingSubscriptionInfoModals = ({
subtitle={t`You have scheduled a credit pack change. Do you want to cancel it?`}
onConfirmClick={onCancelResourceCreditSwitching}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isCancellingMeteredSwitch}
/>
</>
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
index c79c517164e..3c03f556236 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useBillingPlanActions.ts
@@ -63,7 +63,7 @@ export const useBillingPlanActions = ({
disabled: isBillingPortalSessionDisabled,
onClick: openBillingPortal,
title,
- variant: 'secondary',
+ variant: 'outline',
});
const getPlanAction = (
@@ -78,7 +78,7 @@ export const useBillingPlanActions = ({
disabled: true,
Icon: IconCheck,
title: t`Current`,
- variant: 'secondary',
+ variant: 'outline',
};
}
@@ -86,7 +86,7 @@ export const useBillingPlanActions = ({
return {
disabled: true,
title: t`Scheduled`,
- variant: 'secondary',
+ variant: 'outline',
};
}
@@ -102,7 +102,7 @@ export const useBillingPlanActions = ({
return {
disabled: true,
title: hasPermissionToManageBilling ? t`Unavailable` : t`Contact admin`,
- variant: 'secondary',
+ variant: 'outline',
};
}
@@ -119,8 +119,8 @@ export const useBillingPlanActions = ({
: BILLING_MODAL_IDS.switchBillingPlanToPro,
),
title: isSwitchingToOrganizationPlan ? t`Upgrade` : t`Switch to Pro`,
- variant: isSwitchingToOrganizationPlan ? 'primary' : 'secondary',
- accent: isSwitchingToOrganizationPlan ? 'blue' : 'default',
+ variant: isSwitchingToOrganizationPlan ? 'solid' : 'outline',
+ color: isSwitchingToOrganizationPlan ? 'accent' : 'neutral',
};
};
diff --git a/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx b/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
index 643d0901ffe..7323cd63198 100644
--- a/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
+++ b/packages/twenty-front/src/modules/settings/billing/hooks/useWaitForPaymentRecovery.tsx
@@ -3,13 +3,13 @@ import { PAYMENT_RECOVERY_POLLING_MAX_ATTEMPTS } from '@/settings/billing/consta
import { useApplyCurrentWorkspaceBillingUpdate } from '@/settings/billing/hooks/useApplyCurrentWorkspaceBillingUpdate';
import { useMarkBillingPaymentMethodAsAdded } from '@/settings/billing/hooks/useMarkBillingPaymentMethodAsAdded';
import { waitForSubscriptionRecovery } from '@/settings/billing/utils/waitForSubscriptionRecovery';
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useLoadCurrentUser } from '@/users/hooks/useLoadCurrentUser';
import { useApolloClient } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { Button } from 'twenty-ui/primitives/input';
import { GetCurrentUserDocument } from '~/generated-metadata/graphql';
import { logError } from '~/utils/logError';
import { sleep } from '~/utils/sleep';
@@ -49,13 +49,13 @@ export const useWaitForPaymentRecovery = () => {
variant: 'warning',
children: t`Your card was saved, but the payment still needs attention.`,
action: (
- <Button
- title={t`Go to billing`}
- ariaLabel={t`Go to billing`}
+ <NavigationButton
to={getSettingsPath(SettingsPath.Billing)}
- variant="tertiary"
- size="small"
- />
+ variant="ghost"
+ size="sm"
+ >
+ {t`Go to billing`}
+ </NavigationButton>
),
});
diff --git a/packages/twenty-front/src/modules/settings/billing/types/settingsBillingPlanAction.type.ts b/packages/twenty-front/src/modules/settings/billing/types/settingsBillingPlanAction.type.ts
index 507aa7ebd43..ed73acdc892 100644
--- a/packages/twenty-front/src/modules/settings/billing/types/settingsBillingPlanAction.type.ts
+++ b/packages/twenty-front/src/modules/settings/billing/types/settingsBillingPlanAction.type.ts
@@ -1,11 +1,11 @@
import { type IconComponent } from 'twenty-ui/icon';
import {
- type ButtonAccent,
+ type ButtonColor,
type ButtonVariant,
} from 'twenty-ui/primitives/input';
export type SettingsBillingPlanAction = {
- accent?: ButtonAccent;
+ color?: ButtonColor;
disabled?: boolean;
Icon?: IconComponent;
isLoading?: boolean;
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
index bc2d1036c55..7f29fa049f2 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/CancelButton.tsx
@@ -1,5 +1,7 @@
+import { BUTTON_INVERTED_CLASS_NAME } from '@/ui/input/styles/ButtonInvertedClassName';
import { useLingui } from '@lingui/react/macro';
-import { Button, LightButton } from 'twenty-ui/primitives/input';
+import { LightButton } from 'twenty-ui/components';
+import { Button } from 'twenty-ui/primitives/input';
type CancelButtonProps = {
onCancel?: () => void;
@@ -17,23 +19,20 @@ export const CancelButton = ({
if (inverted) {
return (
<Button
- title={t`Cancel`}
- variant="tertiary"
- accent="default"
- inverted
- size="small"
+ className={BUTTON_INVERTED_CLASS_NAME}
+ size="sm"
onClick={onCancel}
disabled={disabled}
- />
+ variant="ghost"
+ >{t`Cancel`}</Button>
);
}
return (
<LightButton
- title={t`Cancel`}
- accent="tertiary"
+ emphasis="subtle"
onClick={onCancel}
disabled={disabled}
- />
+ >{t`Cancel`}</LightButton>
);
};
diff --git a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
index 3b8b19f06fb..f42cb02d435 100644
--- a/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SaveAndCancelButtons/SaveButton.tsx
@@ -1,3 +1,4 @@
+import { BUTTON_INVERTED_CLASS_NAME } from '@/ui/input/styles/ButtonInvertedClassName';
import { t } from '@lingui/core/macro';
import { type IconComponent, IconDeviceFloppy } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
@@ -15,20 +16,19 @@ export const SaveButton = ({
disabled,
isLoading,
inverted = false,
- saveIcon,
+ saveIcon: SaveIcon = IconDeviceFloppy,
}: SaveButtonProps) => {
return (
<Button
- title={t`Save`}
- variant={inverted ? 'secondary' : 'primary'}
- size="small"
- accent={inverted ? 'default' : 'blue'}
- inverted={inverted}
+ className={inverted ? BUTTON_INVERTED_CLASS_NAME : undefined}
+ size="sm"
disabled={disabled}
onClick={onSave}
type="submit"
- Icon={saveIcon ?? IconDeviceFloppy}
- isLoading={isLoading}
- />
+ startIcon={<SaveIcon />}
+ loading={isLoading}
+ variant={inverted ? 'outline' : 'solid'}
+ color={inverted ? 'neutral' : 'accent'}
+ >{t`Save`}</Button>
);
};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
index b6d23912a2e..c77e623967b 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsEnterpriseFeatureGateCard.tsx
@@ -37,13 +37,14 @@ export const SettingsEnterpriseFeatureGateCard = ({
Button={
canDisplayUpgradeButton ? (
<Button
- title={buttonTitle}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconArrowUp}
+ size="sm"
+ startIcon={<IconArrowUp />}
onClick={() => navigateSettings(upgradeSettingsPath)}
- />
+ variant="solid"
+ color="accent"
+ >
+ {buttonTitle}
+ </Button>
) : undefined
}
/>
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsPaginationControls.tsx b/packages/twenty-front/src/modules/settings/components/SettingsPaginationControls.tsx
index c5394cb6eb1..1e680a4195b 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsPaginationControls.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsPaginationControls.tsx
@@ -36,20 +36,18 @@ export const SettingsPaginationControls = ({
return (
<StyledContainer>
<Button
- title={t`Previous`}
- variant="secondary"
- size="small"
+ size="sm"
disabled={page === 0 || isLoading}
onClick={() => onPageChange(page - 1)}
- />
+ variant="outline"
+ >{t`Previous`}</Button>
<div>{t`Page ${page + 1} of ${pageCount}`}</div>
<Button
- title={t`Next`}
- variant="secondary"
- size="small"
+ size="sm"
disabled={isNextDisabled || isLoading}
onClick={() => onPageChange(page + 1)}
- />
+ variant="outline"
+ >{t`Next`}</Button>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
index 3f557997ab4..756796e5d40 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsTableListSection.tsx
@@ -140,12 +140,13 @@ export const SettingsTableListSection = <
{isDefined(footerButtonLabel) && isDefined(onFooterButtonClick) && (
<StyledFooter>
<Button
- Icon={IconPlus}
- title={footerButtonLabel}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={onFooterButtonClick}
- />
+ variant="outline"
+ >
+ {footerButtonLabel}
+ </Button>
</StyledFooter>
)}
</Section>
diff --git a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
index afd8b0ec9a1..5dff5c64958 100644
--- a/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
+++ b/packages/twenty-front/src/modules/settings/config-variables/components/ConfigVariableEdit.tsx
@@ -6,7 +6,7 @@ import { useLingui } from '@lingui/react/macro';
import { type Dispatch, type SetStateAction, useState } from 'react';
import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { Button } from 'twenty-ui/primitives/input';
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
import { H3Title } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme-constants';
@@ -20,11 +20,8 @@ const StyledRow = styled.div`
gap: ${themeCssVariables.spacing[2]};
`;
-const StyledButtonContainer = styled.div`
+const StyledButtonContainer = styled(ButtonGroup)`
display: flex;
- & > :not(:first-of-type) > button {
- border-left: none;
- }
`;
type ConfigVariableEditProps = {
@@ -125,29 +122,30 @@ export const ConfigVariableEdit = ({
{input}
{!isEditing ? (
<Button
- Icon={IconPencil}
- variant="primary"
+ startIcon={<IconPencil />}
+ aria-label={t`Edit`}
onClick={handleEdit}
type="button"
disabled={editDisabled}
+ variant="outline"
/>
) : (
- <StyledButtonContainer>
+ <StyledButtonContainer aria-label={t`Edit variable`}>
<Button
- Icon={IconCheck}
- variant="secondary"
- position="left"
+ startIcon={<IconCheck />}
+ aria-label={t`Save`}
type={'button'}
onClick={handleSave}
disabled={isSaveDisabled || isSubmitting}
+ variant="outline"
/>
<Button
- Icon={IconX}
- variant="secondary"
- position="right"
+ startIcon={<IconX />}
+ aria-label={t`Cancel`}
onClick={handleCancel}
type="button"
disabled={isSubmitting}
+ variant="outline"
/>
</StyledButtonContainer>
)}
@@ -157,7 +155,7 @@ export const ConfigVariableEdit = ({
subtitle={t`Are you sure you want to reset this variable?`}
onConfirmClick={handleConfirmReset}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</StyledRow>
{helpContent}
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
index 06951a896a9..7cab874177c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx
@@ -33,6 +33,7 @@ import { t } from '@lingui/core/macro';
import { useContext, useEffect, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { isDefined } from 'twenty-shared/utils';
+import { LightButton } from 'twenty-ui/components';
import {
IconDotsVertical,
IconPencil,
@@ -40,7 +41,7 @@ import {
IconPoint,
IconTrash,
} from 'twenty-ui/icon';
-import { LightButton, LightIconButton } from 'twenty-ui/primitives/input';
+import { LightIconButton } from 'twenty-ui/primitives/input';
import { CardContent, CardFooter } from 'twenty-ui/primitives/surfaces';
import { MenuItem } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -529,10 +530,9 @@ export const SettingsDataModelFieldSelectForm = ({
<CardFooter>
<StyledButtonContainer>
<LightButton
- title={t`Add option`}
- Icon={IconPlus}
+ startIcon={<IconPlus />}
onClick={handleAddOption}
- />
+ >{t`Add option`}</LightButton>
</StyledButtonContainer>
</CardFooter>
</StyledFooterContainer>
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
index 3ed43375c88..2e8a44a2af3 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverview.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+import { t } from '@lingui/core/macro';
import { SettingsDataModelOverviewEffect } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewEffect';
import { SettingsDataModelOverviewObject } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject';
import { SettingsDataModelOverviewRelationMarkers } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewRelationMarkers';
@@ -30,7 +32,7 @@ import {
IconPlus,
IconX,
} from 'twenty-ui/icon';
-import { Button, IconButtonGroup } from 'twenty-ui/primitives/input';
+import { IconButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const nodeTypes: NodeTypes = {
@@ -186,10 +188,11 @@ export const SettingsDataModelOverview = () => {
return (
<StyledContainer>
<StyledCloseButton>
- <Button
- Icon={IconX}
+ <NavigationButton
+ startIcon={<IconX />}
+ aria-label={t`Close overview`}
to={getSettingsPath(SettingsPath.Objects)}
- ></Button>
+ ></NavigationButton>
</StyledCloseButton>
<SettingsDataModelOverviewEffect
setEdges={setEdges}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
index 004b5f41cc0..6d71752a338 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectRelationsTable.tsx
@@ -207,11 +207,10 @@ export const SettingsObjectRelationsTable = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={
<Button
- Icon={IconFilter}
- size="medium"
- variant="secondary"
- accent="default"
- ariaLabel={t`Filter`}
+ startIcon={<IconFilter />}
+ size="md"
+ aria-label={t`Filter`}
+ variant="outline"
/>
}
dropdownComponents={
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
index a92e580c558..b3f63e3489c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx
@@ -1,3 +1,4 @@
+import { StyledCenteredButton } from '@/ui/layout/modal/components/StyledCenteredButton';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useGetIsMetadataItemCustom } from '@/object-metadata/hooks/useGetIsMetadataItemCustom';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
@@ -11,10 +12,7 @@ import {
type SettingsDataModelObjectAboutFormValues,
settingsDataModelObjectAboutFormSchema,
} from '@/settings/data-model/validation-schemas/settingsDataModelObjectAboutFormSchema';
-import {
- ConfirmationModal,
- StyledCenteredButton,
-} from '@/ui/layout/modal/components/ConfirmationModal';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { zodResolver } from '@hookform/resolvers/zod';
import { useLingui } from '@lingui/react/macro';
@@ -88,18 +86,16 @@ export const SettingsUpdateDataModelObjectAboutForm = ({
title={t`Translate or rename?`}
subtitle={t`You are editing the ${currentLanguageLabel} translation. Renaming instead changes the source label, for every language.`}
confirmButtonText={t`Only in ${currentLanguageLabel}`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
hideCancelButton
onConfirmClick={saveAsTranslation}
onClose={cancelPendingSave}
AdditionalButtons={
<StyledCenteredButton
- title={t`Rename for all languages`}
- variant="secondary"
fullWidth
- justify="center"
onClick={handleRenameForAllLanguages}
- />
+ variant="outline"
+ >{t`Rename for all languages`}</StyledCenteredButton>
}
/>
</FormProvider>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
index 748bc40cbfd..5cad78a6e03 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectFields.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
@@ -10,9 +12,7 @@ import { FieldMetadataType, SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconPlus } from 'twenty-ui/icon';
import { H2Title } from 'twenty-ui/primitives/typography';
-import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsObjectFieldTable } from '~/pages/settings/data-model/SettingsObjectFieldTable';
@@ -63,20 +63,16 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
/>
<StyledButtonContainer>
{!readonly && (
- <UndecoratedLink
+ <NavigationButton
to={getSettingsPath(
SettingsPath.ObjectNewFieldConfigure,
{ objectNamePlural: objectMetadataItem.namePlural },
{ fieldType: FieldMetadataType.MORPH_RELATION },
)}
- >
- <Button
- Icon={IconPlus}
- title={t`Add relation`}
- size="small"
- variant="secondary"
- />
- </UndecoratedLink>
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="outline"
+ >{t`Add relation`}</NavigationButton>
)}
</StyledButtonContainer>
</Section>
@@ -93,18 +89,14 @@ export const ObjectFields = ({ objectMetadataItem }: ObjectFieldsProps) => {
/>
<StyledButtonContainer>
{!readonly && (
- <UndecoratedLink
+ <NavigationButton
to={getSettingsPath(SettingsPath.ObjectNewFieldSelect, {
objectNamePlural: objectMetadataItem.namePlural,
})}
- >
- <Button
- Icon={IconPlus}
- title={t`Add Field`}
- size="small"
- variant="secondary"
- />
- </UndecoratedLink>
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="outline"
+ >{t`Add Field`}</NavigationButton>
)}
</StyledButtonContainer>
</Section>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
index 02c8e717c00..59be3c2b4b9 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectLayout.tsx
@@ -116,14 +116,13 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
description={t`Customize how your record page looks.`}
action={
<Button
- title={t`Customize`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconPencil}
+ size="sm"
+ startIcon={<IconPencil />}
onClick={handleCustomizeRecordPage}
disabled={!hasLayoutsPermission || !isDefined(firstRecord)}
- />
+ variant="solid"
+ color="accent"
+ >{t`Customize`}</Button>
}
/>
}
@@ -142,13 +141,12 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
description={t`Reset all overrides on this layout to return it to the app default`}
/>
<Button
- title={t`Reset to default`}
- variant="secondary"
- size="small"
- Icon={IconReload}
+ size="sm"
+ startIcon={<IconReload />}
onClick={handleResetPageLayout}
disabled={!hasLayoutsPermission || !isDefined(pageLayout)}
- />
+ variant="outline"
+ >{t`Reset to default`}</Button>
</Section>
<ConfirmationModal
modalInstanceId={RESET_PAGE_LAYOUT_MODAL_ID}
@@ -156,7 +154,7 @@ export const ObjectLayout = ({ objectMetadataItem }: ObjectLayoutProps) => {
subtitle={t`This action cannot be undone.`}
onConfirmClick={handleConfirmReset}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</StyledContentContainer>
);
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
index ab9cd5c597f..c8582436377 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/ObjectSettings.tsx
@@ -176,20 +176,18 @@ export const ObjectSettings = ({
/>
<StyledDangerButtonsContainer>
<Button
- Icon={IconArchive}
- title={t`Deactivate`}
- size="small"
+ startIcon={<IconArchive />}
+ size="sm"
onClick={handleDisable}
- />
+ >{t`Deactivate`}</Button>
{getIsMetadataItemCustom(objectMetadataItem) && (
<Button
- Icon={IconTrash}
- title={t`Delete`}
- size="small"
- accent="danger"
- variant="secondary"
+ startIcon={<IconTrash />}
+ size="sm"
onClick={handleDelete}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
)}
</StyledDangerButtonsContainer>
</Section>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
index 05022eb6805..ab411288a9c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectIndexesSection.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { useDeleteOneIndexMetadataItem } from '@/object-metadata/hooks/useDeleteOneIndexMetadataItem';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';
@@ -19,10 +21,7 @@ import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/primitives/feedback';
import { IconEyeOff, IconPlus } from 'twenty-ui/icon';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
-import {
- MenuItemSwitch,
- UndecoratedLink,
-} from 'twenty-ui/primitives/navigation';
+import { MenuItemSwitch } from 'twenty-ui/primitives/navigation';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { SettingsObjectIndexTable } from '~/pages/settings/data-model/SettingsObjectIndexTable';
import { type SettingsObjectIndexesTableItem } from '~/pages/settings/data-model/types/SettingsObjectIndexesTableItem';
@@ -199,26 +198,21 @@ export const SettingsObjectIndexesSection = ({
{!isReadOnly && (
<StyledButtonContainer>
{canCreate ? (
- <UndecoratedLink
+ <NavigationButton
to={getSettingsPath(SettingsPath.ObjectNewIndex, {
objectNamePlural: objectMetadataItem.namePlural,
})}
- >
- <Button
- Icon={IconPlus}
- title={t`Add Index`}
- size="small"
- variant="secondary"
- />
- </UndecoratedLink>
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="outline"
+ >{t`Add Index`}</NavigationButton>
) : (
<Button
- Icon={IconPlus}
- title={t`Add Index`}
- size="small"
- variant="secondary"
+ startIcon={<IconPlus />}
+ size="sm"
disabled
- />
+ variant="outline"
+ >{t`Add Index`}</Button>
)}
</StyledButtonContainer>
)}
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
index b9f85e04769..7c7dc363235 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/SettingsObjectSearchSection.tsx
@@ -260,12 +260,11 @@ export const SettingsObjectSearchSection = ({
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={
<Button
- Icon={IconPlus}
- title={t`Add field`}
- size="small"
- variant="secondary"
+ startIcon={<IconPlus />}
+ size="sm"
disabled={addableFields.length === 0}
- />
+ variant="outline"
+ >{t`Add field`}</Button>
}
dropdownComponents={
<DropdownContent>
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/__stories__/ObjectLayoutHeroCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/__stories__/ObjectLayoutHeroCard.stories.tsx
index 0d7b3c7c659..d89b3a72840 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/__stories__/ObjectLayoutHeroCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/tabs/__stories__/ObjectLayoutHeroCard.stories.tsx
@@ -40,12 +40,13 @@ const renderCard = (colorScheme: 'light' | 'dark') => (
description="Customize how your record page looks."
action={
<Button
- title="Customize"
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconPencil}
- />
+ size="sm"
+ startIcon={<IconPencil />}
+ variant="solid"
+ color="accent"
+ >
+ {'Customize'}
+ </Button>
}
/>
}
@@ -63,7 +64,7 @@ export const Light: Story = {
expect(
canvas.getByText('Customize how your record page looks.'),
).toBeVisible();
- expect(canvas.getByRole('button', { name: 'Customize ...' })).toBeEnabled();
+ expect(canvas.getByRole('button', { name: 'Customize' })).toBeEnabled();
},
};
@@ -76,6 +77,6 @@ export const Dark: Story = {
expect(
canvas.getByText('Customize how your record page looks.'),
).toBeVisible();
- expect(canvas.getByRole('button', { name: 'Customize ...' })).toBeEnabled();
+ expect(canvas.getByRole('button', { name: 'Customize' })).toBeEnabled();
},
};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
index c30f6420b93..a750c0759d5 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/ApiKeyInput.tsx
@@ -31,12 +31,11 @@ export const ApiKeyInput = ({ apiKey }: ApiKeyInputProps) => {
/>
</StyledLinkContainer>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() => {
copyToClipboard(apiKey, t`API Key copied to clipboard`);
}}
- />
+ >{t`Copy`}</Button>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
index 96c9545ba1a..780854f987f 100644
--- a/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/components/SettingsDevelopersWebhookForm.tsx
@@ -208,12 +208,11 @@ export const SettingsDevelopersWebhookForm = ({
description={t`Delete this webhook`}
/>
<Button
- accent="danger"
- variant="secondary"
- title={t`Delete`}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
onClick={() => openModal(DELETE_WEBHOOK_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
</Section>
)}
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
index 807b0940aa7..08f86af44b6 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
@@ -190,21 +190,21 @@ export const SettingPublicDomain = () => {
<ButtonGroup>
<StyledButtonContainer>
<Button
- isLoading={isLoading}
- Icon={IconReload}
- title={t`Reload`}
- variant="primary"
+ loading={isLoading}
+ startIcon={<IconReload />}
onClick={() =>
checkPublicDomainRecords(selectedPublicDomain.domain)
}
type="button"
- />
+ variant="outline"
+ >{t`Reload`}</Button>
</StyledButtonContainer>
<StyledButtonContainer>
<Button
- Icon={IconTrash}
- variant="primary"
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
onClick={onDelete}
+ variant="outline"
/>
</StyledButtonContainer>
</ButtonGroup>
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
index 0c9b0723c40..9a543d8715c 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsCustomDomain.tsx
@@ -92,17 +92,17 @@ export const SettingsCustomDomain = () => {
{currentWorkspace?.customDomain && (
<StyledButtonsContainer>
<Button
- isLoading={isRecordsLoading}
- Icon={IconReload}
- title={t`Reload`}
- variant="primary"
+ loading={isRecordsLoading}
+ startIcon={<IconReload />}
onClick={() => checkCustomDomainRecords()}
type="button"
- />
+ variant="outline"
+ >{t`Reload`}</Button>
<Button
- Icon={IconTrash}
- variant="primary"
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
onClick={handleDelete}
+ variant="outline"
/>
</StyledButtonsContainer>
)}
diff --git a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
index 067c9644880..f121d7a9cc8 100644
--- a/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
+++ b/packages/twenty-front/src/modules/settings/emailing-domains/components/SettingsEmailingDomainVerifyButton.tsx
@@ -35,11 +35,10 @@ export const SettingsEmailingDomainVerifyButton = ({
return (
<Button
onClick={handleVerify}
- isLoading={loading}
- variant="secondary"
- Icon={IconRefresh}
- title={t`Check verification`}
+ loading={loading}
+ startIcon={<IconRefresh />}
disabled={loading}
- />
+ variant="outline"
+ >{t`Check verification`}</Button>
);
};
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 83caf5b8409..4885b7bb020 100644
--- a/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
+++ b/packages/twenty-front/src/modules/settings/enterprise/components/EnterprisePlanModal.tsx
@@ -9,10 +9,15 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { Loader, useToast } from 'twenty-ui/primitives/feedback';
-import { CardPicker, MainButton, RadioGroup } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
+import { CardPicker, RadioGroup } from 'twenty-ui/primitives/input';
import { ModalContent } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
+const StyledCheckoutButton = styled(MainButton)`
+ width: 200px;
+`;
+
export const ENTERPRISE_PLAN_MODAL_ID = 'enterprise-plan-modal';
type BillingInterval = 'monthly' | 'yearly';
@@ -181,13 +186,11 @@ export const EnterprisePlanModal = () => {
</CardPicker>
</RadioGroup>
- <MainButton
- title={t`Continue`}
+ <StyledCheckoutButton
onClick={handleContinue}
- width={200}
- Icon={() => isLoading && <Loader />}
+ startIcon={isLoading && <Loader />}
disabled={isLoading}
- />
+ >{t`Continue`}</StyledCheckoutButton>
</ModalContent>
</ModalStatefulWrapper>
);
diff --git a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
index 15f29bfe501..cebcea4d388 100644
--- a/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
+++ b/packages/twenty-front/src/modules/settings/event-logs/components/SettingsLogs.tsx
@@ -171,11 +171,8 @@ export const SettingsLogs = () => {
description={t`Only application logs are available on your current plan. Other log types require an Organization subscription.`}
Button={
<Button
- title={t`Upgrade`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconArrowUp}
+ size="sm"
+ startIcon={<IconArrowUp />}
onClick={() =>
navigateSettings(
isBillingEnabled
@@ -183,7 +180,9 @@ export const SettingsLogs = () => {
: SettingsPath.AdminPanelOrganization,
)
}
- />
+ variant="solid"
+ color="accent"
+ >{t`Upgrade`}</Button>
}
/>
</Card>
diff --git a/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementRow.tsx b/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementRow.tsx
index e55011045fe..1eb241e25d4 100644
--- a/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementRow.tsx
+++ b/packages/twenty-front/src/modules/settings/legal/components/SettingsDpaAgreementRow.tsx
@@ -48,12 +48,11 @@ export const SettingsDpaAgreementRow = ({
<TableCell align="right">
{agreement.downloadUrl ? (
<Button
- Icon={IconDownload}
- title={t`Download`}
- size="small"
- variant="tertiary"
+ startIcon={<IconDownload />}
+ size="sm"
onClick={() => onDownload(agreement)}
- />
+ variant="ghost"
+ >{t`Download`}</Button>
) : (
'—'
)}
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
index 5c3d5c91b21..b2099336068 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionCodeEditorTab.tsx
@@ -38,14 +38,13 @@ export const SettingsLogicFunctionCodeEditorTab = ({
);
const TestButton = (
<Button
- title={t`Test`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconPlayerPlay}
+ size="sm"
+ startIcon={<IconPlayerPlay />}
disabled={isTesting}
onClick={handleExecute}
- />
+ variant="solid"
+ color="accent"
+ >{t`Test`}</Button>
);
const HeaderTabList = (
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
index 2e5edd41ff7..e8e38e46dc0 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/tabs/SettingsLogicFunctionTestTab.tsx
@@ -142,12 +142,15 @@ export const SettingsLogicFunctionTestTab = ({
{triggerButtons.map((trigger) => (
<Button
key={trigger.kind}
- Icon={trigger.Icon}
- title={trigger.label}
- variant="secondary"
- size="small"
+ startIcon={
+ isDefined(trigger.Icon) ? <trigger.Icon /> : undefined
+ }
+ size="sm"
onClick={() => fillSamplePayload(trigger.kind)}
- />
+ variant="outline"
+ >
+ {trigger.label}
+ </Button>
))}
</StyledTriggerButtonRow>
</div>
@@ -157,14 +160,13 @@ export const SettingsLogicFunctionTestTab = ({
title={t`Input`}
rightNodes={[
<Button
- title={t`Run Function`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconPlayerPlay}
+ size="sm"
+ startIcon={<IconPlayerPlay />}
onClick={handleExecute}
disabled={isTesting}
- />,
+ variant="solid"
+ color="accent"
+ >{t`Run Function`}</Button>,
]}
/>
<CodeEditor
diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/PlaygroundSetupForm.tsx b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/PlaygroundSetupForm.tsx
index d6485f438cf..769e6449e99 100644
--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/PlaygroundSetupForm.tsx
+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/PlaygroundSetupForm.tsx
@@ -89,12 +89,11 @@ export const PlaygroundSetupForm = () => {
)}
/>
<Button
- title={t`Launch`}
- variant="primary"
- accent="blue"
type="submit"
disabled={isSubmitting}
- />
+ variant="solid"
+ color="accent"
+ >{t`Launch`}</Button>
</StyledForm>
);
};
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
index 99203e61648..5108c68129a 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberInfosTab.tsx
@@ -91,19 +91,17 @@ export const MemberInfosTab = ({
<StyledActionRow>
{onImpersonate && (
<Button
- title={t`Impersonate`}
- variant="secondary"
- size="small"
+ size="sm"
onClick={onImpersonate}
- />
+ variant="outline"
+ >{t`Impersonate`}</Button>
)}
<Button
- accent="danger"
- title={t`Delete account`}
- variant="secondary"
- size="small"
+ size="sm"
onClick={onDelete}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete account`}</Button>
</StyledActionRow>
</Section>
</>
diff --git a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
index fb3ead771aa..c350e0b8758 100644
--- a/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
+++ b/packages/twenty-front/src/modules/settings/members/components/MemberPermissionsTab.tsx
@@ -141,11 +141,10 @@ export const MemberPermissionsTab = ({
/>
</StyledRoleSelector>
<Button
- Icon={IconArrowUpRight}
- title={t`Open in Roles`}
- variant="secondary"
+ startIcon={<IconArrowUpRight />}
onClick={handleOpenRole}
- />
+ variant="outline"
+ >{t`Open in Roles`}</Button>
</StyledRoleContainer>
<SettingsRolePermissions roleId={primaryRole.id} isEditable={false} />
</Section>
@@ -157,7 +156,7 @@ export const MemberPermissionsTab = ({
subtitle={t`Are you sure you want to update the role of this user from "${oldRoleLabel}" to "${newRoleLabel}"?`}
onConfirmClick={handleConfirmRoleChange}
confirmButtonText={t`Update role`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
/>
)}
</>
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
index 0e1a1ccf9c6..b89a8b6fd8f 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteAccount.tsx
@@ -81,18 +81,16 @@ export const DeleteAccount = () => {
<StyledDangerActions>
{userHasMultipleWorkspaces && (
<Button
- accent="danger"
onClick={() => openModal(LEAVE_WORKSPACE_MODAL_ID)}
- variant="secondary"
- title={t`Leave workspace`}
- />
+ variant="outline"
+ color="danger"
+ >{t`Leave workspace`}</Button>
)}
<Button
- accent="danger"
onClick={() => openModal(DELETE_ACCOUNT_MODAL_ID)}
- variant="secondary"
- title={t`Delete account`}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete account`}</Button>
</StyledDangerActions>
{userHasMultipleWorkspaces && (
<ConfirmationModal
diff --git a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
index ff7d537d2dd..9a80378ad8f 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/DeleteWorkspace.tsx
@@ -38,12 +38,11 @@ export const DeleteWorkspace = () => {
description={t`Delete your whole workspace`}
/>
<Button
- accent="danger"
- variant="secondary"
- title={t`Delete workspace`}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
onClick={() => openModal(DELETE_WORKSPACE_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete workspace`}</Button>
<ConfirmationModal
modalInstanceId={DELETE_WORKSPACE_MODAL_ID}
diff --git a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
index 60bf48b0ae7..be663982704 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/EmailField.tsx
@@ -9,7 +9,7 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { IconCheck, IconPencil, IconX } from 'twenty-ui/icon';
import { AppTooltip, TooltipDelay } from 'twenty-ui/primitives/surfaces';
-import { Button } from 'twenty-ui/primitives/input';
+import { Button, ButtonGroup } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledContainer = styled.div`
@@ -104,29 +104,26 @@ export const EmailField = () => {
onInputEnter={handleSave}
/>
{isEditing ? (
- <StyledActionWrapper key="editing">
- <StyledActionButtonContainer>
- <Button
- Icon={IconCheck}
- variant="secondary"
- position="left"
- size="medium"
- onClick={handleSave}
- disabled={isSaveDisabled}
- type="button"
- />
- </StyledActionButtonContainer>
- <StyledActionButtonContainer>
- <Button
- Icon={IconX}
- variant="secondary"
- position="right"
- size="medium"
- onClick={handleCancelEditing}
- type="button"
- />
- </StyledActionButtonContainer>
- </StyledActionWrapper>
+ <ButtonGroup key="editing" aria-label={t`Edit email`}>
+ <Button
+ startIcon={<IconCheck />}
+ aria-label={t`Save`}
+ size="md"
+ onClick={handleSave}
+ disabled={isSaveDisabled}
+ type="button"
+ variant="outline"
+ />
+
+ <Button
+ startIcon={<IconX />}
+ aria-label={t`Cancel`}
+ size="md"
+ onClick={handleCancelEditing}
+ type="button"
+ variant="outline"
+ />
+ </ButtonGroup>
) : (
<StyledActionWrapper key="view">
<StyledActionButtonContainer
@@ -137,12 +134,13 @@ export const EmailField = () => {
}
>
<Button
- Icon={IconPencil}
- variant="secondary"
- size="medium"
+ startIcon={<IconPencil />}
+ aria-label={t`Edit`}
+ size="md"
onClick={handleStartEditing}
disabled={!canEdit}
type="button"
+ variant="outline"
/>
</StyledActionButtonContainer>
{shouldShowWorkspaceLimitTooltip && (
diff --git a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
index d02d5b34a95..eea25a11e4d 100644
--- a/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/components/SetOrChangePassword.tsx
@@ -20,11 +20,9 @@ export const SetOrChangePassword = () => {
return (
<>
<H2Title title={heading} description={description} />
- <Button
- onClick={handleResetPassword()}
- variant="secondary"
- title={heading}
- />
+ <Button onClick={handleResetPassword()} variant="outline">
+ {heading}
+ </Button>
</>
);
};
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
index 3fe896031a6..81005f97ebb 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
@@ -117,11 +117,12 @@ export const SettingsProfileDevicesSection = () => {
{hasOtherSessions && (
<StyledButtonContainer>
<Button
- Icon={IconLogout}
- title={t`Log out all other devices`}
- size="small"
+ startIcon={<IconLogout />}
+ size="sm"
onClick={() => void handleRevokeAllOtherSessions()}
- />
+ >
+ {t`Log out all other devices`}
+ </Button>
</StyledButtonContainer>
)}
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
index 589c267fbc6..d4fa8b1e646 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesList.tsx
@@ -101,11 +101,10 @@ export const SettingsRolesList = () => {
dropdownOffset={{ x: 0, y: 8 }}
clickableComponent={
<Button
- Icon={IconFilter}
- size="medium"
- variant="secondary"
- accent="default"
- ariaLabel={t`Filter`}
+ startIcon={<IconFilter />}
+ size="md"
+ aria-label={t`Filter`}
+ variant="outline"
/>
}
dropdownComponents={
@@ -148,12 +147,11 @@ export const SettingsRolesList = () => {
<StyledCreateRoleSectionContainer>
<Section>
<Button
- Icon={IconPlus}
- title={t`Create Role`}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={() => navigateSettings(SettingsPath.RoleCreate)}
- />
+ variant="outline"
+ >{t`Create Role`}</Button>
</Section>
</StyledCreateRoleSectionContainer>
</Section>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index b2f8a8d78a5..6e3c0402b3f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -69,12 +69,13 @@ export const RoleAssignmentSection = ({
<>
<div id={config.tooltip?.anchorId}>
<Button
- Icon={IconPlus}
- title={config.buttonTitle()}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
disabled={allWorkspaceMembersHaveThisRole}
- />
+ variant="outline"
+ >
+ {config.buttonTitle()}
+ </Button>
</div>
{config.tooltip && (
<AppTooltip
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx
index 415c7c23e47..312532e87fb 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentConfirmationModal.tsx
@@ -41,7 +41,7 @@ export const SettingsRoleAssignmentConfirmationModal = ({
onClose={onClose}
onConfirmClick={onConfirm}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
index 75b361ce80f..3eff9df3626 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSection.tsx
@@ -138,15 +138,14 @@ export const SettingsRolePermissionsObjectLevelSection = ({
<StyledCreateObjectOverrideSectionContainer>
<Section>
<Button
- Icon={IconPlus}
- title={t`Add rule`}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
disabled={
!settingsDraftRole.isEditable || allObjectsHaveSetPermission
}
onClick={handleAddRule}
- />
+ variant="outline"
+ >{t`Add rule`}</Button>
</Section>
</StyledCreateObjectOverrideSectionContainer>
)}
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectForm.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectForm.tsx
index c8315d7baa1..eec88654a7b 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectForm.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectForm.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useObjectMetadataItemById } from '@/object-metadata/hooks/useObjectMetadataItemById';
import { mapRLSOperandToRecordFilterOperand } from '@/object-record/record-filter/utils/mapRLSOperandToRecordFilterOperand';
@@ -18,7 +19,6 @@ import {
isDefined,
isRecordFilterValueValid,
} from 'twenty-shared/utils';
-import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { useQuery } from '@apollo/client/react';
import {
@@ -157,14 +157,13 @@ export const SettingsRolePermissionsObjectLevelObjectForm = ({
label={t`2. Set ${objectLabelPlural} permissions`}
onBack={() => navigate(previousStepPath)}
trailing={
- <Button
- title={t`Finish`}
- variant="primary"
- size="small"
- accent="blue"
- to={isFinishDisabled ? undefined : finishButtonPath}
+ <NavigationButton
+ size="sm"
+ to={finishButtonPath}
disabled={isFinishDisabled}
- />
+ variant="solid"
+ color="accent"
+ >{t`Finish`}</NavigationButton>
}
/>
}
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
index 6bd67691370..0ff745ffbc8 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilderContent.tsx
@@ -150,14 +150,12 @@ export const SettingsRolePermissionsObjectLevelRecordLevelPermissionFilterBuilde
</StyledContainer>
) : (
<Button
- Icon={IconFilter}
- size="small"
- variant="secondary"
- accent="default"
+ startIcon={<IconFilter />}
+ size="sm"
onClick={handleCreateFirstFilter}
- ariaLabel={t`Add filter`}
- title={t`Add filter`}
- />
+ aria-label={t`Add filter`}
+ variant="outline"
+ >{t`Add filter`}</Button>
)}
</AdvancedFilterContext.Provider>
);
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
index 260a16029ec..c4c12b8f540 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/record-level-permissions/components/SettingsRolePermissionsObjectLevelRecordLevelSection.tsx
@@ -58,11 +58,8 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
description={t`This feature is part of the Organization plan`}
Button={
<Button
- title={t`Upgrade`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconArrowUp}
+ size="sm"
+ startIcon={<IconArrowUp />}
onClick={() =>
navigateSettings(
isBillingEnabled
@@ -70,7 +67,9 @@ export const SettingsRolePermissionsObjectLevelRecordLevelSection = ({
: SettingsPath.AdminPanelOrganization,
)
}
- />
+ variant="solid"
+ color="accent"
+ >{t`Upgrade`}</Button>
}
/>
</Card>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
index 19c8f895a13..32648326716 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettings.tsx
@@ -123,15 +123,14 @@ export const SettingsRoleSettings = ({
description={t`Delete this role and assign a new role to its members`}
/>
<Button
- title={t`Delete role`}
- size="small"
- variant="secondary"
- accent="danger"
+ size="sm"
onClick={() => {
openModal(ROLE_SETTINGS_DELETE_ROLE_CONFIRMATION_MODAL_ID);
}}
disabled={!isEditable}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete role`}</Button>
</Section>
<SettingsRoleSettingsDeleteRoleConfirmationModal roleId={roleId} />
</>
diff --git a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettingsDeleteRoleConfirmationModal.tsx b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettingsDeleteRoleConfirmationModal.tsx
index 1b5239fc5f2..b5d7d133893 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettingsDeleteRoleConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-settings/components/SettingsRoleSettingsDeleteRoleConfirmationModal.tsx
@@ -36,7 +36,7 @@ export const SettingsRoleSettingsDeleteRoleConfirmationModal = ({
}
onConfirmClick={handleConfirmClick}
confirmButtonText={t`Confirm`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
);
};
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
index 641293d0b90..f0090b07790 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoOidcForm.tsx
@@ -63,8 +63,7 @@ export const SettingsSsoOidcForm = () => {
</StyledLinkContainer>
<StyledButtonCopy>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() => {
copyToClipboard(
authorizedUrl,
@@ -72,7 +71,7 @@ export const SettingsSsoOidcForm = () => {
);
}}
type="button"
- />
+ >{t`Copy`}</Button>
</StyledButtonCopy>
</StyledContainer>
<StyledContainer>
@@ -87,8 +86,7 @@ export const SettingsSsoOidcForm = () => {
</StyledLinkContainer>
<StyledButtonCopy>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() => {
copyToClipboard(
redirectionUrl,
@@ -96,7 +94,7 @@ export const SettingsSsoOidcForm = () => {
);
}}
type="button"
- />
+ >{t`Copy`}</Button>
</StyledButtonCopy>
</StyledContainer>
</StyledInputsContainer>
diff --git a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
index 6578147a289..434764109c9 100644
--- a/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
+++ b/packages/twenty-front/src/modules/settings/security/components/sso/SettingsSsoSamlForm.tsx
@@ -131,11 +131,10 @@ export const SettingsSsoSamlForm = () => {
accept=".xml"
/>
<Button
- Icon={IconUpload}
+ startIcon={<IconUpload />}
onClick={handleUploadFileClick}
- title={t`Upload file`}
type="button"
- ></Button>
+ >{t`Upload file`}</Button>
{isXMLMetadataValid() && (
<IconCheck
size={theme.icon.size.md}
@@ -153,11 +152,10 @@ export const SettingsSsoSamlForm = () => {
<StyledInputsContainer>
<StyledContainer>
<Button
- Icon={IconDownload}
+ startIcon={<IconDownload />}
onClick={downloadMetadata}
- title={t`Download file`}
type="button"
- />
+ >{t`Download file`}</Button>
</StyledContainer>
<HorizontalSeparator text={t`Or`} />
<StyledContainer>
@@ -172,13 +170,12 @@ export const SettingsSsoSamlForm = () => {
</StyledLinkContainer>
<StyledButtonCopy>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() => {
copyToClipboard(acsUrl, t`ACS URL copied to clipboard`);
}}
type="button"
- />
+ >{t`Copy`}</Button>
</StyledButtonCopy>
</StyledContainer>
<StyledContainer>
@@ -193,13 +190,12 @@ export const SettingsSsoSamlForm = () => {
</StyledLinkContainer>
<StyledButtonCopy>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() => {
copyToClipboard(entityID, t`Entity ID copied to clipboard`);
}}
type="button"
- />
+ >{t`Copy`}</Button>
</StyledButtonCopy>
</StyledContainer>
</StyledInputsContainer>
diff --git a/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx b/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx
index f7d0d6abaee..ed747da3fc4 100644
--- a/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx
+++ b/packages/twenty-front/src/modules/settings/translations/components/SettingsTranslationsButton.tsx
@@ -24,10 +24,8 @@ export const SettingsTranslationsButton = ({
return (
<Button
- Icon={IconLanguage}
- title={t`Edit translations`}
- variant="secondary"
- size="small"
+ startIcon={<IconLanguage />}
+ size="sm"
onClick={() => {
setSettingsTranslationsSidePanelTarget(target);
navigateSidePanel({
@@ -37,6 +35,7 @@ export const SettingsTranslationsButton = ({
resetNavigationStack: true,
});
}}
- />
+ variant="outline"
+ >{t`Edit translations`}</Button>
);
};
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
index 00ffa9fe27b..0a1efcb659a 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
@@ -89,11 +89,10 @@ export const DeleteTwoFactorAuthentication = () => {
/>
<Button
- accent="danger"
onClick={() => openModal(DELETE_TWO_FACTOR_AUTHENTICATION_MODAL_ID)}
- variant="secondary"
- title={t`Reset 2FA`}
- />
+ variant="outline"
+ color="danger"
+ >{t`Reset 2FA`}</Button>
<ConfirmationModal
confirmationValue={userEmail}
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
index 3e2ccf7f43e..db94d9fa701 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/SettingsUnsubscribePreview.tsx
@@ -100,28 +100,22 @@ export const SettingsUnsubscribePreview = () => {
))}
</StyledTopics>
<Button
- title={t`Update`}
- variant="primary"
- accent="blue"
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Update`}</Button>
<HorizontalSeparator text={t`Or`} noMargin />
<Button
- title={t`Unsubscribe all`}
- variant="secondary"
fullWidth
- justify="center"
- />
+ variant="outline"
+ >{t`Unsubscribe all`}</Button>
</>
) : (
<Button
- title={t`Unsubscribe`}
- variant="primary"
- accent="blue"
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Unsubscribe`}</Button>
)}
</StyledCard>
)}
diff --git a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
index abe5e852c9e..ef37f24e7d4 100644
--- a/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/unsubscribers/components/filter-dropdown/SettingsUnsubscribersFilterDropdown.tsx
@@ -110,11 +110,10 @@ export const SettingsUnsubscribersFilterDropdown = ({
onClose={goToMenu}
clickableComponent={
<Button
- Icon={IconFilter}
- size="medium"
- variant="secondary"
- accent="default"
- ariaLabel={t`Filter unsubscribers`}
+ startIcon={<IconFilter />}
+ size="md"
+ aria-label={t`Filter unsubscribers`}
+ variant="outline"
/>
}
dropdownComponents={renderContent()}
diff --git a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
index f022639785a..75da7e2ec5d 100644
--- a/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/usage/components/SettingsUsageAnalyticsSection.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { isClickHouseConfiguredState } from '@/client-config/states/isClickHouseConfiguredState';
import { SettingsBillingLabelValueItem } from '@/settings/billing/components/internal/SettingsBillingLabelValueItem';
import { SubscriptionInfoContainer } from '@/settings/billing/components/SubscriptionInfoContainer';
@@ -8,12 +9,10 @@ import { UsageSectionSkeleton } from '@/settings/usage/components/UsageSectionSk
import { useUsageAnalyticsData } from '@/settings/usage/hooks/useUsageAnalyticsData';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { t } from '@lingui/core/macro';
-import { Link } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconSparkles } from 'twenty-ui/icon';
import { H2Title } from 'twenty-ui/primitives/typography';
-import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
import { SETTINGS_AI_TABS } from '~/pages/settings/ai/constants/SettingsAiTabs';
@@ -97,16 +96,11 @@ export const SettingsUsageAnalyticsSection = () => {
showAvatar
/>
<Section>
- <Link
+ <NavigationButton
to={`${getSettingsPath(SettingsPath.AI)}#${SETTINGS_AI_TABS.TABS_IDS.USAGE}`}
- style={{ textDecoration: 'none' }}
- >
- <Button
- Icon={IconSparkles}
- title={t`View AI usage breakdown`}
- variant="secondary"
- />
- </Link>
+ startIcon={<IconSparkles />}
+ variant="outline"
+ >{t`View AI usage breakdown`}</NavigationButton>
</Section>
</>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
index 4c5099f4f38..d694e7c63b9 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage.tsx
@@ -103,15 +103,14 @@ export const SidePanelComposeCalendarEventPage = () => {
/>,
<Button
key="create"
- size="small"
- variant="primary"
- accent="blue"
- title={t`Create event`}
- Icon={IconCalendarEvent}
+ size="sm"
+ startIcon={<IconCalendarEvent />}
hotkeys={[getOsControlSymbol(), '⏎']}
onClick={composerState.handleCreate}
disabled={!composerState.canCreate}
- />,
+ variant="solid"
+ color="accent"
+ >{t`Create event`}</Button>,
]}
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
index baa20eb7082..9f99a613462 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/compose-email/components/SidePanelComposeEmailPage.tsx
@@ -111,15 +111,14 @@ export const SidePanelComposeEmailPage = () => {
/>,
<Button
key="send"
- size="small"
- variant="primary"
- accent="blue"
- title={t`Send`}
- Icon={IconSend}
+ size="sm"
+ startIcon={<IconSend />}
hotkeys={[getOsControlSymbol(), '⏎']}
onClick={composerState.handleSend}
disabled={!canSend}
- />,
+ variant="solid"
+ color="accent"
+ >{t`Send`}</Button>,
]}
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
index 1de4d4980fd..34ff633f5e1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/RegularTabSettingsContent.tsx
@@ -133,7 +133,7 @@ export const RegularTabSettingsContent = ({
subtitle={t`This will cancel all modifications done on the tab and its widgets. Edit mode will be canceled and the page will refresh. This action cannot be undone.`}
onConfirmClick={onResetToDefault}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
index a661bca0dd6..90680bb6347 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SingleWidgetTabSettingsContent.tsx
@@ -160,7 +160,7 @@ export const SingleWidgetTabSettingsContent = ({
subtitle={t`This will cancel all modifications done on the tab and its widgets. Edit mode will be canceled and the page will refresh. This action cannot be undone.`}
onConfirmClick={onResetToDefault}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
index 03b161400d8..d4e0835cd71 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/WidgetSettingsManageSection.tsx
@@ -161,7 +161,7 @@ export const WidgetSettingsManageSection = ({
subtitle={t`This will cancel all modifications done on the widget. This action cannot be undone.`}
onConfirmClick={handleConfirmReset}
confirmButtonText={t`Reset`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
index e69f2d09835..632862713b1 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableSettingsSortsContent.tsx
@@ -102,19 +102,21 @@ export const RecordTableSettingsSortsContent = ({
handleDirectionChange(sort.id, value as ViewSortDirection)
}
/>
- <Button onClick={() => handleRemoveSort(sort.id)} Icon={IconTrash} />
+ <Button
+ onClick={() => handleRemoveSort(sort.id)}
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
+ />
</StyledSortItemContainer>
))}
<StyledAddButtonContainer>
<Button
- Icon={IconArrowsSort}
- size="small"
- variant="secondary"
- accent="default"
+ startIcon={<IconArrowsSort />}
+ size="sm"
onClick={handleAddSort}
- ariaLabel={t`Add sort`}
- title={t`Add sort`}
- />
+ aria-label={t`Add sort`}
+ variant="outline"
+ >{t`Add sort`}</Button>
</StyledAddButtonContainer>
</>
);
diff --git a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
index e9c672e93cc..b9523b06280 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage.tsx
@@ -128,15 +128,14 @@ const SidePanelRecordCreationForm = ({
actions={[
<Button
key="create-record"
- title={t`Create`}
- Icon={IconPlus}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={handleCreateClick}
disabled={isSubmitting}
- dataTestId="record-creation-form-create-button"
- />,
+ data-testid="record-creation-form-create-button"
+ variant="solid"
+ color="accent"
+ >{t`Create`}</Button>,
]}
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage.tsx
index 233d8559517..0b4d1c2c8de 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage.tsx
@@ -88,14 +88,13 @@ export const SidePanelSendCampaignTestPage = () => {
actions={[
<Button
key="send-test"
- title={t`Send test email`}
- Icon={IconSend}
- variant="primary"
- accent="blue"
- size="small"
+ startIcon={<IconSend />}
+ size="sm"
disabled={!canSend || loading}
onClick={handleSend}
- />,
+ variant="solid"
+ color="accent"
+ >{t`Send test email`}</Button>,
]}
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
index bce8f18b265..9431df90181 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
@@ -272,17 +272,18 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {
actions={[
<Button
key="send"
- title={buildCampaignSendButtonTitle({
+ startIcon={isScheduling ? <IconClock /> : <IconSend />}
+ size="sm"
+ disabled={!canSend || isSending}
+ onClick={handleSend}
+ variant="solid"
+ color="accent"
+ >
+ {buildCampaignSendButtonTitle({
deliveryTiming,
isAlreadyScheduled,
})}
- Icon={isScheduling ? IconClock : IconSend}
- variant="primary"
- accent="blue"
- size="small"
- disabled={!canSend || isSending}
- onClick={handleSend}
- />,
+ </Button>,
]}
/>
</StyledContainer>
diff --git a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
index 85c21350cda..5af639c6e6f 100644
--- a/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
+++ b/packages/twenty-front/src/modules/sign-in-background-mock/components/BackgroundMockPage.tsx
@@ -33,22 +33,21 @@ export const BackgroundMockPage = () => {
actionButton={
<>
<Button
- Icon={IconPlus}
- title={t`New Company`}
- variant="primary"
- accent="blue"
- size="small"
- />
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="solid"
+ color="accent"
+ >{t`New Company`}</Button>
<LightIconButton
Icon={IconDotsVertical}
accent="tertiary"
size="small"
/>
<Button
- Icon={IconLayoutSidebarRight}
- variant="secondary"
- accent="default"
- size="small"
+ startIcon={<IconLayoutSidebarRight />}
+ aria-label={t`Open side panel`}
+ size="sm"
+ variant="outline"
/>
</>
}
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
index 5d9397cdd6f..c943649a95d 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/components/StepNavigationButton.tsx
@@ -1,9 +1,9 @@
import { styled } from '@linaria/react';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { t } from '@lingui/core/macro';
import { CircularProgressBar } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
import { ModalFooter } from 'twenty-ui/primitives/surfaces';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
@@ -37,20 +37,21 @@ export const StepNavigationButton = ({
<ModalFooter autoHeight>
{!isUndefinedOrNull(onBack) && (
<MainButton
- Icon={isLoading ? CircularProgressBar : undefined}
- title={backTitle}
+ startIcon={isLoading ? <CircularProgressBar /> : undefined}
onClick={!isLoading ? onBack : undefined}
- variant="secondary"
- />
+ variant="outline"
+ >
+ {backTitle}
+ </MainButton>
)}
{!isUndefinedOrNull(onContinue) && (
<MainButton
- Icon={isLoading ? CircularProgressBar : undefined}
- title={continueTitle}
+ startIcon={isLoading ? <CircularProgressBar /> : undefined}
onClick={!isLoading ? onContinue : undefined}
- variant="primary"
disabled={isContinueDisabled}
- />
+ >
+ {continueTitle}
+ </MainButton>
)}
</ModalFooter>
</StyledFooterContainer>
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
index f1786e871ca..730d4361a92 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/provider/components/SpreadsheetImport.tsx
@@ -60,7 +60,8 @@ export const SpreadsheetImport = (props: SpreadsheetImportProps) => {
{
title: t`Exit`,
onClick: mergedProps.onClose,
- accent: 'danger',
+ color: 'danger',
+ variant: 'solid',
role: 'confirm',
},
],
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
index 6ac5d6909d5..4679ea41a58 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/MatchColumnsStep/MatchColumnsStep.tsx
@@ -216,7 +216,7 @@ export const MatchColumnsStep = ({
{
title: t`Continue`,
onClick: handleAlertOnContinue,
- variant: 'primary',
+ variant: 'outline',
role: 'confirm',
},
],
@@ -262,7 +262,8 @@ export const MatchColumnsStep = ({
{
title: t`Restart`,
onClick: onBackConfirmation,
- accent: 'danger',
+ color: 'danger',
+ variant: 'solid',
role: 'confirm',
},
],
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
index 79557adbed6..a69ad6bdba2 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/UploadStep/components/DropZone.tsx
@@ -7,7 +7,7 @@ import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { useDropzone } from 'react-dropzone';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { read, type WorkBook } from 'xlsx-ugnis';
@@ -189,13 +189,12 @@ export const DropZone = ({ onContinue, isLoading }: DropZoneProps) => {
<Trans>Upload .xlsx, .xls or .csv file</Trans>
</StyledText>
<StyledButtonsContainer>
- <MainButton onClick={open} title={t`Select file`} fullWidth />
+ <MainButton onClick={open} fullWidth>{t`Select file`}</MainButton>
<MainButton
onClick={downloadSample}
- title={t`Download sample`}
- variant="secondary"
fullWidth
- />
+ variant="outline"
+ >{t`Download sample`}</MainButton>
</StyledButtonsContainer>
<StyledFooterText>
{t`Max import capacity: ${formatSpreadsheetMaxRecordImportCapacity} records. Otherwise, consider splitting your file or using the API.`}
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
index 85aef900451..94f8d04db40 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/ValidationStep.tsx
@@ -277,7 +277,7 @@ export const ValidationStep = ({
{ title: t`Cancel` },
{
title: t`Submit`,
- variant: 'primary',
+ variant: 'outline',
onClick: submitData,
role: 'confirm',
},
@@ -330,12 +330,10 @@ export const ValidationStep = ({
</StyledErrorSwitch>
<StyledButtonContainer>
<Button
- Icon={IconTrash}
- title={t`Remove`}
- accent="default"
+ startIcon={<IconTrash />}
onClick={deleteSelectedRows}
disabled={selectedRows.size === 0}
- />
+ >{t`Remove`}</Button>
</StyledButtonContainer>
</StyledToolbar>
</StyledContentWrapper>
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
index 207d34c3676..56ef9599815 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/Dialog.tsx
@@ -1,3 +1,4 @@
+import { type DialogProps } from '@/ui/feedback/dialog-manager/types/DialogProps';
import { styled } from '@linaria/react';
import { motion } from 'framer-motion';
import { Key } from 'ts-key-enum';
@@ -61,25 +62,6 @@ const StyledDialogButtonContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[2]};
`;
-export type DialogButtonOptions = Omit<
- React.ComponentProps<typeof Button>,
- 'fullWidth'
-> & {
- onClick?: (
- event: React.MouseEvent<HTMLButtonElement, MouseEvent> | KeyboardEvent,
- ) => void;
- role?: 'confirm';
-};
-
-export type DialogProps = React.ComponentPropsWithoutRef<typeof motion.div> & {
- title?: string;
- message?: string;
- buttons?: DialogButtonOptions[];
- children?: React.ReactNode;
- className?: string;
- onClose?: () => void;
-};
-
export const Dialog = ({
title,
message,
@@ -157,7 +139,7 @@ export const Dialog = ({
{title && <StyledDialogTitle>{title}</StyledDialogTitle>}
{message && <StyledDialogMessage>{message}</StyledDialogMessage>}
{children}
- {buttons.map(({ accent, onClick, role, title: key, variant }) => (
+ {buttons.map(({ color, onClick, title: key, variant }) => (
<StyledDialogButtonContainer key={key}>
<Button
onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
@@ -165,10 +147,11 @@ export const Dialog = ({
onClick?.(event);
}}
fullWidth={true}
- variant={variant ?? 'secondary'}
- title={key}
- {...{ accent, role }}
- />
+ color={color}
+ variant={variant ?? 'outline'}
+ >
+ {key}
+ </Button>
</StyledDialogButtonContainer>
))}
</StyledDialogContainer>
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/__tests__/useDialogManager.test.tsx b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/__tests__/useDialogManager.test.tsx
index ea0bed88424..5aed1db2a76 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/__tests__/useDialogManager.test.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/__tests__/useDialogManager.test.tsx
@@ -47,7 +47,7 @@ const dialogOptionsArray: DialogOptionsArray = [
{
title: 'Are you sure?',
onClick: mockOnclick,
- variant: 'primary',
+ variant: 'outline',
role: 'confirm',
},
],
@@ -60,7 +60,7 @@ const dialogOptionsArray: DialogOptionsArray = [
{
title: 'Are you sure?',
onClick: mockOnclick,
- variant: 'primary',
+ variant: 'outline',
role: 'confirm',
},
],
@@ -73,7 +73,7 @@ const dialogOptionsArray: DialogOptionsArray = [
{
title: 'Are you sure?',
onClick: mockOnclick,
- variant: 'primary',
+ variant: 'outline',
role: 'confirm',
},
],
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogButtonOptions.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogButtonOptions.ts
new file mode 100644
index 00000000000..365b0549f52
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogButtonOptions.ts
@@ -0,0 +1,10 @@
+import { type ComponentProps, type MouseEvent } from 'react';
+import { type Button } from 'twenty-ui/primitives/input';
+
+export type DialogButtonOptions = Omit<
+ ComponentProps<typeof Button>,
+ 'fullWidth' | 'onClick'
+> & {
+ onClick?: (event: MouseEvent<HTMLButtonElement> | KeyboardEvent) => void;
+ role?: 'confirm';
+};
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
index 743bcb998e4..b3e69e3968f 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
@@ -1,4 +1,4 @@
-import { type DialogProps } from '@/ui/feedback/dialog-manager/components/Dialog';
+import { type DialogProps } from '@/ui/feedback/dialog-manager/types/DialogProps';
export type DialogOptions = DialogProps & {
id: string;
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogProps.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogProps.ts
new file mode 100644
index 00000000000..138bff739b3
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogProps.ts
@@ -0,0 +1,12 @@
+import { type ComponentPropsWithoutRef, type ReactNode } from 'react';
+import { type motion } from 'framer-motion';
+import { type DialogButtonOptions } from './DialogButtonOptions';
+
+export type DialogProps = ComponentPropsWithoutRef<typeof motion.div> & {
+ title?: string;
+ message?: string;
+ buttons?: DialogButtonOptions[];
+ children?: ReactNode;
+ className?: string;
+ onClose?: () => void;
+};
diff --git a/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx b/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
index 91d62a106d6..db7c304099d 100644
--- a/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/toast/components/__tests__/AppToaster.test.tsx
@@ -40,13 +40,9 @@ describe('AppToaster', () => {
children: 'Record saved',
description: 'Your changes are available',
action: (
- <Button
- title="Undo"
- ariaLabel="Undo"
- onClick={onAction}
- variant="tertiary"
- size="small"
- />
+ <Button onClick={onAction} variant="ghost" size="sm">
+ Undo
+ </Button>
),
onClose,
progress: 100,
diff --git a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
index d63d495d9af..943a1deaf86 100644
--- a/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/ImageInput.tsx
@@ -152,28 +152,25 @@ export const ImageInput = ({
/>
{isUploading && onAbort ? (
<Button
- Icon={IconX}
+ startIcon={<IconX />}
onClick={onAbort}
- variant="secondary"
- title={t`Abort`}
disabled={!pictureURI || disabled}
- />
+ variant="outline"
+ >{t`Abort`}</Button>
) : (
<Button
- Icon={IconUpload}
+ startIcon={<IconUpload />}
onClick={onUploadButtonClick}
- variant="secondary"
- title={t`Upload`}
disabled={disabled}
- />
+ variant="outline"
+ >{t`Upload`}</Button>
)}
<Button
- Icon={IconTrash}
+ startIcon={<IconTrash />}
onClick={onRemove}
- variant="secondary"
- title={t`Remove`}
disabled={!pictureURI || disabled}
- />
+ variant="outline"
+ >{t`Remove`}</Button>
</StyledButtonContainer>
<StyledText>
<Trans>We support your square PNGs, JPEGs and GIFs under 10MB</Trans>
diff --git a/packages/twenty-front/src/modules/ui/input/components/NavigationButton.tsx b/packages/twenty-front/src/modules/ui/input/components/NavigationButton.tsx
new file mode 100644
index 00000000000..12f3b5f1199
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/NavigationButton.tsx
@@ -0,0 +1,32 @@
+import { type ComponentType } from 'react';
+import { Link, type LinkProps } from 'react-router-dom';
+import { isDefined } from 'twenty-shared/utils';
+import { Button, type ButtonProps } from 'twenty-ui/primitives/input';
+
+type NavigationButtonProps = Omit<
+ ButtonProps,
+ 'href' | 'render' | 'nativeButton'
+> & {
+ buttonComponent?: ComponentType<ButtonProps>;
+ to?: LinkProps['to'];
+};
+
+export const NavigationButton = ({
+ buttonComponent: ButtonComponent = Button,
+ role,
+ to,
+ type,
+ ...props
+}: NavigationButtonProps) => {
+ const isLink = isDefined(to);
+
+ return (
+ <ButtonComponent
+ {...props}
+ type={isLink ? undefined : (type ?? 'button')}
+ render={isLink ? <Link to={to} /> : undefined}
+ role={isLink ? 'link' : role}
+ nativeButton={!isLink}
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/NavigationButton.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/NavigationButton.stories.tsx
new file mode 100644
index 00000000000..9f44fc7c5da
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/NavigationButton.stories.tsx
@@ -0,0 +1,171 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { styled } from '@linaria/react';
+import { MemoryRouter, Route, Routes, useLocation } from 'react-router-dom';
+import { expect, fn, userEvent, within } from 'storybook/test';
+import { LightButton, MainButton } from 'twenty-ui/components';
+
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
+const meta: Meta<typeof NavigationButton> = {
+ title: 'UI/Input/NavigationButton',
+ component: NavigationButton,
+};
+
+export default meta;
+type Story = StoryObj<typeof NavigationButton>;
+
+const StyledMainButton = styled(MainButton)`
+ width: 200px;
+`;
+
+const CurrentLocation = () => {
+ const { pathname, search, hash } = useLocation();
+
+ return (
+ <p>
+ <output aria-label="Current location">
+ {pathname}
+ {search}
+ {hash}
+ </output>
+ </p>
+ );
+};
+
+export const RouterNavigation: Story = {
+ args: { onClick: fn() },
+ render: (args) => (
+ <MemoryRouter initialEntries={['/settings/objects/companies']}>
+ <Routes>
+ <Route
+ path="/settings/objects/:objectName/*"
+ element={
+ <>
+ <NavigationButton
+ buttonComponent={MainButton}
+ to="./new-field/select"
+ onClick={args.onClick}
+ >
+ Add field
+ </NavigationButton>
+ <NavigationButton
+ buttonComponent={LightButton}
+ to={{
+ pathname: '/settings/usage',
+ search: '?period=week',
+ hash: '#credits',
+ }}
+ onClick={args.onClick}
+ >
+ View usage
+ </NavigationButton>
+ </>
+ }
+ />
+ <Route path="/settings/usage" element={<p>Usage page</p>} />
+ </Routes>
+ <CurrentLocation />
+ </MemoryRouter>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const currentLocation = canvas.getByRole('status', {
+ name: 'Current location',
+ });
+ const addFieldLink = canvas.getByRole('link', { name: 'Add field' });
+
+ await expect(addFieldLink).toHaveAttribute(
+ 'href',
+ '/settings/objects/companies/new-field/select',
+ );
+ await expect(addFieldLink).not.toHaveAttribute('type');
+ await expect(getComputedStyle(addFieldLink).fontWeight).toBe('600');
+ addFieldLink.focus();
+ await userEvent.keyboard('{Enter}');
+ await expect(args.onClick).toHaveBeenCalledOnce();
+ await expect(currentLocation.textContent).toBe(
+ '/settings/objects/companies/new-field/select',
+ );
+
+ const usageLink = canvas.getByRole('link', { name: 'View usage' });
+ await expect(usageLink).not.toHaveAttribute('type');
+ await expect(getComputedStyle(usageLink).fontWeight).toBe('400');
+ await userEvent.click(usageLink);
+ await expect(args.onClick).toHaveBeenCalledTimes(2);
+ await expect(currentLocation.textContent).toBe(
+ '/settings/usage?period=week#credits',
+ );
+ await expect(canvas.getByText('Usage page')).toBeVisible();
+ },
+};
+
+export const Disabled: Story = {
+ args: { disabled: true, onClick: fn() },
+ render: (args) => (
+ <MemoryRouter initialEntries={['/settings']}>
+ <NavigationButton
+ buttonComponent={LightButton}
+ to="/settings/usage"
+ disabled={args.disabled}
+ onClick={args.onClick}
+ >
+ View usage
+ </NavigationButton>
+ <CurrentLocation />
+ </MemoryRouter>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const link = canvas.getByRole('link', { name: 'View usage' });
+
+ await expect(link).toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(link);
+ link.focus();
+ await userEvent.keyboard('{Enter}');
+ await expect(args.onClick).not.toHaveBeenCalled();
+ await expect(
+ canvas.getByRole('status', { name: 'Current location' }).textContent,
+ ).toBe('/settings');
+ },
+};
+
+export const NativeButton: Story = {
+ args: { onClick: fn() },
+ render: (args) => (
+ <NavigationButton onClick={args.onClick}>Save changes</NavigationButton>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const button = canvas.getByRole('button', { name: 'Save changes' });
+
+ await expect(button).not.toHaveAttribute('href');
+ button.focus();
+ await userEvent.keyboard('{Enter} ');
+ await expect(args.onClick).toHaveBeenCalledTimes(2);
+ },
+};
+
+export const NativePreset: Story = {
+ args: { onClick: fn() },
+ render: (args) => (
+ <NavigationButton
+ buttonComponent={StyledMainButton}
+ to={undefined}
+ onClick={args.onClick}
+ >
+ Save changes
+ </NavigationButton>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const button = within(canvasElement).getByRole('button', {
+ name: 'Save changes',
+ });
+
+ await expect(button).toHaveAttribute('type', 'button');
+ await expect(button).not.toHaveAttribute('href');
+ await expect(button.getBoundingClientRect().width).toBe(200);
+ await expect(getComputedStyle(button).fontWeight).toBe('600');
+ await userEvent.click(button);
+ await expect(args.onClick).toHaveBeenCalledOnce();
+ },
+};
diff --git a/packages/twenty-front/src/modules/ui/input/styles/ButtonInvertedClassName.ts b/packages/twenty-front/src/modules/ui/input/styles/ButtonInvertedClassName.ts
new file mode 100644
index 00000000000..41316bd463a
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/input/styles/ButtonInvertedClassName.ts
@@ -0,0 +1,6 @@
+import { css } from '@linaria/core';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+export const BUTTON_INVERTED_CLASS_NAME = css`
+ color: ${themeCssVariables.font.color.inverted};
+`;
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
index 59152b480c5..541b2a2dccc 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
@@ -30,7 +30,7 @@ const meta: Meta<typeof Dropdown> = {
component: Dropdown,
decorators: [ComponentDecorator, (Story) => <Story />],
args: {
- clickableComponent: <Button title="Open Dropdown" />,
+ clickableComponent: <Button>{'Open Dropdown'}</Button>,
dropdownOffset: { x: 0, y: 8 },
dropdownId: 'test-dropdown-id',
},
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
index 65717158b97..20042b88a60 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/ConfirmationModal.tsx
@@ -1,6 +1,8 @@
+import { StyledCenteredButton } from '@/ui/layout/modal/components/StyledCenteredButton';
+import { type ConfirmationModalProps } from '@/ui/layout/modal/types/ConfirmationModalProps';
import { styled } from '@linaria/react';
import { isNonEmptyString } from '@sniptt/guards';
-import { type ReactNode, useState } from 'react';
+import { useState } from 'react';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
@@ -9,45 +11,13 @@ import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { msg } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { H1Title, H1TitleFontColor } from 'twenty-ui/primitives/typography';
-import { Button, type ButtonAccent } from 'twenty-ui/primitives/input';
import {
Section,
SectionAlignment,
SectionFontColor,
} from 'twenty-ui/primitives/layout';
-import { type ModalOverlay } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme-constants';
-export type ConfirmationModalProps = {
- modalInstanceId: string;
- title: string;
- loading?: boolean;
- subtitle: ReactNode;
- onClose?: () => void;
- onConfirmClick: () => void;
- confirmButtonText?: string;
- confirmationPlaceholder?: string;
- confirmationValue?: string;
- confirmButtonAccent?: ButtonAccent;
- AdditionalButtons?: React.ReactNode;
- hideCancelButton?: boolean;
- overlay?: ModalOverlay;
-};
-
-const StyledCenteredButtonContainer = styled.div`
- box-sizing: border-box;
- margin-top: ${themeCssVariables.spacing[2]};
-`;
-
-export const StyledCenteredButton = (
- props: React.ComponentProps<typeof Button>,
-) => (
- <StyledCenteredButtonContainer>
- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}
- <Button {...props} />
- </StyledCenteredButtonContainer>
-);
-
const StyledCenteredTitle = styled.div`
text-align: center;
`;
@@ -56,30 +26,6 @@ const StyledSectionContainer = styled.div`
margin-bottom: ${themeCssVariables.spacing[6]};
`;
-const StyledConfirmationButtonContainer = styled.div`
- box-sizing: border-box;
- margin-top: ${themeCssVariables.spacing[2]};
- > button {
- border-color: ${themeCssVariables.border.color.danger};
- box-shadow: none;
- color: ${themeCssVariables.color.red};
- font-size: ${themeCssVariables.font.size.md};
- line-height: ${themeCssVariables.text.lineHeight.lg};
- &:hover {
- background-color: ${themeCssVariables.color.red3};
- }
- }
-`;
-
-export const StyledConfirmationButton = (
- props: React.ComponentProps<typeof Button>,
-) => (
- <StyledConfirmationButtonContainer>
- {/* oxlint-disable-next-line react/jsx-props-no-spreading */}
- <Button {...props} />
- </StyledConfirmationButtonContainer>
-);
-
const defaultConfirmButtonText = msg`Confirm`;
export const ConfirmationModal = ({
@@ -92,7 +38,7 @@ export const ConfirmationModal = ({
confirmButtonText,
confirmationValue,
confirmationPlaceholder,
- confirmButtonAccent = 'danger',
+ confirmButtonColor = 'danger',
AdditionalButtons,
hideCancelButton = false,
overlay = 'dark',
@@ -175,26 +121,24 @@ export const ConfirmationModal = ({
{!hideCancelButton && (
<StyledCenteredButton
onClick={handleCancelClick}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- justify="center"
- dataTestId="confirmation-modal-cancel-button"
- />
+ data-testid="confirmation-modal-cancel-button"
+ variant="outline"
+ >{t`Cancel`}</StyledCenteredButton>
)}
{AdditionalButtons}
<StyledCenteredButton
onClick={handleConfirmClick}
- variant="primary"
- accent={confirmButtonAccent}
- title={translatedConfirmButtonText}
disabled={!isValidValue || loading}
fullWidth
- justify="center"
- dataTestId="confirmation-modal-confirm-button"
- />
+ data-testid="confirmation-modal-confirm-button"
+ variant={confirmButtonColor === 'neutral' ? 'outline' : 'solid'}
+ color={confirmButtonColor}
+ >
+ {translatedConfirmButtonText}
+ </StyledCenteredButton>
</ModalStatefulWrapper>
);
};
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/StyledCenteredButton.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/StyledCenteredButton.tsx
new file mode 100644
index 00000000000..102a616256c
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/StyledCenteredButton.tsx
@@ -0,0 +1,8 @@
+import { styled } from '@linaria/react';
+import { Button } from 'twenty-ui/primitives/input';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+export const StyledCenteredButton = styled(Button)`
+ box-sizing: border-box;
+ margin-top: ${themeCssVariables.spacing[2]};
+`;
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/types/ConfirmationModalProps.ts b/packages/twenty-front/src/modules/ui/layout/modal/types/ConfirmationModalProps.ts
new file mode 100644
index 00000000000..0a87ab92ac5
--- /dev/null
+++ b/packages/twenty-front/src/modules/ui/layout/modal/types/ConfirmationModalProps.ts
@@ -0,0 +1,19 @@
+import { type ReactNode } from 'react';
+import { type ButtonColor } from 'twenty-ui/primitives/input';
+import { type ModalOverlay } from 'twenty-ui/primitives/surfaces';
+
+export type ConfirmationModalProps = {
+ modalInstanceId: string;
+ title: string;
+ loading?: boolean;
+ subtitle: ReactNode;
+ onClose?: () => void;
+ onConfirmClick: () => void;
+ confirmButtonText?: string;
+ confirmationPlaceholder?: string;
+ confirmationValue?: string;
+ confirmButtonColor?: ButtonColor;
+ AdditionalButtons?: ReactNode;
+ hideCancelButton?: boolean;
+ overlay?: ModalOverlay;
+};
diff --git a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
index 714fa149dab..263edf8e3d0 100644
--- a/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
+++ b/packages/twenty-front/src/modules/views/components/UpdateViewButtonGroup.tsx
@@ -110,12 +110,11 @@ export const UpdateViewButtonGroup = () => {
return (
<StyledContainer>
{currentView?.key !== 'INDEX' ? (
- <ButtonGroup size="small" accent="blue">
+ <ButtonGroup size="sm" variant="solid" color="accent">
<Button
- title={t`Update view`}
onClick={handleUpdateViewClick}
disabled={!canPersistChanges}
- />
+ >{t`Update view`}</Button>
<Dropdown
dropdownId={updateViewButtonDropdownId}
clickableComponent={
@@ -141,12 +140,11 @@ export const UpdateViewButtonGroup = () => {
</ButtonGroup>
) : (
<Button
- title={t`Save as new view`}
onClick={handleSaveAsNewViewClick}
- accent="blue"
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ color="accent"
+ >{t`Save as new view`}</Button>
)}
</StyledContainer>
);
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
index 5289572db90..b5ff90d1ed7 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetails.tsx
@@ -36,7 +36,7 @@ import { isViewBarExpandedComponentState } from '@/views/states/isViewBarExpande
import { t } from '@lingui/core/macro';
import { isNonEmptyArray, isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { LightButton } from 'twenty-ui/primitives/input';
+import { LightButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
export type ViewBarDetailsProps = {
@@ -281,11 +281,10 @@ export const ViewBarDetails = ({
<StyledActionButtonContainer>
{canResetView && (
<LightButton
+ emphasis="subtle"
data-testid="cancel-button"
- accent="tertiary"
- title={t`Reset`}
onClick={handleCancelClick}
- />
+ >{t`Reset`}</LightButton>
)}
{rightComponent}
</StyledActionButtonContainer>
diff --git a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
index 9505c01b7d9..536c8a42b9a 100644
--- a/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
+++ b/packages/twenty-front/src/modules/views/components/ViewBarDetailsAddFilterButton.tsx
@@ -4,8 +4,8 @@ import { getViewBarFilterDropdownId } from '@/views/utils/getViewBarFilterDropdo
import { useResetFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useResetFilterDropdown';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
import { t } from '@lingui/core/macro';
+import { LightButton } from 'twenty-ui/components';
import { IconPlus } from 'twenty-ui/icon';
-import { LightButton } from 'twenty-ui/primitives/input';
export const ViewBarDetailsAddFilterButton = () => {
const { toggleDropdown } = useToggleDropdown();
@@ -23,10 +23,9 @@ export const ViewBarDetailsAddFilterButton = () => {
return (
<LightButton
+ emphasis="subtle"
onClick={handleClick}
- Icon={IconPlus}
- title={t`Add filter`}
- accent="tertiary"
- />
+ startIcon={<IconPlus />}
+ >{t`Add filter`}</LightButton>
);
};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx
index c1af1e8c389..76ba5125e1a 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerCreateButton.tsx
@@ -43,16 +43,13 @@ export const ViewPickerCreateButton = () => {
if (viewPickerMode === 'edit') {
return (
<Button
- title={t`Delete`}
onClick={destroyViewFromCurrentState}
- accent="danger"
fullWidth
- size="small"
- justify="center"
- focus={false}
- variant="secondary"
+ size="sm"
disabled={viewPickerIsPersisting}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
);
}
@@ -62,13 +59,12 @@ export const ViewPickerCreateButton = () => {
) {
return (
<Button
- title={t`Go to Settings`}
onClick={navigateToSelectSettings}
- size="small"
- accent="blue"
+ size="sm"
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Go to Settings`}</Button>
);
}
@@ -78,13 +74,12 @@ export const ViewPickerCreateButton = () => {
) {
return (
<Button
- title={t`Go to Settings`}
onClick={navigateToDateFieldSettings}
- size="small"
- accent="blue"
+ size="sm"
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Go to Settings`}</Button>
);
}
@@ -94,13 +89,10 @@ export const ViewPickerCreateButton = () => {
) {
return (
<Button
- title={t`Create`}
onClick={handleCreateButtonClick}
- ariaLabel={t`Create new view`}
- accent="blue"
+ aria-label={t`Create new view`}
fullWidth
- size="small"
- justify="center"
+ size="sm"
disabled={
viewPickerIsPersisting ||
(viewPickerType === ViewType.KANBAN &&
@@ -108,7 +100,9 @@ export const ViewPickerCreateButton = () => {
(viewPickerType === ViewType.CALENDAR &&
viewPickerCalendarFieldMetadataId === '')
}
- />
+ variant="solid"
+ color="accent"
+ >{t`Create`}</Button>
);
}
};
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
index a872f12bd2b..831fc9b219e 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerEditButton.tsx
@@ -43,16 +43,13 @@ export const ViewPickerEditButton = () => {
if (viewPickerMode === 'edit') {
return (
<Button
- title={t`Delete`}
onClick={destroyViewFromCurrentState}
- accent="danger"
fullWidth
- size="small"
- justify="center"
- focus={false}
- variant="secondary"
+ size="sm"
disabled={viewPickerIsPersisting || isLastView}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
);
}
@@ -62,13 +59,12 @@ export const ViewPickerEditButton = () => {
) {
return (
<Button
- title={t`Go to Settings`}
onClick={navigateToSelectSettings}
- size="small"
- accent="blue"
+ size="sm"
fullWidth
- justify="center"
- />
+ variant="solid"
+ color="accent"
+ >{t`Go to Settings`}</Button>
);
}
@@ -78,18 +74,17 @@ export const ViewPickerEditButton = () => {
) {
return (
<Button
- title={t`Create`}
onClick={createViewFromCurrentState}
- accent="blue"
fullWidth
- size="small"
- justify="center"
+ size="sm"
disabled={
viewPickerIsPersisting ||
(viewPickerType === ViewType.KANBAN &&
viewPickerMainGroupByFieldMetadataId === '')
}
- />
+ variant="solid"
+ color="accent"
+ >{t`Create`}</Button>
);
}
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepCmdEnterButton.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepCmdEnterButton.tsx
index dcd73f0d29c..3aea8dc8cc8 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepCmdEnterButton.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepCmdEnterButton.tsx
@@ -22,13 +22,14 @@ export const WorkflowStepCmdEnterButton = ({
return (
<Button
- title={title}
- variant={disabled ? 'secondary' : 'primary'}
- accent="blue"
- size="small"
+ size="sm"
onClick={onClick}
disabled={disabled}
hotkeys={[getOsControlSymbol(), '⏎']}
- />
+ variant={disabled ? 'outline' : 'solid'}
+ color="accent"
+ >
+ {title}
+ </Button>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
index 8f2082b4b88..3ee8b0c1124 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
@@ -168,15 +168,13 @@ export const WorkflowStepFooter = ({
const deleteButton = (
<Button
- size="small"
- title={t`Delete`}
+ size="sm"
onClick={() => {
deleteStep(stepId);
}}
- Icon={IconTrash}
- accent="danger"
- inverted
- />
+ startIcon={<IconTrash />}
+ color="danger"
+ >{t`Delete`}</Button>
);
return (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
index 7bfd8567e34..338742292e3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterAddRootStepFilterButton.tsx
@@ -19,15 +19,13 @@ export const WorkflowStepFilterAddRootStepFilterButton = () => {
return (
<StyledButtonContainer>
<Button
- Icon={IconFilter}
- size="small"
- variant="secondary"
- accent="default"
+ startIcon={<IconFilter />}
+ size="sm"
onClick={addRootStepFilter}
- ariaLabel={t`Add first filter`}
- title={t`Add first filter`}
+ aria-label={t`Add first filter`}
disabled={readonly}
- />
+ variant="outline"
+ >{t`Add first filter`}</Button>
</StyledButtonContainer>
);
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
index 3741dd916fb..e6a5b09823d 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionEmailBase.tsx
@@ -321,11 +321,9 @@ export const WorkflowEditActionEmailBase = ({
dropdownPlacement="bottom-start"
clickableComponent={
<Button
- title={t`Advanced options`}
- variant="secondary"
- accent="default"
- size="small"
- />
+ size="sm"
+ variant="outline"
+ >{t`Advanced options`}</Button>
}
dropdownComponents={
<DropdownContent
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
index c203d8c7e17..9f1a7d6e92a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowFindRecordsSorts.tsx
@@ -139,7 +139,8 @@ export const WorkflowFindRecordsSorts = ({
{!readonly && (
<Button
onClick={() => handleRemoveSort(sort.id)}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
disabled={readonly}
/>
)}
@@ -149,15 +150,13 @@ export const WorkflowFindRecordsSorts = ({
<StyledAddButtonContainer>
<Button
- Icon={IconArrowsSort}
- size="small"
- variant="secondary"
- accent="default"
+ startIcon={<IconArrowsSort />}
+ size="sm"
onClick={handleAddSort}
- ariaLabel={t`Add sort`}
- title={t`Add sort`}
+ aria-label={t`Add sort`}
disabled={readonly}
- />
+ variant="outline"
+ >{t`Add sort`}</Button>
</StyledAddButtonContainer>
</StyledContainer>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
index ae659491e2e..dbc530d92e8 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/KeyValuePairInput.tsx
@@ -167,10 +167,15 @@ export const KeyValuePairInput = ({
(pair.id !== pairs[pairs.length - 1].id && !pair.isAutoSet ? (
<Button
onClick={() => handleRemovePair(pair.id)}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
/>
) : (
- <Button Icon={IconTrash} disabled={true} />
+ <Button
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
+ disabled={true}
+ />
))}
</StyledKeyValueContainer>
))}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
index 5f749fe3f46..184128a955f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/if-else-action/components/WorkflowEditActionIfElseBody.tsx
@@ -261,14 +261,13 @@ export const WorkflowEditActionIfElseBody = ({
<>
<HorizontalSeparator noMargin />
<Button
- Icon={IconPlus}
- title={t`Add route`}
- variant="secondary"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={(event: React.MouseEvent<HTMLButtonElement>) =>
handleAddRoute(event)
}
- />
+ variant="outline"
+ >{t`Add route`}</Button>
</>
)}
<WorkflowIfElseBranchEditor
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
index 0b2583e27b8..18b8b00bd3a 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteLink.tsx
@@ -40,14 +40,13 @@ export const WorkspaceInviteLink = ({
/>
</StyledLinkContainer>
<Button
- Icon={IconLink}
- variant="primary"
- accent="blue"
- title={t`Copy link`}
+ startIcon={<IconLink />}
onClick={() => {
copyToClipboard(inviteLink, t`Link copied to clipboard`);
}}
- />
+ variant="solid"
+ color="accent"
+ >{t`Copy link`}</Button>
</StyledContainer>
);
};
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
index 93406fed28c..4c028670564 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
@@ -216,13 +216,12 @@ export const WorkspaceInviteTeam = ({ roles }: WorkspaceInviteTeamProps) => {
/>
</StyledRoleContainer>
<Button
- Icon={IconSend}
- variant="primary"
- accent="blue"
- title={t`Invite`}
+ startIcon={<IconSend />}
type="submit"
disabled={isEmailsEmpty || !!errors.emails}
- />
+ variant="solid"
+ color="accent"
+ >{t`Invite`}</Button>
</StyledContainer>
</form>
);
diff --git a/packages/twenty-front/src/pages/auth/PasswordReset.tsx b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
index 6e112601ce6..6f727a78dd1 100644
--- a/packages/twenty-front/src/pages/auth/PasswordReset.tsx
+++ b/packages/twenty-front/src/pages/auth/PasswordReset.tsx
@@ -29,7 +29,7 @@ import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
import { useParams } from 'react-router-dom';
import { AppPath } from 'twenty-shared/types';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { AnimatedEaseIn } from 'twenty-ui/primitives/layout';
import { ModalContent } from 'twenty-ui/primitives/surfaces';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -293,12 +293,13 @@ export const PasswordReset = () => {
<StyledMainButtonContainer>
<MainButton
- variant="secondary"
- title={passwordActionLabel}
type="submit"
fullWidth
disabled={isUpdatingPassword}
- />
+ variant="outline"
+ >
+ {passwordActionLabel}
+ </MainButton>
</StyledMainButtonContainer>
</StyledForm>
)}
diff --git a/packages/twenty-front/src/pages/not-found/NotFound.tsx b/packages/twenty-front/src/pages/not-found/NotFound.tsx
index 18449219c50..9ac9980e598 100644
--- a/packages/twenty-front/src/pages/not-found/NotFound.tsx
+++ b/packages/twenty-front/src/pages/not-found/NotFound.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { Trans, useLingui } from '@lingui/react/macro';
import { lazy, Suspense } from 'react';
@@ -11,7 +12,7 @@ import { AppPath } from 'twenty-shared/types';
import { RootStackingContextZIndices } from '@/ui/layout/constants/RootStackingContextZIndices';
import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';
import { styled } from '@linaria/react';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import {
AnimatedPlaceholder,
@@ -20,7 +21,6 @@ import {
AnimatedPlaceholderErrorSubTitle,
AnimatedPlaceholderErrorTitle,
} from 'twenty-ui/primitives/feedback';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
const StyledBackDrop = styled.div`
align-items: center;
@@ -62,9 +62,11 @@ export const NotFound = () => {
</AnimatedPlaceholderErrorSubTitle>
</AnimatedPlaceholderEmptyTextContainer>
<StyledButtonContainer>
- <UndecoratedLink to={AppPath.Index}>
- <MainButton title={t`Back to content`} fullWidth />
- </UndecoratedLink>
+ <NavigationButton
+ buttonComponent={MainButton}
+ to={AppPath.Index}
+ fullWidth
+ >{t`Back to content`}</NavigationButton>
</StyledButtonContainer>
</AnimatedPlaceholderErrorContainer>
</StyledBackDrop>
diff --git a/packages/twenty-front/src/pages/onboarding/BookCall.tsx b/packages/twenty-front/src/pages/onboarding/BookCall.tsx
index fd0c6d43592..4027ae711c3 100644
--- a/packages/twenty-front/src/pages/onboarding/BookCall.tsx
+++ b/packages/twenty-front/src/pages/onboarding/BookCall.tsx
@@ -1,5 +1,6 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { isNonEmptyString } from '@sniptt/guards';
-import { Link, Navigate } from 'react-router-dom';
+import { Navigate } from 'react-router-dom';
import { calendarBookingPageIdState } from '@/client-config/states/calendarBookingPageIdState';
import { BookCallEmbed } from '@/onboarding/components/BookCallEmbed';
@@ -14,8 +15,8 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { AppPath } from 'twenty-shared/types';
+import { LightButton } from 'twenty-ui/components';
import { IconChevronLeft } from 'twenty-ui/icon';
-import { LightButton } from 'twenty-ui/primitives/input';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
import { OnboardingStatus } from '~/generated-metadata/graphql';
@@ -83,9 +84,11 @@ export const BookCall = () => {
{isOnboardingStep ? (
<BookCallOnboardingStepActions />
) : (
- <Link to={AppPath.PlanRequired}>
- <LightButton Icon={IconChevronLeft} title={t`Back`} />
- </Link>
+ <NavigationButton
+ buttonComponent={LightButton}
+ to={AppPath.PlanRequired}
+ startIcon={<IconChevronLeft />}
+ >{t`Back`}</NavigationButton>
)}
</StyledFooter>
</OnboardingStepAnimatedItem>
diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
index 2f05b047923..9b685a73b17 100644
--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx
@@ -27,7 +27,7 @@ import { Controller, type SubmitHandler, useForm } from 'react-hook-form';
import { Key } from 'ts-key-enum';
import { isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
import { z } from 'zod';
@@ -284,11 +284,10 @@ export const CreateProfile = () => {
<OnboardingStepAnimatedItem index={3}>
<StyledButtonContainer>
<MainButton
- title={t`Continue`}
onClick={handleSubmit(onSubmit)}
disabled={!isValid || isSubmitting || isNavigating}
fullWidth
- />
+ >{t`Continue`}</MainButton>
</StyledButtonContainer>
</OnboardingStepAnimatedItem>
</StyledOnboardingStepPage>
diff --git a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx
index ff966b873b3..c88d4d6ea3e 100644
--- a/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx
+++ b/packages/twenty-front/src/pages/onboarding/ImportContacts.tsx
@@ -12,8 +12,8 @@ import { ONBOARDING_CONTENT_BLOCK_WIDTH } from '@/onboarding/constants/Onboardin
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 { MainButton } from 'twenty-ui/primitives/input';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
const StyledOnboardingStep = styled(StyledOnboardingStepPage)`
@@ -96,19 +96,17 @@ export const ImportContacts = ({
<StyledButtons>
{isDefined(onContinueWithMicrosoft) && (
<MainButton
- title={t`Continue with Microsoft`}
fullWidth
onClick={onContinueWithMicrosoft}
- Icon={() => <IconMicrosoft size={theme.icon.size.md} />}
- />
+ startIcon={<IconMicrosoft size={theme.icon.size.md} />}
+ >{t`Continue with Microsoft`}</MainButton>
)}
{isDefined(onContinueWithGoogle) && (
<MainButton
- title={t`Continue with Google`}
fullWidth
onClick={onContinueWithGoogle}
- Icon={() => <IconGoogle size={theme.icon.size.md} />}
- />
+ startIcon={<IconGoogle size={theme.icon.size.md} />}
+ >{t`Continue with Google`}</MainButton>
)}
</StyledButtons>
{isDefined(onSkip) && <OnboardingSkipButton onClick={onSkip} />}
diff --git a/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
index 14d126e0eeb..205dfeefa85 100644
--- a/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InstallAppsContent.tsx
@@ -11,9 +11,10 @@ import { type OnboardingInstallableApp } from '@/onboarding/types/OnboardingInst
import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { IconCheck, IconPlus } from 'twenty-ui/icon';
-import { IconButton, MainButton } from 'twenty-ui/primitives/input';
+import { IconButton } from 'twenty-ui/primitives/input';
import { AnimatedIconCrossfade } from 'twenty-ui/primitives/layout';
import { themeCssVariables, useTheme } from 'twenty-ui/theme-constants';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
@@ -202,13 +203,12 @@ export const InstallAppsContent = ({
{hasApps && (
<StyledInstallButton>
<MainButton
- title={t`Install`}
onClick={onInstall}
disabled={
isCompleting || !isNonEmptyArray(selectedUniversalIdentifiers)
}
fullWidth
- />
+ >{t`Install`}</MainButton>
</StyledInstallButton>
)}
<OnboardingSkipButton onClick={onSkip} disabled={isCompleting} />
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index b6e5c2ce7cb..70869134352 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -18,9 +18,9 @@ import { useLingui } from '@lingui/react/macro';
import { AnimatePresence, motion } from 'framer-motion';
import { Controller } from 'react-hook-form';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { IconX } from 'twenty-ui/icon';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const StyledForm = styled.div`
@@ -128,12 +128,11 @@ export const InviteTeam = () => {
<OnboardingStepAnimatedItem index={4}>
<StyledFooter>
<MainButton
- title={t`Invite`}
- Icon={() => (isSubmitting || isNavigating ? <Loader /> : null)}
+ startIcon={isSubmitting || isNavigating ? <Loader /> : null}
disabled={!isValid || isSubmitting || isNavigating}
onClick={handleSubmit(onSubmit)}
fullWidth
- />
+ >{t`Invite`}</MainButton>
<OnboardingSkipButton
onClick={handleSkip}
disabled={isSubmitting || isNavigating}
diff --git a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
index baae1dc7b88..a8731adf44f 100644
--- a/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
+++ b/packages/twenty-front/src/pages/onboarding/PaymentSuccess.tsx
@@ -10,7 +10,7 @@ import { AnimatePresence, motion } from 'framer-motion';
import { useEffect, useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { useToast } from 'twenty-ui/primitives/feedback';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
const SUBSCRIPTION_CONFIRMATION_POLL_INTERVAL_MS = 2000;
@@ -109,7 +109,7 @@ export const PaymentSuccess = () => {
</AnimatePresence>
<OnboardingAnimatedReveal isVisible={hasTimedOut}>
<StyledRetryButtonContainer>
- <MainButton title={t`Retry`} onClick={handleRetry} fullWidth />
+ <MainButton onClick={handleRetry} fullWidth>{t`Retry`}</MainButton>
</StyledRetryButtonContainer>
</OnboardingAnimatedReveal>
</OnboardingVerifyLayout>
diff --git a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
index c62601174e6..917b60ad483 100644
--- a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
+++ b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
@@ -27,8 +27,9 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { Elements, PaymentElement } from '@stripe/react-stripe-js';
import { AppPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
+import { MainButton } from 'twenty-ui/components';
import { Info, Loader } from 'twenty-ui/primitives/feedback';
-import { MainButton, RadioGroup } from 'twenty-ui/primitives/input';
+import { RadioGroup } from 'twenty-ui/primitives/input';
import { CAL_LINK, ClickToActionLink } from 'twenty-ui/primitives/navigation';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
import {
@@ -102,12 +103,11 @@ const UpgradeFreeTrialSubmitButton = ({
return (
<MainButton
- title={t`Continue`}
onClick={handleSubmit}
fullWidth
- Icon={() => (isSubmitting ? <Loader /> : null)}
+ startIcon={isSubmitting ? <Loader /> : null}
disabled={!isStripeReady || isSubmitting}
- />
+ >{t`Continue`}</MainButton>
);
};
@@ -231,16 +231,15 @@ const UpgradeFreeTrialContent = ({
recurringInterval={billingCheckoutSession.interval}
/>
) : (
- <MainButton title={t`Continue`} fullWidth disabled />
+ <MainButton fullWidth disabled>{t`Continue`}</MainButton>
)
) : (
<MainButton
- title={t`Continue`}
onClick={handleCheckoutSessionClick}
fullWidth
- Icon={() => (isCheckoutSubmitting ? <Loader /> : null)}
+ startIcon={isCheckoutSubmitting ? <Loader /> : null}
disabled={isCheckoutSubmitting}
- />
+ >{t`Continue`}</MainButton>
)}
<StyledLinkGroup>
<ClickToActionLink onClick={signOut}>
diff --git a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
index d328ecf9722..8986d834c9f 100644
--- a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
+++ b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
@@ -17,7 +17,7 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useCallback, useEffect, useRef } from 'react';
import { isDefined } from 'twenty-shared/utils';
-import { MainButton } from 'twenty-ui/primitives/input';
+import { MainButton } from 'twenty-ui/components';
import { themeCssVariables } from 'twenty-ui/theme-constants';
import { ActivateWorkspaceDocument } from '~/generated-metadata/graphql';
@@ -147,13 +147,12 @@ export const WorkspaceActivation = () => {
<OnboardingStepAnimatedItem index={3}>
<StyledButtonContainer>
<MainButton
- title={t`Retry`}
onClick={() => {
void activate();
}}
disabled={isActivating}
fullWidth
- />
+ >{t`Retry`}</MainButton>
</StyledButtonContainer>
</OnboardingStepAnimatedItem>
</StyledContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
index 2ea1c25a03f..883ada56ba7 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepCalendar.tsx
@@ -46,14 +46,13 @@ export const SettingsAccountsConfigurationStepCalendar = ({
]}
actionButton={
<Button
- Icon={IconDeviceFloppy}
- title={t`Finish Setup`}
- accent="blue"
- size="small"
- variant="primary"
+ startIcon={<IconDeviceFloppy />}
+ size="sm"
onClick={onAddAccount}
disabled={isSubmitting}
- />
+ variant="solid"
+ color="accent"
+ >{t`Finish Setup`}</Button>
}
>
<SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
index adc575d227d..e469cc5cedb 100644
--- a/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/SettingsAccountsConfigurationStepEmail.tsx
@@ -45,24 +45,22 @@ export const SettingsAccountsConfigurationStepEmail = ({
actionButton={
hasNextStep ? (
<Button
- Icon={IconChevronRight}
- title={t`Next`}
- accent="blue"
- size="small"
- variant="secondary"
+ startIcon={<IconChevronRight />}
+ size="sm"
onClick={onNext}
disabled={isSubmitting}
- />
+ variant="outline"
+ color="accent"
+ >{t`Next`}</Button>
) : (
<Button
- Icon={IconPlus}
- title={t`Add account`}
- accent="blue"
- size="small"
- variant="primary"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={onAddAccount}
disabled={isSubmitting}
- />
+ variant="solid"
+ color="accent"
+ >{t`Add account`}</Button>
)
}
>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
index 6ad4198dcb8..c53462952d3 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useClientConfig } from '@/client-config/hooks/useClientConfig';
import { AI_ADMIN_PATH } from '@/settings/admin-panel/ai/constants/AiAdminPath';
import { AI_PROVIDER_SOURCE } from '@/settings/admin-panel/ai/constants/AiProviderSource';
@@ -35,7 +36,7 @@ import {
} from 'twenty-ui/icon';
import { Button, SearchInput } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { RoundedLink, UndecoratedLink } from 'twenty-ui/primitives/navigation';
+import { RoundedLink } from 'twenty-ui/primitives/navigation';
import { H2Title } from 'twenty-ui/primitives/typography';
import {
type AdminAiModelConfig,
@@ -396,13 +397,11 @@ export const SettingsAdminAiProviderDetail = () => {
)}
{isCustomProvider && newModelPath && (
- <UndecoratedLink to={newModelPath}>
- <Button
- Icon={IconPlus}
- title={t`Add Model`}
- variant="secondary"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={newModelPath}
+ startIcon={<IconPlus />}
+ variant="outline"
+ >{t`Add Model`}</NavigationButton>
)}
</Section>
@@ -413,12 +412,11 @@ export const SettingsAdminAiProviderDetail = () => {
description={t`Remove this provider and disconnect all its models`}
/>
<Button
- Icon={IconTrash}
- title={t`Remove provider`}
- variant="secondary"
- accent="danger"
+ startIcon={<IconTrash />}
onClick={() => openModal(REMOVE_PROVIDER_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Remove provider`}</Button>
</Section>
)}
</SettingsPageContainer>
@@ -429,7 +427,7 @@ export const SettingsAdminAiProviderDetail = () => {
subtitle={t`This will disconnect all models from this provider. Models will no longer be available until a new provider is configured.`}
onConfirmClick={handleRemoveProvider}
confirmButtonText={t`Remove`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
<ConfirmationModal
@@ -438,7 +436,7 @@ export const SettingsAdminAiProviderDetail = () => {
subtitle={t`This model will be removed from the provider. You can re-add it later.`}
onConfirmClick={handleRemoveModel}
confirmButtonText={t`Remove`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
/>
</SettingsPageLayout>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
index 827ca26a236..5f4324853f6 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx
@@ -209,13 +209,12 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
<StyledDangerButtonGroup>
<Button
id={DELETE_REGISTRATION_BUTTON_ID}
- accent="danger"
- variant="secondary"
- title={t`Delete app`}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
disabled={hasActiveInstalls}
onClick={() => openModal(DELETE_REGISTRATION_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete app`}</Button>
{hasActiveInstalls && (
<AppTooltip
anchorSelect={`#${DELETE_REGISTRATION_BUTTON_ID}`}
@@ -229,21 +228,17 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
{isUnclaimed
? fromAdmin && (
<Button
- accent="default"
- variant="secondary"
- title={t`Claim ownership`}
- Icon={IconUserPlus}
+ startIcon={<IconUserPlus />}
onClick={() => openModal(CLAIM_OWNERSHIP_MODAL_ID)}
- />
+ variant="outline"
+ >{t`Claim ownership`}</Button>
)
: !isUnclaimed && (
<Button
- accent="default"
- variant="secondary"
- title={t`Transfer ownership`}
- Icon={IconShare}
+ startIcon={<IconShare />}
onClick={() => openModal(TRANSFER_OWNERSHIP_MODAL_ID)}
- />
+ variant="outline"
+ >{t`Transfer ownership`}</Button>
)}
</StyledDangerButtonGroup>
</Section>
@@ -276,7 +271,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
}
onConfirmClick={handleClaimOwnership}
confirmButtonText={t`Claim`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isClaiming}
/>
@@ -316,20 +311,18 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({
closeModal(TRANSFER_OWNERSHIP_MODAL_ID);
setTransferSubdomain('');
}}
- variant="secondary"
- title={t`Cancel`}
fullWidth
- />
+ variant="outline"
+ >{t`Cancel`}</StyledAppModalButton>
<StyledAppModalButton
onClick={handleTransferOwnership}
- variant="secondary"
- accent="danger"
- title={t`Transfer`}
disabled={
!isNonEmptyString(transferSubdomain.trim()) || isTransferring
}
fullWidth
- />
+ variant="outline"
+ color="danger"
+ >{t`Transfer`}</StyledAppModalButton>
</StyledAppModal>
</>
);
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
index 6642dfa58d9..208c4e3d74b 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminChats.tsx
@@ -80,13 +80,12 @@ export const SettingsAdminChats = () => {
{hasMore && !isDefined(error) && (
<StyledShowMoreContainer>
<Button
- title={t`Show more`}
- Icon={IconDotsVertical}
+ startIcon={<IconDotsVertical />}
onClick={handleShowMore}
disabled={isShowMoreDisabled}
- size="small"
- variant="secondary"
- />
+ size="sm"
+ variant="outline"
+ >{t`Show more`}</Button>
</StyledShowMoreContainer>
)}
</Section>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
index c5b397fc642..2301821fef6 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInferredVersion.tsx
@@ -99,11 +99,10 @@ export const SettingsAdminInferredVersion = () => {
/>
<StyledRefreshButtonContainer>
<Button
- variant="secondary"
- title={t`Refresh status`}
onClick={handleRefreshUpgradeStatus}
disabled={isRefreshingUpgradeStatus || isLoadingUpgradeStatus}
- />
+ variant="outline"
+ >{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
</Section>
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
index c18103e3d9f..4db440182c1 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
@@ -169,11 +169,10 @@ export const SettingsAdminInstanceStatus = () => {
/>
<StyledRefreshButtonContainer>
<Button
- variant="secondary"
- title={t`Refresh status`}
onClick={handleRefreshUpgradeStatus}
disabled={isRefreshingUpgradeStatus || isLoadingUpgradeStatus}
- />
+ variant="outline"
+ >{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
</Section>
</SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
index 179c2980cc3..57c15ee8dc7 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminUserDetail.tsx
@@ -198,14 +198,7 @@ export const SettingsAdminUserDetail = () => {
user.id !== currentUser.id && (
<StyledButtonContainer>
<Button
- Icon={IconEyeShare}
- variant="primary"
- accent="default"
- title={
- activeWorkspace.allowImpersonation === false
- ? t`Impersonation is disabled for this workspace`
- : t`Impersonate`
- }
+ startIcon={<IconEyeShare />}
onClick={() =>
handleImpersonate(user.id, activeWorkspace.id)
}
@@ -213,7 +206,12 @@ export const SettingsAdminUserDetail = () => {
impersonatingUserId !== null ||
activeWorkspace.allowImpersonation === false
}
- />
+ variant="outline"
+ >
+ {activeWorkspace.allowImpersonation === false
+ ? t`Impersonation is disabled for this workspace`
+ : t`Impersonate`}
+ </Button>
</StyledButtonContainer>
)}
</Section>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
index 0b6bc678463..697c61a6e12 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspaceDetail.tsx
@@ -399,17 +399,16 @@ export const SettingsAdminWorkspaceDetail = () => {
isDefined(currentUser?.id) &&
userId !== currentUser.id && (
<Button
- Icon={IconEyeShare}
- variant="secondary"
- size="small"
- title={t`Impersonate`}
+ startIcon={<IconEyeShare />}
+ size="sm"
onClick={(e) => {
e.preventDefault();
e.stopPropagation();
handleImpersonate(userId, workspaceId!);
}}
disabled={impersonatingUserId === userId}
- />
+ variant="outline"
+ >{t`Impersonate`}</Button>
)}
</TableCell>
</TableRow>
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
index 59ccf8d3682..8a3bed17a43 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminWorkspacesStatus.tsx
@@ -100,11 +100,10 @@ export const SettingsAdminWorkspacesStatus = () => {
/>
<StyledRefreshButtonContainer>
<Button
- variant="secondary"
- title={t`Refresh status`}
onClick={handleRefreshUpgradeStatus}
disabled={isRefreshingUpgradeStatus || isLoadingUpgradeStatus}
- />
+ variant="outline"
+ >{t`Refresh status`}</Button>
</StyledRefreshButtonContainer>
</Section>
<Section>
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
index 58a8fab9027..541bc4acf9b 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAI.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { SettingsDiscoveryHeroCard } from '@/settings/components/SettingsDiscoveryHeroCard';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
@@ -18,7 +20,6 @@ import {
} from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { SettingsAgentSkillsTab } from '~/pages/settings/ai/components/SettingsAgentSkillsTab';
import { SettingsAgentToolsTab } from '~/pages/settings/ai/components/SettingsAgentToolsTab';
import { SettingsAiSystemPromptsSection } from '~/pages/settings/ai/components/SettingsAiSystemPromptsSection';
@@ -86,23 +87,22 @@ export const SettingsAI = () => {
}
actionButton={
isSkillsTab ? (
- <UndecoratedLink to={getSettingsPath(SettingsPath.AiNewSkill)}>
- <Button
- Icon={IconPlus}
- title={t`New Skill`}
- accent="blue"
- size="small"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.AiNewSkill)}
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="solid"
+ color="accent"
+ >{t`New Skill`}</NavigationButton>
) : isToolsTab ? (
<Button
- Icon={IconPlus}
- title={t`New Tool`}
- accent="blue"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={handleCreateTool}
disabled={isCreatingTool}
- />
+ variant="solid"
+ color="accent"
+ >{t`New Tool`}</Button>
) : undefined
}
links={[
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
index 9ef90414519..8bac0c919c3 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsToolDetail.tsx
@@ -252,13 +252,12 @@ export const SettingsToolDetail = () => {
description={t`Delete this tool`}
/>
<Button
- Icon={IconTrash}
- title={t`Delete`}
- accent="danger"
- size="small"
- variant="secondary"
+ startIcon={<IconTrash />}
+ size="sm"
onClick={() => openModal(DELETE_TOOL_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
</Section>
)}
</>
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index 7745b0b394d..c19497e47b6 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -146,14 +146,13 @@ export const SettingsAgentEvalsTab = ({
fullWidth
/>
<Button
- Icon={IconPlus}
- variant="primary"
- accent="blue"
- size="small"
- title={t`Add`}
+ startIcon={<IconPlus />}
+ size="sm"
onClick={handleAddInput}
disabled={disabled || !newInput.trim()}
- />
+ variant="solid"
+ color="accent"
+ >{t`Add`}</Button>
</StyledInputContainer>
{evalInputs.length > 0 ? (
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
index 8393f0f54ab..4a279b1b8e7 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentLogsTab.tsx
@@ -217,12 +217,11 @@ export const SettingsAgentLogsTab = ({
<Status color="blue" loading>{t`Evaluating`}</Status>
) : (
<Button
- size="small"
- variant="secondary"
+ size="sm"
onClick={() => handleEvaluateTurn(turn.id)}
disabled={evaluating}
- title={t`Evaluate`}
- />
+ variant="outline"
+ >{t`Evaluate`}</Button>
)}
</TableCell>
<TableCell
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
index 12f34685405..4e11964bf00 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
@@ -155,12 +155,11 @@ export const SettingsAgentRoleTab = ({
description={t`Create a role to define permissions for this agent.`}
/>
<Button
- Icon={IconPlus}
- title={t`Create Role`}
- variant="secondary"
+ startIcon={<IconPlus />}
onClick={handleCreateRole}
disabled={disabled || isCreatingRole}
- />
+ variant="outline"
+ >{t`Create Role`}</Button>
</>
) : (
<>
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
index e14e6a8a4f7..31774f7147a 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
@@ -160,12 +160,11 @@ export const SettingsAgentSettingsTab = ({
<Section>
<H2Title title={t`Danger zone`} description={t`Delete this agent`} />
<Button
- accent="danger"
- variant="secondary"
- title={t`Delete Agent`}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
onClick={() => openModal(DELETE_AGENT_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete Agent`}</Button>
</Section>
)}
{!disabled && agent && (
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
index 321d4c60454..dbec6759d1e 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsSkillDangerZone.tsx
@@ -80,20 +80,20 @@ export const SettingsSkillDangerZone = ({
/>
<StyledDangerButtonsContainer>
<Button
- Icon={skill.isActive ? IconArchive : IconArchiveOff}
- title={skill.isActive ? t`Deactivate` : t`Activate`}
- size="small"
+ startIcon={skill.isActive ? <IconArchive /> : <IconArchiveOff />}
+ size="sm"
onClick={handleToggleActive}
- />
+ >
+ {skill.isActive ? t`Deactivate` : t`Activate`}
+ </Button>
{skill.isCustom && (
<Button
- Icon={IconTrash}
- title={t`Delete`}
- size="small"
- accent="danger"
- variant="secondary"
+ startIcon={<IconTrash />}
+ size="sm"
onClick={() => openModal(DELETE_SKILL_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
)}
</StyledDangerButtonsContainer>
<ConfirmationModal
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
index ebacdaef525..8ba990f3533 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolParameterTable.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
@@ -24,8 +26,6 @@ import {
OverflowingTextWithTooltip,
TooltipDelay,
} from 'twenty-ui/primitives/surfaces';
-import { Button } from 'twenty-ui/primitives/input';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
type SchemaProperty = {
@@ -175,14 +175,12 @@ export const SettingsToolParameterTable = ({
)}
{functionLink && (
<StyledFooter>
- <UndecoratedLink to={functionLink}>
- <Button
- Icon={IconArrowUpRight}
- title={t`See function`}
- size="small"
- variant="secondary"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={functionLink}
+ startIcon={<IconArrowUpRight />}
+ size="sm"
+ variant="outline"
+ >{t`See function`}</NavigationButton>
</StyledFooter>
)}
</Table>
diff --git a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
index b17a049a6f7..c6ead3212f9 100644
--- a/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
+++ b/packages/twenty-front/src/pages/settings/api-webhooks/SettingsApiWebhooks.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';
@@ -23,7 +25,6 @@ import {
IconSparkles,
IconWebhook,
} from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
import { H2Title } from 'twenty-ui/primitives/typography';
@@ -141,13 +142,12 @@ export const SettingsApiWebhooks = () => {
<StyledTableContainer isMobile={isMobile}>
<SettingsApiKeysTable />
<StyledButtonContainer>
- <Button
- Icon={IconPlus}
- title={t`Create API key`}
- size="small"
- variant="secondary"
+ <NavigationButton
+ startIcon={<IconPlus />}
+ size="sm"
to={getSettingsPath(SettingsPath.NewApiKey)}
- />
+ variant="outline"
+ >{t`Create API key`}</NavigationButton>
</StyledButtonContainer>
</StyledTableContainer>
</Section>
@@ -170,13 +170,12 @@ export const SettingsApiWebhooks = () => {
<StyledTableContainer isMobile={isMobile}>
<SettingsWebhooksTable />
<StyledButtonContainer>
- <Button
- Icon={IconPlus}
- title={t`Create webhook`}
- size="small"
- variant="secondary"
+ <NavigationButton
+ startIcon={<IconPlus />}
+ size="sm"
to={getSettingsPath(SettingsPath.NewWebhook)}
- />
+ variant="outline"
+ >{t`Create webhook`}</NavigationButton>
</StyledButtonContainer>
</StyledTableContainer>
</Section>
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
index aee5aae11f1..34630353e75 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
@@ -331,29 +331,25 @@ export const SettingsApplicationConnectionDetail = () => {
<StyledActions>
{connection.authFailedAt && (
<Button
- title={t`Reconnect`}
- Icon={IconRefresh}
- variant="secondary"
- accent="blue"
+ startIcon={<IconRefresh />}
onClick={handleReconnect}
- />
+ variant="outline"
+ color="accent"
+ >{t`Reconnect`}</Button>
)}
{connection.visibility !== 'workspace' && (
<Button
- title={t`Share with workspace`}
- Icon={IconUsers}
- variant="secondary"
- accent="default"
+ startIcon={<IconUsers />}
onClick={() => openModal(shareWithWorkspaceModalId)}
- />
+ variant="outline"
+ >{t`Share with workspace`}</Button>
)}
<Button
- title={t`Disconnect`}
- Icon={IconTrash}
- variant="secondary"
- accent="danger"
+ startIcon={<IconTrash />}
onClick={() => openModal(deleteModalId)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Disconnect`}</Button>
</StyledActions>
</Section>
<Section>
@@ -406,7 +402,7 @@ export const SettingsApplicationConnectionDetail = () => {
}
onConfirmClick={handleShareWithWorkspace}
confirmButtonText={t`Reconnect and share`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
/>
</>
)}
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
index 46d71c85fe8..98903f24f76 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
@@ -193,23 +193,21 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({
{!hasFailed && !isExpanded && totalCount > INITIAL_VISIBLE_WORKSPACES && (
<StyledButtonContainer>
<Button
- title={t`Show all`}
- Icon={IconChevronDown}
- variant="secondary"
- size="small"
+ startIcon={<IconChevronDown />}
+ size="sm"
onClick={() => setIsExpanded(true)}
- />
+ variant="outline"
+ >{t`Show all`}</Button>
</StyledButtonContainer>
)}
{!hasFailed && isExpanded && hasMore && (
<StyledButtonContainer>
<Button
- title={t`Show more`}
- Icon={IconDotsVertical}
- variant="secondary"
- size="small"
+ startIcon={<IconDotsVertical />}
+ size="sm"
onClick={handleShowMore}
- />
+ variant="outline"
+ >{t`Show more`}</Button>
</StyledButtonContainer>
)}
</StyledSection>
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsInput.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsInput.tsx
index c8d12723182..c4f08aeb765 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsInput.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationRedirectURIsInput.tsx
@@ -88,7 +88,7 @@ export const SettingsApplicationRegistrationRedirectURIsInput = ({
)}
/>
</StyledLinkContainer>
- <Button title={t`Add URI`} type="submit" />
+ <Button type="submit">{t`Add URI`}</Button>
</StyledContainer>
</form>
);
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
index 6232c2acf06..85cfcad64f5 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+import { isNonEmptyString } from '@sniptt/guards';
import { SettingsApplicationInstallPermissionValidationModal } from '@/marketplace/components/SettingsApplicationInstallPermissionValidationModal';
import { useInstallMarketplaceAppWithPermissionValidation } from '@/marketplace/hooks/useInstallMarketplaceAppWithPermissionValidation';
import { getMarketplaceAppDefaultRoleManifest } from '@/marketplace/utils/getMarketplaceAppDefaultRoleManifest';
@@ -61,12 +63,13 @@ export const SettingsApplicationRegistrationShareLinkButtons = ({
{installable && (
<>
<Button
- Icon={IconDownload}
- title={isInstalling ? t`Installing...` : t`Install`}
- variant={'secondary'}
+ startIcon={<IconDownload />}
onClick={requestInstall}
disabled={isInstalling}
- />
+ variant="outline"
+ >
+ {isInstalling ? t`Installing...` : t`Install`}
+ </Button>
<SettingsApplicationInstallPermissionValidationModal
modalInstanceId={modalInstanceId}
appDisplayName={displayName}
@@ -79,9 +82,7 @@ export const SettingsApplicationRegistrationShareLinkButtons = ({
)}
{withCopyButton && (
<Button
- Icon={IconCopy}
- title={t`Copy sharing link`}
- variant="secondary"
+ startIcon={<IconCopy />}
disabled={!shareLink}
onClick={async () => {
if (shareLink) {
@@ -91,15 +92,17 @@ export const SettingsApplicationRegistrationShareLinkButtons = ({
);
}
}}
- />
+ variant="outline"
+ >{t`Copy sharing link`}</Button>
)}
- <Button
- Icon={isNpmSource ? IconArrowUpRight : IconInfoCircle}
- title={isNpmSource ? t`See on marketplace` : t`See app page`}
- variant="secondary"
+ <NavigationButton
+ startIcon={isNpmSource ? <IconArrowUpRight /> : <IconInfoCircle />}
disabled={!shareLink}
- to={shareLink}
- />
+ to={isNonEmptyString(shareLink) ? shareLink : undefined}
+ variant="outline"
+ >
+ {isNpmSource ? t`See on marketplace` : t`See app page`}
+ </NavigationButton>
</StyledButtonGroup>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
index baf99adbd4c..c200eeda888 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsClaimApplicationSection.tsx
@@ -259,19 +259,17 @@ export const SettingsClaimApplicationSection = () => {
/>
</StyledInputContainer>
<Button
- title={t`Look up`}
- Icon={IconSearch}
+ startIcon={<IconSearch />}
onClick={handleLookup}
disabled={isLookingUp || lookupValue.trim().length === 0}
- />
+ >{t`Look up`}</Button>
{canSyncCatalog && (
<Button
- title={t`Sync catalog`}
- variant="secondary"
- Icon={IconRefresh}
+ startIcon={<IconRefresh />}
onClick={handleSync}
disabled={isSyncing}
- />
+ variant="outline"
+ >{t`Sync catalog`}</Button>
)}
</StyledRow>
@@ -301,12 +299,12 @@ export const SettingsClaimApplicationSection = () => {
</StyledHint>
<StyledRow>
<Button
- title={t`Claim with GitHub`}
- Icon={IconBrandGithub}
- accent="blue"
+ startIcon={<IconBrandGithub />}
onClick={handleClaimWithGithub}
disabled={isRedirectingToGithub}
- />
+ variant="solid"
+ color="accent"
+ >{t`Claim with GitHub`}</Button>
</StyledRow>
</StyledResultCard>
)}
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
index a35b505adb2..a6c197e1c85 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationConnectionsSection.tsx
@@ -161,11 +161,8 @@ export const SettingsApplicationConnectionsSection = ({
{isClientCredentialsConfigured && (
<StyledFooter>
<Button
- title={t`Add connection`}
- Icon={IconPlus}
- variant="secondary"
- accent="default"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
onClick={() =>
triggerAppOAuth({
applicationId,
@@ -173,7 +170,8 @@ export const SettingsApplicationConnectionsSection = ({
visibility: 'workspace',
})
}
- />
+ variant="outline"
+ >{t`Add connection`}</Button>
</StyledFooter>
)}
</Section>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
index cb707afdb13..9b7f0415663 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
@@ -68,8 +68,8 @@ export const SettingsApplicationRegistrationDistributionTab = ({
t`Command copied to clipboard`,
);
}}
- ariaLabel={t`Copy command`}
- Icon={IconCopy}
+ aria-label={t`Copy command`}
+ startIcon={<IconCopy />}
/>
}
/>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
index 01fedb6d793..451b8ac483c 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab.tsx
@@ -142,11 +142,10 @@ export const SettingsApplicationRegistrationOAuthTab = ({
/>
<StyledRotateContainer>
<Button
- Icon={IconRefresh}
- title={t`Rotate client secret`}
- variant="secondary"
+ startIcon={<IconRefresh />}
onClick={() => openModal(ROTATE_SECRET_MODAL_ID)}
- />
+ variant="outline"
+ >{t`Rotate client secret`}</Button>
</StyledRotateContainer>
</Section>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
index fa87a285048..06de5d05247 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationTimelineActivityTypeSettingsTab.tsx
@@ -135,13 +135,12 @@ export const SettingsApplicationTimelineActivityTypeSettingsTab = ({
description={t`Restore the activity type settings defined by the application`}
/>
<Button
- title={t`Reset to default`}
- variant="secondary"
- size="small"
- Icon={IconRestore}
+ size="sm"
+ startIcon={<IconRestore />}
disabled={disabled}
onClick={onReset}
- />
+ variant="outline"
+ >{t`Reset to default`}</Button>
</Section>
)}
</>
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
index bfc0ac6cf83..ea8c3a7739a 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationsDeveloperTab.tsx
@@ -86,8 +86,8 @@ export const SettingsApplicationsDeveloperTab = () => {
t`Commands copied to clipboard`,
);
}}
- ariaLabel={t`Copy commands`}
- Icon={IconCopy}
+ aria-label={t`Copy commands`}
+ startIcon={<IconCopy />}
/>
);
@@ -108,10 +108,8 @@ export const SettingsApplicationsDeveloperTab = () => {
<CommandBlock commands={createCommands} button={createCopyButton} />
<StyledButtonContainer>
<Button
- Icon={IconArrowUpRight}
- variant={'secondary'}
- size={'small'}
- title={t`Read documentation`}
+ startIcon={<IconArrowUpRight />}
+ size="sm"
onClick={() =>
window.open(
getDocumentationUrl({
@@ -121,7 +119,8 @@ export const SettingsApplicationsDeveloperTab = () => {
'_blank',
)
}
- />
+ variant="outline"
+ >{t`Read documentation`}</Button>
</StyledButtonContainer>
</Section>
diff --git a/packages/twenty-front/src/pages/settings/billing/SettingsBillingLimits.tsx b/packages/twenty-front/src/pages/settings/billing/SettingsBillingLimits.tsx
index 050ea7e47a7..01b13a05e81 100644
--- a/packages/twenty-front/src/pages/settings/billing/SettingsBillingLimits.tsx
+++ b/packages/twenty-front/src/pages/settings/billing/SettingsBillingLimits.tsx
@@ -1,9 +1,9 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
import { IconPlus } from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { SettingsBillingLimitsContent } from '@/settings/billing/components/SettingsBillingLimitsContent';
import { SettingsBillingPageLayout } from '@/settings/billing/components/SettingsBillingPageLayout';
@@ -14,14 +14,13 @@ export const SettingsBillingLimits = () => {
return (
<SettingsBillingPageLayout
actionButton={
- <UndecoratedLink to={getSettingsPath(SettingsPath.BillingNewLimit)}>
- <Button
- Icon={IconPlus}
- title={t`New limit`}
- accent="blue"
- size="small"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.BillingNewLimit)}
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="solid"
+ color="accent"
+ >{t`New limit`}</NavigationButton>
}
>
<SettingsBillingLimitsContent />
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
index 267c0e891a2..3e49f7bebf8 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceCommunicationGroupChannelDetail.tsx
@@ -154,14 +154,13 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
]}
actionButton={
<Button
- Icon={IconTrash}
- title={t`Delete`}
- variant="secondary"
- accent="danger"
- size="small"
+ startIcon={<IconTrash />}
+ size="sm"
disabled={deleting}
onClick={() => openModal(DELETE_EMAIL_GROUP_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
}
>
<SettingsPageContainer>
@@ -192,15 +191,14 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
/>
</StyledInputContainer>
<Button
- Icon={IconCopy}
- title={t`Copy`}
+ startIcon={<IconCopy />}
onClick={() =>
copyToClipboard(
forwardingAddress,
t`Forwarding address copied to clipboard`,
)
}
- />
+ >{t`Copy`}</Button>
</StyledInputRow>
</Section>
{isNonEmptyString(channel.displayName) && (
@@ -251,7 +249,7 @@ export const SettingsWorkspaceCommunicationGroupChannelDetail = () => {
subtitle={t`Are you sure you want to delete ${sourceHandle}? Inbound mail forwarded to this address and outbound replies from it will stop working.`}
onConfirmClick={handleDelete}
confirmButtonText={t`Delete`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
loading={deleting}
/>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
index 8680ea96391..9fdccf018e8 100644
--- a/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/communications/SettingsWorkspaceUnsubscribeTopicDetail.tsx
@@ -148,14 +148,13 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
]}
actionButton={
<Button
- Icon={IconTrash}
- title={t`Delete`}
- variant="secondary"
- accent="danger"
- size="small"
+ startIcon={<IconTrash />}
+ size="sm"
disabled={deleting}
onClick={() => openModal(DELETE_UNSUBSCRIBE_TOPIC_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
}
>
<SettingsPageContainer>
@@ -209,7 +208,7 @@ export const SettingsWorkspaceUnsubscribeTopicDetail = () => {
subtitle={t`Are you sure you want to delete ${topicName}? Recipients will no longer be able to opt out of this category.`}
onConfirmClick={handleDelete}
confirmButtonText={t`Delete`}
- confirmButtonAccent="danger"
+ confirmButtonColor="danger"
loading={deleting}
/>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
index fddb34309fe..8de0bad2988 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
@@ -1,3 +1,4 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
@@ -34,8 +35,6 @@ import {
IconPlus,
IconSettings,
} from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { useNavigateApp } from '~/hooks/useNavigateApp';
import { SETTINGS_OBJECT_DETAIL_TABS } from '~/pages/settings/data-model/constants/SettingsObjectDetailTabs';
import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';
@@ -167,26 +166,23 @@ export const SettingsObjectDetailPage = () => {
]}
actionButton={
<>
- <Button
- Icon={IconArrowUpRight}
- title={t`See records`}
- variant="tertiary"
- size="small"
+ <NavigationButton
+ startIcon={<IconArrowUpRight />}
+ size="sm"
to={getAppPath(AppPath.RecordIndexPage, {
objectNamePlural: objectMetadataItem.namePlural,
})}
- />
+ variant="ghost"
+ >{t`See records`}</NavigationButton>
{!readonly &&
activeTabId === SETTINGS_OBJECT_DETAIL_TABS.TABS_IDS.FIELDS && (
- <UndecoratedLink to="./new-field/select">
- <Button
- title={t`New Field`}
- variant="primary"
- size="small"
- accent="blue"
- Icon={IconPlus}
- />
- </UndecoratedLink>
+ <NavigationButton
+ to="./new-field/select"
+ size="sm"
+ startIcon={<IconPlus />}
+ variant="solid"
+ color="accent"
+ >{t`New Field`}</NavigationButton>
)}
</>
}
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 7c782e88994..95f61c82a10 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -428,29 +428,31 @@ export const SettingsObjectFieldEdit = () => {
/>
<StyledDangerButtons>
<Button
- Icon={
- fieldMetadataItem.isActive ? IconArchive : IconArchiveOff
+ startIcon={
+ fieldMetadataItem.isActive ? (
+ <IconArchive />
+ ) : (
+ <IconArchiveOff />
+ )
}
- variant="secondary"
- title={
- fieldMetadataItem.isActive ? t`Deactivate` : t`Activate`
- }
- size="small"
+ size="sm"
onClick={
fieldMetadataItem.isActive
? handleDeactivate
: handleActivate
}
- />
+ variant="outline"
+ >
+ {fieldMetadataItem.isActive ? t`Deactivate` : t`Activate`}
+ </Button>
{isCustomField && (
<Button
- Icon={IconTrash}
- variant="secondary"
- accent="danger"
- title={t`Delete`}
- size="small"
+ startIcon={<IconTrash />}
+ size="sm"
onClick={handleDelete}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
)}
</StyledDangerButtons>
</Section>
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
index 4984edf9a1c..5ce36162396 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjects.tsx
@@ -1,3 +1,5 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
@@ -12,7 +14,6 @@ import { getSettingsPath } from 'twenty-shared/utils';
import { IconEye, IconPlus, IconSparkle2 } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { H2Title } from 'twenty-ui/primitives/typography';
import { SettingsObjectTable } from '~/pages/settings/data-model/SettingsObjectTable';
@@ -40,21 +41,20 @@ export const SettingsObjects = () => {
actionButton={
isDDLLocked ? (
<Button
- Icon={IconPlus}
- title={t`Add object`}
- accent="blue"
- size="small"
+ startIcon={<IconPlus />}
+ size="sm"
disabled
- />
+ variant="solid"
+ color="accent"
+ >{t`Add object`}</Button>
) : (
- <UndecoratedLink to={getSettingsPath(SettingsPath.NewObject)}>
- <Button
- Icon={IconPlus}
- title={t`Add object`}
- accent="blue"
- size="small"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.NewObject)}
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="solid"
+ color="accent"
+ >{t`Add object`}</NavigationButton>
)
}
links={[
@@ -87,14 +87,12 @@ export const SettingsObjects = () => {
title={t`Visualize data model`}
description={t`See your data structure as an interactive diagram`}
/>
- <UndecoratedLink to={getSettingsPath(SettingsPath.ObjectOverview)}>
- <Button
- title={t`Visualize`}
- variant="secondary"
- size="medium"
- Icon={IconEye}
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.ObjectOverview)}
+ size="md"
+ startIcon={<IconEye />}
+ variant="outline"
+ >{t`Visualize`}</NavigationButton>
</Section>
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
index 599dbbd93a1..dac7af0737b 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
@@ -228,13 +228,12 @@ export const SettingsObjectNewFieldConfigure = () => {
}
trailing={
<Button
- title={t`Save`}
- variant="primary"
- size="small"
- accent="blue"
+ size="sm"
onClick={formConfig.handleSubmit(handleSave)}
disabled={!canSave || isSaving}
- />
+ variant="solid"
+ color="accent"
+ >{t`Save`}</Button>
}
/>
}
diff --git a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
index c35965ec533..206622e7b73 100644
--- a/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/api-keys/SettingsDevelopersApiKeyDetail.tsx
@@ -289,10 +289,9 @@ export const SettingsDevelopersApiKeyDetail = () => {
/>
<StyledInputContainer>
<Button
- title={t`Regenerate Key`}
- Icon={IconRepeat}
+ startIcon={<IconRepeat />}
onClick={() => openModal(REGENERATE_API_KEY_MODAL_ID)}
- />
+ >{t`Regenerate Key`}</Button>
<StyledInfo>
{formatExpiration(apiKey?.expiresAt || '', true, false)}
</StyledInfo>
@@ -339,12 +338,11 @@ export const SettingsDevelopersApiKeyDetail = () => {
description={t`Delete this integration`}
/>
<Button
- accent="danger"
- variant="secondary"
- title={t`Delete`}
- Icon={IconTrash}
+ startIcon={<IconTrash />}
onClick={() => openModal(DELETE_API_KEY_MODAL_ID)}
- />
+ variant="outline"
+ color="danger"
+ >{t`Delete`}</Button>
</Section>
</SettingsPageContainer>
</SettingsPageLayout>
diff --git a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
index 8f650305e51..afc89e8b057 100644
--- a/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
+++ b/packages/twenty-front/src/pages/settings/enterprise/SettingsEnterprise.tsx
@@ -544,12 +544,14 @@ export const SettingsEnterprise = ({
</StyledInputWrapper>
<StyledActivateButtonWrapper>
<Button
- Icon={IconKey}
- title={isActivating ? t`Activating...` : t`Activate`}
- accent="blue"
+ startIcon={<IconKey />}
onClick={handleActivate}
disabled={isActivating || !enterpriseKey.trim()}
- />
+ variant="solid"
+ color="accent"
+ >
+ {isActivating ? t`Activating...` : t`Activate`}
+ </Button>
</StyledActivateButtonWrapper>
</StyledInputContainer>
</Section>
@@ -562,19 +564,18 @@ export const SettingsEnterprise = ({
description={t`This Organization key is already bound to a different server instance. Releasing it here will transfer the license to this server and stop counting seats on the previous one.`}
/>
<Button
- Icon={IconKey}
- title={
- isReleasing
- ? t`Transferring...`
- : t`Release & transfer to this server`
- }
- variant="secondary"
- accent="blue"
+ startIcon={<IconKey />}
onClick={() =>
openModal(RELEASE_ENTERPRISE_BINDING_CONFIRMATION_MODAL_ID)
}
disabled={isReleasing}
- />
+ variant="outline"
+ color="accent"
+ >
+ {isReleasing
+ ? t`Transferring...`
+ : t`Release & transfer to this server`}
+ </Button>
</Section>
);
@@ -599,30 +600,28 @@ export const SettingsEnterprise = ({
/>
{instanceType === ENTERPRISE_INSTANCE_TYPE.DEVELOPMENT ? (
<Button
- title={
- isUpdatingInstanceType
- ? t`Updating...`
- : t`Switch to production instance`
- }
- variant="secondary"
onClick={() =>
handleSetInstanceType(ENTERPRISE_INSTANCE_TYPE.PRODUCTION)
}
disabled={isUpdatingInstanceType}
- />
+ variant="outline"
+ >
+ {isUpdatingInstanceType
+ ? t`Updating...`
+ : t`Switch to production instance`}
+ </Button>
) : (
<Button
- title={
- isUpdatingInstanceType
- ? t`Updating...`
- : t`Register as development instance`
- }
- variant="secondary"
onClick={() =>
handleSetInstanceType(ENTERPRISE_INSTANCE_TYPE.DEVELOPMENT)
}
disabled={isUpdatingInstanceType}
- />
+ variant="outline"
+ >
+ {isUpdatingInstanceType
+ ? t`Updating...`
+ : t`Register as development instance`}
+ </Button>
)}
</Section>
);
@@ -641,11 +640,10 @@ export const SettingsEnterprise = ({
description={t`Your premium features are active but your Organization key is missing or invalid. This may be expected, but if not, please set a valid signed Organization key to manage your subscription, or contact support.`}
/>
<Button
- Icon={IconKey}
- title={t`Get Organization Key`}
- variant="secondary"
+ startIcon={<IconKey />}
onClick={openCheckoutModal}
- />
+ variant="outline"
+ >{t`Get Organization Key`}</Button>
</Section>
{activateKeySection}
</>
@@ -661,11 +659,10 @@ export const SettingsEnterprise = ({
description={t`Unlock premium features like SSO, row-level security, and audit logs.`}
/>
<Button
- Icon={IconKey}
- title={t`Get Organization Key`}
- variant="secondary"
+ startIcon={<IconKey />}
onClick={openCheckoutModal}
- />
+ variant="outline"
+ >{t`Get Organization Key`}</Button>
</Section>
{activateKeySection}
</>
@@ -681,15 +678,14 @@ export const SettingsEnterprise = ({
description={t`Your subscription is active but your validity token is invalid or has expired. Try reloading it or contact support.`}
/>
<Button
- Icon={IconKey}
- title={
- isRefreshingToken ? t`Reloading...` : t`Reload validity token`
- }
- variant="secondary"
- accent="blue"
+ startIcon={<IconKey />}
onClick={handleRefreshValidityToken}
disabled={isRefreshingToken}
- />
+ variant="outline"
+ color="accent"
+ >
+ {isRefreshingToken ? t`Reloading...` : t`Reload validity token`}
+ </Button>
<StyledSpacer />
<SubscriptionInfoContainer>
<SubscriptionInfoRowContainer
@@ -729,11 +725,10 @@ export const SettingsEnterprise = ({
description={t`Edit payment method, see your invoices and more`}
/>
<Button
- Icon={IconCreditCard}
- title={t`View billing details`}
- variant="secondary"
+ startIcon={<IconCreditCard />}
onClick={openBillingPortal}
- />
+ variant="outline"
+ >{t`View billing details`}</Button>
</Section>
</>
);
@@ -797,11 +792,10 @@ export const SettingsEnterprise = ({
description={t`Edit payment method, see your invoices and more`}
/>
<Button
- Icon={IconCreditCard}
- title={t`View billing details`}
- variant="secondary"
+ startIcon={<IconCreditCard />}
onClick={openBillingPortal}
- />
+ variant="outline"
+ >{t`View billing details`}</Button>
</Section>
{!isCancelScheduled && (
<Section>
@@ -810,12 +804,11 @@ export const SettingsEnterprise = ({
description={t`Your premium features will be disabled`}
/>
<Button
- Icon={IconCircleX}
- title={t`Cancel Plan`}
- variant="secondary"
- accent="danger"
+ startIcon={<IconCircleX />}
onClick={openBillingPortal}
- />
+ variant="outline"
+ color="danger"
+ >{t`Cancel Plan`}</Button>
</Section>
)}
</>
@@ -846,11 +839,10 @@ export const SettingsEnterprise = ({
Icon={IconCreditCard}
currentValue={
<Button
- title={t`View invoices`}
- variant="secondary"
- size="small"
+ size="sm"
onClick={openBillingPortal}
- />
+ variant="outline"
+ >{t`View invoices`}</Button>
}
/>
</SubscriptionInfoContainer>
@@ -861,11 +853,10 @@ export const SettingsEnterprise = ({
description={t`Start a new Organization subscription to re-enable premium features.`}
/>
<Button
- Icon={IconKey}
- title={t`Get Organization Key`}
- variant="secondary"
+ startIcon={<IconKey />}
onClick={openCheckoutModal}
- />
+ variant="outline"
+ >{t`Get Organization Key`}</Button>
</Section>
{activateKeySection}
</>
@@ -909,11 +900,10 @@ export const SettingsEnterprise = ({
Icon={IconCreditCard}
currentValue={
<Button
- title={t`View invoices`}
- variant="secondary"
- size="small"
+ size="sm"
onClick={openBillingPortal}
- />
+ variant="outline"
+ >{t`View invoices`}</Button>
}
/>
</SubscriptionInfoContainer>
@@ -933,12 +923,11 @@ export const SettingsEnterprise = ({
}
/>
<Button
- Icon={IconCreditCard}
- title={t`Go to billing portal`}
- variant="secondary"
- accent="blue"
+ startIcon={<IconCreditCard />}
onClick={openBillingPortal}
- />
+ variant="outline"
+ color="accent"
+ >{t`Go to billing portal`}</Button>
</Section>
</>
);
@@ -971,10 +960,9 @@ export const SettingsEnterprise = ({
description={t`Start a new Organization subscription.`}
/>
<Button
- Icon={IconKey}
- title={t`Get Organization Key`}
+ startIcon={<IconKey />}
onClick={openCheckoutModal}
- />
+ >{t`Get Organization Key`}</Button>
</Section>
{activateKeySection}
</>
@@ -993,11 +981,10 @@ export const SettingsEnterprise = ({
})()}
/>
<Button
- Icon={IconCreditCard}
- title={t`Go to billing portal`}
- variant="secondary"
+ startIcon={<IconCreditCard />}
onClick={openBillingPortal}
- />
+ variant="outline"
+ >{t`Go to billing portal`}</Button>
</Section>
{activateKeySection}
</>
@@ -1014,7 +1001,7 @@ export const SettingsEnterprise = ({
title={t`Release & transfer Organization key`}
subtitle={t`This Organization key is currently bound to a different server instance. Transferring it here will release it from the previous server and stop counting seats on it. Are you sure you want to continue?`}
confirmButtonText={t`Release & transfer`}
- confirmButtonAccent="blue"
+ confirmButtonColor="accent"
loading={isReleasing}
onConfirmClick={handleReleaseBinding}
/>
diff --git a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
index 2094b1fe4c1..f39504cc53a 100644
--- a/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
+++ b/packages/twenty-front/src/pages/settings/layout/SettingsLayout.tsx
@@ -64,13 +64,12 @@ export const SettingsLayout = () => {
description={t`Customize how your workspace looks.`}
action={
<Button
- title={t`Customize`}
- variant="primary"
- accent="blue"
- size="small"
- Icon={IconPencil}
+ size="sm"
+ startIcon={<IconPencil />}
onClick={handleCustomize}
- />
+ variant="solid"
+ color="accent"
+ >{t`Customize`}</Button>
}
/>
}
diff --git a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
index f44d6aeec80..395c420e389 100644
--- a/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
+++ b/packages/twenty-front/src/pages/settings/legal/SettingsLegalDpa.tsx
@@ -1,11 +1,11 @@
+import { NavigationButton } from '@/ui/input/components/NavigationButton';
+
import { useQuery } from '@apollo/client/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { IconPlus } from 'twenty-ui/icon';
-import { Button } from 'twenty-ui/primitives/input';
import { Section } from 'twenty-ui/primitives/layout';
-import { UndecoratedLink } from 'twenty-ui/primitives/navigation';
import { H2Title } from 'twenty-ui/primitives/typography';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
@@ -53,14 +53,13 @@ export const SettingsLegalDpa = () => {
{ children: t`Legal` },
]}
actionButton={
- <UndecoratedLink to={getSettingsPath(SettingsPath.LegalDpaNew)}>
- <Button
- Icon={IconPlus}
- title={t`Generate DPA`}
- accent="blue"
- size="small"
- />
- </UndecoratedLink>
+ <NavigationButton
+ to={getSettingsPath(SettingsPath.LegalDpaNew)}
+ startIcon={<IconPlus />}
+ size="sm"
+ variant="solid"
+ color="accent"
+ >{t`Generate DPA`}</NavigationButton>
}
>
<SettingsPageContainer>
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
index e28bffaf4dc..fb63d84d882 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersTeamTab.tsx
@@ -179,11 +179,10 @@ export const SettingsWorkspaceMembersTeamTab = () => {
dropdownId="workspace-members-open-dropdown"
clickableComponent={
<Button
- Icon={IconArrowUpRight}
- title={t`Open`}
- variant="secondary"
- size="medium"
- />
+ startIcon={<IconArrowUpRight />}
+ size="md"
+ variant="outline"
+ >{t`Open`}</Button>
}
dropdownPlacement="bottom-end"
dropdownOffset={{ y: 8 }}
diff --git a/packages/twenty-shared/src/constants/DocumentationPaths.ts b/packages/twenty-shared/src/constants/DocumentationPaths.ts
index a12a7952ee6..3bd0610cc65 100644
--- a/packages/twenty-shared/src/constants/DocumentationPaths.ts
+++ b/packages/twenty-shared/src/constants/DocumentationPaths.ts
@@ -128,6 +128,8 @@ export const DOCUMENTATION_PATHS = {
GETTING_STARTED_KEY_FEATURES: '/getting-started/key-features',
GETTING_STARTED_QUICKSTART: '/getting-started/quickstart',
UI_ACCESSIBILITY: '/ui/accessibility',
+ UI_COMPONENTS_INPUT_LIGHT_BUTTON: '/ui/components/input/light-button',
+ UI_COMPONENTS_INPUT_MAIN_BUTTON: '/ui/components/input/main-button',
UI_COMPONENTS_OVERVIEW: '/ui/components/overview',
UI_DARK_MODE: '/ui/dark-mode',
UI_GETTING_STARTED: '/ui/getting-started',
@@ -136,6 +138,8 @@ export const DOCUMENTATION_PATHS = {
UI_PRIMITIVES_DATA_DISPLAY_STATUS: '/ui/primitives/data-display/status',
UI_PRIMITIVES_DATA_DISPLAY_TAG: '/ui/primitives/data-display/tag',
UI_PRIMITIVES_FEEDBACK_TOAST: '/ui/primitives/feedback/toast',
+ UI_PRIMITIVES_INPUT_BUTTON: '/ui/primitives/input/button',
+ UI_PRIMITIVES_INPUT_BUTTON_GROUP: '/ui/primitives/input/button-group',
UI_PRIMITIVES_INPUT_CHECKBOX: '/ui/primitives/input/checkbox',
UI_PRIMITIVES_INPUT_FIELD: '/ui/primitives/input/field',
UI_PRIMITIVES_INPUT_INPUT: '/ui/primitives/input/input',
diff --git a/packages/twenty-ui/.size-limit.json b/packages/twenty-ui/.size-limit.json
index 3a0570e34e1..c676ef1b83e 100644
--- a/packages/twenty-ui/.size-limit.json
+++ b/packages/twenty-ui/.size-limit.json
@@ -13,7 +13,7 @@
{
"name": "components",
"path": "dist/components.mjs",
- "limit": "1 kB"
+ "limit": "65 kB"
},
{
"name": "primitives",
diff --git a/packages/twenty-ui/README.md b/packages/twenty-ui/README.md
index a9b1978bc70..1bc112ef6ee 100644
--- a/packages/twenty-ui/README.md
+++ b/packages/twenty-ui/README.md
@@ -35,7 +35,7 @@ import 'twenty-ui/theme-light.css';
export const App = () => (
<ThemeProvider colorScheme="light">
- <Button title="Click me" />
+ <Button>Click me</Button>
</ThemeProvider>
);
```
@@ -52,9 +52,9 @@ import { Button } from 'twenty-ui/primitives/input';
| --- | --- |
| `twenty-ui` | All components, icons, theme tokens, and utilities |
| `twenty-ui/assets` | Logos and static assets |
-| `twenty-ui/components` | Reserved for reusable app building blocks |
+| `twenty-ui/components` | Shared design presets and reusable app building blocks |
| `twenty-ui/icon` | Icon components and the icon provider |
-| `twenty-ui/primitives` | All existing UI component families |
+| `twenty-ui/primitives` | Foundational UI controls and compound controls |
| `twenty-ui/primitives/accessibility` | Hidden elements and keyboard interaction helpers |
| `twenty-ui/primitives/data-display` | Avatars, chips, tags, status indicators, and display helpers |
| `twenty-ui/primitives/feedback` | Toasts, banners, progress bars, and loaders |
@@ -77,7 +77,7 @@ import { Button } from 'twenty-ui/primitives/input';
# Development
-Component guides belong in `packages/twenty-docs/ui/primitives`. For each stateful API that supports both modes, include separate **Uncontrolled state** and **Controlled state** examples with the same scenario, labels, and initial state. Keep each example complete, with public imports and one exported example component.
+Primitive guides belong in `packages/twenty-docs/ui/primitives`. Shared component guides belong in `packages/twenty-docs/ui/components`. For each stateful API that supports both modes, include separate **Uncontrolled state** and **Controlled state** examples with the same scenario, labels, and initial state. Keep each example complete, with public imports and one exported example component.
Explain state ownership before advanced behavior such as indeterminate selection or manual tab activation. Document independent states, such as selection and popup visibility, separately. For components that delegate state to a parent or group, explain that ownership and link to the relevant examples.
diff --git a/packages/twenty-ui/docs/buttonGroupPropDescriptions.ts b/packages/twenty-ui/docs/buttonGroupPropDescriptions.ts
new file mode 100644
index 00000000000..a083d4982b2
--- /dev/null
+++ b/packages/twenty-ui/docs/buttonGroupPropDescriptions.ts
@@ -0,0 +1,9 @@
+import { type ButtonGroupProps } from '../src/primitives/input/ButtonGroup/types/ButtonGroupProps';
+
+export const BUTTON_GROUP_PROP_DESCRIPTIONS = {
+ variant:
+ 'Shared surface treatment that overrides the variant of buttons in the group.',
+ color:
+ 'Shared semantic color that overrides the color of buttons in the group.',
+ size: 'Shared button height that overrides the size of buttons in the group.',
+} satisfies Partial<Record<keyof ButtonGroupProps, string>>;
diff --git a/packages/twenty-ui/docs/buttonPropDescriptions.ts b/packages/twenty-ui/docs/buttonPropDescriptions.ts
new file mode 100644
index 00000000000..a969b0f29dd
--- /dev/null
+++ b/packages/twenty-ui/docs/buttonPropDescriptions.ts
@@ -0,0 +1,16 @@
+import { type ButtonProps } from '../src/primitives/input/Button/types/ButtonProps';
+
+export const BUTTON_PROP_DESCRIPTIONS = {
+ variant: 'Visual treatment of the button surface.',
+ color: 'Semantic color of the button.',
+ size: 'Button height: `sm` (24px) or `md` (32px).',
+ fullWidth: 'Expands the button to fill its container width.',
+ loading:
+ 'Shows a loading indicator and disables activation while preserving the button width.',
+ elevated: 'Adds a shadow to the button.',
+ startIcon: 'Decorative content displayed before the label.',
+ endIcon: 'Decorative content displayed after the label.',
+ hotkeys: 'Keyboard shortcut hints displayed on non-mobile screens.',
+ soon: 'Displays a coming-soon label and disables activation.',
+ soonLabel: 'Text for the coming-soon label.',
+} satisfies Partial<Record<keyof ButtonProps, string>>;
diff --git a/packages/twenty-ui/docs/components.ts b/packages/twenty-ui/docs/components.ts
index 843c8233d80..ce3014ea351 100644
--- a/packages/twenty-ui/docs/components.ts
+++ b/packages/twenty-ui/docs/components.ts
@@ -1,9 +1,40 @@
import { AVATAR_PROP_DESCRIPTIONS } from './avatarPropDescriptions';
+import { BUTTON_GROUP_PROP_DESCRIPTIONS } from './buttonGroupPropDescriptions';
+import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
import { CHIP_PROP_DESCRIPTIONS } from './chipPropDescriptions';
+import { LIGHT_BUTTON_PROP_DESCRIPTIONS } from './lightButtonPropDescriptions';
import { STATUS_PROP_DESCRIPTIONS } from './statusPropDescriptions';
import { TAG_PROP_DESCRIPTIONS } from './tagPropDescriptions';
export const DOCUMENTED_COMPONENTS = [
+ {
+ name: 'MainButton',
+ source: 'components/MainButton/MainButton.tsx',
+ entryPoint: 'twenty-ui/components',
+ slug: 'input/main-button',
+ propDescriptions: BUTTON_PROP_DESCRIPTIONS,
+ },
+ {
+ name: 'LightButton',
+ source: 'components/LightButton/LightButton.tsx',
+ entryPoint: 'twenty-ui/components',
+ slug: 'input/light-button',
+ propDescriptions: LIGHT_BUTTON_PROP_DESCRIPTIONS,
+ },
+ {
+ name: 'Button',
+ source: 'primitives/input/Button/Button.tsx',
+ entryPoint: 'twenty-ui/primitives/input',
+ slug: 'input/button',
+ propDescriptions: BUTTON_PROP_DESCRIPTIONS,
+ },
+ {
+ name: 'ButtonGroup',
+ source: 'primitives/input/ButtonGroup/ButtonGroup.tsx',
+ entryPoint: 'twenty-ui/primitives/input',
+ slug: 'input/button-group',
+ propDescriptions: BUTTON_GROUP_PROP_DESCRIPTIONS,
+ },
{
name: 'Field',
source: 'primitives/input/Field/Field.tsx',
diff --git a/packages/twenty-ui/docs/lightButtonPropDescriptions.ts b/packages/twenty-ui/docs/lightButtonPropDescriptions.ts
new file mode 100644
index 00000000000..0887dedb710
--- /dev/null
+++ b/packages/twenty-ui/docs/lightButtonPropDescriptions.ts
@@ -0,0 +1,9 @@
+import { type LightButtonProps } from '../src/components/LightButton/types/LightButtonProps';
+
+import { BUTTON_PROP_DESCRIPTIONS } from './buttonPropDescriptions';
+
+export const LIGHT_BUTTON_PROP_DESCRIPTIONS = {
+ ...BUTTON_PROP_DESCRIPTIONS,
+ emphasis:
+ 'Uses secondary or tertiary text for neutral buttons. Semantic colors and solid surfaces retain their contrast treatment.',
+} satisfies Partial<Record<keyof LightButtonProps, string>>;
diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.json
index d0ce2374fae..6fc3ced6b87 100644
--- a/packages/twenty-ui/generated/components.docs.json
+++ b/packages/twenty-ui/generated/components.docs.json
@@ -1,4 +1,403 @@
[
+ {
+ "name": "MainButton",
+ "entryPoint": "twenty-ui/components",
+ "slug": "input/main-button",
+ "props": [
+ {
+ "name": "className",
+ "type": "string | ((state: ButtonState) => string | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "CSS class applied to the element, or a function that\nreturns a class based on the component's state."
+ },
+ {
+ "name": "color",
+ "type": "\"neutral\" | \"accent\" | \"danger\" | \"success\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Semantic color of the button."
+ },
+ {
+ "name": "elevated",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "true",
+ "description": "Adds a shadow to the button."
+ },
+ {
+ "name": "endIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed after the label."
+ },
+ {
+ "name": "focusableWhenDisabled",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Whether the button should be focusable when disabled."
+ },
+ {
+ "name": "fullWidth",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Expands the button to fill its container width."
+ },
+ {
+ "name": "hotkeys",
+ "type": "string[]",
+ "required": false,
+ "defaultValue": null,
+ "description": "Keyboard shortcut hints displayed on non-mobile screens."
+ },
+ {
+ "name": "loading",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Shows a loading indicator and disables activation while preserving the button width."
+ },
+ {
+ "name": "nativeButton",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "true",
+ "description": "Whether the component renders a native `<button>` element when replacing it\nvia the `render` prop.\nSet to `false` if the rendered element is not a button (for example, `<div>`)."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, ButtonState>",
+ "required": false,
+ "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": "size",
+ "type": "\"sm\" | \"md\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Button height: `sm` (24px) or `md` (32px)."
+ },
+ {
+ "name": "soon",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Displays a coming-soon label and disables activation."
+ },
+ {
+ "name": "soonLabel",
+ "type": "string",
+ "required": false,
+ "defaultValue": null,
+ "description": "Text for the coming-soon label."
+ },
+ {
+ "name": "startIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed before the label."
+ },
+ {
+ "name": "style",
+ "type": "CSSProperties | ((state: ButtonState) => CSSProperties | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "Style applied to the element, or a function that\nreturns a style object based on the component's state."
+ },
+ {
+ "name": "variant",
+ "type": "\"solid\" | \"outline\" | \"ghost\" | \"soft\"",
+ "required": false,
+ "defaultValue": "solid",
+ "description": "Visual treatment of the button surface."
+ }
+ ]
+ },
+ {
+ "name": "LightButton",
+ "entryPoint": "twenty-ui/components",
+ "slug": "input/light-button",
+ "props": [
+ {
+ "name": "className",
+ "type": "string | ((state: ButtonState) => string | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "CSS class applied to the element, or a function that\nreturns a class based on the component's state."
+ },
+ {
+ "name": "color",
+ "type": "\"neutral\" | \"accent\" | \"danger\" | \"success\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Semantic color of the button."
+ },
+ {
+ "name": "elevated",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Adds a shadow to the button."
+ },
+ {
+ "name": "emphasis",
+ "type": "\"standard\" | \"subtle\"",
+ "required": false,
+ "defaultValue": "standard",
+ "description": "Uses secondary or tertiary text for neutral buttons. Semantic colors and solid surfaces retain their contrast treatment."
+ },
+ {
+ "name": "endIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed after the label."
+ },
+ {
+ "name": "focusableWhenDisabled",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Whether the button should be focusable when disabled."
+ },
+ {
+ "name": "fullWidth",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Expands the button to fill its container width."
+ },
+ {
+ "name": "hotkeys",
+ "type": "string[]",
+ "required": false,
+ "defaultValue": null,
+ "description": "Keyboard shortcut hints displayed on non-mobile screens."
+ },
+ {
+ "name": "loading",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Shows a loading indicator and disables activation while preserving the button width."
+ },
+ {
+ "name": "nativeButton",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "true",
+ "description": "Whether the component renders a native `<button>` element when replacing it\nvia the `render` prop.\nSet to `false` if the rendered element is not a button (for example, `<div>`)."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, ButtonState>",
+ "required": false,
+ "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": "size",
+ "type": "\"sm\" | \"md\"",
+ "required": false,
+ "defaultValue": "sm",
+ "description": "Button height: `sm` (24px) or `md` (32px)."
+ },
+ {
+ "name": "soon",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": null,
+ "description": "Displays a coming-soon label and disables activation."
+ },
+ {
+ "name": "soonLabel",
+ "type": "string",
+ "required": false,
+ "defaultValue": null,
+ "description": "Text for the coming-soon label."
+ },
+ {
+ "name": "startIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed before the label."
+ },
+ {
+ "name": "style",
+ "type": "CSSProperties | ((state: ButtonState) => CSSProperties | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "Style applied to the element, or a function that\nreturns a style object based on the component's state."
+ },
+ {
+ "name": "variant",
+ "type": "\"solid\" | \"outline\" | \"ghost\" | \"soft\"",
+ "required": false,
+ "defaultValue": "ghost",
+ "description": "Visual treatment of the button surface."
+ }
+ ]
+ },
+ {
+ "name": "Button",
+ "entryPoint": "twenty-ui/primitives/input",
+ "slug": "input/button",
+ "props": [
+ {
+ "name": "className",
+ "type": "string | ((state: ButtonState) => string | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "CSS class applied to the element, or a function that\nreturns a class based on the component's state."
+ },
+ {
+ "name": "color",
+ "type": "\"neutral\" | \"accent\" | \"danger\" | \"success\"",
+ "required": false,
+ "defaultValue": "neutral",
+ "description": "Semantic color of the button."
+ },
+ {
+ "name": "elevated",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Adds a shadow to the button."
+ },
+ {
+ "name": "endIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed after the label."
+ },
+ {
+ "name": "focusableWhenDisabled",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Whether the button should be focusable when disabled."
+ },
+ {
+ "name": "fullWidth",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Expands the button to fill its container width."
+ },
+ {
+ "name": "hotkeys",
+ "type": "string[]",
+ "required": false,
+ "defaultValue": null,
+ "description": "Keyboard shortcut hints displayed on non-mobile screens."
+ },
+ {
+ "name": "loading",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Shows a loading indicator and disables activation while preserving the button width."
+ },
+ {
+ "name": "nativeButton",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "true",
+ "description": "Whether the component renders a native `<button>` element when replacing it\nvia the `render` prop.\nSet to `false` if the rendered element is not a button (for example, `<div>`)."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, ButtonState>",
+ "required": false,
+ "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": "size",
+ "type": "\"sm\" | \"md\"",
+ "required": false,
+ "defaultValue": "md",
+ "description": "Button height: `sm` (24px) or `md` (32px)."
+ },
+ {
+ "name": "soon",
+ "type": "boolean",
+ "required": false,
+ "defaultValue": "false",
+ "description": "Displays a coming-soon label and disables activation."
+ },
+ {
+ "name": "soonLabel",
+ "type": "string",
+ "required": false,
+ "defaultValue": null,
+ "description": "Text for the coming-soon label."
+ },
+ {
+ "name": "startIcon",
+ "type": "ReactNode",
+ "required": false,
+ "defaultValue": null,
+ "description": "Decorative content displayed before the label."
+ },
+ {
+ "name": "style",
+ "type": "CSSProperties | ((state: ButtonState) => CSSProperties | undefined)",
+ "required": false,
+ "defaultValue": null,
+ "description": "Style applied to the element, or a function that\nreturns a style object based on the component's state."
+ },
+ {
+ "name": "variant",
+ "type": "\"solid\" | \"outline\" | \"ghost\" | \"soft\"",
+ "required": false,
+ "defaultValue": "outline",
+ "description": "Visual treatment of the button surface."
+ }
+ ]
+ },
+ {
+ "name": "ButtonGroup",
+ "entryPoint": "twenty-ui/primitives/input",
+ "slug": "input/button-group",
+ "props": [
+ {
+ "name": "color",
+ "type": "\"neutral\" | \"accent\" | \"danger\" | \"success\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Shared semantic color that overrides the color of buttons in the group."
+ },
+ {
+ "name": "render",
+ "type": "ReactElement<unknown, string | JSXElementConstructor<any>> | ComponentRenderFn<HTMLProps, {}>",
+ "required": false,
+ "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": "size",
+ "type": "\"sm\" | \"md\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Shared button height that overrides the size of buttons in the group."
+ },
+ {
+ "name": "variant",
+ "type": "\"solid\" | \"outline\" | \"ghost\" | \"soft\"",
+ "required": false,
+ "defaultValue": null,
+ "description": "Shared surface treatment that overrides the variant of buttons in the group."
+ }
+ ]
+ },
{
"name": "Field",
"entryPoint": "twenty-ui/primitives/input",
@@ -1370,7 +1769,7 @@
},
{
"name": "thumbCollisionBehavior",
- "type": "\"push\" | \"none\" | \"swap\"",
+ "type": "\"none\" | \"push\" | \"swap\"",
"required": false,
"defaultValue": "push",
"description": "Controls how thumbs behave when they collide during pointer interactions.\n\n- `'push'` (default): Thumbs push each other without restoring their previous positions when dragged back.\n- `'swap'`: Thumbs swap places when dragged past each other.\n- `'none'`: Thumbs cannot move past each other; excess movement is ignored."
@@ -4025,7 +4424,7 @@
},
{
"name": "variant",
- "type": "\"solid\" | \"soft\" | \"ghost\"",
+ "type": "\"solid\" | \"ghost\" | \"soft\"",
"required": false,
"defaultValue": "ghost",
"description": "Background treatment of the chip."
@@ -4102,7 +4501,7 @@
},
{
"name": "variant",
- "type": "\"solid\" | \"outline\" | \"soft\" | \"ghost\"",
+ "type": "\"solid\" | \"outline\" | \"ghost\" | \"soft\"",
"required": false,
"defaultValue": "soft",
"description": "Visual treatment of the tag background and border."
diff --git a/packages/twenty-ui/project.json b/packages/twenty-ui/project.json
index 43a0441a4bb..fbbad6deb8c 100644
--- a/packages/twenty-ui/project.json
+++ b/packages/twenty-ui/project.json
@@ -106,9 +106,7 @@
"cwd": "{projectRoot}",
"command": "npx vitest run --project unit"
},
- "configurations": {
- "watch": { "command": "npx vitest --project unit" }
- }
+ "configurations": { "watch": { "command": "npx vitest --project unit" } }
},
"typecheck": {},
"storybook:build": {
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.module.scss b/packages/twenty-ui/src/components/LightButton/LightButton.module.scss
new file mode 100644
index 00000000000..2b758e5e25c
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/LightButton.module.scss
@@ -0,0 +1,7 @@
+.button {
+ --tw-button-font-weight: var(--t-font-weight-regular);
+
+ &[data-emphasis='subtle'][data-color='neutral']:not([data-variant='solid']) {
+ --tw-button-color: var(--t-font-color-tertiary);
+ }
+}
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.module.scss.d.ts b/packages/twenty-ui/src/components/LightButton/LightButton.module.scss.d.ts
new file mode 100644
index 00000000000..37b2ec6b50f
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/LightButton.module.scss.d.ts
@@ -0,0 +1,4 @@
+declare const styles: {
+ readonly button: string;
+};
+export default styles;
diff --git a/packages/twenty-ui/src/components/LightButton/LightButton.tsx b/packages/twenty-ui/src/components/LightButton/LightButton.tsx
new file mode 100644
index 00000000000..ef5edd9db60
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/LightButton.tsx
@@ -0,0 +1,21 @@
+import { Button } from '@ui/primitives/input/Button/Button';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
+import styles from './LightButton.module.scss';
+import { type LightButtonProps } from './types/LightButtonProps';
+
+export const LightButton = ({
+ className,
+ emphasis = 'standard',
+ size = 'sm',
+ variant = 'ghost',
+ ...props
+}: LightButtonProps) => (
+ <Button
+ {...props}
+ size={size}
+ variant={variant}
+ data-emphasis={emphasis}
+ className={mergeClassNames(styles.button, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/components/LightButton/__stories__/LightButton.stories.tsx b/packages/twenty-ui/src/components/LightButton/__stories__/LightButton.stories.tsx
new file mode 100644
index 00000000000..fa07edf9649
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/__stories__/LightButton.stories.tsx
@@ -0,0 +1,142 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, within } from 'storybook/test';
+
+import { Button } from '@ui/primitives/input/Button/Button';
+import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
+import {
+ A11Y_DEFER_COLOR_CONTRAST,
+ CatalogDecorator,
+ type CatalogStory,
+ ComponentDecorator,
+} from '@ui/testing';
+
+import { LightButton } from '../LightButton';
+import { type LightButtonProps } from '../types/LightButtonProps';
+
+const meta: Meta<typeof LightButton> = {
+ title: 'UI/Components/LightButton',
+ component: LightButton,
+ args: { children: 'Add filter' },
+};
+
+export default meta;
+type Story = StoryObj<typeof LightButton>;
+
+export const Default: Story = { decorators: [ComponentDecorator] };
+
+export const Emphasis: Story = {
+ ...Default,
+ parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
+ render: () => (
+ <>
+ <LightButton>Standard action</LightButton>
+ <LightButton emphasis="subtle">Subtle action</LightButton>
+ <Button variant="ghost">Reference action</Button>
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const standard = canvas.getByRole('button', { name: 'Standard action' });
+ const subtle = canvas.getByRole('button', { name: 'Subtle action' });
+ const reference = canvas.getByRole('button', { name: 'Reference action' });
+
+ await expect(getComputedStyle(standard).fontWeight).toBe('400');
+ await expect(getComputedStyle(subtle).fontWeight).toBe('400');
+ await expect(standard.getBoundingClientRect().height).toBe(24);
+ await expect(getComputedStyle(standard).backgroundColor).toBe(
+ 'rgba(0, 0, 0, 0)',
+ );
+ await expect(getComputedStyle(standard).color).toBe(
+ getComputedStyle(reference).color,
+ );
+ await expect(getComputedStyle(subtle).color).not.toBe(
+ getComputedStyle(standard).color,
+ );
+ },
+};
+
+export const SemanticAndGroupAppearance: Story = {
+ ...Default,
+ render: () => (
+ <>
+ <LightButton emphasis="subtle" color="danger">
+ Delete record
+ </LightButton>
+ <Button variant="ghost" color="danger">
+ Danger reference
+ </Button>
+ <LightButton emphasis="subtle" variant="solid">
+ Solid action
+ </LightButton>
+ <Button variant="solid">Solid reference</Button>
+ <ButtonGroup
+ aria-label="Shared appearance"
+ color="accent"
+ variant="outline"
+ size="md"
+ >
+ <LightButton emphasis="subtle" color="danger">
+ Group action
+ </LightButton>
+ <Button>Group reference</Button>
+ </ButtonGroup>
+ </>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ for (const [actionName, referenceName] of [
+ ['Delete record', 'Danger reference'],
+ ['Solid action', 'Solid reference'],
+ ['Group action', 'Group reference'],
+ ]) {
+ const action = canvas.getByRole('button', { name: actionName });
+ const reference = canvas.getByRole('button', { name: referenceName });
+ await expect(getComputedStyle(action).color).toBe(
+ getComputedStyle(reference).color,
+ );
+ await expect(getComputedStyle(action).backgroundColor).toBe(
+ getComputedStyle(reference).backgroundColor,
+ );
+ }
+ await expect(
+ canvas
+ .getByRole('button', { name: 'Group action' })
+ .getBoundingClientRect().height,
+ ).toBe(32);
+ },
+};
+
+const CATALOG_STATES: Record<string, Partial<LightButtonProps>> = {
+ default: {},
+ medium: { size: 'md' },
+ disabled: { disabled: true },
+ loading: { loading: true },
+};
+
+export const Catalog: CatalogStory<Story, typeof LightButton> = {
+ decorators: [CatalogDecorator],
+ parameters: {
+ a11y: A11Y_DEFER_COLOR_CONTRAST,
+ catalog: {
+ dimensions: [
+ {
+ name: 'state',
+ values: Object.keys(CATALOG_STATES),
+ props: (state: string) => CATALOG_STATES[state],
+ },
+ {
+ name: 'emphasis',
+ values: ['standard', 'subtle'],
+ props: (emphasis: LightButtonProps['emphasis']) => ({ emphasis }),
+ },
+ ],
+ options: { elementContainer: { style: { width: 100 } } },
+ },
+ },
+};
+
+export const CatalogDark: CatalogStory<Story, typeof LightButton> = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/components/LightButton/__tests__/LightButton.test.tsx b/packages/twenty-ui/src/components/LightButton/__tests__/LightButton.test.tsx
new file mode 100644
index 00000000000..cefdcf75e4f
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/__tests__/LightButton.test.tsx
@@ -0,0 +1,11 @@
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+
+import { LightButton } from '../LightButton';
+import styles from '../LightButton.module.scss';
+
+runComponentConformance({
+ name: 'LightButton',
+ element: <LightButton>Add filter</LightButton>,
+ refInstanceOf: HTMLButtonElement,
+ ownClassName: styles.button,
+});
diff --git a/packages/twenty-ui/src/components/LightButton/types/LightButtonProps.ts b/packages/twenty-ui/src/components/LightButton/types/LightButtonProps.ts
new file mode 100644
index 00000000000..9fac2252c0c
--- /dev/null
+++ b/packages/twenty-ui/src/components/LightButton/types/LightButtonProps.ts
@@ -0,0 +1,5 @@
+import { type ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
+
+export type LightButtonProps = ButtonProps & {
+ emphasis?: 'standard' | 'subtle';
+};
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.module.scss b/packages/twenty-ui/src/components/MainButton/MainButton.module.scss
new file mode 100644
index 00000000000..130d0c12c25
--- /dev/null
+++ b/packages/twenty-ui/src/components/MainButton/MainButton.module.scss
@@ -0,0 +1,4 @@
+.button {
+ --tw-button-font-weight: var(--t-font-weight-semi-bold);
+ --tw-button-padding-inline: var(--t-spacing-3);
+}
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.module.scss.d.ts b/packages/twenty-ui/src/components/MainButton/MainButton.module.scss.d.ts
new file mode 100644
index 00000000000..37b2ec6b50f
--- /dev/null
+++ b/packages/twenty-ui/src/components/MainButton/MainButton.module.scss.d.ts
@@ -0,0 +1,4 @@
+declare const styles: {
+ readonly button: string;
+};
+export default styles;
diff --git a/packages/twenty-ui/src/components/MainButton/MainButton.tsx b/packages/twenty-ui/src/components/MainButton/MainButton.tsx
new file mode 100644
index 00000000000..5bedb474f96
--- /dev/null
+++ b/packages/twenty-ui/src/components/MainButton/MainButton.tsx
@@ -0,0 +1,19 @@
+import { Button } from '@ui/primitives/input/Button/Button';
+import { type ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
+
+import styles from './MainButton.module.scss';
+
+export const MainButton = ({
+ className,
+ elevated = true,
+ variant = 'solid',
+ ...props
+}: ButtonProps) => (
+ <Button
+ {...props}
+ elevated={elevated}
+ variant={variant}
+ className={mergeClassNames(styles.button, className)}
+ />
+);
diff --git a/packages/twenty-ui/src/components/MainButton/__stories__/MainButton.stories.tsx b/packages/twenty-ui/src/components/MainButton/__stories__/MainButton.stories.tsx
new file mode 100644
index 00000000000..d655e5512c5
--- /dev/null
+++ b/packages/twenty-ui/src/components/MainButton/__stories__/MainButton.stories.tsx
@@ -0,0 +1,134 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { type FormEventHandler } from 'react';
+import { expect, fn, userEvent, within } from 'storybook/test';
+
+import { type ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
+import { type ButtonVariant } from '@ui/primitives/input/Button/types/ButtonVariant';
+import {
+ A11Y_DEFER_COLOR_CONTRAST,
+ CatalogDecorator,
+ type CatalogStory,
+ ComponentDecorator,
+} from '@ui/testing';
+
+import { MainButton } from '../MainButton';
+
+type MainButtonStoryProps = ButtonProps & {
+ onFormSubmit?: FormEventHandler<HTMLFormElement>;
+};
+
+const meta: Meta<MainButtonStoryProps> = {
+ title: 'UI/Components/MainButton',
+ component: MainButton,
+ args: { children: 'Save changes' },
+};
+
+export default meta;
+type Story = StoryObj<MainButtonStoryProps>;
+
+export const Default: Story = { decorators: [ComponentDecorator] };
+
+export const FormControls: Story = {
+ ...Default,
+ args: {
+ onClick: fn(),
+ onFormSubmit: fn<FormEventHandler<HTMLFormElement>>((event) =>
+ event.preventDefault(),
+ ),
+ },
+ render: (args) => (
+ <form onSubmit={args.onFormSubmit}>
+ <MainButton onClick={args.onClick}>Preview changes</MainButton>
+ <MainButton type="submit" onClick={args.onClick}>
+ Save changes
+ </MainButton>
+ </form>
+ ),
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const previewButton = canvas.getByRole('button', {
+ name: 'Preview changes',
+ });
+ const previewButtonStyle = getComputedStyle(previewButton);
+
+ await expect(previewButtonStyle.fontWeight).toBe('600');
+ await expect(previewButtonStyle.paddingInlineStart).toBe('12px');
+ await expect(previewButtonStyle.paddingInlineEnd).toBe('12px');
+ await expect(previewButtonStyle.boxShadow).not.toBe('none');
+ await expect(previewButton).toHaveAttribute('type', 'button');
+ await userEvent.click(previewButton);
+ await expect(args.onClick).toHaveBeenCalledOnce();
+ await expect(args.onFormSubmit).not.toHaveBeenCalled();
+
+ await userEvent.click(canvas.getByRole('button', { name: 'Save changes' }));
+ await expect(args.onClick).toHaveBeenCalledTimes(2);
+ await expect(args.onFormSubmit).toHaveBeenCalledOnce();
+ },
+};
+
+export const Loading: Story = {
+ ...Default,
+ args: {
+ loading: true,
+ className: ({ disabled }) => (disabled ? 'unavailable-action' : undefined),
+ },
+ play: async ({ canvasElement }) => {
+ const button = within(canvasElement).getByRole('button', {
+ name: 'Save changes',
+ });
+
+ await expect(button).toBeDisabled();
+ await expect(button).toHaveAttribute('aria-busy', 'true');
+ await expect(button).toHaveClass('unavailable-action');
+ await expect(getComputedStyle(button).fontWeight).toBe('600');
+ },
+};
+
+export const DisabledOutline: Story = {
+ ...Default,
+ args: { variant: 'outline', elevated: false, disabled: true, onClick: fn() },
+ play: async ({ canvasElement, args }) => {
+ const button = within(canvasElement).getByRole('button');
+
+ await expect(button).toBeDisabled();
+ await expect(button).toHaveAttribute('data-variant', 'outline');
+ await expect(getComputedStyle(button).boxShadow).toBe('none');
+ await userEvent.click(button);
+ await expect(args.onClick).not.toHaveBeenCalled();
+ },
+};
+
+const CATALOG_STATES: Record<string, Partial<ButtonProps>> = {
+ default: {},
+ small: { size: 'sm' },
+ disabled: { disabled: true },
+ loading: { loading: true },
+};
+
+export const Catalog: CatalogStory<Story, typeof MainButton> = {
+ decorators: [CatalogDecorator],
+ parameters: {
+ a11y: A11Y_DEFER_COLOR_CONTRAST,
+ catalog: {
+ dimensions: [
+ {
+ name: 'state',
+ values: Object.keys(CATALOG_STATES),
+ props: (state: string) => CATALOG_STATES[state],
+ },
+ {
+ name: 'variant',
+ values: ['solid', 'outline'],
+ props: (variant: ButtonVariant) => ({ variant }),
+ },
+ ],
+ options: { elementContainer: { style: { width: 100 } } },
+ },
+ },
+};
+
+export const CatalogDark: CatalogStory<Story, typeof MainButton> = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
+};
diff --git a/packages/twenty-ui/src/components/MainButton/__tests__/MainButton.test.tsx b/packages/twenty-ui/src/components/MainButton/__tests__/MainButton.test.tsx
new file mode 100644
index 00000000000..6bce5efc7ff
--- /dev/null
+++ b/packages/twenty-ui/src/components/MainButton/__tests__/MainButton.test.tsx
@@ -0,0 +1,11 @@
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+
+import { MainButton } from '../MainButton';
+import styles from '../MainButton.module.scss';
+
+runComponentConformance({
+ name: 'MainButton',
+ element: <MainButton>Save changes</MainButton>,
+ refInstanceOf: HTMLButtonElement,
+ ownClassName: styles.button,
+});
diff --git a/packages/twenty-ui/src/components/index.ts b/packages/twenty-ui/src/components/index.ts
index a3046804c03..da0d8a078e0 100644
--- a/packages/twenty-ui/src/components/index.ts
+++ b/packages/twenty-ui/src/components/index.ts
@@ -7,4 +7,6 @@
* |___/
*/
-export {};
+export { LightButton } from './LightButton/LightButton';
+export type { LightButtonProps } from './LightButton/types/LightButtonProps';
+export { MainButton } from './MainButton/MainButton';
diff --git a/packages/twenty-ui/src/primitives/data-display/Chip/__stories__/Chip.stories.tsx b/packages/twenty-ui/src/primitives/data-display/Chip/__stories__/Chip.stories.tsx
index 1d2198dde1c..3991e13f6b8 100644
--- a/packages/twenty-ui/src/primitives/data-display/Chip/__stories__/Chip.stories.tsx
+++ b/packages/twenty-ui/src/primitives/data-display/Chip/__stories__/Chip.stories.tsx
@@ -234,7 +234,9 @@ export const ContentAndSlots: Story = {
children: <strong>Rich content</strong>,
startElement: <IconUser />,
endElement: (
- <Button type="button" title="Remove" ariaLabel="Remove" onClick={fn()} />
+ <Button type="button" aria-label="Remove" onClick={fn()}>
+ Remove
+ </Button>
),
endElementDivider: true,
},
diff --git a/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx b/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
index 6eafb5680e7..4848a068af0 100644
--- a/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Banner/__stories__/Banner.stories.tsx
@@ -74,12 +74,18 @@ export const Default: Story = {
<div className={styles.bannerContent}>
Sync lost with mailbox [email protected]. Please reconnect for updates:
<Button
- variant="secondary"
- accent={getButtonAccent(args.color)}
- title="Reconnect"
- size="small"
- inverted={args.variant === 'primary'}
- />
+ size="sm"
+ variant="outline"
+ color={args.color === 'danger' ? 'danger' : 'accent'}
+ style={{
+ color:
+ args.variant === 'primary'
+ ? 'var(--t-font-color-inverted)'
+ : undefined,
+ }}
+ >
+ {'Reconnect'}
+ </Button>
</div>
<BannerCloseButton color={args.color} variant={args.variant} />
</Banner>
@@ -99,12 +105,18 @@ export const Catalog: CatalogStory<Story, typeof Banner> = {
<div className={styles.bannerContent}>
Sync lost with mailbox [email protected]. Please reconnect for updates:
<Button
- variant="secondary"
- accent={getButtonAccent(args.color)}
- title="Reconnect"
- size="small"
- inverted={args.variant === 'primary'}
- />
+ size="sm"
+ variant="outline"
+ color={args.color === 'danger' ? 'danger' : 'accent'}
+ style={{
+ color:
+ args.variant === 'primary'
+ ? 'var(--t-font-color-inverted)'
+ : undefined,
+ }}
+ >
+ {'Reconnect'}
+ </Button>
</div>
<BannerCloseButton color={args.color} variant={args.variant} />
</Banner>
diff --git a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx b/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx
index 728516eb645..c5034cb299d 100644
--- a/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Callout/Callout.tsx
@@ -4,7 +4,7 @@ import { isDefined } from '@ui/utilities/utils/isDefined';
import { IconHelp, IconX } from '@ui/icon/components/TablerIcons';
import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { LightButton, LightIconButton } from '@ui/primitives/input';
+import { LightIconButton, Button } from '@ui/primitives/input';
import styles from './Callout.module.scss';
@@ -104,11 +104,15 @@ export const Callout = ({
</div>
{isDefined(action) && (
<div className={styles.footer}>
- <LightButton
+ <Button
type="button"
- title={action.label}
onClick={action.onClick}
- />
+ size="sm"
+ variant="ghost"
+ style={{ fontWeight: 'var(--t-font-weight-regular)' }}
+ >
+ {action.label}
+ </Button>
</div>
)}
</div>
diff --git a/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx b/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx
index 66e8a5094ac..a677515b4db 100644
--- a/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Info/Info.tsx
@@ -39,24 +39,27 @@ export const Info = ({
</div>
{buttonTitle && to && (
<span className={styles.linkContainer}>
- <Link to={to}>
- <Button
- title={buttonTitle}
- size="small"
- variant="secondary"
- accent={accent}
- />
- </Link>
+ <Button
+ render={<Link to={to} />}
+ nativeButton={false}
+ role="link"
+ size="sm"
+ variant="outline"
+ color={accent === 'blue' ? 'accent' : 'danger'}
+ >
+ {buttonTitle}
+ </Button>
</span>
)}
{buttonTitle && onClick && !to && (
<Button
- title={buttonTitle}
onClick={onClick}
- size="small"
- variant="secondary"
- accent={accent}
- />
+ size="sm"
+ variant="outline"
+ color={accent === 'blue' ? 'accent' : 'danger'}
+ >
+ {buttonTitle}
+ </Button>
)}
</div>
);
diff --git a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx b/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx
index 27a205cfbe5..68349da9116 100644
--- a/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/InlineBanner/InlineBanner.tsx
@@ -1,3 +1,4 @@
+import { isDefined } from '@ui/utilities/utils/isDefined';
import { clsx } from 'clsx';
import { OverflowingTextWithTooltip } from '@ui/primitives/surfaces/OverflowingTextWithTooltip/OverflowingTextWithTooltip';
import { useTheme } from '@ui/theme-constants';
@@ -54,14 +55,15 @@ export const InlineBanner = ({
</div>
{button && !button.hidden && (
<Button
- size="small"
- variant="secondary"
- accent={color}
- title={button?.title}
+ size="sm"
onClick={button?.onClick}
disabled={button.disabled}
- Icon={button.Icon}
- />
+ startIcon={isDefined(button.Icon) ? <button.Icon /> : undefined}
+ variant="outline"
+ color={color === 'danger' ? 'danger' : 'accent'}
+ >
+ {button?.title}
+ </Button>
)}
</Banner>
);
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx b/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx
index 0a5fa977770..040ead1fff5 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Toast/Toast.tsx
@@ -9,7 +9,7 @@ import {
IconSquareRoundedCheck,
IconX,
} from '@ui/icon';
-import { LightButton } from '@ui/primitives/input/LightButton/LightButton';
+import { Button } from '@ui/primitives/input/Button/Button';
import { LightIconButton } from '@ui/primitives/input/LightIconButton/LightIconButton';
import { HorizontalSeparator } from '@ui/primitives/layout/HorizontalSeparator/HorizontalSeparator';
import { useTheme } from '@ui/theme-constants';
@@ -93,7 +93,14 @@ export const Toast = ({
<div className={styles.message}>{children}</div>
<div className={styles.actions}>
{isDefined(onCancel) && (
- <LightButton title={cancelLabel} onClick={onCancel} />
+ <Button
+ onClick={onCancel}
+ size="sm"
+ variant="ghost"
+ style={{ fontWeight: 'var(--t-font-weight-regular)' }}
+ >
+ {cancelLabel}
+ </Button>
)}
{isDefined(onClose) && (
<LightIconButton
diff --git a/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx b/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx
index bcfb0257dbc..7535d283a73 100644
--- a/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx
+++ b/packages/twenty-ui/src/primitives/feedback/Toast/__stories__/Toast.stories.tsx
@@ -4,7 +4,6 @@ import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { IconBell } from '@ui/icon';
import { Button } from '@ui/primitives/input/Button/Button';
-import { LightButton } from '@ui/primitives/input/LightButton/LightButton';
import { ClickToActionLink } from '@ui/primitives/navigation/ClickToActionLink/ClickToActionLink';
import {
A11Y_DEFER_COLOR_CONTRAST,
@@ -58,7 +57,16 @@ export const WithDescriptionAndAction: Story = {
render: (args) => (
<Toast
{...args}
- action={<LightButton title="Undo" onClick={args.onCancel} />}
+ action={
+ <Button
+ onClick={args.onCancel}
+ size="sm"
+ variant="ghost"
+ style={{ fontWeight: 'var(--t-font-weight-regular)' }}
+ >
+ {'Undo'}
+ </Button>
+ }
/>
),
play: async ({ canvasElement, args }) => {
@@ -108,10 +116,11 @@ const DismissibleToast = ({ onClose, ...props }: ToastProps) => {
<>
<Button
type="button"
- title="Show notification"
- ariaLabel="Show notification"
+ aria-label="Show notification"
onClick={() => setIsOpen(true)}
- />
+ >
+ Show notification
+ </Button>
{isOpen && (
<Toast
{...props}
diff --git a/packages/twenty-ui/src/primitives/feedback/index.ts b/packages/twenty-ui/src/primitives/feedback/index.ts
index 1777de9aaad..4da90b05c28 100644
--- a/packages/twenty-ui/src/primitives/feedback/index.ts
+++ b/packages/twenty-ui/src/primitives/feedback/index.ts
@@ -7,12 +7,12 @@
* |___/
*/
-export type { AnimatedPlaceholderType } from './AnimatedPlaceholder/types/AnimatedPlaceholderType';
export { AnimatedPlaceholder } from './AnimatedPlaceholder/AnimatedPlaceholder';
export { BACKGROUND } from './AnimatedPlaceholder/constants/Background';
export { DARK_BACKGROUND } from './AnimatedPlaceholder/constants/DarkBackground';
export { DARK_MOVING_IMAGE } from './AnimatedPlaceholder/constants/DarkMovingImage';
export { MOVING_IMAGE } from './AnimatedPlaceholder/constants/MovingImage';
+export type { AnimatedPlaceholderType } from './AnimatedPlaceholder/types/AnimatedPlaceholderType';
export type { BannerColor, BannerVariant } from './Banner/Banner';
export { Banner } from './Banner/Banner';
export type { CalloutVariant, CalloutProps } from './Callout/Callout';
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/AnimatedButton.tsx b/packages/twenty-ui/src/primitives/input/AnimatedButton/AnimatedButton.tsx
index 73ccf452c5b..a32d9774325 100644
--- a/packages/twenty-ui/src/primitives/input/AnimatedButton/AnimatedButton.tsx
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/AnimatedButton.tsx
@@ -7,20 +7,13 @@ import { themeCssVariables, useTheme } from '@ui/theme-constants';
import { GRAY_SCALE_LIGHT } from '@ui/theme/constants/GrayScaleLight';
import { useIsMobile } from '@ui/utilities';
import { getOsShortcutSeparator } from '@ui/utilities/device/getOsShortcutSeparator';
-import type { ButtonAccent } from '@ui/primitives/input/Button/types/ButtonAccent';
-import type { ButtonPosition } from '@ui/primitives/input/Button/types/ButtonPosition';
-import type { ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
-import type { ButtonVariant } from '@ui/primitives/input/Button/types/ButtonVariant';
+import { type AnimatedButtonAccent } from './internal/AnimatedButtonAccent';
+import { type AnimatedButtonPosition } from './internal/AnimatedButtonPosition';
+import { type AnimatedButtonProps } from './types/AnimatedButtonProps';
+import { type AnimatedButtonVariant } from './internal/AnimatedButtonVariant';
import styles from './AnimatedButton.module.scss';
-export type AnimatedButtonProps = ButtonProps & {
- animatedSvg: React.ReactNode;
- soonLabel?: string;
- // Renders a square icon-only button (width matches the size-based height).
- square?: boolean;
-};
-
type AnimatedButtonDynamicStyles = {
background: string;
borderColor: string;
@@ -31,14 +24,21 @@ type AnimatedButtonDynamicStyles = {
activeBackground: string;
};
-const computeAnimatedButtonDynamicStyles = (
- variant: ButtonVariant,
- inverted: boolean,
- accent: ButtonAccent,
- disabled: boolean,
- focus: boolean,
- position: ButtonPosition,
-): AnimatedButtonDynamicStyles => {
+const computeAnimatedButtonDynamicStyles = ({
+ variant,
+ inverted,
+ accent,
+ disabled,
+ focus,
+ position,
+}: {
+ variant: AnimatedButtonVariant;
+ inverted: boolean;
+ accent: AnimatedButtonAccent;
+ disabled: boolean;
+ focus: boolean;
+ position: AnimatedButtonPosition;
+}): AnimatedButtonDynamicStyles => {
const result: AnimatedButtonDynamicStyles = {
background: 'transparent',
borderColor: 'transparent',
@@ -334,14 +334,14 @@ export const AnimatedButton = ({
const isDisabled = soon || disabled;
const dynamicStyles = useMemo(() => {
- const computedStyles = computeAnimatedButtonDynamicStyles(
+ const computedStyles = computeAnimatedButtonDynamicStyles({
variant,
inverted,
accent,
- isDisabled,
+ disabled: isDisabled,
focus,
position,
- );
+ });
return {
'--abtn-bg': computedStyles.background,
'--abtn-border-color': computedStyles.borderColor,
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonAccent.ts b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonAccent.ts
new file mode 100644
index 00000000000..97d601de664
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonAccent.ts
@@ -0,0 +1 @@
+export type AnimatedButtonAccent = 'default' | 'blue' | 'danger' | 'green';
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonBaseProps.ts b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonBaseProps.ts
new file mode 100644
index 00000000000..c4250d85dd3
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonBaseProps.ts
@@ -0,0 +1,31 @@
+import { type ComponentProps, type MouseEvent } from 'react';
+import { type IconComponent } from '@ui/icon';
+import { type ClickOutsideAttributes } from '@ui/utilities/types/ClickOutsideAttributes';
+import { type AnimatedButtonAccent } from './AnimatedButtonAccent';
+import { type AnimatedButtonVariant } from './AnimatedButtonVariant';
+import { type AnimatedButtonPosition } from './AnimatedButtonPosition';
+
+export type AnimatedButtonBaseProps = ClickOutsideAttributes & {
+ id?: string;
+ className?: string;
+ Icon?: IconComponent;
+ title?: string;
+ fullWidth?: boolean;
+ variant?: AnimatedButtonVariant;
+ inverted?: boolean;
+ size?: 'small' | 'medium';
+ position?: AnimatedButtonPosition;
+ accent?: AnimatedButtonAccent;
+ soon?: boolean;
+ justify?: 'center' | 'flex-start' | 'flex-end';
+ disabled?: boolean;
+ focus?: boolean;
+ onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
+ to?: string;
+ target?: string;
+ dataTestId?: string;
+ hotkeys?: string[];
+ ariaLabel?: string;
+ isLoading?: boolean;
+ type?: ComponentProps<'button'>['type'];
+};
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonPosition.ts b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonPosition.ts
new file mode 100644
index 00000000000..cb8b83efd04
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonPosition.ts
@@ -0,0 +1 @@
+export type AnimatedButtonPosition = 'standalone' | 'left' | 'middle' | 'right';
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonVariant.ts b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonVariant.ts
new file mode 100644
index 00000000000..99a63fa83a1
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/internal/AnimatedButtonVariant.ts
@@ -0,0 +1 @@
+export type AnimatedButtonVariant = 'primary' | 'secondary' | 'tertiary';
diff --git a/packages/twenty-ui/src/primitives/input/AnimatedButton/types/AnimatedButtonProps.ts b/packages/twenty-ui/src/primitives/input/AnimatedButton/types/AnimatedButtonProps.ts
new file mode 100644
index 00000000000..4ef9a8422d2
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/AnimatedButton/types/AnimatedButtonProps.ts
@@ -0,0 +1,8 @@
+import { type ReactNode } from 'react';
+import { type AnimatedButtonBaseProps } from '../internal/AnimatedButtonBaseProps';
+
+export type AnimatedButtonProps = AnimatedButtonBaseProps & {
+ animatedSvg: ReactNode;
+ soonLabel?: string;
+ square?: boolean;
+};
diff --git a/packages/twenty-ui/src/primitives/input/Button/Button.module.scss b/packages/twenty-ui/src/primitives/input/Button/Button.module.scss
index 8bae4003af5..630215679d7 100644
--- a/packages/twenty-ui/src/primitives/input/Button/Button.module.scss
+++ b/packages/twenty-ui/src/primitives/input/Button/Button.module.scss
@@ -1,349 +1,172 @@
@use 'sass:map';
-// GRAY_SCALE_LIGHT.gray1 from theme/constants/GrayScaleLight.ts — the legacy
-// Linaria styles read it from JS because it is theme-invariant.
-$gray-scale-light-gray1: color(display-p3 1 1 1);
-
-// The variant × accent × inverted × disabled × focus matrix below is ported
-// token-for-token from computeButtonDynamicStyles in the deprecated
-// Button.tsx. Matrix rules only assign CSS custom properties; the actual
-// declarations live on the flat .button class so twenty-front styled(Button)
-// overrides keep beating them at (0,1,0) specificity, exactly like the legacy
-// single Linaria class did.
-// Cascade order inside each branch: base, then [data-focus], then
-// [data-disabled], then [data-disabled][data-focus] — later rules win, which
-// replicates the Linaria switch precedence (disabled > focus > base).
-
-.wrapper {
- max-width: none;
- position: relative;
- width: auto;
-}
-
-.wrapperLoading {
- max-width: calc(100% - var(--t-spacing-8));
-}
-
.button {
- --tw-button-color: var(--btn-color, var(--t-font-color-secondary));
+ @include focus-ring;
+
+ --tw-button-background: var(--t-background-transparent-lighter);
+ --tw-button-border: var(--t-background-transparent-light);
+ --tw-button-color: var(--t-font-color-secondary);
+ --tw-button-hover: var(--t-background-tertiary);
+ --tw-button-active: var(--t-background-quaternary);
align-items: center;
- background: var(--btn-bg, transparent);
- border-color: var(--btn-border-color, transparent);
- border-radius: var(--btn-radius, var(--t-border-radius-md));
- border-style: solid;
- border-width: var(--btn-border-width, 1px 1px 1px 1px);
- box-shadow: var(--btn-box-shadow, none);
+ background: var(--tw-button-background);
+ block-size: var(--t-spacing-8);
+ border: 1px solid var(--tw-button-border);
+ border-radius: var(--t-border-radius-md);
box-sizing: border-box;
- color: var(--btn-color, var(--t-font-color-secondary));
+ color: var(--tw-button-color);
cursor: pointer;
- display: flex;
- flex-direction: row;
+ display: inline-flex;
+ flex-shrink: 0;
font-family: var(--t-font-family);
font-size: var(--t-font-size-md);
- font-weight: 500;
- gap: var(--t-spacing-1);
- justify-content: var(--btn-justify, flex-start);
- padding: 0 var(--t-spacing-2) 0 var(--t-spacing-2);
+ font-weight: var(--tw-button-font-weight, var(--t-font-weight-medium));
+ justify-content: center;
+ max-inline-size: 100%;
+ min-inline-size: 0;
+ padding: 0 var(--tw-button-padding-inline, var(--t-spacing-2));
+ position: relative;
text-decoration: none;
transition: background 0.1s ease;
+ vertical-align: middle;
white-space: nowrap;
- width: auto;
- &:hover {
- background: var(--btn-hover-bg, transparent);
+ &[data-size='sm'] {
+ block-size: var(--t-spacing-6);
}
-
- &:active {
- background: var(--btn-active-bg, transparent);
+ &[data-full-width] {
+ inline-size: 100%;
}
-
- &:focus {
- outline: none;
+ &[data-elevated] {
+ box-shadow: var(--t-box-shadow-light);
+ }
+ &[data-variant='solid'] {
+ --tw-button-background: var(--t-background-primary-inverted);
+ --tw-button-border: var(--t-background-transparent-strong);
+ --tw-button-color: var(--t-font-color-inverted);
+ --tw-button-hover: var(--t-background-primary-inverted-hover);
+ --tw-button-active: var(--t-background-primary-inverted-hover);
+ }
+ &[data-variant='ghost'] {
+ --tw-button-background: transparent;
+ --tw-button-border: transparent;
+ --tw-button-hover: var(--t-background-transparent-light);
+ --tw-button-active: var(--t-background-transparent-medium);
+ }
+ &[data-variant='soft'] {
+ --tw-button-background: var(--t-background-transparent-light);
+ --tw-button-border: transparent;
+ --tw-button-hover: var(--t-background-transparent-medium);
+ --tw-button-active: var(--t-background-transparent-strong);
+ }
+ &:not([data-disabled]) {
+ @include hover-capable {
+ &:hover {
+ background: var(--tw-button-hover);
+ }
+ }
+ &:active {
+ background: var(--tw-button-active);
+ }
}
-
- @include focus-ring;
-
&[data-disabled] {
cursor: not-allowed;
+ opacity: 0.5;
+ }
+ &[data-loading] {
+ cursor: progress;
+ }
+ @media (prefers-reduced-motion: reduce) {
+ transition: none;
}
}
-.small {
- height: 24px;
-}
-
-.medium {
- height: 32px;
-}
-
-// Applied to both the wrapper and the button; declared after them so the
-// sizing wins the cascade at equal specificity, including over
-// .wrapperLoading's max-width shrink which only applies to auto-width buttons.
-.fullWidth {
- max-width: 100%;
- width: 100%;
-}
-
-// position only reshapes radius and collapses inner borders. The legacy
-// '1px 1px' override for primary/danger is omitted: it computes to the same
-// 1px on every side as the default.
-.button[data-position='left'] {
- --btn-radius: var(--t-border-radius-md) 0px 0px var(--t-border-radius-md);
- --btn-border-width: 1px 0px 1px 1px;
-}
-
-.button[data-position='middle'] {
- --btn-radius: 0px;
- --btn-border-width: 1px 0px 1px 0px;
-}
-
-.button[data-position='right'] {
- --btn-radius: 0px var(--t-border-radius-md) var(--t-border-radius-md) 0px;
- --btn-border-width: 1px 1px 1px 0px;
-}
-
-// variant=primary, not inverted, keyed by accent.
-// focus-needs-enabled mirrors the one asymmetry of the legacy switch: the
-// default accent only shows its focus border when enabled, while blue and
-// danger keep the focus border even when disabled.
-$primary-accents: (
- 'default': (
- bg: var(--t-background-transparent-lighter),
- bg-disabled: var(--t-background-transparent-lighter),
- border: var(--t-background-transparent-light),
- border-focus: var(--t-color-blue),
- focus-needs-enabled: true,
- shadow-focus: var(--t-accent-tertiary),
- color: var(--t-font-color-secondary),
- color-disabled: var(--t-font-color-extra-light),
- hover: var(--t-background-tertiary),
- active: var(--t-background-quaternary),
- ),
- 'blue': (
- bg: var(--t-color-blue),
- bg-disabled: var(--t-accent-accent4060),
- border: var(--t-background-transparent-light),
- border-focus: var(--t-color-blue),
- focus-needs-enabled: false,
- shadow-focus: var(--t-accent-tertiary),
- color: $gray-scale-light-gray1,
- color-disabled: $gray-scale-light-gray1,
+$colors: (
+ 'accent': (
+ base: var(--t-color-blue),
+ text: var(--t-color-blue),
+ border: var(--t-accent-primary),
hover: var(--t-color-blue10),
active: var(--t-color-blue12),
+ soft: var(--t-accent-tertiary),
+ soft-hover: var(--t-accent-secondary),
),
'danger': (
- bg: var(--t-color-red),
- bg-disabled: var(--t-color-red),
- border: var(--t-background-transparent-light),
- border-focus: var(--t-color-red),
- focus-needs-enabled: false,
- shadow-focus: var(--t-color-red3),
- color: var(--t-background-primary),
- color-disabled: var(--t-background-primary),
+ base: var(--t-color-red),
+ text: var(--t-color-red11),
+ border: var(--t-border-color-danger),
hover: var(--t-color-red8),
active: var(--t-color-red10),
+ soft: var(--t-background-danger),
+ soft-hover: var(--t-color-red3),
),
- 'green': (
- bg: var(--t-color-green9),
- bg-disabled: var(--t-color-green3),
- border: var(--t-background-transparent-light),
- border-focus: var(--t-color-green9),
- focus-needs-enabled: false,
- shadow-focus: var(--t-color-green3),
- color: $gray-scale-light-gray1,
- color-disabled: var(--t-color-green9),
+ 'success': (
+ base: var(--t-color-green9),
+ text: var(--t-color-green9),
+ border: var(--t-color-green9),
hover: var(--t-color-green10),
active: var(--t-color-green12),
+ soft: var(--t-color-green3),
+ soft-hover: var(--t-color-green4),
),
);
-@each $accent, $tokens in $primary-accents {
- .button[data-variant='primary'][data-accent='#{$accent}']:not(
- [data-inverted]
- ) {
- --btn-bg: #{map.get($tokens, bg)};
- --btn-border-color: #{map.get($tokens, border)};
- --btn-color: #{map.get($tokens, color)};
- --btn-hover-bg: #{map.get($tokens, hover)};
- --btn-active-bg: #{map.get($tokens, active)};
- }
-
- .button[data-variant='primary'][data-accent='#{$accent}']:not(
- [data-inverted]
- )[data-focus] {
- --btn-border-color: #{map.get($tokens, border-focus)};
- --btn-box-shadow: 0 0 0 3px #{map.get($tokens, shadow-focus)};
- }
-
- .button[data-variant='primary'][data-accent='#{$accent}']:not(
- [data-inverted]
- )[data-disabled] {
- --btn-bg: #{map.get($tokens, bg-disabled)};
- --btn-box-shadow: none;
- --btn-color: #{map.get($tokens, color-disabled)};
- --btn-hover-bg: #{map.get($tokens, bg-disabled)};
- --btn-active-bg: #{map.get($tokens, bg-disabled)};
-
- @if map.get($tokens, focus-needs-enabled) {
- --btn-border-color: #{map.get($tokens, border)};
+@each $color, $tokens in $colors {
+ .button[data-color='#{$color}'] {
+ --tw-button-color: #{map.get($tokens, text)};
+ --tw-button-hover: #{map.get($tokens, soft)};
+ --tw-button-active: #{map.get($tokens, soft-hover)};
+
+ &[data-variant='solid'] {
+ --tw-button-background: #{map.get($tokens, base)};
+ --tw-button-border: var(--t-background-transparent-light);
+ --tw-button-color: color(display-p3 1 1 1);
+ --tw-button-hover: #{map.get($tokens, hover)};
+ --tw-button-active: #{map.get($tokens, active)};
}
- }
-}
-
-// variant=primary, inverted: identical across accents except for the text
-// color.
-$primary-inverted-colors: (
- 'default': var(--t-font-color-secondary),
- 'blue': var(--t-color-blue),
- 'danger': var(--t-color-red),
- 'green': var(--t-color-green9),
-);
-
-.button[data-variant='primary'][data-inverted] {
- --btn-bg: var(--t-background-primary);
- --btn-border-color: var(--t-background-transparent-light);
- --btn-hover-bg: var(--t-background-secondary);
- --btn-active-bg: var(--t-background-tertiary);
-}
-
-@each $accent, $color in $primary-inverted-colors {
- .button[data-variant='primary'][data-accent='#{$accent}'][data-inverted] {
- --btn-color: #{$color};
- }
-}
-
-.button[data-variant='primary'][data-inverted][data-focus] {
- --btn-box-shadow: 0 0 0 3px var(--t-background-transparent-medium);
-}
-
-.button[data-variant='primary'][data-inverted][data-disabled] {
- --btn-box-shadow: none;
- --btn-hover-bg: var(--t-background-primary);
- --btn-active-bg: var(--t-background-primary);
-}
-
-// variant=secondary|tertiary, not inverted, keyed by accent. Background stays
-// transparent (the .button fallback). The two variants only differ in their
-// resting border: secondary uses border-secondary, tertiary is borderless.
-// focus-needs-enabled-secondary mirrors the legacy gating: only
-// secondary/default hides its focus border when disabled.
-$secondary-accents: (
- 'default': (
- border-secondary: var(--t-background-transparent-medium),
- border-focus: var(--t-color-blue),
- focus-needs-enabled-secondary: true,
- shadow-focus: var(--t-accent-tertiary),
- color: var(--t-font-color-secondary),
- color-disabled: var(--t-font-color-extra-light),
- hover: var(--t-background-transparent-light),
- active: var(--t-background-transparent-light),
- ),
- 'blue': (
- border-secondary: var(--t-accent-primary),
- border-focus: var(--t-color-blue),
- focus-needs-enabled-secondary: false,
- shadow-focus: var(--t-accent-tertiary),
- color: var(--t-color-blue),
- color-disabled: var(--t-accent-accent4060),
- hover: var(--t-accent-tertiary),
- active: var(--t-accent-secondary),
- ),
- 'danger': (
- border-secondary: var(--t-border-color-danger),
- border-focus: var(--t-color-red),
- focus-needs-enabled-secondary: false,
- shadow-focus: var(--t-color-red3),
- color: var(--t-font-color-danger),
- color-disabled: var(--t-color-red5),
- hover: var(--t-background-danger),
- active: var(--t-background-danger),
- ),
- 'green': (
- border-secondary: var(--t-color-green9),
- border-focus: var(--t-color-green9),
- focus-needs-enabled-secondary: false,
- shadow-focus: var(--t-color-green3),
- color: var(--t-color-green9),
- color-disabled: var(--t-color-green3),
- hover: var(--t-color-green3),
- active: var(--t-color-green4),
- ),
-);
-
-@each $accent, $tokens in $secondary-accents {
- .button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-accent='#{$accent}']:not([data-inverted]) {
- --btn-color: #{map.get($tokens, color)};
- --btn-hover-bg: #{map.get($tokens, hover)};
- --btn-active-bg: #{map.get($tokens, active)};
- }
-
- .button[data-variant='secondary'][data-accent='#{$accent}']:not(
- [data-inverted]
- ) {
- --btn-border-color: #{map.get($tokens, border-secondary)};
- }
-
- .button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-accent='#{$accent}']:not([data-inverted])[data-focus] {
- --btn-border-color: #{map.get($tokens, border-focus)};
- --btn-box-shadow: 0 0 0 3px #{map.get($tokens, shadow-focus)};
- }
-
- .button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-accent='#{$accent}']:not([data-inverted])[data-disabled] {
- --btn-box-shadow: none;
- --btn-color: #{map.get($tokens, color-disabled)};
- --btn-hover-bg: transparent;
- --btn-active-bg: transparent;
- }
-
- @if map.get($tokens, focus-needs-enabled-secondary) {
- .button[data-variant='secondary'][data-accent='#{$accent}']:not(
- [data-inverted]
- )[data-disabled] {
- --btn-border-color: #{map.get($tokens, border-secondary)};
+ &[data-variant='outline'] {
+ --tw-button-background: transparent;
+ --tw-button-border: #{map.get($tokens, border)};
+ }
+ &[data-variant='soft'] {
+ --tw-button-background: #{map.get($tokens, soft)};
+ --tw-button-hover: #{map.get($tokens, soft-hover)};
}
}
}
-// variant=secondary|tertiary, inverted: identical across accents. Hover and
-// active stay enabled even when disabled, matching the legacy source.
-.button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-inverted] {
- --btn-color: var(--t-font-color-inverted);
- --btn-hover-bg: var(--t-background-transparent-light);
- --btn-active-bg: var(--t-background-transparent-medium);
+.content {
+ align-items: center;
+ display: inline-flex;
+ gap: var(--t-spacing-1);
+ justify-content: inherit;
+ max-inline-size: 100%;
+ min-inline-size: 0;
}
-
-.button[data-variant='secondary'][data-inverted] {
- --btn-border-color: var(--t-background-transparent-primary);
+.label {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
+.icon {
+ align-items: center;
+ display: inline-flex;
+ flex-shrink: 0;
-.button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-inverted][data-focus] {
- --btn-border-color: #{$gray-scale-light-gray1};
- --btn-box-shadow: 0 0 0 3px var(--t-background-transparent-medium);
+ & > svg {
+ block-size: calc(var(--t-icon-size-sm) * 1px);
+ inline-size: calc(var(--t-icon-size-sm) * 1px);
+ }
}
-
-.button:is(
- [data-variant='secondary'],
- [data-variant='tertiary']
- )[data-inverted][data-disabled] {
- --btn-box-shadow: none;
+.hidden {
+ opacity: 0;
}
-
-.button[data-variant='secondary'][data-inverted][data-disabled] {
- --btn-border-color: #{$gray-scale-light-gray1};
+.loader {
+ align-items: center;
+ display: flex;
+ inline-size: var(--t-spacing-6);
+ inset: 0;
+ margin: auto;
+ position: absolute;
}
diff --git a/packages/twenty-ui/src/primitives/input/Button/Button.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/Button/Button.module.scss.d.ts
index 3cf3ea6a313..c33ff6ecf6f 100644
--- a/packages/twenty-ui/src/primitives/input/Button/Button.module.scss.d.ts
+++ b/packages/twenty-ui/src/primitives/input/Button/Button.module.scss.d.ts
@@ -1,9 +1,9 @@
declare const classNames: {
- readonly wrapper: 'wrapper';
- readonly wrapperLoading: 'wrapperLoading';
readonly button: 'button';
- readonly small: 'small';
- readonly medium: 'medium';
- readonly fullWidth: 'fullWidth';
+ readonly content: 'content';
+ readonly label: 'label';
+ readonly icon: 'icon';
+ readonly hidden: 'hidden';
+ readonly loader: 'loader';
};
export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/Button/Button.tsx b/packages/twenty-ui/src/primitives/input/Button/Button.tsx
index 047447b06f0..a7a0270a141 100644
--- a/packages/twenty-ui/src/primitives/input/Button/Button.tsx
+++ b/packages/twenty-ui/src/primitives/input/Button/Button.tsx
@@ -1,152 +1,88 @@
-import { type ButtonProps } from './types/ButtonProps';
-
+import { Button as ButtonPrimitive } from '@base-ui/react/button';
import { clsx } from 'clsx';
-import React, { useState } from 'react';
-import { Link } from 'react-router-dom';
-import { isDefined } from '@ui/utilities/utils/isDefined';
+import { useContext } from 'react';
+import { Loader } from '@ui/primitives/feedback/Loader/Loader';
import { ButtonHotkeys } from '@ui/primitives/input/Button/internal/ButtonHotKeys';
-import { ButtonIcon } from '@ui/primitives/input/Button/internal/ButtonIcon';
import { ButtonSoon } from '@ui/primitives/input/Button/internal/ButtonSoon';
+import { ButtonGroupContext } from '@ui/primitives/input/ButtonGroup/internal/ButtonGroupContext';
+import { mergeClassNames } from '@ui/utilities/internal/mergeClassNames';
import { useIsMobile } from '@ui/utilities';
-
-import { ButtonText } from '@ui/primitives/input/Button/internal/ButtonText';
+import { isDefined } from '@ui/utilities/utils/isDefined';
import styles from './Button.module.scss';
+import { type ButtonProps } from './types/ButtonProps';
export const Button = ({
- className,
- Icon,
- title,
- id,
+ variant = 'outline',
+ color = 'neutral',
+ size = 'md',
fullWidth = false,
- variant = 'primary',
- inverted = false,
- size = 'medium',
- accent = 'default',
- position = 'standalone',
+ loading = false,
+ elevated = false,
+ startIcon,
+ endIcon,
+ hotkeys,
soon = false,
+ soonLabel,
disabled = false,
- justify = 'flex-start',
- focus: propFocus = false,
- onClick,
- to,
- target,
- dataTestId,
- dataClickOutsideId,
- dataGloballyPreventClickOutside,
- hotkeys,
- ariaLabel,
- 'aria-label': nativeAriaLabel,
- ariaExpanded,
- 'aria-expanded': nativeAriaExpanded,
- 'aria-controls': ariaControls,
- 'aria-haspopup': ariaHasPopup,
- 'aria-disabled': ariaDisabled,
- 'data-base-ui-click-trigger': dataBaseUiClickTrigger,
- 'data-popup-open': dataPopupOpen,
- 'data-pressed': dataPressed,
- onFocus,
- onBlur,
- onKeyDown,
- onKeyUp,
- onMouseDown,
- onMouseMove,
- onMouseLeave,
- onPointerDown,
- onPointerEnter,
- ref,
- role,
- tabIndex,
- style,
- type,
- isLoading = false,
+ href,
+ render,
+ nativeButton,
+ className,
+ children,
+ ...props
}: ButtonProps) => {
+ const buttonGroup = useContext(ButtonGroupContext);
+ const resolvedVariant = buttonGroup?.variant ?? variant;
+ const resolvedColor = buttonGroup?.color ?? color;
+ const resolvedSize = buttonGroup?.size ?? size;
const isMobile = useIsMobile();
-
- const [isFocused, setIsFocused] = useState(propFocus);
- const isDisabled = soon || disabled;
-
- // Replaces the legacy Linaria `as` polymorphism: react-router Link when a
- // `to` is provided, a native button otherwise. Typed as any to forward all
- // props untyped, exactly like the legacy `as` prop did.
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const ButtonComponent: any = to ? Link : 'button';
+ const isNativeButton = nativeButton ?? !isDefined(href);
+ const nonNativeRole = isDefined(href) ? 'link' : 'button';
+ const resolvedRole =
+ props.role ?? (isNativeButton ? undefined : nonNativeRole);
return (
- <div
- className={clsx(
- styles.wrapper,
- isLoading && styles.wrapperLoading,
- fullWidth && styles.fullWidth,
- )}
+ <ButtonPrimitive
+ {...props}
+ className={mergeClassNames(styles.button, className)}
+ data-variant={resolvedVariant}
+ data-color={resolvedColor}
+ data-size={resolvedSize}
+ data-full-width={fullWidth || undefined}
+ data-loading={loading || undefined}
+ data-elevated={elevated || undefined}
+ aria-busy={loading || props['aria-busy']}
+ disabled={disabled || soon || loading}
+ role={resolvedRole}
+ nativeButton={isNativeButton}
+ render={
+ render ?? (isDefined(href) ? <a href={href}>{children}</a> : undefined)
+ }
>
- <ButtonComponent
- ref={ref}
- id={id}
- role={role}
- tabIndex={tabIndex}
- className={clsx(
- styles.button,
- styles[size],
- fullWidth && styles.fullWidth,
- className,
- )}
- data-variant={variant}
- data-accent={accent}
- data-position={position}
- data-inverted={inverted || undefined}
- data-disabled={isDisabled || undefined}
- data-focus={isFocused || undefined}
- disabled={isDisabled}
- onClick={onClick}
- onKeyDown={onKeyDown}
- onKeyUp={onKeyUp}
- onMouseDown={onMouseDown}
- onMouseMove={onMouseMove}
- onMouseLeave={onMouseLeave}
- onPointerDown={onPointerDown}
- onPointerEnter={onPointerEnter}
- to={to}
- target={target}
- data-testid={dataTestId}
- data-click-outside-id={dataClickOutsideId}
- data-globally-prevent-click-outside={dataGloballyPreventClickOutside}
- data-base-ui-click-trigger={dataBaseUiClickTrigger}
- data-popup-open={dataPopupOpen}
- data-pressed={dataPressed}
- aria-label={ariaLabel ?? nativeAriaLabel}
- aria-expanded={ariaExpanded ?? nativeAriaExpanded}
- aria-controls={ariaControls}
- aria-haspopup={ariaHasPopup}
- aria-disabled={ariaDisabled}
- type={type}
- onFocus={(event: React.FocusEvent<HTMLButtonElement>) => {
- setIsFocused(true);
- onFocus?.(event);
- }}
- onBlur={(event: React.FocusEvent<HTMLButtonElement>) => {
- setIsFocused(false);
- onBlur?.(event);
- }}
- style={{ ...style, '--btn-justify': justify } as React.CSSProperties}
- >
- {(isLoading || Icon) && (
- <ButtonIcon Icon={Icon} isLoading={!!isLoading} />
+ <span className={clsx(styles.content, loading && styles.hidden)}>
+ {isDefined(startIcon) && (
+ <span className={styles.icon} aria-hidden>
+ {startIcon}
+ </span>
)}
- {isDefined(title) && (
- <ButtonText hasIcon={!!Icon} title={title} isLoading={isLoading} />
+ {isDefined(children) && (
+ <span className={styles.label}>{children}</span>
)}
- {hotkeys && !isMobile && (
- <ButtonHotkeys
- hotkeys={hotkeys}
- variant={variant}
- accent={accent}
- size={size}
- />
+ {isDefined(endIcon) && (
+ <span className={styles.icon} aria-hidden>
+ {endIcon}
+ </span>
)}
- {soon && <ButtonSoon />}
- </ButtonComponent>
- </div>
+ {isDefined(hotkeys) && !isMobile && <ButtonHotkeys hotkeys={hotkeys} />}
+ {soon && <ButtonSoon label={soonLabel} />}
+ </span>
+ {loading && (
+ <span className={styles.loader} aria-hidden>
+ <Loader />
+ </span>
+ )}
+ </ButtonPrimitive>
);
};
diff --git a/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx b/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
index af609a8c63a..12a94042185 100644
--- a/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/Button/__stories__/Button.stories.tsx
@@ -1,362 +1,236 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconReload, IconSearch } from '@ui/icon';
+import { useState } from 'react';
+import { MemoryRouter, Link, useLocation } from 'react-router-dom';
+import { expect, fn, userEvent, within } from 'storybook/test';
+
+import { IconArrowRight, IconPlus } from '@ui/icon';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
type CatalogStory,
ComponentDecorator,
} from '@ui/testing';
-import { Button } from '@ui/primitives/input/Button/Button';
-import type { ButtonAccent } from '@ui/primitives/input/Button/types/ButtonAccent';
-import type { ButtonPosition } from '@ui/primitives/input/Button/types/ButtonPosition';
-import type { ButtonSize } from '@ui/primitives/input/Button/types/ButtonSize';
-import type { ButtonVariant } from '@ui/primitives/input/Button/types/ButtonVariant';
+import { Button } from '../Button';
+import { type ButtonProps } from '../types/ButtonProps';
+import { type ButtonVariant } from '../types/ButtonVariant';
+import { type ButtonColor } from '../types/ButtonColor';
const meta: Meta<typeof Button> = {
title: 'UI/Input/Button/Button',
component: Button,
+ args: { children: 'Save changes' },
};
-
export default meta;
type Story = StoryObj<typeof Button>;
-export const Default: Story = {
- parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
- argTypes: {
- hotkeys: { control: false },
- Icon: { control: false },
+export const Default: Story = { decorators: [ComponentDecorator] };
+export const Keyboard: Story = {
+ ...Default,
+ args: { onClick: fn(), onFocus: fn(), onBlur: fn() },
+ play: async ({ canvasElement, args }) => {
+ const button = within(canvasElement).getByRole('button');
+ button.focus();
+ await expect(args.onFocus).toHaveBeenCalledOnce();
+ await userEvent.keyboard('{Enter} ');
+ await expect(args.onClick).toHaveBeenCalledTimes(2);
+ await userEvent.tab();
+ await expect(args.onBlur).toHaveBeenCalledOnce();
},
- args: {
- title: 'Button',
- size: 'small',
- variant: 'primary',
- inverted: false,
- accent: 'danger',
- disabled: false,
- focus: false,
- fullWidth: false,
- soon: false,
- position: 'standalone',
- Icon: IconSearch,
- className: '',
- isLoading: false,
+};
+export const Disabled: Story = {
+ ...Default,
+ args: { disabled: true, onClick: fn() },
+ play: async ({ canvasElement, args }) => {
+ const button = within(canvasElement).getByRole('button');
+ await expect(button).toBeDisabled();
+ await userEvent.click(button);
+ await expect(args.onClick).not.toHaveBeenCalled();
},
- decorators: [ComponentDecorator],
+};
+export const Soon: Story = {
+ ...Disabled,
+ args: { soon: true, soonLabel: 'Coming soon', onClick: fn() },
};
-export const Catalog: CatalogStory<Story, typeof Button> = {
- args: { title: 'Filter', Icon: IconSearch, hotkeys: ['⌘', 'O'] },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- disabled: { control: false },
- focus: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
- className: { control: false },
- isLoading: { control: false },
+const LoadingExample = () => {
+ const [loading, setLoading] = useState(false);
+ return (
+ <>
+ <Button
+ startIcon={<IconPlus />}
+ loading={loading}
+ onClick={() => setLoading(true)}
+ >
+ Create record
+ </Button>
+ <Button onClick={() => setLoading(false)}>Complete request</Button>
+ </>
+ );
+};
+export const Loading: Story = {
+ ...Default,
+ render: () => <LoadingExample />,
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const button = canvas.getByRole('button', { name: 'Create record' });
+ const width = button.getBoundingClientRect().width;
+ await userEvent.click(button);
+ await expect(button).toHaveAttribute('aria-busy', 'true');
+ await expect(button).toBeDisabled();
+ await expect(button.getBoundingClientRect().width).toBe(width);
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Complete request' }),
+ );
+ await expect(button).toBeEnabled();
},
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
- catalog: {
- dimensions: [
- {
- name: 'sizes',
- values: ['small', 'medium'] satisfies ButtonSize[],
- props: (size: ButtonSize) => ({ size }),
- },
- {
- name: 'states',
- values: [
- 'default',
- 'hover',
- 'pressed',
- 'disabled',
- 'focus',
- 'disabled+focus',
- ],
- props: (state: string) => {
- switch (state) {
- case 'default':
- return {};
- case 'hover':
- case 'pressed':
- return { className: state };
- case 'focus':
- return { focus: true };
- case 'disabled':
- return { disabled: true };
- case 'active':
- return { active: true };
- case 'disabled+focus':
- return { focus: true, disabled: true };
- default:
- return {};
- }
- },
- },
- {
- name: 'accents',
- values: ['default', 'blue', 'danger'] satisfies ButtonAccent[],
- props: (accent: ButtonAccent) => ({ accent }),
- },
- {
- name: 'variants',
- values: [
- 'primary',
- 'secondary',
- 'tertiary',
- ] satisfies ButtonVariant[],
- props: (variant: ButtonVariant) => ({ variant }),
- },
- ],
- },
+};
+export const NativeForm: Story = {
+ ...Default,
+ args: { onClick: fn() },
+ render: (args) => (
+ <form aria-label="Profile" onSubmit={(event) => event.preventDefault()}>
+ <input aria-label="Name" defaultValue="Ada" />
+ <Button {...args}>Default button</Button>
+ <Button type="reset">Reset</Button>
+ <Button type="submit">Submit</Button>
+ </form>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const form = canvas.getByRole('form');
+ const onSubmit = fn();
+ form.addEventListener('submit', onSubmit);
+ await userEvent.click(
+ canvas.getByRole('button', { name: 'Default button' }),
+ );
+ await expect(onSubmit).not.toHaveBeenCalled();
+ await userEvent.click(canvas.getByRole('button', { name: 'Submit' }));
+ await expect(onSubmit).toHaveBeenCalledOnce();
+ const input = canvas.getByRole('textbox');
+ await userEvent.clear(input);
+ await userEvent.type(input, 'Grace');
+ await userEvent.click(canvas.getByRole('button', { name: 'Reset' }));
+ await expect(input).toHaveValue('Ada');
+ form.removeEventListener('submit', onSubmit);
},
- decorators: [CatalogDecorator],
};
-
-export const SoonCatalog: CatalogStory<Story, typeof Button> = {
- args: { title: 'Filter', Icon: IconSearch, soon: true },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- disabled: { control: false },
- focus: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
- className: { control: false },
- hotkeys: { control: false },
+export const LinkButton: Story = {
+ ...Default,
+ args: {
+ href: '#button-destination',
+ target: '_blank',
+ rel: 'noreferrer',
+ children: 'Read documentation',
},
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
- catalog: {
- dimensions: [
- {
- name: 'sizes',
- values: ['small', 'medium'] satisfies ButtonSize[],
- props: (size: ButtonSize) => ({ size }),
- },
- {
- name: 'states',
- values: [
- 'default',
- 'hover',
- 'pressed',
- 'disabled',
- 'focus',
- 'disabled+focus',
- ],
- props: (state: string) => {
- switch (state) {
- case 'default':
- return {};
- case 'hover':
- case 'pressed':
- return { className: state };
- case 'focus':
- return { focus: true };
- case 'disabled':
- return { disabled: true };
- case 'active':
- return { active: true };
- case 'disabled+focus':
- return { focus: true, disabled: true };
- default:
- return {};
- }
- },
- },
- {
- name: 'accents',
- values: ['default', 'blue', 'danger'] satisfies ButtonAccent[],
- props: (accent: ButtonAccent) => ({ accent }),
- },
- {
- name: 'variants',
- values: [
- 'primary',
- 'secondary',
- 'tertiary',
- ] satisfies ButtonVariant[],
- props: (variant: ButtonVariant) => ({ variant }),
- },
- ],
- },
+ play: async ({ canvasElement }) => {
+ const link = within(canvasElement).getByRole('link');
+ await expect(link).toHaveAttribute('href', '#button-destination');
+ await expect(link).not.toHaveAttribute('type');
},
- decorators: [CatalogDecorator],
};
-
-export const PositionCatalog: CatalogStory<Story, typeof Button> = {
- args: { title: 'Filter', Icon: IconSearch },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- disabled: { control: false },
- focus: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
- hotkeys: { control: false },
+export const DisabledLink: Story = {
+ ...Default,
+ args: { href: '#disabled-destination', disabled: true, onClick: fn() },
+ play: async ({ canvasElement, args }) => {
+ const link = within(canvasElement).getByRole('link');
+ await expect(link).toHaveAttribute('aria-disabled', 'true');
+ await userEvent.click(link);
+ await expect(args.onClick).not.toHaveBeenCalled();
},
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
- catalog: {
- dimensions: [
- {
- name: 'positions',
- values: [
- 'standalone',
- 'left',
- 'middle',
- 'right',
- ] satisfies ButtonPosition[],
- props: (position: ButtonPosition) => ({ position }),
- },
- {
- name: 'states',
- values: [
- 'default',
- 'hover',
- 'pressed',
- 'disabled',
- 'focus',
- 'disabled+focus',
- ],
- props: (state: string) => {
- switch (state) {
- case 'default':
- return {};
- case 'hover':
- case 'pressed':
- return { className: state };
- case 'focus':
- return { focus: true };
- case 'disabled':
- return { disabled: true };
- case 'active':
- return { active: true };
- case 'disabled+focus':
- return { focus: true, disabled: true };
- default:
- return {};
- }
- },
- },
- {
- name: 'sizes',
- values: ['small', 'medium'] satisfies ButtonSize[],
- props: (size: ButtonSize) => ({ size }),
- },
- {
- name: 'variants',
- values: [
- 'primary',
- 'secondary',
- 'tertiary',
- ] satisfies ButtonVariant[],
- props: (variant: ButtonVariant) => ({ variant }),
- },
- ],
- },
+};
+const RouterExample = () => {
+ const location = useLocation();
+ return (
+ <>
+ <Button render={<Link to="/settings" />} nativeButton={false} role="link">
+ Open settings
+ </Button>
+ <p>Current path: {location.pathname}</p>
+ </>
+ );
+};
+export const RouterLink: Story = {
+ ...Default,
+ render: () => (
+ <MemoryRouter>
+ <RouterExample />
+ </MemoryRouter>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const link = canvas.getByRole('link');
+ link.focus();
+ await userEvent.keyboard('{Enter}');
+ await expect(canvas.getByText('Current path: /settings')).toBeVisible();
},
- decorators: [CatalogDecorator],
};
-
-export const ShortcutCatalog: CatalogStory<Story, typeof Button> = {
- args: { title: 'Actions', hotkeys: ['⌘', 'O'] },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- disabled: { control: false },
- focus: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
+export const CustomRender: Story = {
+ ...Keyboard,
+ args: {
+ render: <span />,
+ nativeButton: false,
+ onClick: fn(),
+ onFocus: fn(),
+ onBlur: fn(),
},
+};
+export const Icons: Story = {
+ ...Default,
+ args: {
+ startIcon: <IconPlus />,
+ endIcon: <IconArrowRight />,
+ hotkeys: ['⌘', '⏎'],
+ },
+};
+export const Truncation: Story = {
+ ...Default,
+ args: {
+ children: 'A long button label that must remain inside its container',
+ startIcon: <IconPlus />,
+ endIcon: <IconArrowRight />,
+ style: { width: 220 },
+ },
+ play: async ({ canvasElement }) => {
+ const button = within(canvasElement).getByRole('button');
+ await expect(button.scrollWidth).toBeLessThanOrEqual(button.clientWidth);
+ },
+};
+
+const CATALOG_STATES: Record<string, Partial<ButtonProps>> = {
+ default: {},
+ small: { size: 'sm' },
+ disabled: { disabled: true },
+ loading: { loading: true },
+};
+export const Catalog: CatalogStory<Story, typeof Button> = {
+ decorators: [CatalogDecorator],
+ args: { children: 'Button' },
parameters: {
a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
catalog: {
dimensions: [
{
- name: 'sizes',
- values: ['small', 'medium'] satisfies ButtonSize[],
- props: (size: ButtonSize) => ({ size }),
+ name: 'state',
+ values: Object.keys(CATALOG_STATES),
+ props: (state: string) => CATALOG_STATES[state],
},
{
- name: 'accents',
- values: ['default', 'blue', 'danger'] satisfies ButtonAccent[],
- props: (accent: ButtonAccent) => ({ accent }),
+ name: 'color',
+ values: ['neutral', 'accent', 'danger', 'success'],
+ props: (color: ButtonColor) => ({ color }),
},
{
- name: 'variants',
- values: [
- 'primary',
- 'secondary',
- 'tertiary',
- ] satisfies ButtonVariant[],
+ name: 'variant',
+ values: ['solid', 'outline', 'soft', 'ghost'],
props: (variant: ButtonVariant) => ({ variant }),
},
],
+ options: { elementContainer: { style: { width: 100 } } },
},
},
- decorators: [CatalogDecorator],
-};
-
-export const FullWidth: Story = {
- args: { title: 'Filter', Icon: IconSearch, fullWidth: true },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- focus: { control: false },
- disabled: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
- className: { control: false },
- Icon: { control: false },
- },
- decorators: [ComponentDecorator],
};
-
-export const LoadingButton: Story = {
- args: {
- title: 'Reload',
- Icon: IconReload,
- isLoading: true,
- },
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- focus: { control: false },
- disabled: { control: false },
- fullWidth: { control: false },
- soon: { control: false },
- position: { control: false },
- className: { control: false },
- isLoading: { control: 'boolean' },
- },
- parameters: {
- catalog: {
- isLoading: [
- {
- name: 'isLoading',
- values: [true, false] satisfies boolean[],
- props: (value: boolean) => ({ isLoading: value }),
- },
- ],
- },
- },
- decorators: [ComponentDecorator],
+export const CatalogDark: CatalogStory<Story, typeof Button> = {
+ ...Catalog,
+ tags: ['!autodocs'],
+ globals: { colorScheme: 'dark' },
};
diff --git a/packages/twenty-ui/src/primitives/input/Button/__tests__/Button.test.tsx b/packages/twenty-ui/src/primitives/input/Button/__tests__/Button.test.tsx
index 9ebb9205d4e..84e8041beff 100644
--- a/packages/twenty-ui/src/primitives/input/Button/__tests__/Button.test.tsx
+++ b/packages/twenty-ui/src/primitives/input/Button/__tests__/Button.test.tsx
@@ -1,31 +1,10 @@
-import { render, screen } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { describe, expect, it } from 'vitest';
-
-import { ThemeProvider } from '@ui/theme-constants/ThemeProvider';
-
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
import { Button } from '../Button';
+import styles from '../Button.module.scss';
-describe('Button', () => {
- it('ignores unsupported button attributes when rendered as a link', () => {
- const nativeButtonProps = { formAction: '/submit' };
-
- render(
- <MemoryRouter>
- <ThemeProvider colorScheme="light">
- <Button
- {...nativeButtonProps}
- to="/contacts"
- title="Contacts"
- ariaLabel="Contacts"
- />
- </ThemeProvider>
- </MemoryRouter>,
- );
-
- const link = screen.getByRole('link', { name: 'Contacts' });
-
- expect(link).toHaveAttribute('href', '/contacts');
- expect(link).not.toHaveAttribute('formaction');
- });
+runComponentConformance({
+ name: 'Button',
+ element: <Button>Save</Button>,
+ refInstanceOf: HTMLButtonElement,
+ ownClassName: styles.button,
});
diff --git a/packages/twenty-ui/src/primitives/input/Button/constant.ts b/packages/twenty-ui/src/primitives/input/Button/constant.ts
deleted file mode 100644
index 62b9b9e064f..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const baseTransitionTiming = 300;
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss
index c7b46a754d3..589ee7a629d 100644
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss
+++ b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss
@@ -1,35 +1,7 @@
-.separator {
- background: var(--t-font-color-light);
- height: var(--t-spacing-4);
- margin: 0;
- width: 1px;
-
- &[data-size='small'] {
- height: var(--t-spacing-2);
- }
-
- &[data-accent='blue'] {
- background: var(--t-buttons-secondary-text-color);
- }
-
- &[data-accent='danger'] {
- background: var(--t-border-color-danger);
- }
-}
-
-.shortcutLabel {
- color: var(--t-font-color-light);
+.hotkeys {
+ border-inline-start: 1px solid currentColor;
font-weight: var(--t-font-weight-medium);
-
- &[data-accent='blue'] {
- color: var(--t-buttons-secondary-text-color);
- }
-
- &[data-accent='danger'] {
- color: var(--t-color-red8);
- }
-
- &[data-accent='danger'][data-variant='primary'] {
- color: var(--t-border-color-danger);
- }
+ margin-inline-start: var(--t-spacing-1);
+ opacity: 0.7;
+ padding-inline-start: var(--t-spacing-2);
}
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss.d.ts
index f8d905ac622..84db7fe9039 100644
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss.d.ts
+++ b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.module.scss.d.ts
@@ -1,5 +1,4 @@
declare const classNames: {
- readonly separator: 'separator';
- readonly shortcutLabel: 'shortcutLabel';
+ readonly hotkeys: 'hotkeys';
};
export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.tsx b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.tsx
index 9e59a65b870..b509a8e0db1 100644
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.tsx
+++ b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonHotKeys.tsx
@@ -1,31 +1,11 @@
-import type { ButtonAccent } from '@ui/primitives/input/Button/types/ButtonAccent';
-import type { ButtonSize } from '@ui/primitives/input/Button/types/ButtonSize';
-import type { ButtonVariant } from '@ui/primitives/input/Button/types/ButtonVariant';
import { getOsShortcutSeparator } from '@ui/utilities';
import styles from './ButtonHotKeys.module.scss';
-export const ButtonHotkeys = ({
- size,
- accent,
- variant,
- hotkeys,
-}: {
- size: ButtonSize;
- accent: ButtonAccent;
- variant: ButtonVariant;
- hotkeys: string[];
-}) => {
- return (
- <>
- <div className={styles.separator} data-size={size} data-accent={accent} />
- <div
- className={styles.shortcutLabel}
- data-variant={variant}
- data-accent={accent}
- >
- {hotkeys.join(getOsShortcutSeparator())}
- </div>
- </>
- );
-};
+type ButtonHotkeysProps = { hotkeys: string[] };
+
+export const ButtonHotkeys = ({ hotkeys }: ButtonHotkeysProps) => (
+ <span className={styles.hotkeys} aria-hidden>
+ {hotkeys.join(getOsShortcutSeparator())}
+ </span>
+);
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss
deleted file mode 100644
index 475e5f8a46f..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// Mirrors baseTransitionTiming (300) in ../constant.ts — keep in sync.
-$base-transition-timing: 300ms;
-
-.iconWrapper {
- align-items: center;
- display: flex;
- pointer-events: none;
-}
-
-.icon {
- align-items: center;
- color: var(--tw-button-color);
- display: flex;
- height: calc(100% - var(--t-spacing-4));
- opacity: 1;
- transition: opacity ($base-transition-timing * 0.5) ease;
- transition-delay: $base-transition-timing * 0.5;
-
- &[data-loading] {
- opacity: 0;
- transition-delay: 0ms;
- }
-}
-
-.loader {
- left: var(--t-spacing-2);
- opacity: 1;
- position: absolute;
- transition: opacity ($base-transition-timing * 0.5) ease;
- transition-delay: $base-transition-timing * 0.5;
- width: var(--t-spacing-6);
-}
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss.d.ts
deleted file mode 100644
index acd6652bf45..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.module.scss.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare const classNames: {
- readonly iconWrapper: 'iconWrapper';
- readonly icon: 'icon';
- readonly loader: 'loader';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.tsx b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.tsx
deleted file mode 100644
index 2fbf2825447..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonIcon.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { type IconComponent } from '@ui/icon';
-import { Loader } from '@ui/primitives/feedback/Loader/Loader';
-import { useTheme } from '@ui/theme-constants';
-
-import styles from './ButtonIcon.module.scss';
-
-export const ButtonIcon = ({
- Icon,
- isLoading,
-}: {
- Icon?: IconComponent;
- isLoading?: boolean;
-}) => {
- const theme = useTheme();
-
- return (
- <div className={styles.iconWrapper}>
- {isLoading && (
- <div className={styles.loader}>
- <Loader />
- </div>
- )}
- {Icon && (
- <div className={styles.icon} data-loading={isLoading || undefined}>
- <Icon size={theme.icon.size.sm} aria-hidden />
- </div>
- )}
- </div>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss
deleted file mode 100644
index 7cb0c4abf8c..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-// Mirrors baseTransitionTiming (300) in ../constant.ts — keep in sync.
-$base-transition-timing: 300ms;
-
-.textWrapper {
- align-items: center;
- display: flex;
- height: 100%;
- justify-content: center;
- position: relative;
-}
-
-.text {
- clip-path: inset(0 0 0 0);
- overflow: hidden;
- transform: none;
- transition:
- transform $base-transition-timing ease,
- clip-path $base-transition-timing ease;
- transition-delay: $base-transition-timing * 0.25;
- white-space: nowrap;
-
- &[data-loading] {
- clip-path: inset(0 var(--t-spacing-12) 0 0);
- transform: translateX(var(--t-spacing-7));
- transition-delay: 0ms;
- }
-
- &[data-loading][data-has-icon] {
- clip-path: inset(0 var(--t-spacing-6) 0 0);
- transform: translateX(var(--t-spacing-3));
- }
-}
-
-.ellipsis {
- clip-path: inset(0 0 0 var(--t-spacing-6));
- overflow: hidden;
- position: absolute;
- right: 0;
- transition: clip-path $base-transition-timing ease;
-
- &[data-loading] {
- clip-path: inset(0 0 0 0);
- }
-}
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss.d.ts
deleted file mode 100644
index 17cb79c585b..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.module.scss.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare const classNames: {
- readonly textWrapper: 'textWrapper';
- readonly text: 'text';
- readonly ellipsis: 'ellipsis';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.tsx b/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.tsx
deleted file mode 100644
index 145d0093c9b..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/internal/ButtonText.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import styles from './ButtonText.module.scss';
-
-export const ButtonText = ({
- hasIcon = false,
- isLoading,
- title,
-}: {
- isLoading?: boolean;
- hasIcon: boolean;
- title?: string;
-}) => {
- return (
- <div className={styles.textWrapper}>
- <div
- className={styles.text}
- data-loading={isLoading || undefined}
- data-has-icon={hasIcon || undefined}
- >
- {title}
- </div>
- <div className={styles.ellipsis} data-loading={isLoading || undefined}>
- ...
- </div>
- </div>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonAccent.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonAccent.ts
deleted file mode 100644
index 2e108a982e8..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/types/ButtonAccent.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ButtonAccent = 'default' | 'blue' | 'danger' | 'green';
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonColor.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonColor.ts
new file mode 100644
index 00000000000..81aa53a0bd5
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/Button/types/ButtonColor.ts
@@ -0,0 +1 @@
+export type ButtonColor = 'neutral' | 'accent' | 'danger' | 'success';
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonPosition.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonPosition.ts
deleted file mode 100644
index 9200a8f72b1..00000000000
--- a/packages/twenty-ui/src/primitives/input/Button/types/ButtonPosition.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type ButtonPosition = 'standalone' | 'left' | 'middle' | 'right';
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonProps.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonProps.ts
index 7b598d446d4..7cac83b50fb 100644
--- a/packages/twenty-ui/src/primitives/input/Button/types/ButtonProps.ts
+++ b/packages/twenty-ui/src/primitives/input/Button/types/ButtonProps.ts
@@ -1,57 +1,21 @@
-import React from 'react';
-import { type IconComponent } from '@ui/icon/types/IconComponent';
-import { type ClickOutsideAttributes } from '@ui/utilities/types/ClickOutsideAttributes';
+import { type Button as ButtonPrimitive } from '@base-ui/react/button';
+import { type ComponentPropsWithRef, type ReactNode } from 'react';
+
+import { type ButtonColor } from './ButtonColor';
import { type ButtonSize } from './ButtonSize';
-import { type ButtonPosition } from './ButtonPosition';
import { type ButtonVariant } from './ButtonVariant';
-import { type ButtonAccent } from './ButtonAccent';
-export type ButtonProps = {
- id?: string;
- className?: string;
- Icon?: IconComponent;
- title?: string;
- fullWidth?: boolean;
- variant?: ButtonVariant;
- inverted?: boolean;
- size?: ButtonSize;
- position?: ButtonPosition;
- accent?: ButtonAccent;
- soon?: boolean;
- justify?: 'center' | 'flex-start' | 'flex-end';
- disabled?: boolean;
- focus?: boolean;
- onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
- to?: string;
- target?: string;
- dataTestId?: string;
- hotkeys?: string[];
- ariaLabel?: string;
- ariaExpanded?: boolean;
- isLoading?: boolean;
- 'data-base-ui-click-trigger'?: string;
- 'data-popup-open'?: string;
- 'data-pressed'?: string;
-} & Pick<
- React.ComponentPropsWithRef<'button'>,
- | 'ref'
- | 'type'
- | 'role'
- | 'tabIndex'
- | 'style'
- | 'aria-label'
- | 'aria-expanded'
- | 'aria-controls'
- | 'aria-haspopup'
- | 'aria-disabled'
- | 'onFocus'
- | 'onBlur'
- | 'onKeyDown'
- | 'onKeyUp'
- | 'onMouseDown'
- | 'onMouseMove'
- | 'onMouseLeave'
- | 'onPointerDown'
- | 'onPointerEnter'
-> &
- ClickOutsideAttributes;
+export type ButtonProps = Omit<ButtonPrimitive.Props, 'color'> &
+ Pick<ComponentPropsWithRef<'a'>, 'href' | 'target' | 'rel' | 'download'> & {
+ variant?: ButtonVariant;
+ color?: ButtonColor;
+ size?: ButtonSize;
+ fullWidth?: boolean;
+ loading?: boolean;
+ elevated?: boolean;
+ startIcon?: ReactNode;
+ endIcon?: ReactNode;
+ hotkeys?: string[];
+ soon?: boolean;
+ soonLabel?: string;
+ };
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonSize.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonSize.ts
index 8984bde68ed..083445bdd57 100644
--- a/packages/twenty-ui/src/primitives/input/Button/types/ButtonSize.ts
+++ b/packages/twenty-ui/src/primitives/input/Button/types/ButtonSize.ts
@@ -1 +1 @@
-export type ButtonSize = 'medium' | 'small';
+export type ButtonSize = 'sm' | 'md';
diff --git a/packages/twenty-ui/src/primitives/input/Button/types/ButtonVariant.ts b/packages/twenty-ui/src/primitives/input/Button/types/ButtonVariant.ts
index 28eac9f82e2..8c10f48d538 100644
--- a/packages/twenty-ui/src/primitives/input/Button/types/ButtonVariant.ts
+++ b/packages/twenty-ui/src/primitives/input/Button/types/ButtonVariant.ts
@@ -1 +1 @@
-export type ButtonVariant = 'primary' | 'secondary' | 'tertiary';
+export type ButtonVariant = 'solid' | 'outline' | 'ghost' | 'soft';
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.module.scss b/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.module.scss
index f93d20c4bae..1225d53072f 100644
--- a/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.module.scss
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.module.scss
@@ -1,4 +1,18 @@
.container {
border-radius: var(--t-border-radius-md);
- display: flex;
+ display: inline-flex;
+ max-inline-size: 100%;
+
+ & > :not(:first-child) {
+ border-start-start-radius: 0;
+ border-end-start-radius: 0;
+ margin-inline-start: -1px;
+ }
+ & > :not(:last-child) {
+ border-start-end-radius: 0;
+ border-end-end-radius: 0;
+ }
+ & > :focus-visible {
+ z-index: 1;
+ }
}
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.tsx b/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.tsx
index 8a266769988..b2861639038 100644
--- a/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.tsx
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/ButtonGroup.tsx
@@ -1,58 +1,34 @@
+import { useRender } from '@base-ui/react/use-render';
import { clsx } from 'clsx';
-import React, { type ReactNode } from 'react';
-import { isDefined } from '@ui/utilities/utils/isDefined';
-
-import type { ButtonPosition } from '@ui/primitives/input/Button/types/ButtonPosition';
-import type { ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
import styles from './ButtonGroup.module.scss';
-
-export type ButtonGroupProps = Partial<
- Pick<ButtonProps, 'variant' | 'size' | 'accent'>
-> & {
- className?: string;
- children: ReactNode[];
-};
+import { ButtonGroupContext } from './internal/ButtonGroupContext';
+import { type ButtonGroupProps } from './types/ButtonGroupProps';
export const ButtonGroup = ({
className,
children,
variant,
size,
- accent,
+ color,
+ render,
+ ref,
+ ...props
}: ButtonGroupProps) => {
- return (
- <div className={clsx(styles.container, className)}>
- {React.Children.map(children, (child, index) => {
- if (!React.isValidElement(child)) return null;
-
- let position: ButtonPosition;
-
- if (index === 0) {
- position = 'left';
- } else if (index === children.length - 1) {
- position = 'right';
- } else {
- position = 'middle';
- }
+ const element = useRender({
+ render,
+ ref,
+ props: {
+ role: 'group',
+ ...props,
+ className: clsx(styles.container, className),
+ children,
+ },
+ });
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const additionalProps: any = { position };
-
- if (isDefined(variant)) {
- additionalProps.variant = variant;
- }
-
- if (isDefined(accent)) {
- additionalProps.accent = accent;
- }
-
- if (isDefined(size)) {
- additionalProps.size = size;
- }
-
- return React.cloneElement(child, additionalProps);
- })}
- </div>
+ return (
+ <ButtonGroupContext.Provider value={{ variant, color, size }}>
+ {element}
+ </ButtonGroupContext.Provider>
);
};
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx b/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
index 272a9b95196..08373b8d9c3 100644
--- a/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/__stories__/ButtonGroup.stories.tsx
@@ -1,83 +1,114 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, userEvent, within } from 'storybook/test';
import { IconCheckbox, IconNotes, IconTimelineEvent } from '@ui/icon';
-import {
- A11Y_DEFER_COLOR_CONTRAST,
- CatalogDecorator,
- type CatalogStory,
- ComponentDecorator,
-} from '@ui/testing';
+import { ComponentDecorator } from '@ui/testing';
import { Button } from '@ui/primitives/input/Button/Button';
-import type { ButtonAccent } from '@ui/primitives/input/Button/types/ButtonAccent';
-import type { ButtonSize } from '@ui/primitives/input/Button/types/ButtonSize';
-import type { ButtonVariant } from '@ui/primitives/input/Button/types/ButtonVariant';
import { ButtonGroup } from '@ui/primitives/input/ButtonGroup/ButtonGroup';
const meta: Meta<typeof ButtonGroup> = {
title: 'UI/Input/Button/ButtonGroup',
component: ButtonGroup,
};
-
export default meta;
type Story = StoryObj<typeof ButtonGroup>;
export const Default: Story = {
- parameters: { a11y: A11Y_DEFER_COLOR_CONTRAST },
args: {
- size: 'small',
- variant: 'primary',
- accent: 'danger',
+ 'aria-label': 'Create activity',
+ size: 'sm',
children: [
- <Button key="note" Icon={IconNotes} title="Note" />,
- <Button key="task" Icon={IconCheckbox} title="Task" />,
- <Button key="activity" Icon={IconTimelineEvent} title="Activity" />,
+ <Button key="note" startIcon={<IconNotes />}>
+ Note
+ </Button>,
+ <Button key="task" startIcon={<IconCheckbox />}>
+ Task
+ </Button>,
+ <Button key="activity" startIcon={<IconTimelineEvent />}>
+ Activity
+ </Button>,
],
},
- argTypes: {
- children: { control: false },
- },
decorators: [ComponentDecorator],
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const buttons = canvas.getAllByRole('button');
+ buttons[0].focus();
+ await userEvent.tab();
+ await expect(buttons[1]).toHaveFocus();
+ },
};
-export const Catalog: CatalogStory<Story, typeof ButtonGroup> = {
+export const Dark: Story = { ...Default, globals: { colorScheme: 'dark' } };
+export const Single: Story = {
+ ...Default,
+ play: undefined,
+ args: { children: <Button>Save</Button> },
+};
+
+const WrappedButton = () => <Button>Wrapped action</Button>;
+
+export const InheritedAppearance: Story = {
+ ...Default,
args: {
- children: [
- <Button key="note" Icon={IconNotes} title="Note" />,
- <Button key="task" Icon={IconCheckbox} title="Task" />,
- <Button key="activity" Icon={IconTimelineEvent} title="Activity" />,
- ],
+ 'aria-label': 'Shared appearance',
+ variant: 'solid',
+ color: 'accent',
+ size: 'sm',
},
- argTypes: {
- size: { control: false },
- variant: { control: false },
- accent: { control: false },
- children: { control: false },
+ render: (args) => (
+ <ButtonGroup {...args}>
+ <Button variant="ghost" color="danger" size="md">
+ Direct action
+ </Button>
+ <>
+ <Button>Fragment action</Button>
+ </>
+ <span title="Button wrapper">
+ <WrappedButton />
+ </span>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ for (const button of canvas.getAllByRole('button')) {
+ await expect(button).toHaveAttribute('data-variant', 'solid');
+ await expect(button).toHaveAttribute('data-color', 'accent');
+ await expect(button).toHaveAttribute('data-size', 'sm');
+ }
+
+ const wrapper = canvas.getByTitle('Button wrapper');
+
+ await expect(wrapper).not.toHaveAttribute('variant');
+ await expect(wrapper).not.toHaveAttribute('color');
+ await expect(wrapper).not.toHaveAttribute('size');
},
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'], focus: ['.focus'] },
- catalog: {
- dimensions: [
- {
- name: 'sizes',
- values: ['small', 'medium'] satisfies ButtonSize[],
- props: (size: ButtonSize) => ({ size }),
- },
- {
- name: 'accents',
- values: ['default', 'blue', 'danger'] satisfies ButtonAccent[],
- props: (accent: ButtonAccent) => ({ accent }),
- },
- {
- name: 'variants',
- values: [
- 'primary',
- 'secondary',
- 'tertiary',
- ] satisfies ButtonVariant[],
- props: (variant: ButtonVariant) => ({ variant }),
- },
- ],
- },
+};
+
+export const UnspecifiedAppearance: Story = {
+ ...Default,
+ render: () => (
+ <ButtonGroup aria-label="Individual appearance">
+ <Button variant="ghost" color="danger" size="sm">
+ Explicit appearance
+ </Button>
+ <Button>Default appearance</Button>
+ </ButtonGroup>
+ ),
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const explicitButton = canvas.getByRole('button', {
+ name: 'Explicit appearance',
+ });
+ const defaultButton = canvas.getByRole('button', {
+ name: 'Default appearance',
+ });
+
+ await expect(explicitButton).toHaveAttribute('data-variant', 'ghost');
+ await expect(explicitButton).toHaveAttribute('data-color', 'danger');
+ await expect(explicitButton).toHaveAttribute('data-size', 'sm');
+ await expect(defaultButton).toHaveAttribute('data-variant', 'outline');
+ await expect(defaultButton).toHaveAttribute('data-color', 'neutral');
+ await expect(defaultButton).toHaveAttribute('data-size', 'md');
},
- decorators: [CatalogDecorator],
};
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/__tests__/ButtonGroup.test.tsx b/packages/twenty-ui/src/primitives/input/ButtonGroup/__tests__/ButtonGroup.test.tsx
new file mode 100644
index 00000000000..9966aace92e
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/__tests__/ButtonGroup.test.tsx
@@ -0,0 +1,10 @@
+import { runComponentConformance } from '@test-utilities/conformance/runComponentConformance';
+import { ButtonGroup } from '../ButtonGroup';
+import styles from '../ButtonGroup.module.scss';
+
+runComponentConformance({
+ name: 'ButtonGroup',
+ element: <ButtonGroup aria-label="Actions" />,
+ refInstanceOf: HTMLDivElement,
+ ownClassName: styles.container,
+});
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/internal/ButtonGroupContext.ts b/packages/twenty-ui/src/primitives/input/ButtonGroup/internal/ButtonGroupContext.ts
new file mode 100644
index 00000000000..b9dfcbd26b3
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/internal/ButtonGroupContext.ts
@@ -0,0 +1,8 @@
+import { createContext } from 'react';
+
+import { type ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
+
+export const ButtonGroupContext = createContext<Pick<
+ ButtonProps,
+ 'variant' | 'color' | 'size'
+> | null>(null);
diff --git a/packages/twenty-ui/src/primitives/input/ButtonGroup/types/ButtonGroupProps.ts b/packages/twenty-ui/src/primitives/input/ButtonGroup/types/ButtonGroupProps.ts
new file mode 100644
index 00000000000..b1d39c7c303
--- /dev/null
+++ b/packages/twenty-ui/src/primitives/input/ButtonGroup/types/ButtonGroupProps.ts
@@ -0,0 +1,5 @@
+import { type useRender } from '@base-ui/react/use-render';
+import { type ButtonProps } from '@ui/primitives/input/Button/types/ButtonProps';
+
+export type ButtonGroupProps = useRender.ComponentProps<'div'> &
+ Pick<ButtonProps, 'variant' | 'size' | 'color'>;
diff --git a/packages/twenty-ui/src/primitives/input/Checkbox/__stories__/Checkbox.stories.tsx b/packages/twenty-ui/src/primitives/input/Checkbox/__stories__/Checkbox.stories.tsx
index 62a01631cab..4d4dfca95e1 100644
--- a/packages/twenty-ui/src/primitives/input/Checkbox/__stories__/Checkbox.stories.tsx
+++ b/packages/twenty-ui/src/primitives/input/Checkbox/__stories__/Checkbox.stories.tsx
@@ -30,10 +30,11 @@ const ControlledExample = (props: CheckboxProps) => {
<Checkbox {...props} checked={checked} />
<Button
type="button"
- title="Apply selection"
- ariaLabel="Apply selection"
+ aria-label="Apply selection"
onClick={() => setChecked(true)}
- />
+ >
+ Apply selection
+ </Button>
</>
);
};
diff --git a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss b/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss
deleted file mode 100644
index f2119c05dc4..00000000000
--- a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-// State rules below only assign CSS custom properties; the actual
-// declarations live on the flat .button class so twenty-front
-// styled(LightButton) overrides keep beating them at (0,1,0) specificity,
-// exactly like the legacy single Linaria class did.
-// Cascade order replicates the legacy Linaria color switch precedence:
-// (active || focus) > disabled > accent base — later rules win.
-
-.button {
- align-items: center;
- background: transparent;
- border: var(--light-button-border, none);
- border-radius: var(--t-border-radius-md);
- box-shadow: var(--light-button-box-shadow, none);
- color: var(--light-button-color);
- cursor: pointer;
- display: flex;
- flex-direction: row;
- font-family: var(--t-font-family);
- font-weight: var(--t-font-weight-regular);
- gap: var(--t-spacing-1);
- height: 24px;
- padding: 0 var(--t-spacing-2);
- transition: background 0.1s ease;
- white-space: nowrap;
-
- &:hover {
- background: var(
- --light-button-hover-bg,
- var(--t-background-transparent-light)
- );
- }
-
- &:focus {
- outline: none;
- }
-
- @include focus-ring;
-
- &:active {
- background: var(
- --light-button-active-bg,
- var(--t-background-transparent-medium)
- );
- }
-
- &[data-disabled] {
- cursor: not-allowed;
- }
-}
-
-.button[data-accent='secondary'] {
- --light-button-color: var(--t-font-color-secondary);
-}
-
-.button[data-accent='tertiary'] {
- --light-button-color: var(--t-font-color-tertiary);
-}
-
-.button[data-disabled] {
- --light-button-color: var(--t-font-color-extra-light);
- --light-button-hover-bg: transparent;
- --light-button-active-bg: transparent;
-}
-
-// active || focus turn the text blue even when disabled, matching the legacy
-// switch where the (active || focus) branch came first.
-.button[data-active],
-.button[data-focus] {
- --light-button-color: var(--t-color-blue);
-}
-
-// focus is gated by !disabled in the component, like the legacy call-site.
-.button[data-focus] {
- --light-button-border: 1px solid var(--t-color-blue);
- --light-button-box-shadow: 0 0 0 3px var(--t-color-blue3);
-}
diff --git a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss.d.ts
deleted file mode 100644
index d6e2364fc57..00000000000
--- a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly button: 'button';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.tsx b/packages/twenty-ui/src/primitives/input/LightButton/LightButton.tsx
deleted file mode 100644
index b943c7a90f5..00000000000
--- a/packages/twenty-ui/src/primitives/input/LightButton/LightButton.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { clsx } from 'clsx';
-import { type MouseEvent } from 'react';
-
-import { type IconComponent } from '@ui/icon';
-import { useTheme } from '@ui/theme-constants';
-
-import styles from './LightButton.module.scss';
-
-export type LightButtonAccent = 'secondary' | 'tertiary';
-
-export type LightButtonProps = {
- className?: string;
- Icon?: IconComponent;
- title?: string;
- accent?: LightButtonAccent;
- active?: boolean;
- disabled?: boolean;
- focus?: boolean;
- onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
- type?: React.ComponentProps<'button'>['type'];
-};
-
-export const LightButton = ({
- className,
- Icon,
- title,
- active = false,
- accent = 'secondary',
- disabled = false,
- focus = false,
- type = 'button',
- onClick,
-}: LightButtonProps) => {
- const theme = useTheme();
-
- return (
- <button
- onClick={onClick}
- disabled={disabled}
- type={type}
- className={clsx(styles.button, className)}
- data-accent={accent}
- data-active={active || undefined}
- data-disabled={disabled || undefined}
- data-focus={(focus && !disabled) || undefined}
- >
- {!!Icon && <Icon size={theme.icon.size.md} aria-hidden />}
- {title}
- </button>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/input/LightButton/__stories__/LightButton.stories.tsx b/packages/twenty-ui/src/primitives/input/LightButton/__stories__/LightButton.stories.tsx
deleted file mode 100644
index d5ec5115a90..00000000000
--- a/packages/twenty-ui/src/primitives/input/LightButton/__stories__/LightButton.stories.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconSearch } from '@ui/icon';
-import {
- A11Y_DEFER_COLOR_CONTRAST,
- CatalogDecorator,
- type CatalogStory,
- ComponentDecorator,
-} from '@ui/testing';
-import {
- LightButton,
- type LightButtonAccent,
-} from '@ui/primitives/input/LightButton/LightButton';
-
-const meta: Meta<typeof LightButton> = {
- title: 'UI/Input/Button/LightButton',
- component: LightButton,
-};
-
-export default meta;
-type Story = StoryObj<typeof LightButton>;
-
-export const Default: Story = {
- args: {
- title: 'Filter',
- accent: 'secondary',
- disabled: false,
- active: false,
- focus: false,
- Icon: IconSearch,
- },
- argTypes: {
- Icon: { control: false },
- },
- decorators: [ComponentDecorator],
-};
-
-export const Catalog: CatalogStory<Story, typeof LightButton> = {
- args: { title: 'Filter', Icon: IconSearch },
- argTypes: {
- accent: { control: false },
- disabled: { control: false },
- active: { control: false },
- focus: { control: false },
- },
- parameters: {
- a11y: A11Y_DEFER_COLOR_CONTRAST,
- pseudo: { hover: ['.hover'], active: ['.pressed'] },
- catalog: {
- dimensions: [
- {
- name: 'accents',
- values: ['secondary', 'tertiary'] satisfies LightButtonAccent[],
- props: (accent: LightButtonAccent) => ({ accent }),
- },
- {
- name: 'states',
- values: [
- 'default',
- 'hover',
- 'pressed',
- 'disabled',
- 'active',
- 'focus',
- 'disabled+focus',
- 'disabled+active',
- ],
- props: (state: string) => {
- switch (state) {
- case 'default':
- return {};
- case 'hover':
- case 'pressed':
- return { className: state };
- case 'focus':
- return { focus: true };
- case 'disabled':
- return { disabled: true };
- case 'active':
- return { active: true };
- case 'disabled+focus':
- return { disabled: true, focus: true };
- case 'disabled+active':
- return { disabled: true, active: true };
- default:
- return {};
- }
- },
- },
- ],
- },
- },
- decorators: [CatalogDecorator],
-};
diff --git a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss b/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss
deleted file mode 100644
index 3d722a0fe6d..00000000000
--- a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-// State rules below only assign CSS custom properties; the actual
-// declarations live on the flat .button class so twenty-front
-// styled(MainButton) overrides keep beating them at (0,1,0) specificity,
-// exactly like the legacy single Linaria class did.
-// Cascade order replicates the legacy switches: disabled > variant.
-
-.button {
- align-items: center;
- background: var(--main-button-bg);
- border: 1px solid;
- border-color: var(--main-button-border-color);
- border-radius: var(--t-border-radius-md);
- box-shadow: var(--main-button-box-shadow, var(--t-box-shadow-light));
- color: var(--main-button-color);
- cursor: pointer;
- display: flex;
- flex-direction: row;
- font-family: var(--t-font-family);
- font-weight: var(--t-font-weight-semi-bold);
- gap: var(--t-spacing-2);
- justify-content: center;
- outline: none;
- padding: var(--t-spacing-2) var(--t-spacing-3);
- max-height: var(--t-spacing-8);
- width: var(--main-button-width, auto);
-
- &:hover {
- background: var(--main-button-hover-bg);
- }
-
- &[data-disabled] {
- cursor: not-allowed;
- }
-
- @include focus-ring;
-}
-
-.button[data-variant='primary'] {
- --main-button-bg: var(--t-background-primary-inverted);
- --main-button-border-color: var(--t-background-transparent-strong);
- --main-button-color: var(--t-font-color-inverted);
- --main-button-hover-bg: var(--t-background-primary-inverted-hover);
-}
-
-.button[data-variant='secondary'] {
- --main-button-bg: var(--t-background-primary);
- --main-button-border-color: var(--t-border-color-medium);
- --main-button-color: var(--t-font-color-primary);
- --main-button-hover-bg: var(--t-background-tertiary);
-}
-
-.button[data-disabled] {
- --main-button-bg: var(--t-background-secondary);
- --main-button-border-color: var(--t-background-transparent-lighter);
- --main-button-box-shadow: none;
- --main-button-color: var(--t-font-color-light);
-}
-
-// hover when disabled: the legacy hover switch ignores disabled for
-// secondary (keeps tertiary), while primary falls back to the disabled
-// background.
-.button[data-variant='primary'][data-disabled] {
- --main-button-hover-bg: var(--t-background-secondary);
-}
diff --git a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss.d.ts b/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss.d.ts
deleted file mode 100644
index d6e2364fc57..00000000000
--- a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.module.scss.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare const classNames: {
- readonly button: 'button';
-};
-export default classNames;
diff --git a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.tsx b/packages/twenty-ui/src/primitives/input/MainButton/MainButton.tsx
deleted file mode 100644
index 55d439e3756..00000000000
--- a/packages/twenty-ui/src/primitives/input/MainButton/MainButton.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { clsx } from 'clsx';
-import React, { type FunctionComponent } from 'react';
-
-import { type IconComponent } from '@ui/icon';
-import { useTheme } from '@ui/theme-constants';
-
-import styles from './MainButton.module.scss';
-
-export type MainButtonVariant = 'primary' | 'secondary';
-
-type Props = {
- title: string;
- fullWidth?: boolean;
- width?: number;
- variant?: MainButtonVariant;
- soon?: boolean;
-} & React.ComponentProps<'button'>;
-
-type MainButtonProps = Props & {
- Icon?: IconComponent | FunctionComponent<{ size: number }>;
-};
-
-export const MainButton = ({
- Icon,
- title,
- width,
- fullWidth = false,
- variant = 'primary',
- type,
- onClick,
- disabled,
- className,
-}: MainButtonProps) => {
- const theme = useTheme();
-
- // Replicates the legacy ternary exactly: fullWidth wins over width, and a
- // falsy width (0) falls back to the 'auto' default.
- const widthValue = fullWidth ? '100%' : width ? `${width}px` : undefined;
-
- return (
- <button
- className={clsx(styles.button, className)}
- data-variant={variant}
- data-disabled={disabled || undefined}
- disabled={disabled}
- onClick={onClick}
- type={type}
- style={
- widthValue
- ? ({ '--main-button-width': widthValue } as React.CSSProperties)
- : undefined
- }
- >
- {Icon && <Icon size={theme.icon.size.sm} aria-hidden />}
- {title}
- </button>
- );
-};
diff --git a/packages/twenty-ui/src/primitives/input/MainButton/__stories__/MainButton.stories.tsx b/packages/twenty-ui/src/primitives/input/MainButton/__stories__/MainButton.stories.tsx
deleted file mode 100644
index 43694eaaa15..00000000000
--- a/packages/twenty-ui/src/primitives/input/MainButton/__stories__/MainButton.stories.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { IconBrandGoogle } from '@ui/icon';
-import { ComponentDecorator } from '@ui/testing';
-import { expect, fn, userEvent, within } from 'storybook/test';
-import { MainButton } from '@ui/primitives/input/MainButton/MainButton';
-
-const clickJestFn = fn();
-
-const meta: Meta<typeof MainButton> = {
- title: 'UI/Input/Button/MainButton',
- component: MainButton,
- decorators: [ComponentDecorator],
- args: { title: 'A primary Button', onClick: clickJestFn },
-};
-
-export default meta;
-type Story = StoryObj<typeof MainButton>;
-
-export const Default: Story = {
- play: async ({ canvasElement }) => {
- const canvas = within(canvasElement);
-
- expect(clickJestFn).toHaveBeenCalledTimes(0);
- const button = canvas.getByRole('button');
- await userEvent.click(button);
-
- expect(clickJestFn).toHaveBeenCalledTimes(1);
- },
-};
-
-export const WithIcon: Story = {
- args: { Icon: IconBrandGoogle },
-};
-
-export const DisabledWithIcon: Story = {
- args: { ...WithIcon.args, disabled: true },
-};
-
-export const FullWidth: Story = {
- args: { fullWidth: true },
-};
-
-export const Width: Story = {
- args: { width: 200 },
-};
-
-export const Secondary: Story = {
- args: { title: 'A secondary Button', variant: 'secondary' },
-};
-
-export const SecondaryWithIcon: Story = {
- args: { ...Secondary.args, ...WithIcon.args },
-};
-
-export const SecondaryDisabledWithIcon: Story = {
- args: { ...SecondaryWithIcon.args, disabled: true },
-};
-
-export const SecondaryFullWidth: Story = {
- args: { ...Secondary.args, ...FullWidth.args },
-};
diff --git a/packages/twenty-ui/src/primitives/input/index.ts b/packages/twenty-ui/src/primitives/input/index.ts
index 3ed3d2e12f5..9f56a09f0d5 100644
--- a/packages/twenty-ui/src/primitives/input/index.ts
+++ b/packages/twenty-ui/src/primitives/input/index.ts
@@ -7,19 +7,17 @@
* |___/
*/
-export type { AnimatedButtonProps } from './AnimatedButton/AnimatedButton';
export { AnimatedButton } from './AnimatedButton/AnimatedButton';
+export type { AnimatedButtonProps } from './AnimatedButton/types/AnimatedButtonProps';
export type { AnimatedLightIconButtonProps } from './AnimatedLightIconButton/AnimatedLightIconButton';
export { AnimatedLightIconButton } from './AnimatedLightIconButton/AnimatedLightIconButton';
+export { Button } from './Button/Button';
+export type { ButtonColor } from './Button/types/ButtonColor';
+export type { ButtonProps } from './Button/types/ButtonProps';
export type { ButtonSize } from './Button/types/ButtonSize';
-export type { ButtonPosition } from './Button/types/ButtonPosition';
export type { ButtonVariant } from './Button/types/ButtonVariant';
-export type { ButtonAccent } from './Button/types/ButtonAccent';
-export type { ButtonProps } from './Button/types/ButtonProps';
-export { Button } from './Button/Button';
-export { baseTransitionTiming } from './Button/constant';
-export type { ButtonGroupProps } from './ButtonGroup/ButtonGroup';
export { ButtonGroup } from './ButtonGroup/ButtonGroup';
+export type { ButtonGroupProps } from './ButtonGroup/types/ButtonGroupProps';
export { CardPicker } from './CardPicker/CardPicker';
export type { CardPickerProps } from './CardPicker/types/CardPickerProps';
export { Checkbox } from './Checkbox/Checkbox';
@@ -58,12 +56,12 @@ export type {
export { FloatingIconButton } from './FloatingIconButton/FloatingIconButton';
export type { FloatingIconButtonGroupProps } from './FloatingIconButtonGroup/FloatingIconButtonGroup';
export { FloatingIconButtonGroup } from './FloatingIconButtonGroup/FloatingIconButtonGroup';
-export type { IconButtonSize } from './IconButton/types/IconButtonSize';
-export type { IconButtonPosition } from './IconButton/types/IconButtonPosition';
-export type { IconButtonVariant } from './IconButton/types/IconButtonVariant';
+export { IconButton } from './IconButton/IconButton';
export type { IconButtonAccent } from './IconButton/types/IconButtonAccent';
+export type { IconButtonPosition } from './IconButton/types/IconButtonPosition';
export type { IconButtonProps } from './IconButton/types/IconButtonProps';
-export { IconButton } from './IconButton/IconButton';
+export type { IconButtonSize } from './IconButton/types/IconButtonSize';
+export type { IconButtonVariant } from './IconButton/types/IconButtonVariant';
export type { IconButtonGroupProps } from './IconButtonGroup/IconButtonGroup';
export { IconButtonGroup } from './IconButtonGroup/IconButtonGroup';
export type { IconButtonWithTooltipProps } from './IconButtonWithTooltip/IconButtonWithTooltip';
@@ -77,11 +75,6 @@ export { InputHint } from './InputHint/InputHint';
export { InputLabel } from './InputLabel/InputLabel';
export type { InsideButtonProps } from './InsideButton/InsideButton';
export { InsideButton } from './InsideButton/InsideButton';
-export type {
- LightButtonAccent,
- LightButtonProps,
-} from './LightButton/LightButton';
-export { LightButton } from './LightButton/LightButton';
export type {
LightIconButtonAccent,
LightIconButtonSize,
@@ -90,8 +83,6 @@ export type {
export { LightIconButton } from './LightIconButton/LightIconButton';
export type { LightIconButtonGroupProps } from './LightIconButtonGroup/LightIconButtonGroup';
export { LightIconButtonGroup } from './LightIconButtonGroup/LightIconButtonGroup';
-export type { MainButtonVariant } from './MainButton/MainButton';
-export { MainButton } from './MainButton/MainButton';
export { Radio } from './Radio/Radio';
export type { RadioProps } from './Radio/types/RadioProps';
export { RadioGroup } from './RadioGroup/RadioGroup';
diff --git a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
index 9ee2b5e78bc..d26c6fb1c85 100644
--- a/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
+++ b/packages/twenty-ui/src/primitives/layout/AnimatedExpandableContainer/__stories__/AnimatedExpandableContainer.stories.tsx
@@ -38,10 +38,11 @@ const AnimatedExpandableContainerWithButton = ({
<Button
type="button"
className={styles.button}
- title={isExpanded ? 'Collapse' : 'Expand'}
- ariaLabel={isExpanded ? 'Collapse' : 'Expand'}
+ aria-label={isExpanded ? 'Collapse' : 'Expand'}
onClick={() => setIsExpanded(!isExpanded)}
- />
+ >
+ {isExpanded ? 'Collapse' : 'Expand'}
+ </Button>
<AnimatedExpandableContainer
isExpanded={isExpanded}
dimension={args.dimension}
diff --git a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
index 957d7e369be..1a0de7c58a1 100644
--- a/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/AppTooltip/__stories__/Tooltip.stories.tsx
@@ -61,9 +61,10 @@ const meta: Meta<typeof Tooltip> = {
<Button
type="button"
id={args.anchorSelect?.slice(1)}
- title="Hover or focus me"
- ariaLabel="Hover or focus me"
- />
+ aria-label="Hover or focus me"
+ >
+ Hover or focus me
+ </Button>
<Tooltip {...args} />
</>
),
@@ -224,10 +225,11 @@ export const InteractiveCustomContent: Story = {
children: (
<Button
type="button"
- title="Show more"
- ariaLabel="Show more"
+ aria-label="Show more"
onClick={onCustomActionClick}
- />
+ >
+ Show more
+ </Button>
),
},
decorators: [ComponentDecorator],
diff --git a/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.stories.tsx
index d18590dac99..d1eadc93bbe 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Menu/__stories__/Menu.stories.tsx
@@ -123,7 +123,7 @@ const MenuStory = ({ content = 'basic', ...props }: MenuStoryProps) => {
id={triggerId}
aria-label="Options"
style={{ alignSelf: 'flex-start' }}
- render={<Button title="Options" />}
+ render={<Button>Options</Button>}
/>
<Menu.Popup>{MENU_STORY_CONTENT[content]}</Menu.Popup>
</Menu.Root>
@@ -270,7 +270,7 @@ const MenuCatalogCell = ({ content = 'basic' }: MenuStoryProps) => {
<Menu.Trigger
id={triggerId}
aria-label={`${content} options`}
- render={<Button title="Options" />}
+ render={<Button>Options</Button>}
/>
<Menu.Popup container={cellElement} side="bottom" align="start">
{contentByType[content]}
diff --git a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
index d585e002857..28533c035d7 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Modal/__stories__/Modal.stories.tsx
@@ -69,8 +69,10 @@ export const Default: Story = {
</Section>
</ModalContent>
<ModalFooter>
- <Button title="Cancel" variant="secondary" />
- <Button title="Save" variant="primary" accent="blue" />
+ <Button variant="outline">{'Cancel'}</Button>
+ <Button variant="solid" color="accent">
+ {'Save'}
+ </Button>
</ModalFooter>
</Modal>
),
@@ -117,14 +119,17 @@ export const Confirmation: Story = {
permanently removed.
</Section>
</div>
- <Button title="Cancel" variant="secondary" fullWidth justify="center" />
+ <Button fullWidth variant="outline" style={{ justifyContent: 'center' }}>
+ {'Cancel'}
+ </Button>
<Button
- title="Delete"
- variant="secondary"
- accent="danger"
fullWidth
- justify="center"
- />
+ variant="outline"
+ color="danger"
+ style={{ justifyContent: 'center' }}
+ >
+ {'Delete'}
+ </Button>
</Modal>
),
};
@@ -151,8 +156,10 @@ export const Small: Story = {
<Section>Are you sure you want to archive this item?</Section>
</ModalContent>
<ModalFooter>
- <Button title="No" variant="secondary" />
- <Button title="Yes, archive" variant="primary" accent="blue" />
+ <Button variant="outline">{'No'}</Button>
+ <Button variant="solid" color="accent">
+ {'Yes, archive'}
+ </Button>
</ModalFooter>
</Modal>
),
@@ -187,8 +194,10 @@ export const ExtraLarge: Story = {
</Section>
</ModalContent>
<ModalFooter>
- <Button title="Cancel" variant="secondary" />
- <Button title="Upload & import" variant="primary" accent="blue" />
+ <Button variant="outline">{'Cancel'}</Button>
+ <Button variant="solid" color="accent">
+ {'Upload & import'}
+ </Button>
</ModalFooter>
</Modal>
),
@@ -213,12 +222,9 @@ const InteractiveModal = () => {
return (
<>
- <Button
- title="Open Modal"
- variant="primary"
- accent="blue"
- onClick={() => setIsOpen(true)}
- />
+ <Button onClick={() => setIsOpen(true)} variant="solid" color="accent">
+ {'Open Modal'}
+ </Button>
<Modal
isOpen={isOpen}
size="medium"
@@ -242,17 +248,16 @@ const InteractiveModal = () => {
</Section>
</ModalContent>
<ModalFooter>
+ <Button onClick={() => setIsOpen(false)} variant="outline">
+ {'Cancel'}
+ </Button>
<Button
- title="Cancel"
- variant="secondary"
- onClick={() => setIsOpen(false)}
- />
- <Button
- title="Create"
- variant="primary"
- accent="blue"
onClick={() => setIsOpen(false)}
- />
+ variant="solid"
+ color="accent"
+ >
+ {'Create'}
+ </Button>
</ModalFooter>
</Modal>
</>
diff --git a/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx b/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
index 775006529b8..7e991d8491d 100644
--- a/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
+++ b/packages/twenty-ui/src/primitives/surfaces/Popover/__stories__/Popover.stories.tsx
@@ -37,7 +37,7 @@ const PopoverStory = ({
<Popover.Trigger
aria-label="Open"
style={{ alignSelf: 'flex-start', marginInline: 'auto' }}
- render={<Button title="Open" />}
+ render={<Button>Open</Button>}
/>
<Popover.Popup
side={side}
@@ -48,14 +48,18 @@ const PopoverStory = ({
>
<Popover.Title>Details</Popover.Title>
<Popover.Description>More information</Popover.Description>
- <Button type="button" title="First action" ariaLabel="First action" />
+ <Button type="button" aria-label="First action">
+ First action
+ </Button>
<Popover.Close
style={{ alignSelf: 'flex-start' }}
render={<IconButton Icon={IconX} ariaLabel="Close" size="small" />}
/>
</Popover.Popup>
</Popover.Root>
- <Button type="button" title="Outside" ariaLabel="Outside" />
+ <Button type="button" aria-label="Outside">
+ Outside
+ </Button>
</>
);
@@ -133,14 +137,14 @@ export const Documentation: Story = {
<Popover.Trigger
aria-label="Show details"
style={{ alignSelf: 'flex-start' }}
- render={<Button title="Show details" />}
+ render={<Button>Show details</Button>}
/>
<Popover.Popup>
<Popover.Title>Contact details</Popover.Title>
<Popover.Description>
Add notes and contact information here.
</Popover.Description>
- <Popover.Close aria-label="Close" render={<Button title="Close" />} />
+ <Popover.Close aria-label="Close" render={<Button>Close</Button>} />
</Popover.Popup>
</Popover.Root>
),
@@ -181,10 +185,11 @@ const ArrowPopoverStory = (props: PopoverStoryProps) => {
<PopoverStory {...props} open arrow={arrow} />
<Button
type="button"
- title="Toggle arrow"
- ariaLabel="Toggle arrow"
+ aria-label="Toggle arrow"
onClick={() => setArrow(!arrow)}
- />
+ >
+ Toggle arrow
+ </Button>
</div>
);
};
@@ -322,7 +327,7 @@ export const WithoutTabbableContent: Story = {
args: {},
render: (args) => (
<Popover.Root {...args}>
- <Popover.Trigger aria-label="Open" render={<Button title="Open" />} />
+ <Popover.Trigger aria-label="Open" render={<Button>Open</Button>} />
<Popover.Popup>
<Popover.Title>Details</Popover.Title>
</Popover.Popup>
@@ -373,10 +378,11 @@ const ControlledPopoverStory = (props: PopoverStoryProps) => {
<PopoverStory {...props} open={open} />
<Button
type="button"
- title="Apply closed state"
- ariaLabel="Apply closed state"
+ aria-label="Apply closed state"
onClick={() => setOpen(false)}
- />
+ >
+ Apply closed state
+ </Button>
</>
);
};
diff --git a/packages/twenty-ui/vite.config.ts b/packages/twenty-ui/vite.config.ts
index 5e1dec62818..ccad3deeaa3 100644
--- a/packages/twenty-ui/vite.config.ts
+++ b/packages/twenty-ui/vite.config.ts
@@ -80,6 +80,7 @@ export default defineConfig(({ command }) => {
// mid-run during browser-mode Storybook tests — re-bundling rotates the
// optimized chunk hash and 404s in-flight dynamic imports (vite 8 / rolldown).
include: [
+ '@base-ui/utils/store',
'react',
'react-dom',
'react-dom/client',