The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
[Campaigns 1/2] Polish composer and editor (#27873)
Thomas des Francs7aea73daec2f
diff --git a/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch b/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patchnew file mode 100644index 00000000000..30a712da6e9--- /dev/null+++ b/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch@@ -0,0 +1,48 @@+diff --git a/dist/index.cjs b/dist/index.cjs+index 5bb89346860e3c334731755df48cfb72a6a9d3b7..a18965a2884c31eab1dcf639f72b472ec31e107d 100644+--- a/dist/index.cjs++++ b/dist/index.cjs+@@ -210,7 +210,9 @@ function findBestDragTarget(view, coords, options) {+ });+ if (!posInfo) return null;+ const { doc } = view.state;+- const $pos = doc.resolve(posInfo.pos);++ const insideNode = posInfo.inside >= 0 ? doc.nodeAt(posInfo.inside) : null;++ const hoveredPos = insideNode && insideNode.isAtom && !insideNode.isInline ? posInfo.inside : posInfo.pos;++ const $pos = doc.resolve(hoveredPos);+ const rules = [];+ if (options.defaultRules) rules.push(...defaultRules);+ rules.push(...options.rules);+@@ -245,7 +247,7 @@ function findBestDragTarget(view, coords, options) {+ }).filter((candidate) => candidate !== null);+ const nodeAfter = $pos.nodeAfter;+ if (nodeAfter && nodeAfter.isAtom && !nodeAfter.isInline) {+- const nodePos = posInfo.pos;++ const nodePos = hoveredPos;+ const depth = $pos.depth + 1;+ const parent = $pos.parent;+ const index = $pos.index();+diff --git a/dist/index.js b/dist/index.js+index 48ce5bafcbf764d8bfe8dde7c0d8c679317e7e1a..446185b5016b59d01b420721875f38ec6cadabd6 100644+--- a/dist/index.js++++ b/dist/index.js+@@ -206,7 +206,9 @@ function findBestDragTarget(view, coords, options) {+ });+ if (!posInfo) return null;+ const { doc } = view.state;+- const $pos = doc.resolve(posInfo.pos);++ const insideNode = posInfo.inside >= 0 ? doc.nodeAt(posInfo.inside) : null;++ const hoveredPos = insideNode && insideNode.isAtom && !insideNode.isInline ? posInfo.inside : posInfo.pos;++ const $pos = doc.resolve(hoveredPos);+ const rules = [];+ if (options.defaultRules) rules.push(...defaultRules);+ rules.push(...options.rules);+@@ -241,7 +243,7 @@ function findBestDragTarget(view, coords, options) {+ }).filter((candidate) => candidate !== null);+ const nodeAfter = $pos.nodeAfter;+ if (nodeAfter && nodeAfter.isAtom && !nodeAfter.isInline) {+- const nodePos = posInfo.pos;++ const nodePos = hoveredPos;+ const depth = $pos.depth + 1;+ const parent = $pos.parent;+ const index = $pos.index();diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 31b1a6d3398..4b65a3711e8 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -1888,6 +1888,7 @@ enum EngineComponentKey {EDIT_DASHBOARD_LAYOUTEDIT_RECORD_PAGE_LAYOUTEMAIL_BLOCK_SETTINGS+ EMAIL_PAGE_STYLEEXPORT_FROM_RECORD_INDEXEXPORT_FROM_RECORD_SHOWEXPORT_MULTIPLE_RECORDSdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex f1ea9b2eb69..760c208b3fd 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1260,7 +1260,7 @@ export interface EmailsConfiguration {__typename: 'EmailsConfiguration'}-export type EngineComponentKey = 'ACTIVATE_WORKFLOW' | 'ADD_NODE_WORKFLOW' | 'ADD_TO_FAVORITES' | 'ADD_TO_MESSAGE_LIST' | 'ADD_VIEW_TO_MESSAGE_LIST' | 'ASK_AI' | 'ASSIGN_AI_CHAT' | 'CANCEL_DASHBOARD_LAYOUT' | 'CANCEL_MESSAGE_CAMPAIGN' | 'COMPOSE_CAMPAIGN' | 'COMPOSE_EMAIL' | 'CREATE_NEW_RECORD' | 'CREATE_NEW_VIEW' | 'DEACTIVATE_WORKFLOW' | 'DELETE_MULTIPLE_RECORDS' | 'DELETE_RECORDS' | 'DELETE_SINGLE_RECORD' | 'DESTROY_MULTIPLE_RECORDS' | 'DESTROY_RECORDS' | 'DESTROY_SINGLE_RECORD' | 'DISCARD_DRAFT_WORKFLOW' | 'DUPLICATE_DASHBOARD' | 'DUPLICATE_MESSAGE_CAMPAIGN' | 'DUPLICATE_MESSAGE_LIST' | 'DUPLICATE_WORKFLOW' | 'EDIT_DASHBOARD_LAYOUT' | 'EDIT_RECORD_PAGE_LAYOUT' | 'EMAIL_BLOCK_SETTINGS' | 'EXPORT_FROM_RECORD_INDEX' | 'EXPORT_FROM_RECORD_SHOW' | 'EXPORT_MULTIPLE_RECORDS' | 'EXPORT_NOTE_TO_PDF' | 'EXPORT_RECORDS' | 'EXPORT_VIEW' | 'FRONT_COMPONENT_RENDERER' | 'GO_TO_COMPANIES' | 'GO_TO_DASHBOARDS' | 'GO_TO_NOTES' | 'GO_TO_OPPORTUNITIES' | 'GO_TO_PEOPLE' | 'GO_TO_RUNS' | 'GO_TO_SETTINGS' | 'GO_TO_TASKS' | 'GO_TO_WORKFLOWS' | 'HIDE_DELETED_RECORDS' | 'IMPORT_RECORDS' | 'MARK_AI_CHAT_AS_DONE' | 'MARK_AI_CHAT_AS_READ' | 'MARK_AI_CHAT_AS_UNREAD' | 'MERGE_MULTIPLE_RECORDS' | 'NAVIGATE_TO_NEXT_RECORD' | 'NAVIGATE_TO_PREVIOUS_RECORD' | 'NAVIGATION' | 'NEW_AI_CHAT' | 'REMOVE_FROM_FAVORITES' | 'REOPEN_AI_CHAT' | 'REPLY_TO_EMAIL_THREAD' | 'RESTORE_MULTIPLE_RECORDS' | 'RESTORE_RECORDS' | 'RESTORE_SINGLE_RECORD' | 'RETRY_WORKFLOW_RUN' | 'SAVE_DASHBOARD_LAYOUT' | 'SEARCH_RECORDS' | 'SEARCH_RECORDS_FALLBACK' | 'SEE_ACTIVE_VERSION_WORKFLOW' | 'SEE_DELETED_RECORDS' | 'SEE_RUNS_WORKFLOW' | 'SEE_RUNS_WORKFLOW_VERSION' | 'SEE_VERSIONS_WORKFLOW' | 'SEE_VERSIONS_WORKFLOW_VERSION' | 'SEE_VERSION_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_VERSION' | 'SEND_MESSAGE_CAMPAIGN' | 'SEND_MESSAGE_CAMPAIGN_TEST' | 'SHARE_RECORD' | 'SNOOZE_AI_CHAT' | 'STOP_WORKFLOW_RUN' | 'SUBSCRIBE_TO_AI_CHAT' | 'TEST_WORKFLOW' | 'TIDY_UP_WORKFLOW' | 'TOGGLE_WORKFLOW_VISIBILITY' | 'TRIGGER_WORKFLOW_VERSION' | 'UNSUBSCRIBE_FROM_AI_CHAT' | 'UPDATE_MULTIPLE_RECORDS' | 'USE_AS_DRAFT_WORKFLOW_VERSION' | 'VIEW_PREVIOUS_AI_CHATS'+export type EngineComponentKey = 'ACTIVATE_WORKFLOW' | 'ADD_NODE_WORKFLOW' | 'ADD_TO_FAVORITES' | 'ADD_TO_MESSAGE_LIST' | 'ADD_VIEW_TO_MESSAGE_LIST' | 'ASK_AI' | 'ASSIGN_AI_CHAT' | 'CANCEL_DASHBOARD_LAYOUT' | 'CANCEL_MESSAGE_CAMPAIGN' | 'COMPOSE_CAMPAIGN' | 'COMPOSE_EMAIL' | 'CREATE_NEW_RECORD' | 'CREATE_NEW_VIEW' | 'DEACTIVATE_WORKFLOW' | 'DELETE_MULTIPLE_RECORDS' | 'DELETE_RECORDS' | 'DELETE_SINGLE_RECORD' | 'DESTROY_MULTIPLE_RECORDS' | 'DESTROY_RECORDS' | 'DESTROY_SINGLE_RECORD' | 'DISCARD_DRAFT_WORKFLOW' | 'DUPLICATE_DASHBOARD' | 'DUPLICATE_MESSAGE_CAMPAIGN' | 'DUPLICATE_MESSAGE_LIST' | 'DUPLICATE_WORKFLOW' | 'EDIT_DASHBOARD_LAYOUT' | 'EDIT_RECORD_PAGE_LAYOUT' | 'EMAIL_BLOCK_SETTINGS' | 'EMAIL_PAGE_STYLE' | 'EXPORT_FROM_RECORD_INDEX' | 'EXPORT_FROM_RECORD_SHOW' | 'EXPORT_MULTIPLE_RECORDS' | 'EXPORT_NOTE_TO_PDF' | 'EXPORT_RECORDS' | 'EXPORT_VIEW' | 'FRONT_COMPONENT_RENDERER' | 'GO_TO_COMPANIES' | 'GO_TO_DASHBOARDS' | 'GO_TO_NOTES' | 'GO_TO_OPPORTUNITIES' | 'GO_TO_PEOPLE' | 'GO_TO_RUNS' | 'GO_TO_SETTINGS' | 'GO_TO_TASKS' | 'GO_TO_WORKFLOWS' | 'HIDE_DELETED_RECORDS' | 'IMPORT_RECORDS' | 'MARK_AI_CHAT_AS_DONE' | 'MARK_AI_CHAT_AS_READ' | 'MARK_AI_CHAT_AS_UNREAD' | 'MERGE_MULTIPLE_RECORDS' | 'NAVIGATE_TO_NEXT_RECORD' | 'NAVIGATE_TO_PREVIOUS_RECORD' | 'NAVIGATION' | 'NEW_AI_CHAT' | 'REMOVE_FROM_FAVORITES' | 'REOPEN_AI_CHAT' | 'REPLY_TO_EMAIL_THREAD' | 'RESTORE_MULTIPLE_RECORDS' | 'RESTORE_RECORDS' | 'RESTORE_SINGLE_RECORD' | 'RETRY_WORKFLOW_RUN' | 'SAVE_DASHBOARD_LAYOUT' | 'SEARCH_RECORDS' | 'SEARCH_RECORDS_FALLBACK' | 'SEE_ACTIVE_VERSION_WORKFLOW' | 'SEE_DELETED_RECORDS' | 'SEE_RUNS_WORKFLOW' | 'SEE_RUNS_WORKFLOW_VERSION' | 'SEE_VERSIONS_WORKFLOW' | 'SEE_VERSIONS_WORKFLOW_VERSION' | 'SEE_VERSION_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_VERSION' | 'SEND_MESSAGE_CAMPAIGN' | 'SEND_MESSAGE_CAMPAIGN_TEST' | 'SHARE_RECORD' | 'SNOOZE_AI_CHAT' | 'STOP_WORKFLOW_RUN' | 'SUBSCRIBE_TO_AI_CHAT' | 'TEST_WORKFLOW' | 'TIDY_UP_WORKFLOW' | 'TOGGLE_WORKFLOW_VISIBILITY' | 'TRIGGER_WORKFLOW_VERSION' | 'UNSUBSCRIBE_FROM_AI_CHAT' | 'UPDATE_MULTIPLE_RECORDS' | 'USE_AS_DRAFT_WORKFLOW_VERSION' | 'VIEW_PREVIOUS_AI_CHATS'export interface EnqueueJobResult {enqueued: Scalars['Boolean']@@ -11457,6 +11457,7 @@ export const enumEngineComponentKey = {EDIT_DASHBOARD_LAYOUT: 'EDIT_DASHBOARD_LAYOUT' as const,EDIT_RECORD_PAGE_LAYOUT: 'EDIT_RECORD_PAGE_LAYOUT' as const,EMAIL_BLOCK_SETTINGS: 'EMAIL_BLOCK_SETTINGS' as const,+ EMAIL_PAGE_STYLE: 'EMAIL_PAGE_STYLE' as const,EXPORT_FROM_RECORD_INDEX: 'EXPORT_FROM_RECORD_INDEX' as const,EXPORT_FROM_RECORD_SHOW: 'EXPORT_FROM_RECORD_SHOW' as const,EXPORT_MULTIPLE_RECORDS: 'EXPORT_MULTIPLE_RECORDS' as const,diff --git a/packages/twenty-docs/snippets/ui/generated/components/input/segmented-control.mdx b/packages/twenty-docs/snippets/ui/generated/components/input/segmented-control.mdxindex 8e2613a3c95..417f3edc914 100644--- a/packages/twenty-docs/snippets/ui/generated/components/input/segmented-control.mdx+++ b/packages/twenty-docs/snippets/ui/generated/components/input/segmented-control.mdx@@ -74,6 +74,10 @@Whether the user must choose a value before submitting a form.</ParamField>+<ParamField body="size" type=""md" | "sm"" default="md">+ Control height: `sm` (24px) or `md` (32px).+</ParamField>+<ParamField body="style" type="CSSProperties | ((state: RadioGroupState) => CSSProperties | undefined)">Style applied to the element, or a function thatreturns a style object based on the component's state.diff --git a/packages/twenty-docs/snippets/ui/generated/icon/catalog.mdx b/packages/twenty-docs/snippets/ui/generated/icon/catalog.mdxindex 97052489117..6846066fc1a 100644--- a/packages/twenty-docs/snippets/ui/generated/icon/catalog.mdx+++ b/packages/twenty-docs/snippets/ui/generated/icon/catalog.mdx@@ -453,6 +453,7 @@ Supported props: `color`, `size`, `stroke`, `title`. Native SVG attributes and r- `IconUserPin`- `IconUserPlus`- `IconUsers`+- `IconUsersGroup`- `IconVariable`- `IconVariablePlus`- `IconVersions`diff --git a/packages/twenty-docs/user-guide/email-campaigns/how-tos/email-campaign-best-practices.mdx b/packages/twenty-docs/user-guide/email-campaigns/how-tos/email-campaign-best-practices.mdxindex 87d78938e2f..4ed33845628 100644--- a/packages/twenty-docs/user-guide/email-campaigns/how-tos/email-campaign-best-practices.mdx+++ b/packages/twenty-docs/user-guide/email-campaigns/how-tos/email-campaign-best-practices.mdx@@ -45,7 +45,7 @@ Twenty cannot know how you got a person's email address or what your postal addr## Numbers to watch-After each campaign, compare the **Bounced count** and **Complained count** with the **Sent count**.+After each campaign, compare **Bounced** and **Complaints** with **Sent**.| Measure | Aim for | Why it matters || ------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------- |diff --git a/packages/twenty-emails/src/utils/email-renderer/email-renderer.tsx b/packages/twenty-emails/src/utils/email-renderer/email-renderer.tsxindex d63b68042f1..949f825791b 100644--- a/packages/twenty-emails/src/utils/email-renderer/email-renderer.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/email-renderer.tsx@@ -1,14 +1,26 @@import { type ReactNode } from 'react';import { Body, Container, Head, Html } from 'react-email';import { type JSONContent } from '@tiptap/core';-import { type CanvasTheme, resolveCanvasTheme } from 'twenty-shared/utils';+import {+ CANVAS_THEME_DEFAULTS,+ type CanvasTheme,+ EMAIL_TYPOGRAPHY,+ resolveCanvasTheme,+} from 'twenty-shared/utils';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';const BASE_STYLE_RESET = `blockquote,h1,h2,h3,img,li,ol,p,ul{margin-top:0;margin-bottom:0}`;+const BASE_TYPOGRAPHY = {+ fontFamily: EMAIL_TYPOGRAPHY.fontFamily,+ fontSize: EMAIL_TYPOGRAPHY.fontSize,+ lineHeight: EMAIL_TYPOGRAPHY.lineHeight,+};+const themedBody = (theme: CanvasTheme, children: ReactNode) => (<Bodystyle={{+ ...BASE_TYPOGRAPHY,backgroundColor: theme.pageBackground,color: theme.textColor,margin: 0,@@ -39,8 +51,9 @@ export const reactMarkupFromJSON = (json: JSONContent | string) => {return json;}- const jsxNodes = mappedNodeContent(json);const canvasTheme = resolveCanvasTheme(json.attrs?.canvasTheme);+ const textColor = canvasTheme?.textColor ?? CANVAS_THEME_DEFAULTS.textColor;+ const jsxNodes = mappedNodeContent(json, { color: textColor });return (<Html>@@ -54,7 +67,7 @@ export const reactMarkupFromJSON = (json: JSONContent | string) => {{canvasTheme !== null ? (themedBody(canvasTheme, jsxNodes)) : (- <Body>{jsxNodes}</Body>+ <Body style={{ ...BASE_TYPOGRAPHY, color: textColor }}>{jsxNodes}</Body>)}</Html>);diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/blockquote.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/blockquote.tsxnew file mode 100644index 00000000000..c6a6cae9a3b--- /dev/null+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/blockquote.tsx@@ -0,0 +1,37 @@+import { type JSONContent } from '@tiptap/core';+import { type ReactNode } from 'react';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';+import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';+import { blockStyle } from 'src/utils/email-renderer/utils/block-style';+import {+ type InheritedTypography,+ mergeInheritedTypography,+} from 'src/utils/email-renderer/utils/inherited-typography';++export const blockquote = (+ node: JSONContent,+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,+): ReactNode => {+ const style = blockStyle(node.attrs?.style);++ return (+ <blockquote+ style={{+ borderLeft: `${EMAIL_TYPOGRAPHY.quoteBorderWidth} solid ${EMAIL_TYPOGRAPHY.accentColor}`,+ fontStyle: 'italic',+ marginLeft: '0',+ marginRight: '0',+ ...blockSpacing(context),+ paddingLeft: EMAIL_TYPOGRAPHY.quoteIndent,+ ...style,+ }}+ >+ {mappedNodeContent(node, mergeInheritedTypography(inherited, style))}+ </blockquote>+ );+};diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/bullet-list.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/bullet-list.tsxindex 849e939e4a8..4d48cde6dc9 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/bullet-list.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/bullet-list.tsx@@ -1,17 +1,23 @@import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';export const bulletList = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {return (<ulstyle={{- marginBottom: '16px',- lineHeight: '1.5',+ paddingLeft: EMAIL_TYPOGRAPHY.listIndent,+ ...blockSpacing(context),...inherited,}}>diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/button.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/button.tsxindex 5c0b273e2f4..35df566b537 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/button.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/button.tsx@@ -1,10 +1,19 @@import { Button, Column, Row } from 'react-email';import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';+import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import { safeUrl } from 'src/utils/email-renderer/utils/safe-url';-export const button = (node: JSONContent): ReactNode => {+export const button = (+ node: JSONContent,+ _inherited: InheritedTypography,+ context: EmailNodeRenderContext,+): ReactNode => {const label = (node.content ?? []).map((childNode) => childNode.text ?? '').join('');@@ -12,7 +21,7 @@ export const button = (node: JSONContent): ReactNode => {const align = node.attrs?.align ?? 'left';return (- <Row>+ <Row style={blockSpacing(context)}><Column align={align}><Button href={safeUrl(href)} style={blockStyle(node.attrs?.style)}>{label}diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/columns.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/columns.tsxindex 9944413427c..31be2c127cb 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/columns.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/columns.tsx@@ -2,6 +2,10 @@ import { Column, Row } from 'react-email';import { type JSONContent } from '@tiptap/core';import { Fragment, type ReactNode } from 'react';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import {type InheritedTypography,@@ -10,7 +14,8 @@ import {export const columns = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {const columnNodes = node.content ?? [];const columnWidth = `${100 / Math.max(columnNodes.length, 1)}%`;@@ -18,7 +23,7 @@ export const columns = (const rowTypography = mergeInheritedTypography(inherited, rowStyle);return (- <Row style={rowStyle}>+ <Row style={{ ...blockSpacing(context), ...rowStyle }}>{columnNodes.map((column, index) => {const columnStyle = blockStyle(column.attrs?.style);diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/divider.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/divider.tsxindex 5c5c4f74b7e..b44002bfa23 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/divider.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/divider.tsx@@ -4,5 +4,5 @@ import { type ReactNode } from 'react';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';export const divider = (node: JSONContent): ReactNode => {- return <Hr style={blockStyle(node.attrs?.style)} />;+ return <Hr style={{ width: 'auto', ...blockStyle(node.attrs?.style) }} />;};diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/heading.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/heading.tsxindex 55e0ffca4dc..08ec73e107d 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/heading.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/heading.tsx@@ -2,44 +2,52 @@ import { Heading } from 'react-email';import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import { type EmailNodeRenderContext } from 'src/utils/email-renderer/utils/block-spacing';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';-import { isDefined } from 'twenty-shared/utils';+import { EMAIL_TYPOGRAPHY, isDefined } from 'twenty-shared/utils';-type HeadingLevel = 1 | 2 | 3;+type HeadingLevel = keyof typeof EMAIL_TYPOGRAPHY.headingFontSizes;-type HeadingStyle = {- element: 'h1' | 'h2' | 'h3';- fontSize: string;+const HEADING_ELEMENTS: Record<HeadingLevel, 'h1' | 'h2' | 'h3'> = {+ 1: 'h1',+ 2: 'h2',+ 3: 'h3',};-const HEADING_STYLES: Record<HeadingLevel, HeadingStyle> = {- 1: { element: 'h1', fontSize: '32px' },- 2: { element: 'h2', fontSize: '24px' },- 3: { element: 'h3', fontSize: '16px' },-};+const isHeadingLevel = (level: unknown): level is HeadingLevel =>+ level === 1 || level === 2 || level === 3;export const heading = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ { isFirstChild, isLastChild }: EmailNodeRenderContext,): ReactNode => {- const { level } = node?.attrs || {};+ const level = node?.attrs?.level;- if (!isDefined(level) || !HEADING_STYLES[level as HeadingLevel]) {+ if (!isDefined(level) || !isHeadingLevel(level)) {return null;}const content = mappedNodeContent(node, inherited);- const { element, fontSize } = HEADING_STYLES[level as HeadingLevel];- const { fontSize: _inheritedFontSize, ...inheritedWithoutSize } = inherited;+ const {+ fontSize: _inheritedFontSize,+ fontWeight: _inheritedFontWeight,+ lineHeight: _inheritedLineHeight,+ ...inheritedTypography+ } = inherited;return (<Heading- as={element}+ as={HEADING_ELEMENTS[level]}style={{- fontSize,- ...inheritedWithoutSize,+ fontSize: EMAIL_TYPOGRAPHY.headingFontSizes[level],+ fontWeight: EMAIL_TYPOGRAPHY.headingFontWeight,+ lineHeight: EMAIL_TYPOGRAPHY.headingLineHeight,+ marginTop: isFirstChild ? '0' : EMAIL_TYPOGRAPHY.headingSpacingTop,+ marginBottom: isLastChild ? '0' : EMAIL_TYPOGRAPHY.headingSpacingBottom,+ ...inheritedTypography,...blockStyle(node.attrs?.style),}}>diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/image.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/image.tsxindex c596be16f5a..3b616a13085 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/image.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/image.tsx@@ -3,9 +3,18 @@ import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';import { isDefined } from 'twenty-shared/utils';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';+import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';import { safeUrl } from 'src/utils/email-renderer/utils/safe-url';-export const image = (node: JSONContent): ReactNode => {+export const image = (+ node: JSONContent,+ _inherited: InheritedTypography,+ context: EmailNodeRenderContext,+): ReactNode => {const { src: rawSrc, alt, align = 'left', width, href } = node?.attrs || {};const src = safeUrl(rawSrc);if (!isDefined(src)) {@@ -29,7 +38,7 @@ export const image = (node: JSONContent): ReactNode => {);return (- <Row>+ <Row style={blockSpacing(context)}><Column align={align}>{isDefined(safeUrl(href)) ? (<Link href={safeUrl(href)} target="_blank">diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/list-item.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/list-item.tsxindex 9df9890336c..03af83bc1e2 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/list-item.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/list-item.tsx@@ -1,21 +1,45 @@import { type JSONContent } from '@tiptap/core';-import { type ReactNode } from 'react';+import { Fragment, type ReactNode } from 'react';+import { EMAIL_TYPOGRAPHY, TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';+import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';export const listItem = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {+ const { color: textColor, ...typography } = inherited;+return (<listyle={{- marginBottom: '8px',- lineHeight: '1.5',- ...inherited,+ fontSize: EMAIL_TYPOGRAPHY.fontSize,+ lineHeight: EMAIL_TYPOGRAPHY.lineHeight,+ ...blockSpacing(context, EMAIL_TYPOGRAPHY.listItemSpacing),+ ...typography,+ color: EMAIL_TYPOGRAPHY.accentColor,}}>- {mappedNodeContent(node, inherited)}+ {(node.content ?? []).map((childNode, index) =>+ childNode.type === TIPTAP_NODE_TYPES.PARAGRAPH ? (+ <div+ key={index}+ style={{ color: textColor, ...blockStyle(childNode.attrs?.style) }}+ >+ {mappedNodeContent(childNode, inherited)}+ </div>+ ) : (+ <Fragment key={index}>+ {mappedNodeContent({ content: [childNode] }, inherited)}+ </Fragment>+ ),+ )}</li>);};diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/ordered-list.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/ordered-list.tsxindex f6fdebf56ff..a00d0af28ec 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/ordered-list.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/ordered-list.tsx@@ -1,17 +1,23 @@import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';export const orderedList = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {return (<olstyle={{- marginBottom: '16px',- lineHeight: '1.5',+ paddingLeft: EMAIL_TYPOGRAPHY.listIndent,+ ...blockSpacing(context),...inherited,}}>diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/paragraph.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/paragraph.tsxindex 3e5e8b2196b..636263e5267 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/paragraph.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/paragraph.tsx@@ -1,22 +1,29 @@import { Text } from 'react-email';import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';export const paragraph = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {const content = mappedNodeContent(node, inherited);return (<Textstyle={{- lineHeight: '1.5',- margin: '0',+ fontSize: EMAIL_TYPOGRAPHY.fontSize,+ lineHeight: EMAIL_TYPOGRAPHY.lineHeight,padding: '0',+ ...blockSpacing(context),...inherited,...blockStyle(node.attrs?.style),}}diff --git a/packages/twenty-emails/src/utils/email-renderer/nodes/section.tsx b/packages/twenty-emails/src/utils/email-renderer/nodes/section.tsxindex 1e4138ee933..b5ebd7d545a 100644--- a/packages/twenty-emails/src/utils/email-renderer/nodes/section.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/nodes/section.tsx@@ -2,6 +2,10 @@ import { Section } from 'react-email';import { type JSONContent } from '@tiptap/core';import { type ReactNode } from 'react';import { mappedNodeContent } from 'src/utils/email-renderer/renderers/render-node';+import {+ blockSpacing,+ type EmailNodeRenderContext,+} from 'src/utils/email-renderer/utils/block-spacing';import { blockStyle } from 'src/utils/email-renderer/utils/block-style';import {type InheritedTypography,@@ -10,12 +14,13 @@ import {export const section = (node: JSONContent,- inherited: InheritedTypography = {},+ inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {const style = blockStyle(node.attrs?.style);return (- <Section style={style}>+ <Section style={{ ...blockSpacing(context), ...style }}>{mappedNodeContent(node, mergeInheritedTypography(inherited, style))}</Section>);diff --git a/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx b/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsxindex ab879af4caf..a701f22ce81 100644--- a/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx+++ b/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx@@ -1,3 +1,4 @@+import { blockquote } from '@/utils/email-renderer/nodes/blockquote';import { bulletList } from '@/utils/email-renderer/nodes/bullet-list';import { button } from '@/utils/email-renderer/nodes/button';import { columns } from '@/utils/email-renderer/nodes/columns';@@ -14,6 +15,7 @@ import { text } from '@/utils/email-renderer/nodes/text';import { variableTag } from '@/utils/email-renderer/nodes/variable-tag';import { type JSONContent } from '@tiptap/core';import { Fragment, type JSX, type ReactNode } from 'react';+import { type EmailNodeRenderContext } from 'src/utils/email-renderer/utils/block-spacing';import { type InheritedTypography } from 'src/utils/email-renderer/utils/inherited-typography';import {isRenderedEmailDocumentNodeType,@@ -24,6 +26,7 @@ import {type EmailNodeRenderer = (node: JSONContent,inherited: InheritedTypography,+ context: EmailNodeRenderContext,) => ReactNode;const NODE_RENDERERS = {@@ -35,6 +38,7 @@ const NODE_RENDERERS = {[TIPTAP_NODE_TYPES.BULLET_LIST]: bulletList,[TIPTAP_NODE_TYPES.ORDERED_LIST]: orderedList,[TIPTAP_NODE_TYPES.LIST_ITEM]: listItem,+ [TIPTAP_NODE_TYPES.BLOCKQUOTE]: blockquote,[TIPTAP_NODE_TYPES.HARD_BREAK]: hardBreak,[TIPTAP_NODE_TYPES.SECTION]: section,[TIPTAP_NODE_TYPES.COLUMNS]: columns,@@ -47,6 +51,7 @@ const NODE_RENDERERS = {const renderNode = (node: JSONContent,inherited: InheritedTypography,+ context: EmailNodeRenderContext,): ReactNode => {if (typeof node.type !== 'string' ||@@ -55,7 +60,7 @@ const renderNode = (return null;}- return NODE_RENDERERS[node.type](node, inherited);+ return NODE_RENDERERS[node.type](node, inherited, context);};export const mappedNodeContent = (@@ -65,7 +70,10 @@ export const mappedNodeContent = (const allNodes = node.content || [];return allNodes.map((childNode, index) => {- const component = renderNode(childNode, inherited);+ const component = renderNode(childNode, inherited, {+ isFirstChild: index === 0,+ isLastChild: index === allNodes.length - 1,+ });if (!component) {return null;}diff --git a/packages/twenty-emails/src/utils/email-renderer/utils/block-spacing.ts b/packages/twenty-emails/src/utils/email-renderer/utils/block-spacing.tsnew file mode 100644index 00000000000..f56fc5610de--- /dev/null+++ b/packages/twenty-emails/src/utils/email-renderer/utils/block-spacing.ts@@ -0,0 +1,14 @@+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';++export type EmailNodeRenderContext = {+ isFirstChild: boolean;+ isLastChild: boolean;+};++export const blockSpacing = (+ { isLastChild }: EmailNodeRenderContext,+ spacing: string = EMAIL_TYPOGRAPHY.blockSpacing,+) => ({+ marginTop: '0',+ marginBottom: isLastChild ? '0' : spacing,+});diff --git a/packages/twenty-front/package.json b/packages/twenty-front/package.jsonindex dc130ae5283..961f8267811 100644--- a/packages/twenty-front/package.json+++ b/packages/twenty-front/package.json@@ -65,7 +65,7 @@"@tiptap/extension-bold": "3.30.5","@tiptap/extension-collaboration": "3.30.5","@tiptap/extension-document": "3.30.5",- "@tiptap/extension-drag-handle": "3.30.5",+ "@tiptap/extension-drag-handle": "patch:@tiptap/extension-drag-handle@npm%3A3.30.5#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch","@tiptap/extension-drag-handle-react": "3.30.5","@tiptap/extension-hard-break": "3.30.5","@tiptap/extension-heading": "3.30.5",diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.tsindex eabda54326a..9d2d512faac 100644--- a/packages/twenty-front/src/generated-metadata/graphql.ts+++ b/packages/twenty-front/src/generated-metadata/graphql.ts@@ -1999,6 +1999,7 @@ export enum EngineComponentKey {EDIT_DASHBOARD_LAYOUT = 'EDIT_DASHBOARD_LAYOUT',EDIT_RECORD_PAGE_LAYOUT = 'EDIT_RECORD_PAGE_LAYOUT',EMAIL_BLOCK_SETTINGS = 'EMAIL_BLOCK_SETTINGS',+ EMAIL_PAGE_STYLE = 'EMAIL_PAGE_STYLE',EXPORT_FROM_RECORD_INDEX = 'EXPORT_FROM_RECORD_INDEX',EXPORT_FROM_RECORD_SHOW = 'EXPORT_FROM_RECORD_SHOW',EXPORT_MULTIPLE_RECORDS = 'EXPORT_MULTIPLE_RECORDS',diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsxindex 42f861a47b5..ec53515270b 100644--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx@@ -26,8 +26,6 @@ import { Callout } from 'twenty-ui/components/feedback';import { Switch } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-const COMPOSER_LABEL_MIN_WIDTH = '80px';-const StyledFieldsContainer = styled.div`display: flex;flex: 1;@@ -98,10 +96,7 @@ export const CalendarEventComposerFields = ({onDragEnd={handlers.onDragEnd}><ComposerHeader>- <ComposerFieldRow- label={t`Calendar`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Calendar`}><SelectdropdownId="calendar-event-composer-account"fullWidth@@ -111,10 +106,7 @@ export const CalendarEventComposerFields = ({onChange={composerState.setConnectedAccountId}/></ComposerFieldRow>- <ComposerFieldRow- label={t`Guests`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Guests`}><EmailRecipientsFieldInputfieldId="to"draggedSourceIndices={draggedSourceIndices}@@ -127,20 +119,14 @@ export const CalendarEventComposerFields = ({/></ComposerFieldRow>{composerState.canPickTargets && (- <ComposerFieldRow- label={t`Relations`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Relations`}><CalendarEventComposerTargetsInputtargets={composerState.targets}onTargetChange={composerState.handleTargetChange}/></ComposerFieldRow>)}- <ComposerFieldRow- label={t`Title`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Title`}><StyledComposerTextInputtype="text"aria-label={t`Title`}@@ -148,10 +134,7 @@ export const CalendarEventComposerFields = ({onChange={(event) => composerState.setTitle(event.target.value)}/></ComposerFieldRow>- <ComposerFieldRow- label={t`Location`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Location`}><CalendarEventLocationInputariaLabel={t`Location`}placeholder={t`Add a location`}@@ -161,7 +144,6 @@ export const CalendarEventComposerFields = ({</ComposerFieldRow><ComposerFieldRowlabel={t`All day`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}onClick={() =>composerState.handleIsFullDayChange(!composerState.isFullDay)}@@ -180,20 +162,14 @@ export const CalendarEventComposerFields = ({</ComposerFieldRow>{composerState.isFullDay ? (<>- <ComposerFieldRow- label={t`Starts`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Starts`}><FormDateFieldInputvariant="transparent"defaultValue={composerState.dates.startsAt}onChange={composerState.handleStartsAtChange}/></ComposerFieldRow>- <ComposerFieldRow- label={t`Ends`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Ends`}><FormDateFieldInputkey={composerState.dates.endsAt}variant="transparent"@@ -204,10 +180,7 @@ export const CalendarEventComposerFields = ({</>) : (<>- <ComposerFieldRow- label={t`Starts`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Starts`}><FormDateTimeFieldInputkey={`starts-at-${composerState.timeZone}`}variant="transparent"@@ -216,10 +189,7 @@ export const CalendarEventComposerFields = ({timeZone={composerState.timeZone}/></ComposerFieldRow>- <ComposerFieldRow- label={t`Ends`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Ends`}><FormDateTimeFieldInputkey={`ends-at-${composerState.dates.endsAt}-${composerState.timeZone}`}variant="transparent"@@ -230,10 +200,7 @@ export const CalendarEventComposerFields = ({</ComposerFieldRow></>)}- <ComposerFieldRow- label={t`Time zone`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Time zone`}><SelectdropdownId="calendar-event-composer-time-zone"fullWidth@@ -246,7 +213,6 @@ export const CalendarEventComposerFields = ({</ComposerFieldRow><ComposerFieldRowlabel={t`Invitations`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}onClick={() =>composerState.setSendInvitations(!composerState.sendInvitations)}@@ -265,7 +231,6 @@ export const CalendarEventComposerFields = ({</ComposerFieldRow><ComposerFieldRowlabel={t`Video call`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}onClick={() =>composerState.setAddConferencing(!composerState.addConferencing)}@@ -282,10 +247,7 @@ export const CalendarEventComposerFields = ({{t`Add a meeting link`}</StyledRowDescription></ComposerFieldRow>- <ComposerFieldRow- label={t`Description`}- labelMinWidth={COMPOSER_LABEL_MIN_WIDTH}- >+ <ComposerFieldRow label={t`Description`}><TextAreatextAreaId="calendar-event-composer-description"variant="transparent"diff --git a/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx b/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsxindex 47fcf18fc4b..8088b6a7301 100644--- a/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx+++ b/packages/twenty-front/src/modules/activities/components/ComposerFieldRow.tsx@@ -1,40 +1,61 @@import { styled } from '@linaria/react';-import { type MouseEventHandler, type ReactNode } from 'react';+import { type MouseEvent, type MouseEventHandler, type ReactNode } from 'react';import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';+import { COMPOSER_LABEL_MIN_WIDTH } from '@/activities/constants/ComposerLabelMinWidth';+const ROW_MIN_HEIGHT = '40px';+const NESTED_CONTROL_SELECTOR =+ 'input, textarea, button, a[href], [role="button"]';++const StyledContent = styled.div`+ align-items: center;+ display: flex;+ flex: 1;+ min-width: 0;+ padding: 0 ${themeCssVariables.spacing[2]};++ & :focus-visible {+ outline: none;+ }+`;+const StyledRow = styled.div<{ $clickable: boolean }>`align-items: center;border-bottom: 1px solid ${themeCssVariables.border.color.light};box-sizing: border-box;cursor: ${({ $clickable }) => ($clickable ? 'pointer' : 'default')};display: flex;- gap: ${themeCssVariables.spacing[2]};+ gap: ${themeCssVariables.spacing[3]};min-height: ${ROW_MIN_HEIGHT};- padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]}+ padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[1]}${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[3]};width: 100%;+ &:hover {+ background-color: ${({ $clickable }) =>+ $clickable+ ? themeCssVariables.background.transparent.lighter+ : 'transparent'};+ }++ &:has(${StyledContent} :focus-visible) {+ background-color: ${themeCssVariables.background.transparent.lighter};+ }+&:last-of-type {border-bottom: none;}`;-const StyledLabel = styled.span<{ $minWidth: string | undefined }>`+const StyledLabel = styled.span`color: ${themeCssVariables.font.color.tertiary};flex-shrink: 0;font-size: ${themeCssVariables.font.size.md};font-weight: ${themeCssVariables.font.weight.regular};- min-width: ${({ $minWidth }) => $minWidth ?? 'auto'};-`;--const StyledContent = styled.div`- align-items: center;- display: flex;- flex: 1;- min-width: 0;+ min-width: ${COMPOSER_LABEL_MIN_WIDTH};`;const StyledTrailing = styled.div`@@ -47,8 +68,6 @@ type ComposerFieldRowProps = {children: ReactNode;trailing?: ReactNode;onClick?: MouseEventHandler<HTMLDivElement>;- // A floor, not a fixed width, so a long translation doesn't run under its control.- labelMinWidth?: string;};// The label is a plain span, so the row is named as a group to give assistive technology the field name.@@ -57,22 +76,39 @@ export const ComposerFieldRow = ({children,trailing,onClick,- labelMinWidth,-}: ComposerFieldRowProps) => (- <StyledRow- role="group"- aria-label={label}- $clickable={isDefined(onClick)}- onClick={onClick}- >- <StyledLabel aria-hidden="true" $minWidth={labelMinWidth}>- {label}- </StyledLabel>- <StyledContent>{children}</StyledContent>- {isDefined(trailing) && (- <StyledTrailing onClick={(event) => event.stopPropagation()}>- {trailing}- </StyledTrailing>- )}- </StyledRow>-);+}: ComposerFieldRowProps) => {+ const handleClick = (event: MouseEvent<HTMLDivElement>) => {+ if (!(event.target instanceof Element)) {+ return;+ }++ const row = event.currentTarget;+ const nestedControl = event.target.closest(NESTED_CONTROL_SELECTOR);+ const isFromPortaledContent = !row.contains(event.target);+ const isOnNestedControl =+ isDefined(nestedControl) && row.contains(nestedControl);++ if (isFromPortaledContent || isOnNestedControl) {+ return;+ }++ onClick?.(event);+ };++ return (+ <StyledRow+ role="group"+ aria-label={label}+ $clickable={isDefined(onClick)}+ onClick={isDefined(onClick) ? handleClick : undefined}+ >+ <StyledLabel aria-hidden="true">{label}</StyledLabel>+ <StyledContent>{children}</StyledContent>+ {isDefined(trailing) && (+ <StyledTrailing onClick={(event) => event.stopPropagation()}>+ {trailing}+ </StyledTrailing>+ )}+ </StyledRow>+ );+};diff --git a/packages/twenty-front/src/modules/activities/constants/ComposerLabelMinWidth.ts b/packages/twenty-front/src/modules/activities/constants/ComposerLabelMinWidth.tsnew file mode 100644index 00000000000..93bb10aa7b9--- /dev/null+++ b/packages/twenty-front/src/modules/activities/constants/ComposerLabelMinWidth.ts@@ -0,0 +1 @@+export const COMPOSER_LABEL_MIN_WIDTH = '80px';diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsxindex fef560984f3..36aa5ad7fda 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignBodyField.tsx@@ -1,7 +1,4 @@import { styled } from '@linaria/react';-import { t } from '@lingui/core/macro';-import { type Editor } from '@tiptap/core';-import { useCallback } from 'react';import { useCampaignBodyState } from '@/activities/emails/hooks/useCampaignBodyState';import { EmailEditorCanvas } from '@/activities/emails/editor/components/EmailEditorCanvas';@@ -21,38 +18,24 @@ const StyledContainer = styled.div`type CampaignBodyFieldProps = {campaign: MessageCampaign;- // Exposes the editor so the envelope block can follow the per-campaign canvas width.- onEditorReady?: (editor: Editor | null) => void;};-export const CampaignBodyField = ({- campaign,- onEditorReady,-}: CampaignBodyFieldProps) => {+export const CampaignBodyField = ({ campaign }: CampaignBodyFieldProps) => {const { body, setBody, flush, draftResyncKey } = useCampaignBodyState({campaign,});const setActiveEmailEditor = useSetAtomState(activeEmailEditorState);const { uploadEmailImage } = useUploadEmailImage();- const handleEditorReady = useCallback(- (editor: Editor | null) => {- setActiveEmailEditor(editor);- onEditorReady?.(editor);- },- [setActiveEmailEditor, onEditorReady],- );-return (<StyledContainer onBlur={() => flush()}><FormAdvancedTextFieldInputkey={draftResyncKey}defaultValue={body}onChange={setBody}- placeholder={t`Type something or press "/" to see commands`}profile={CAMPAIGN_BODY_EDITOR_PROFILE}EditorComponent={EmailEditorCanvas}- onEditorReady={handleEditorReady}+ onEditorReady={setActiveEmailEditor}onImageUpload={uploadEmailImage}/></StyledContainer>diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsxindex 1bacb3cfbea..8fe693ce229 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignComposer.tsx@@ -1,33 +1,16 @@-import { styled } from '@linaria/react';-import { type Editor } from '@tiptap/core';-import { useState } from 'react';-import { CampaignBodyField } from '@/activities/emails/components/CampaignBodyField';import { CampaignDetailsFields } from '@/activities/emails/components/CampaignDetailsFields';-import { useCampaignCanvasWidth } from '@/activities/emails/hooks/useCampaignCanvasWidth';+import { StyledCampaignWidgetContainer } from '@/activities/emails/components/CampaignWidgetContainer';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';-const StyledContainer = styled.div`- display: flex;- flex-direction: column;- height: 100%;- min-height: 0;- width: 100%;-`;-type CampaignComposerProps = {campaign: MessageCampaign;};// One widget, not two: stacked widgets would each get boxed in their own card.-export const CampaignComposer = ({ campaign }: CampaignComposerProps) => {- const [bodyEditor, setBodyEditor] = useState<Editor | null>(null);- const canvasWidth = useCampaignCanvasWidth(bodyEditor);-- return (- <StyledContainer>- <CampaignDetailsFields campaign={campaign} width={canvasWidth} />- <CampaignBodyField campaign={campaign} onEditorReady={setBodyEditor} />- </StyledContainer>- );-};+export const CampaignComposer = ({ campaign }: CampaignComposerProps) => (+ <StyledCampaignWidgetContainer>+ <CampaignDetailsFields campaign={campaign} />+ <CampaignBodyField campaign={campaign} />+ </StyledCampaignWidgetContainer>+);diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsxindex 71fe84aa9f1..11510b15b3f 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignDetailsFields.tsx@@ -1,6 +1,6 @@import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { useId } from 'react';+import { useId, useRef } from 'react';import {CoreObjectNameSingular,MessageChannelType,@@ -8,53 +8,50 @@ import {import { isDefined } from 'twenty-shared/utils';import { InlineBanner } from 'twenty-ui/components/feedback';import { IconAlertTriangle } from 'twenty-ui/icon';+import { Avatar } from 'twenty-ui/primitives/data-display';import { type SelectOption } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-import {- CampaignEnvelopeBox,- CampaignEnvelopeRow,-} from '@/activities/emails/components/CampaignEnvelopeBox';+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';+import { StyledComposerTextInput } from '@/activities/components/ComposerTextInput';+import { CampaignEnvelopeBox } from '@/activities/emails/components/CampaignEnvelopeBox';import { useCampaignDetailsState } from '@/activities/emails/hooks/useCampaignDetailsState';import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';-import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';import { useMyMessageChannels } from '@/settings/accounts/hooks/useMyMessageChannels';+import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';import { Select } from '@/ui/input/components/Select';+import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';import { useRemoveFocusItemFromFocusStackOnUnmount } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackOnUnmount';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';-const StyledSubjectInput = styled.input`- background: transparent;- border: none;- color: ${themeCssVariables.font.color.primary};- font-family: inherit;- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.regular};- outline: none;- padding: 0;- width: 100%;-`;-const StyledWarningContainer = styled.div`- margin-top: ${themeCssVariables.spacing[2]};+ padding: ${themeCssVariables.spacing[2]} ${themeCssVariables.spacing[3]};`;+const FROM_DROPDOWN_ID = 'campaign-composer-from-account';+const UNSUBSCRIBE_TOPIC_DROPDOWN_ID = 'campaign-composer-unsubscribe-topic';+type CampaignDetailsFieldsProps = {campaign: MessageCampaign;- width: string;};export const CampaignDetailsFields = ({campaign,- width,}: CampaignDetailsFieldsProps) => {const detailsState = useCampaignDetailsState({ campaign });const instanceId = useId();const subjectFocusId = `campaign-subject-input-${instanceId}`;+ const listDropdownId = `campaign-list-picker-${instanceId}`;+ const subjectInputRef = useRef<HTMLInputElement>(null);+ const { openDropdown } = useOpenDropdown();++ const openDropdownById = (dropdownId: string) =>+ openDropdown({ dropdownComponentInstanceIdFromProps: dropdownId });const { pushFocusItemToFocusStack } = usePushFocusItemToFocusStack();const { removeFocusItemFromFocusStackById } =useRemoveFocusItemFromFocusStackById();@@ -102,18 +99,38 @@ export const CampaignDetailsFields = ({.map((handle) => ({ label: handle, value: handle }));const topicOptions: SelectOption<string>[] = unsubscribeTopics.map(- (topic) => ({- label: topic.name ?? t`Untitled topic`,- value: topic.id,- }),+ (topic) => {+ const topicName = topic.name ?? t`Untitled topic`;++ return {+ label: topicName,+ value: topic.id,+ LeftComponent: (+ <Avatar+ colorSeed={topic.id}+ name={topicName}+ size="md"+ shape="circle"+ />+ ),+ };+ },);const hasTopicOptions = topicOptions.length > 0;const hasSenderOptions = senderOptions.length > 0;+ const isSenderSelectDisabled =+ senderOptions.length <= 1 &&+ senderOptions.some((option) => option.value === detailsState.fromAddress);+ const isTopicSelectDisabled =+ topicOptions.length <= 1 &&+ topicOptions.some(+ (option) => option.value === detailsState.unsubscribeTopicId,+ );+return (<CampaignEnvelopeBox- width={width}onBlur={() => detailsState.flush()}below={!hasSenderOptions && (@@ -127,50 +144,82 @@ export const CampaignDetailsFields = ({)}>- <CampaignEnvelopeRow label={t`From`}>+ <ComposerFieldRow+ label={t`From`}+ onClick={+ isSenderSelectDisabled+ ? undefined+ : () => openDropdownById(FROM_DROPDOWN_ID)+ }+ ><Select- dropdownId="campaign-composer-from-account"+ dropdownId={FROM_DROPDOWN_ID}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}fullWidth+ variant="transparent"value={detailsState.fromAddress}options={senderOptions}emptyOption={{ label: t`Select a sender`, value: '' }}onChange={detailsState.setFromAddress}/>- </CampaignEnvelopeRow>- <CampaignEnvelopeRow label={t`To`}>+ </ComposerFieldRow>+ <ComposerFieldRow+ label={t`To`}+ onClick={() => openDropdownById(listDropdownId)}+ ><FormSingleRecordPickerkey={`list-${detailsState.draftResyncKey}`}+ dropdownId={listDropdownId}+ variant="transparent"objectNameSingulars={[CoreObjectNameSingular.MessageList]}defaultValue={detailsState.listId}onChange={detailsState.setListId}onCreate={handleCreateList}/>- </CampaignEnvelopeRow>+ </ComposerFieldRow>{hasTopicOptions && (- <CampaignEnvelopeRow label={t`Unsubscribe topic`}>+ <ComposerFieldRow+ label={t`Topic`}+ onClick={+ isTopicSelectDisabled+ ? undefined+ : () => openDropdownById(UNSUBSCRIBE_TOPIC_DROPDOWN_ID)+ }+ ><Select- dropdownId="campaign-composer-unsubscribe-topic"+ dropdownId={UNSUBSCRIBE_TOPIC_DROPDOWN_ID}+ dropdownWidth={GenericDropdownContentWidth.ExtraLarge}fullWidth+ variant="transparent"value={detailsState.unsubscribeTopicId ?? ''}options={topicOptions}- emptyOption={{ label: t`No topic`, value: '' }}+ showIconInControl={false}+ emptyOption={{+ label: t`No topic`,+ value: '',+ }}onChange={(value) =>detailsState.setUnsubscribeTopicId(value === '' ? null : value)}/>- </CampaignEnvelopeRow>+ </ComposerFieldRow>)}- <CampaignEnvelopeRow label={t`Subject`}>- <StyledSubjectInput+ <ComposerFieldRow+ label={t`Subject`}+ onClick={() => subjectInputRef.current?.focus()}+ >+ <StyledComposerTextInputkey={`subject-${detailsState.draftResyncKey}`}+ ref={subjectInputRef}type="text"aria-label={t`Subject`}+ placeholder={t`Add a subject`}defaultValue={detailsState.subject}onChange={(event) => detailsState.setSubject(event.target.value)}onFocus={handleSubjectFocus}onBlur={handleSubjectBlur}/>- </CampaignEnvelopeRow>+ </ComposerFieldRow></CampaignEnvelopeBox>);};diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsxindex 4f713841c6f..525690a59f3 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignEnvelopeBox.tsx@@ -1,80 +1,28 @@import { styled } from '@linaria/react';-import { type MouseEventHandler, type ReactNode } from 'react';-import { themeCssVariables } from 'twenty-ui/theme';+import { type ReactNode } from 'react';-import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';--// Widest campaign row label ("Unsubscribe topic"), so every value starts on the same column.-const CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH = '116px';+import { ComposerHeader } from '@/activities/components/ComposerHeader';const StyledContainer = styled.div`- align-items: center;display: flex;flex-direction: column;flex-shrink: 0;- padding: ${themeCssVariables.spacing[3]} 0;- width: 100%;-`;--const StyledColumn = styled.div<{ $width: string }>`- display: flex;- flex-direction: column;- max-width: ${({ $width }) => $width};- min-width: 0;- width: 100%;-`;--const StyledRows = styled.div`- background-color: ${themeCssVariables.background.secondary};- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.md};- display: flex;- flex-direction: column;- /* Keeps the row hairlines from crossing the rounded corners. */- overflow: hidden;width: 100%;`;type CampaignEnvelopeBoxProps = {- width: string;children: ReactNode;below?: ReactNode;onBlur?: () => void;};export const CampaignEnvelopeBox = ({- width,children,below,onBlur,}: CampaignEnvelopeBoxProps) => (<StyledContainer onBlur={onBlur}>- <StyledColumn $width={width}>- <StyledRows>{children}</StyledRows>- {below}- </StyledColumn>+ <ComposerHeader>{children}</ComposerHeader>+ {below}</StyledContainer>);--type CampaignEnvelopeRowProps = {- label: string;- children: ReactNode;- trailing?: ReactNode;- onClick?: MouseEventHandler<HTMLDivElement>;-};--export const CampaignEnvelopeRow = ({- label,- children,- trailing,- onClick,-}: CampaignEnvelopeRowProps) => (- <ComposerFieldRow- label={label}- trailing={trailing}- onClick={onClick}- labelMinWidth={CAMPAIGN_ENVELOPE_LABEL_MIN_WIDTH}- >- {children}- </ComposerFieldRow>-);diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsxindex 96ab1af2f44..f54804910d3 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx@@ -8,10 +8,8 @@ import {import { isDefined, isValidUuid } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';-import {- CampaignEnvelopeBox,- CampaignEnvelopeRow,-} from '@/activities/emails/components/CampaignEnvelopeBox';+import { ComposerFieldRow } from '@/activities/components/ComposerFieldRow';+import { CampaignEnvelopeBox } from '@/activities/emails/components/CampaignEnvelopeBox';import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';import { formatCampaignSendTime } from '@/activities/emails/utils/formatCampaignSendTime';@@ -36,17 +34,15 @@ const StyledEmptyValue = styled.span`type CampaignSentEnvelopeProps = {campaign: MessageCampaign;- width: string;};// Doesn't reuse CampaignDetailsFields, which owns draft persistence state a sent campaign has no use for.export const CampaignSentEnvelope = ({campaign,- width,}: CampaignSentEnvelopeProps) => {const { unsubscribeTopics, loading: areTopicsLoading } =useUnsubscribeTopics();- const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();+ const { timeFormat, timeZone } = useDateTimeFormat();const { localeCatalog } = useAtomStateValue(dateLocaleState);const hasList = isDefined(campaign.listId) && isValidUuid(campaign.listId);@@ -83,22 +79,21 @@ export const CampaignSentEnvelope = ({? formatCampaignSendTime({value: campaign.scheduledAt,timeZone,- dateFormat,timeFormat,localeCatalog,}): '';return (- <CampaignEnvelopeBox width={width}>- <CampaignEnvelopeRow label={t`From`}>+ <CampaignEnvelopeBox>+ <ComposerFieldRow label={t`From`}>{isNonEmptyString(fromAddress) ? (<StyledValue>{fromAddress}</StyledValue>) : (<StyledEmptyValue>{t`No sender`}</StyledEmptyValue>)}- </CampaignEnvelopeRow>- <CampaignEnvelopeRow label={t`To`}>+ </ComposerFieldRow>+ <ComposerFieldRow label={t`To`}>{isDefined(list) ? (<RecordChiprecord={list}@@ -111,9 +106,9 @@ export const CampaignSentEnvelope = ({<StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>))}- </CampaignEnvelopeRow>+ </ComposerFieldRow>{hasUnsubscribeTopic && (- <CampaignEnvelopeRow label={t`Unsubscribe topic`}>+ <ComposerFieldRow label={t`Topic`}>{isDefined(unsubscribeTopic) ? (<StyledValue>{unsubscribeTopic.name ?? t`Untitled topic`}@@ -123,19 +118,19 @@ export const CampaignSentEnvelope = ({<StyledEmptyValue>{t`Unavailable`}</StyledEmptyValue>))}- </CampaignEnvelopeRow>+ </ComposerFieldRow>)}- <CampaignEnvelopeRow label={t`Subject`}>+ <ComposerFieldRow label={t`Subject`}>{isNonEmptyString(subject) ? (<StyledValue>{subject}</StyledValue>) : (<StyledEmptyValue>{t`No subject`}</StyledEmptyValue>)}- </CampaignEnvelopeRow>+ </ComposerFieldRow>{isNonEmptyString(scheduledSendTime) && (- <CampaignEnvelopeRow label={t`Scheduled at`}>+ <ComposerFieldRow label={t`Send at`}><StyledValue>{scheduledSendTime}</StyledValue>- </CampaignEnvelopeRow>+ </ComposerFieldRow>)}</CampaignEnvelopeBox>);diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsxindex 40afc633f24..649aeeb6610 100644--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentPreview.tsx@@ -1,23 +1,13 @@import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';-import { type Editor } from '@tiptap/core';-import { useState } from 'react';import { CampaignSentEnvelope } from '@/activities/emails/components/CampaignSentEnvelope';+import { StyledCampaignWidgetContainer } from '@/activities/emails/components/CampaignWidgetContainer';import { EmailEditorCanvas } from '@/activities/emails/editor/components/EmailEditorCanvas';import { CAMPAIGN_BODY_EDITOR_PROFILE } from '@/activities/emails/editor/constants/CampaignBodyEditorProfile';-import { useCampaignCanvasWidth } from '@/activities/emails/hooks/useCampaignCanvasWidth';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';import { FormAdvancedTextFieldInput } from '@/advanced-text-editor/components/FormAdvancedTextFieldInput';-const StyledContainer = styled.div`- display: flex;- flex-direction: column;- height: 100%;- min-height: 0;- width: 100%;-`;-const StyledBody = styled.div`display: flex;flex: 1;@@ -29,23 +19,17 @@ type CampaignSentPreviewProps = {campaign: MessageCampaign;};-export const CampaignSentPreview = ({ campaign }: CampaignSentPreviewProps) => {- const [bodyEditor, setBodyEditor] = useState<Editor | null>(null);- const canvasWidth = useCampaignCanvasWidth(bodyEditor);-- return (- <StyledContainer>- <CampaignSentEnvelope campaign={campaign} width={canvasWidth} />- <StyledBody>- <FormAdvancedTextFieldInput- defaultValue={campaign.bodyTemplate}- readonly- profile={CAMPAIGN_BODY_EDITOR_PROFILE}- EditorComponent={EmailEditorCanvas}- placeholder={t`No content`}- onEditorReady={setBodyEditor}- />- </StyledBody>- </StyledContainer>- );-};+export const CampaignSentPreview = ({ campaign }: CampaignSentPreviewProps) => (+ <StyledCampaignWidgetContainer>+ <CampaignSentEnvelope campaign={campaign} />+ <StyledBody>+ <FormAdvancedTextFieldInput+ defaultValue={campaign.bodyTemplate}+ readonly+ profile={CAMPAIGN_BODY_EDITOR_PROFILE}+ EditorComponent={EmailEditorCanvas}+ placeholder={t`No content`}+ />+ </StyledBody>+ </StyledCampaignWidgetContainer>+);diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignWidgetContainer.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignWidgetContainer.tsxnew file mode 100644index 00000000000..34e806064aa--- /dev/null+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignWidgetContainer.tsx@@ -0,0 +1,11 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme';++export const StyledCampaignWidgetContainer = styled.div`+ display: flex;+ flex-direction: column;+ height: calc(100% + 2 * ${themeCssVariables.spacing[2]});+ margin: calc(-1 * ${themeCssVariables.spacing[2]})+ calc(-1 * var(--widget-card-padding-inline, 0px));+ min-height: 0;+`;diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsxindex f085740476f..bc3020905f0 100644--- a/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailComposerFields.tsx@@ -212,6 +212,7 @@ export const EmailComposerFields = ({<SelectdropdownId="email-composer-from-account"fullWidth+ variant="transparent"value={selectedSenderValue}options={senderOptions}onChange={handleSenderChange}@@ -291,7 +292,6 @@ export const EmailComposerFields = ({<FormAdvancedTextFieldInputdefaultValue={composerState.initialBody}onChange={composerState.setBody}- placeholder={t`Type something or press "/" to see commands`}profile={INLINE_EMAIL_BODY_EDITOR_PROFILE}onImageUpload={uploadEmailImage}/>diff --git a/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorCanvas.tsx b/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorCanvas.tsxindex 93b8d9301fc..a8b7e591830 100644--- a/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorCanvas.tsx+++ b/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorCanvas.tsx@@ -1,10 +1,12 @@import { AdvancedTextEditor } from '@/advanced-text-editor/components/AdvancedTextEditor';import { AdvancedTextEditorBlockHandle } from '@/advanced-text-editor/components/AdvancedTextEditorBlockHandle';+import { EmailEditorHtmlBlockSettingsEffect } from '@/activities/emails/editor/components/EmailEditorHtmlBlockSettingsEffect';import { useOpenEmailBlockStyleInSidePanel } from '@/side-panel/hooks/useOpenEmailBlockStyleInSidePanel';+import { themeBoxValueToSides } from '@/side-panel/pages/email-block-settings/utils/themeBoxValueToSides';import { useLiveEditorState } from '@/advanced-text-editor/hooks/useLiveEditorState';import { type AdvancedTextEditorComponentProps } from '@/advanced-text-editor/types/AdvancedTextEditorComponentProps';import { styled } from '@linaria/react';-import { type MouseEvent } from 'react';+import { type CSSProperties } from 'react';import { CANVAS_THEME_DEFAULTS, resolveCanvasTheme } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';@@ -18,6 +20,7 @@ const StyledCanvasBackdrop = styled.div`const StyledCanvasPage = styled.div`box-sizing: border-box;+ display: grid;margin: 0 auto;max-width: 100%;min-height: 400px;@@ -31,6 +34,7 @@ const StyledCanvasPage = styled.div`color: inherit;margin-left: calc(-1 * ${themeCssVariables.spacing[10]});padding: 0 0 0 ${themeCssVariables.spacing[10]};+ padding-bottom: var(--email-canvas-padding-bottom, 0);width: calc(100% + ${themeCssVariables.spacing[10]});}`;@@ -41,24 +45,15 @@ export const EmailEditorCanvas = ({editor,readonly,minHeight,+ variant,}: EmailEditorCanvasProps) => {const storedCanvasTheme = useLiveEditorState(editor, (currentEditor) =>resolveCanvasTheme(currentEditor.state.doc.attrs.canvasTheme),);const canvasTheme = storedCanvasTheme ?? CANVAS_THEME_DEFAULTS;- const {- openEmailBlockStyleInSidePanel,- followEmailBlockSelectionInSidePanel,- } = useOpenEmailBlockStyleInSidePanel();-- const handleCanvasClick = (event: MouseEvent<HTMLDivElement>) => {- if (- event.target instanceof Node &&- editor.view.dom.contains(event.target)- ) {- followEmailBlockSelectionInSidePanel(editor);- }- };+ const canvasPadding = themeBoxValueToSides(canvasTheme.padding);+ const { openEmailBlockStyleInSidePanel } =+ useOpenEmailBlockStyleInSidePanel();return (<StyledCanvasBackdrop@@ -68,29 +63,34 @@ export const EmailEditorCanvas = ({}}><StyledCanvasPage- onClick={handleCanvasClick}- style={{- backgroundColor: canvasTheme.bodyBackground || undefined,- border:- canvasTheme.borderWidth !== '' && canvasTheme.borderWidth !== '0px'- ? `${canvasTheme.borderWidth} solid ${canvasTheme.borderColor}`- : undefined,- borderRadius: canvasTheme.cornerRadius,- color: canvasTheme.textColor,- padding: canvasTheme.padding,- textAlign: canvasTheme.textAlign,- width: canvasTheme.width,- }}+ style={+ {+ backgroundColor: canvasTheme.bodyBackground || undefined,+ border:+ canvasTheme.borderWidth !== '' &&+ canvasTheme.borderWidth !== '0px'+ ? `${canvasTheme.borderWidth} solid ${canvasTheme.borderColor}`+ : undefined,+ borderRadius: canvasTheme.cornerRadius,+ color: canvasTheme.textColor,+ padding: `${canvasPadding.top} ${canvasPadding.right} 0 ${canvasPadding.left}`,+ textAlign: canvasTheme.textAlign,+ width: canvasTheme.width,+ '--email-canvas-padding-bottom': canvasPadding.bottom,+ } as CSSProperties+ }><AdvancedTextEditoreditor={editor}readonly={readonly}minHeight={minHeight}+ variant={variant}/><AdvancedTextEditorBlockHandleeditor={editor}onOpenBlockSettings={openEmailBlockStyleInSidePanel}/>+ {!readonly && <EmailEditorHtmlBlockSettingsEffect editor={editor} />}</StyledCanvasPage></StyledCanvasBackdrop>);diff --git a/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorHtmlBlockSettingsEffect.tsx b/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorHtmlBlockSettingsEffect.tsxnew file mode 100644index 00000000000..cd4b97e939a--- /dev/null+++ b/packages/twenty-front/src/modules/activities/emails/editor/components/EmailEditorHtmlBlockSettingsEffect.tsx@@ -0,0 +1,60 @@+import { type Editor, type EditorEvents } from '@tiptap/core';+import { NodeSelection, type Transaction } from '@tiptap/pm/state';+import { useEffect } from 'react';+import { isDefined, TIPTAP_NODE_TYPES } from 'twenty-shared/utils';++import { getInsertedNodePosition } from '@/advanced-text-editor/utils/getInsertedNodePosition';+import { useOpenEmailBlockStyleInSidePanel } from '@/side-panel/hooks/useOpenEmailBlockStyleInSidePanel';++const isHtmlBlockClick = (transaction: Transaction) =>+ transaction.getMeta('pointer') === true &&+ transaction.selection instanceof NodeSelection &&+ transaction.selection.node.type.name === TIPTAP_NODE_TYPES.HTML;++type EmailEditorHtmlBlockSettingsEffectProps = {+ editor: Editor;+};++export const EmailEditorHtmlBlockSettingsEffect = ({+ editor,+}: EmailEditorHtmlBlockSettingsEffectProps) => {+ const { openEmailBlockStyleInSidePanel } =+ useOpenEmailBlockStyleInSidePanel();++ useEffect(() => {+ const handleTransaction = ({+ transaction,+ }: EditorEvents['transaction']) => {+ if (isHtmlBlockClick(transaction)) {+ openEmailBlockStyleInSidePanel();+ return;+ }++ const insertedHtmlBlockPosition = getInsertedNodePosition({+ transaction,+ nodeTypeName: TIPTAP_NODE_TYPES.HTML,+ });++ if (!isDefined(insertedHtmlBlockPosition)) {+ return;+ }++ queueMicrotask(() => {+ if (editor.isDestroyed) {+ return;+ }++ editor.commands.setNodeSelection(insertedHtmlBlockPosition);+ openEmailBlockStyleInSidePanel();+ });+ };++ editor.on('transaction', handleTransaction);++ return () => {+ editor.off('transaction', handleTransaction);+ };+ }, [editor, openEmailBlockStyleInSidePanel]);++ return null;+};diff --git a/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts b/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.tsindex 20c291dae8f..d4c1ef8ec34 100644--- a/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts+++ b/packages/twenty-front/src/modules/activities/emails/editor/constants/CampaignBodyEditorProfile.ts@@ -7,6 +7,7 @@ import { buildFullRichTextExtensions } from '@/advanced-text-editor/utils/buildFexport const CAMPAIGN_BODY_EDITOR_PROFILE = {chrome: 'document',+ variant: 'email',minHeight: 0,enableFullScreen: false,documentExtension: EmailThemedDocument,diff --git a/packages/twenty-front/src/modules/activities/emails/editor/constants/InlineEmailBodyEditorProfile.ts b/packages/twenty-front/src/modules/activities/emails/editor/constants/InlineEmailBodyEditorProfile.tsindex d55ba68c100..34b5bcfaa64 100644--- a/packages/twenty-front/src/modules/activities/emails/editor/constants/InlineEmailBodyEditorProfile.ts+++ b/packages/twenty-front/src/modules/activities/emails/editor/constants/InlineEmailBodyEditorProfile.ts@@ -4,6 +4,7 @@ import { parseLegacyHtmlDocument } from '@/advanced-text-editor/utils/parseLegacexport const INLINE_EMAIL_BODY_EDITOR_PROFILE = {chrome: 'document',+ variant: 'email',minHeight: 120,enableFullScreen: true,parseLegacyDocument: parseLegacyHtmlDocument,diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.tsdeleted file mode 100644index ef5e97ad98b..00000000000--- a/packages/twenty-front/src/modules/activities/emails/hooks/useCampaignCanvasWidth.ts+++ /dev/null@@ -1,22 +0,0 @@-import { type Editor } from '@tiptap/core';-import { useEditorState } from '@tiptap/react';-import {- CANVAS_THEME_DEFAULTS,- isDefined,- resolveCanvasTheme,-} from 'twenty-shared/utils';--// The envelope block reads the body width the Design panel writes onto the document; default until the editor mounts.-export const useCampaignCanvasWidth = (editor: Editor | null): string => {- const canvasWidth = useEditorState({- editor,- // Reads the editor passed in: the snapshot one can still be the instance `useEditor` destroyed when recreating it.- selector: () =>- isDefined(editor)- ? (resolveCanvasTheme(editor.state.doc.attrs.canvasTheme)?.width ??- CANVAS_THEME_DEFAULTS.width)- : CANVAS_THEME_DEFAULTS.width,- });-- return canvasWidth ?? CANVAS_THEME_DEFAULTS.width;-};diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.tsindex 0220be549b5..23c488b2132 100644--- a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts@@ -33,7 +33,7 @@ export const useSendMessageCampaign = () => {const { enqueueToast } = useToast();const { upsertRecordsInStore } = useUpsertRecordsInStore();const { formatNumber } = useNumberFormat();- const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();+ const { timeFormat, timeZone } = useDateTimeFormat();const { localeCatalog } = useAtomStateValue(dateLocaleState);const sendMessageCampaign = async ({@@ -82,7 +82,6 @@ export const useSendMessageCampaign = () => {const sendTime = formatCampaignSendTime({value: scheduledAt,timeZone,- dateFormat,timeFormat,localeCatalog,});diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/types/CampaignDeliveryTiming.ts b/packages/twenty-front/src/modules/activities/emails/types/CampaignDeliveryTiming.tssimilarity index 100%rename from packages/twenty-front/src/modules/side-panel/pages/send-campaign/types/CampaignDeliveryTiming.tsrename to packages/twenty-front/src/modules/activities/emails/types/CampaignDeliveryTiming.tsdiff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignDeliveryHint.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignDeliveryHint.test.tssimilarity index 68%rename from packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignDeliveryHint.test.tsrename to packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignDeliveryHint.test.tsindex 65c0ce6a57d..d46967abbae 100644--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignDeliveryHint.test.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignDeliveryHint.test.ts@@ -1,4 +1,4 @@-import { buildCampaignDeliveryHint } from '@/side-panel/pages/send-campaign/utils/buildCampaignDeliveryHint';+import { buildCampaignDeliveryHint } from '@/activities/emails/utils/buildCampaignDeliveryHint';describe('buildCampaignDeliveryHint', () => {it('warns that an immediate send cannot be undone', () => {@@ -6,7 +6,7 @@ describe('buildCampaignDeliveryHint', () => {buildCampaignDeliveryHint({deliveryTiming: 'NOW',isAlreadyScheduled: false,- formattedSendTime: null,+ hasValidSendTime: false,}),).toBe('Sending starts right away and cannot be undone.');});@@ -16,7 +16,7 @@ describe('buildCampaignDeliveryHint', () => {buildCampaignDeliveryHint({deliveryTiming: 'NOW',isAlreadyScheduled: true,- formattedSendTime: 'Sep 7, 2026 6:00 PM GMT+2',+ hasValidSendTime: true,}),).toBe('Sending starts right away, ahead of the time this campaign is holding.',@@ -28,20 +28,18 @@ describe('buildCampaignDeliveryHint', () => {buildCampaignDeliveryHint({deliveryTiming: 'LATER',isAlreadyScheduled: false,- formattedSendTime: null,+ hasValidSendTime: false,}),).toBe('Pick a send time in the future.');});- it('names the send time it will start at', () => {+ it('explains what happens before a scheduled send', () => {expect(buildCampaignDeliveryHint({deliveryTiming: 'LATER',isAlreadyScheduled: false,- formattedSendTime: 'Sep 7, 2026 6:00 PM GMT+2',+ hasValidSendTime: true,}),- ).toBe(- 'Sending starts Sep 7, 2026 6:00 PM GMT+2. You can cancel before then.',- );+ ).toBe('Recipients are recounted at send time. You can cancel until then.');});});diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignSendButtonTitle.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignSendButtonTitle.test.tssimilarity index 76%rename from packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignSendButtonTitle.test.tsrename to packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignSendButtonTitle.test.tsindex 06b3fd5d501..c1e38da05be 100644--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/__tests__/buildCampaignSendButtonTitle.test.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildCampaignSendButtonTitle.test.ts@@ -1,4 +1,4 @@-import { buildCampaignSendButtonTitle } from '@/side-panel/pages/send-campaign/utils/buildCampaignSendButtonTitle';+import { buildCampaignSendButtonTitle } from '@/activities/emails/utils/buildCampaignSendButtonTitle';describe('buildCampaignSendButtonTitle', () => {it('sends a draft', () => {@@ -7,7 +7,7 @@ describe('buildCampaignSendButtonTitle', () => {deliveryTiming: 'NOW',isAlreadyScheduled: false,}),- ).toBe('Send campaign');+ ).toBe('Send Campaign');});it('sends a scheduled campaign ahead of its time', () => {@@ -16,7 +16,7 @@ describe('buildCampaignSendButtonTitle', () => {deliveryTiming: 'NOW',isAlreadyScheduled: true,}),- ).toBe('Send campaign');+ ).toBe('Send Now');});it('schedules a draft', () => {@@ -25,7 +25,7 @@ describe('buildCampaignSendButtonTitle', () => {deliveryTiming: 'LATER',isAlreadyScheduled: false,}),- ).toBe('Schedule campaign');+ ).toBe('Schedule Campaign');});it('reschedules a campaign that already holds a time', () => {@@ -34,6 +34,6 @@ describe('buildCampaignSendButtonTitle', () => {deliveryTiming: 'LATER',isAlreadyScheduled: true,}),- ).toBe('Reschedule campaign');+ ).toBe('Reschedule Campaign');});});diff --git a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/formatCampaignSendTime.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/formatCampaignSendTime.test.tsindex 94fce0eba84..acf1b040d19 100644--- a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/formatCampaignSendTime.test.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/formatCampaignSendTime.test.ts@@ -1,11 +1,9 @@import { enUS } from 'date-fns/locale/en-US';import { formatCampaignSendTime } from '@/activities/emails/utils/formatCampaignSendTime';-import { DateFormat } from '@/localization/constants/DateFormat';import { TimeFormat } from '@/localization/constants/TimeFormat';const FORMAT_PREFERENCES = {- dateFormat: DateFormat.MONTH_FIRST,timeFormat: TimeFormat.HOUR_12,localeCatalog: enUS,};@@ -18,7 +16,7 @@ describe('formatCampaignSendTime', () => {timeZone: 'America/New_York',...FORMAT_PREFERENCES,}),- ).toBe('Sep 7, 2026 12:00 PM EDT');+ ).toBe('Monday, September 7, 2026 at 12:00 PM EDT');});it('expresses the same instant in the reader time zone', () => {@@ -28,7 +26,18 @@ describe('formatCampaignSendTime', () => {timeZone: 'Europe/Paris',...FORMAT_PREFERENCES,}),- ).toBe('Sep 7, 2026 6:00 PM GMT+2');+ ).toBe('Monday, September 7, 2026 at 6:00 PM GMT+2');+ });++ it('follows the reader 24-hour time format', () => {+ expect(+ formatCampaignSendTime({+ value: '2026-09-07T16:00:00.000Z',+ timeZone: 'Europe/Paris',+ ...FORMAT_PREFERENCES,+ timeFormat: TimeFormat.HOUR_24,+ }),+ ).toBe('Monday, September 7, 2026 at 18:00 GMT+2');});it('returns nothing when there is no send time', () => {diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignDeliveryHint.ts b/packages/twenty-front/src/modules/activities/emails/utils/buildCampaignDeliveryHint.tssimilarity index 53%rename from packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignDeliveryHint.tsrename to packages/twenty-front/src/modules/activities/emails/utils/buildCampaignDeliveryHint.tsindex 84bf426d8bc..d1ed265babd 100644--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignDeliveryHint.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/buildCampaignDeliveryHint.ts@@ -1,16 +1,15 @@import { t } from '@lingui/core/macro';-import { isDefined } from 'twenty-shared/utils';-import { type CampaignDeliveryTiming } from '@/side-panel/pages/send-campaign/types/CampaignDeliveryTiming';+import { type CampaignDeliveryTiming } from '@/activities/emails/types/CampaignDeliveryTiming';export const buildCampaignDeliveryHint = ({deliveryTiming,isAlreadyScheduled,- formattedSendTime,+ hasValidSendTime,}: {deliveryTiming: CampaignDeliveryTiming;isAlreadyScheduled: boolean;- formattedSendTime: string | null;+ hasValidSendTime: boolean;}): string => {if (deliveryTiming === 'NOW') {return isAlreadyScheduled@@ -18,9 +17,7 @@ export const buildCampaignDeliveryHint = ({: t`Sending starts right away and cannot be undone.`;}- if (!isDefined(formattedSendTime)) {- return t`Pick a send time in the future.`;- }-- return t`Sending starts ${formattedSendTime}. You can cancel before then.`;+ return hasValidSendTime+ ? t`Recipients are recounted at send time. You can cancel until then.`+ : t`Pick a send time in the future.`;};diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignSendButtonTitle.ts b/packages/twenty-front/src/modules/activities/emails/utils/buildCampaignSendButtonTitle.tssimilarity index 52%rename from packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignSendButtonTitle.tsrename to packages/twenty-front/src/modules/activities/emails/utils/buildCampaignSendButtonTitle.tsindex c78ecaf0e46..b674856a495 100644--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/utils/buildCampaignSendButtonTitle.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/buildCampaignSendButtonTitle.ts@@ -1,6 +1,6 @@import { t } from '@lingui/core/macro';-import { type CampaignDeliveryTiming } from '@/side-panel/pages/send-campaign/types/CampaignDeliveryTiming';+import { type CampaignDeliveryTiming } from '@/activities/emails/types/CampaignDeliveryTiming';export const buildCampaignSendButtonTitle = ({deliveryTiming,@@ -10,8 +10,8 @@ export const buildCampaignSendButtonTitle = ({isAlreadyScheduled: boolean;}): string => {if (deliveryTiming === 'NOW') {- return t`Send campaign`;+ return isAlreadyScheduled ? t`Send Now` : t`Send Campaign`;}- return isAlreadyScheduled ? t`Reschedule campaign` : t`Schedule campaign`;+ return isAlreadyScheduled ? t`Reschedule Campaign` : t`Schedule Campaign`;};diff --git a/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts b/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.tsindex 41a6edf6803..f5d81e673a8 100644--- a/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts+++ b/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts@@ -2,39 +2,40 @@ import { isNonEmptyString } from '@sniptt/guards';import { type Locale } from 'date-fns';import { formatInTimeZone } from 'date-fns-tz';-import { type DateFormat } from '@/localization/constants/DateFormat';-import { type TimeFormat } from '@/localization/constants/TimeFormat';-import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';+import { TimeFormat } from '@/localization/constants/TimeFormat';const TIME_ZONE_ABBREVIATION_FORMAT = 'zzz';export const formatCampaignSendTime = ({value,timeZone,- dateFormat,timeFormat,localeCatalog,}: {value?: string | null;timeZone: string;- dateFormat: DateFormat;timeFormat: TimeFormat;localeCatalog: Locale;}): string => {- const sendTime = formatDateTimeString({- value,- timeZone,- dateFormat,- timeFormat,- localeCatalog,- });+ if (!isNonEmptyString(value)) {+ return '';+ }- if (!isNonEmptyString(sendTime) || !isNonEmptyString(value)) {+ const sendDate = new Date(value);++ if (Number.isNaN(sendDate.getTime())) {return '';}+ const sendTime = new Intl.DateTimeFormat(localeCatalog.code, {+ dateStyle: 'full',+ timeStyle: 'short',+ hourCycle: timeFormat === TimeFormat.HOUR_24 ? 'h23' : 'h12',+ timeZone,+ }).format(sendDate);+const timeZoneAbbreviation = formatInTimeZone(- new Date(value),+ sendDate,timeZone,TIME_ZONE_ABBREVIATION_FORMAT,{ locale: localeCatalog },diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditor.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditor.tsxindex 937f1e4aae6..2130e9b82f6 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditor.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditor.tsx@@ -2,6 +2,7 @@ import { ImageBubbleMenu } from '@/advanced-text-editor/components/ImageBubbleMeimport { LinkBubbleMenu } from '@/advanced-text-editor/components/LinkBubbleMenu';import { TextBubbleMenu } from '@/advanced-text-editor/components/TextBubbleMenu';import { type AdvancedTextEditorComponentProps } from '@/advanced-text-editor/types/AdvancedTextEditorComponentProps';+import { getAdvancedTextEditorTypographyStyle } from '@/advanced-text-editor/utils/getAdvancedTextEditorTypographyStyle';import { hasEditorExtension } from '@/advanced-text-editor/utils/hasEditorExtension';import { FORM_FIELD_PLACEHOLDER_STYLES } from '@/ui/input/constants/FormFieldPlaceholderStyles';import { styled } from '@linaria/react';@@ -29,6 +30,8 @@ const StyledEditorContainer = styled.div<{.drop-cursor {background-color: ${themeCssVariables.color.blue};border-radius: ${themeCssVariables.border.radius.pill};+ pointer-events: none;+ position: absolute;transition-duration: calc(${themeCssVariables.animation.duration.fast} * 1s);@@ -43,13 +46,14 @@ const StyledEditorContainer = styled.div<{readonly? themeCssVariables.font.color.secondary: themeCssVariables.font.color.primary};- font-family: ${themeCssVariables.font.family};- font-size: ${themeCssVariables.font.size.sm};+ font-family: var(--editor-font-family);+ font-size: var(--editor-font-size);font-weight: ${themeCssVariables.font.weight.regular};height: 100%;+ line-height: var(--editor-line-height);padding: ${themeCssVariables.spacing[1]} ${themeCssVariables.spacing[2]};- p.is-editor-empty:first-of-type::before {+ p.is-editor-empty:first-of-type:not([data-placeholder=''])::before {${FORM_FIELD_PLACEHOLDER_STYLES}content: attr(data-placeholder);float: left;@@ -57,9 +61,26 @@ const StyledEditorContainer = styled.div<{pointer-events: none;}+ .empty-block-hint {+ position: relative;++ &::before {+ color: ${themeCssVariables.font.color.light};+ content: attr(data-hint);+ left: 0;+ overflow: hidden;+ padding: inherit;+ pointer-events: none;+ position: absolute;+ right: 0;+ text-overflow: ellipsis;+ top: 0;+ white-space: nowrap;+ }+ }+p {- line-height: 1.5;- margin: 0;+ margin: 0 0 var(--editor-block-spacing);}.variable-tag {@@ -69,40 +90,98 @@ const StyledEditorContainer = styled.div<{padding: ${themeCssVariables.spacing[1]};}+ h1,+ h2,+ h3 {+ font-weight: var(--editor-heading-font-weight);+ line-height: var(--editor-heading-line-height);+ margin: var(--editor-heading-spacing-top) 0+ var(--editor-heading-spacing-bottom);+ }+h1 {- font-size: 1.5em;+ font-size: var(--editor-heading-1-font-size);}h2 {- font-size: 1.3em;+ font-size: var(--editor-heading-2-font-size);}h3 {- font-size: 1.1em;+ font-size: var(--editor-heading-3-font-size);+ }++ ul,+ ol {+ margin: 0 0 var(--editor-block-spacing);+ padding-left: var(--editor-list-indent);}li {- line-height: 1.5;- margin-bottom: ${themeCssVariables.spacing[2]};+ --editor-list-item-offset: calc(+ var(--editor-parent-list-offset, 0px) + var(--editor-list-indent)+ );+ margin: 0 0 var(--editor-list-item-spacing);++ &::marker {+ color: var(--editor-accent-color);+ }++ & > p {+ margin: 0;+ }++ & > p:first-child {+ margin-left: calc(-1 * var(--editor-list-item-offset));+ padding-left: var(--editor-list-item-offset);+ position: relative;+ }++ & > :is(ul, ol) {+ --editor-parent-list-offset: var(--editor-list-item-offset);+ }+ }++ blockquote {+ border-left: var(--editor-quote-border-width) solid+ var(--editor-accent-color);+ font-style: italic;+ margin: 0 0 var(--editor-block-spacing);+ padding-left: var(--editor-quote-indent);+ }++ .node-image {+ margin-bottom: var(--editor-block-spacing);}.block-section {border-radius: ${themeCssVariables.border.radius.sm};box-sizing: border-box;- margin-bottom: ${themeCssVariables.spacing[2]};+ margin-bottom: var(--editor-block-spacing);outline: 1px dashed transparent;outline-offset: 2px;&:hover {- outline-color: ${themeCssVariables.border.color.medium};+ outline-color: ${themeCssVariables.border.color.strong};+ }++ &.ProseMirror-selectednode {+ background-color: ${themeCssVariables.color.blue3};+ outline: 1px dashed ${themeCssVariables.border.color.strong};}}.block-columns {+ border-radius: ${themeCssVariables.border.radius.sm};box-sizing: border-box;display: flex;gap: ${themeCssVariables.spacing[2]};- margin-bottom: ${themeCssVariables.spacing[2]};+ margin-bottom: var(--editor-block-spacing);++ &.ProseMirror-selectednode {+ background-color: ${themeCssVariables.color.blue3};+ outline: none;+ }}.block-column {@@ -110,12 +189,22 @@ const StyledEditorContainer = styled.div<{box-sizing: border-box;flex: 1;min-width: 0;- outline: 1px dashed ${themeCssVariables.border.color.light};+ outline: 1px dashed transparent;outline-offset: 2px;}+ .block-columns:hover .block-column,+ .block-columns.ProseMirror-selectednode .block-column {+ outline-color: ${themeCssVariables.border.color.strong};+ }+.block-button-wrapper {- margin-bottom: ${themeCssVariables.spacing[2]};+ margin-bottom: var(--editor-block-spacing);++ &.ProseMirror-selectednode {+ background-color: ${themeCssVariables.color.blue3};+ outline: none;+ }}.block-button {@@ -128,11 +217,62 @@ const StyledEditorContainer = styled.div<{border-bottom: none;border-left: none;border-right: none;++ &.ProseMirror-selectednode {+ box-shadow: 0 0 0 ${themeCssVariables.spacing[2]}+ ${themeCssVariables.color.blue3};+ outline: none;+ }}.ProseMirror-selectednode {outline: 2px solid ${themeCssVariables.color.blue};}++ :is(p, h1, h2, h3, ul, ol, li, blockquote).ProseMirror-selectednode {+ background-color: ${themeCssVariables.color.blue3};+ outline: none;+ }++ .block-column.ProseMirror-selectednode {+ background-color: ${themeCssVariables.color.blue3};+ outline: 1px dashed ${themeCssVariables.border.color.strong};+ }++ :is(.node-image, .node-html).ProseMirror-selectednode {+ outline: none;+ position: relative;++ &::after {+ background-color: ${themeCssVariables.color.blue3};+ content: '';+ inset: 0;+ mix-blend-mode: multiply;+ pointer-events: none;+ position: absolute;+ }+ }++ :is(h1, h2, h3):first-child {+ margin-top: 0;+ }++ :is(+ p,+ h1,+ h2,+ h3,+ ul,+ ol,+ li,+ blockquote,+ .node-image,+ .block-section,+ .block-columns,+ .block-button-wrapper+ ):last-child {+ margin-bottom: 0;+ }}.ProseMirror-focused {@@ -161,13 +301,18 @@ export const AdvancedTextEditor = ({readonly,editor,minHeight,+ variant,}: AdvancedTextEditorProps) => {const hasTextBubbleMenu = TEXT_BUBBLE_MENU_EXTENSION_NAMES.some((extensionName) => hasEditorExtension(editor, extensionName),);return (- <StyledEditorContainer readonly={readonly} minHeight={minHeight}>+ <StyledEditorContainer+ readonly={readonly}+ minHeight={minHeight}+ style={getAdvancedTextEditorTypographyStyle(variant)}+ ><EditorContent className="editor-content" editor={editor} />{hasEditorExtension(editor, 'image') &&!hasEditorExtension(editor, 'section') && (diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandle.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandle.tsxindex 2ea30720160..63147fa4ee7 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandle.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandle.tsx@@ -1,6 +1,7 @@import { AdvancedTextEditorBlockHandleMenu } from '@/advanced-text-editor/components/AdvancedTextEditorBlockHandleMenu';import { AdvancedTextEditorDragPreview } from '@/advanced-text-editor/components/AdvancedTextEditorDragPreview';import { getAdvancedTextEditorBlockDisplay } from '@/advanced-text-editor/utils/getAdvancedTextEditorBlockDisplay';+import { getBlockHandleAnchorRect } from '@/advanced-text-editor/utils/getBlockHandleAnchorRect';import { offset } from '@floating-ui/react';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';@@ -9,8 +10,7 @@ import {DragHandle,type DragHandleProps,} from '@tiptap/extension-drag-handle-react';-import { type CSSProperties, useRef, useState } from 'react';-import { createPortal } from 'react-dom';+import { useRef, useState } from 'react';import { isDefined, TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';@@ -22,13 +22,18 @@ const DRAG_HANDLE_OPTIONS: Pick<edgeDetection: 'none',rules: [{- id: 'excludeColumn',- evaluate: ({ node }) =>- node.type.name === TIPTAP_NODE_TYPES.COLUMN ? 1000 : 0,+ id: 'excludeColumnAndItsContent',+ evaluate: ({ node, $pos, depth }) =>+ node.type.name === TIPTAP_NODE_TYPES.COLUMN ||+ Array.from({ length: depth }, (_, ancestorDepth) =>+ $pos.node(ancestorDepth),+ ).some((ancestor) => ancestor.type.name === TIPTAP_NODE_TYPES.COLUMN)+ ? 1000+ : 0,},],},- computePositionConfig: { middleware: [offset(8)] },+ computePositionConfig: { placement: 'left', middleware: [offset(4)] },};const StyledHandleSlot = styled.div`@@ -39,18 +44,9 @@ const StyledHandleSlot = styled.div`width: ${themeCssVariables.spacing[6]};`;-const StyledBlockOutline = styled.div`- border-radius: ${themeCssVariables.border.radius.sm};- outline: 1px solid ${themeCssVariables.border.color.blue};- outline-offset: ${themeCssVariables.spacing[1]};- pointer-events: none;- position: absolute;-`;-type HoveredBlock = {pos: number;display: ReturnType<typeof getAdvancedTextEditorBlockDisplay>;- outline: CSSProperties;};type AdvancedTextEditorBlockHandleProps = {@@ -64,33 +60,40 @@ export const AdvancedTextEditorBlockHandle = ({}: AdvancedTextEditorBlockHandleProps) => {const { i18n } = useLingui();const dragPreviewRef = useRef<HTMLDivElement>(null);+ const handleSlotRef = useRef<HTMLDivElement>(null);+ const hoveredBlockElementRef = useRef<HTMLElement>(null);const [hoveredBlock, setHoveredBlock] = useState<HoveredBlock | null>(null);- const outlineContainer = editor.view.dom.parentElement;- const handleNodeChange = ({ pos }: { pos: number }) => {- const blockElement = pos >= 0 ? editor.view.nodeDOM(pos) : null;+ const getHoveredBlockAnchor = () => {+ const blockElement = hoveredBlockElementRef.current;- if (- !(blockElement instanceof HTMLElement) ||- !isDefined(outlineContainer)- ) {- setHoveredBlock(null);- return;+ if (!isDefined(blockElement)) {+ return null;}- const blockRect = blockElement.getBoundingClientRect();- const containerRect = outlineContainer.getBoundingClientRect();+ return {+ getBoundingClientRect: () =>+ getBlockHandleAnchorRect({+ blockElement,+ handleHeight: handleSlotRef.current?.offsetHeight ?? 0,+ }),+ };+ };- setHoveredBlock({- pos,- display: getAdvancedTextEditorBlockDisplay(editor.state.doc, pos),- outline: {- top: blockRect.top - containerRect.top,- left: blockRect.left - containerRect.left,- width: blockRect.width,- height: blockRect.height,- },- });+ const handleNodeChange = ({ pos }: { pos: number }) => {+ const blockElement = pos >= 0 ? editor.view.nodeDOM(pos) : null;++ hoveredBlockElementRef.current =+ blockElement instanceof HTMLElement ? blockElement : null;++ setHoveredBlock(+ blockElement instanceof HTMLElement+ ? {+ pos,+ display: getAdvancedTextEditorBlockDisplay(editor.state.doc, pos),+ }+ : null,+ );};const handleMenuOpenChange = (isOpen: boolean) =>@@ -114,42 +117,36 @@ export const AdvancedTextEditorBlockHandle = ({);return (- <>- <DragHandle- editor={editor}- nested={DRAG_HANDLE_OPTIONS.nested}- computePositionConfig={DRAG_HANDLE_OPTIONS.computePositionConfig}- onNodeChange={handleNodeChange}- onElementDragStart={replaceDragImageAfterDragHandle}- onElementDragEnd={() => {- editor.view.dragging = null;- setHoveredBlock(null);- }}- >- <StyledHandleSlot>- {isDefined(hoveredBlock) && (- <>- <AdvancedTextEditorBlockHandleMenu- editor={editor}- blockPos={hoveredBlock.pos}- onOpenChange={handleMenuOpenChange}- onOpenBlockSettings={onOpenBlockSettings}- />- <AdvancedTextEditorDragPreview- ref={dragPreviewRef}- Icon={hoveredBlock.display.icon}- label={i18n._(hoveredBlock.display.title)}- />- </>- )}- </StyledHandleSlot>- </DragHandle>- {isDefined(hoveredBlock) &&- isDefined(outlineContainer) &&- createPortal(- <StyledBlockOutline style={hoveredBlock.outline} />,- outlineContainer,+ <DragHandle+ editor={editor}+ nested={DRAG_HANDLE_OPTIONS.nested}+ computePositionConfig={DRAG_HANDLE_OPTIONS.computePositionConfig}+ getReferencedVirtualElement={getHoveredBlockAnchor}+ onNodeChange={handleNodeChange}+ onElementDragStart={replaceDragImageAfterDragHandle}+ onElementDragEnd={() => {+ editor.view.dragging = null;+ editor.view.dispatch(editor.state.tr.setMeta('hideDragHandle', true));+ setHoveredBlock(null);+ }}+ >+ <StyledHandleSlot ref={handleSlotRef}>+ {isDefined(hoveredBlock) && (+ <>+ <AdvancedTextEditorBlockHandleMenu+ editor={editor}+ blockPos={hoveredBlock.pos}+ onOpenChange={handleMenuOpenChange}+ onOpenBlockSettings={onOpenBlockSettings}+ />+ <AdvancedTextEditorDragPreview+ ref={dragPreviewRef}+ Icon={hoveredBlock.display.icon}+ label={i18n._(hoveredBlock.display.title)}+ />+ </>)}- </>+ </StyledHandleSlot>+ </DragHandle>);};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandleMenu.tsxindex 70b9e0e61a5..5ac345dfd36 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandleMenu.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/AdvancedTextEditorBlockHandleMenu.tsx@@ -1,4 +1,7 @@+import { useTurnIntoBlockOptions } from '@/advanced-text-editor/hooks/useTurnIntoBlockOptions';import { isAdvancedTextEditorBlockNodeType } from '@/advanced-text-editor/types/AdvancedTextEditorBlockCatalog';+import { getTurnIntoSelection } from '@/advanced-text-editor/utils/getTurnIntoSelection';+import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';@@ -13,8 +16,16 @@ import {IconCopy,IconGripVertical,IconPlus,+ IconTransform,IconTrash,} from 'twenty-ui/icon';+import { useTheme } from 'twenty-ui/theme';++const TURN_INTO_NODE_TYPES: string[] = [+ TIPTAP_NODE_TYPES.PARAGRAPH,+ TIPTAP_NODE_TYPES.HEADING,+ TIPTAP_NODE_TYPES.BLOCKQUOTE,+];type AdvancedTextEditorBlockHandleMenuProps = {editor: Editor;@@ -30,8 +41,13 @@ export const AdvancedTextEditorBlockHandleMenu = ({onOpenBlockSettings,}: AdvancedTextEditorBlockHandleMenuProps) => {const { t } = useLingui();+ const theme = useTheme();const instanceId = useId();- const blockNode = editor.state.doc.nodeAt(blockPos);+ const turnIntoOptions = useTurnIntoBlockOptions(editor);+ const blockNode =+ blockPos < editor.state.doc.content.size+ ? editor.state.doc.nodeAt(blockPos)+ : null;if (!isDefined(blockNode)) {return null;@@ -41,6 +57,14 @@ export const AdvancedTextEditorBlockHandleMenu = ({const hasBlockSettings =isDefined(onOpenBlockSettings) &&isAdvancedTextEditorBlockNodeType(blockNode.type.name);+ const canTurnInto = TURN_INTO_NODE_TYPES.includes(blockNode.type.name);+ const currentBlockTypeOptionId =+ blockNode.type.name === TIPTAP_NODE_TYPES.HEADING+ ? `heading${blockNode.attrs.level}`+ : blockNode.type.name;+ const currentBlockTypeTitle = turnIntoOptions.find(+ ({ id }) => id === currentBlockTypeOptionId,+ )?.title;const handleAddBlock = () =>editor@@ -59,14 +83,34 @@ export const AdvancedTextEditorBlockHandleMenu = ({onOpenBlockSettings?.();};+ const handleTurnIntoOpenChange = (isOpen: boolean) => {+ if (!isOpen) {+ return;+ }++ editor.view.dispatch(+ editor.state.tr.setSelection(+ getTurnIntoSelection({ doc: editor.state.doc, blockPos }),+ ),+ );+ };+const handleDelete = () =>editor.chain().deleteRange({ from: blockPos, to: blockEnd }).run();+ const handleOpenChange = (isOpen: boolean) => {+ if (isOpen) {+ editor.commands.setNodeSelection(blockPos);+ }++ onOpenChange(isOpen);+ };+return (<DropdownRootdropdownId={`advanced-text-editor-block-handle-${instanceId}`}type="menu"- onOpenChange={onOpenChange}+ onOpenChange={handleOpenChange}><Dropdown.Triggerrender={@@ -75,21 +119,63 @@ export const AdvancedTextEditorBlockHandleMenu = ({emphasis="subtle"aria-label={t`Drag to move, click for options`}>- <IconGripVertical />+ <IconGripVertical stroke={theme.icon.stroke.lg} /></LightIconButton>}/><DropdownContentside="bottom"align="start"- width={GenericDropdownContentWidth.Narrow}+ width={GenericDropdownContentWidth.Medium}>+ {(canTurnInto || hasBlockSettings) && (+ <>+ <Dropdown.Section>+ {canTurnInto && (+ <Dropdown.Submenu onOpenChange={handleTurnIntoOpenChange}>+ <Dropdown.SubmenuTrigger+ startIcon={<IconTransform />}+ description={currentBlockTypeTitle}+ descriptionPlacement="end"+ >+ {t`Turn into`}+ </Dropdown.SubmenuTrigger>+ <Dropdown.Content aria-label={t`Turn into`}>+ <Dropdown.Section>+ {turnIntoOptions.map(+ ({ id, title, icon, onClick, isActive }) => (+ <Dropdown.OptionItem+ key={id}+ selected={isActive()}+ startIcon={<SelectOptionIcon Icon={icon} />}+ onSelect={onClick}+ >+ {title}+ </Dropdown.OptionItem>+ ),+ )}+ </Dropdown.Section>+ </Dropdown.Content>+ </Dropdown.Submenu>+ )}+ {hasBlockSettings && (+ <Dropdown.ActionItem+ startIcon={<IconAdjustments />}+ onClick={handleOpenBlockSettings}+ >+ {t`Block style`}+ </Dropdown.ActionItem>+ )}+ </Dropdown.Section>+ <Dropdown.Separator />+ </>+ )}<Dropdown.Section><Dropdown.ActionItemstartIcon={<IconPlus />}onClick={handleAddBlock}>- {t`Add block`}+ {t`Add block below`}</Dropdown.ActionItem><Dropdown.ActionItemstartIcon={<IconCopy />}@@ -97,14 +183,9 @@ export const AdvancedTextEditorBlockHandleMenu = ({>{t`Duplicate`}</Dropdown.ActionItem>- {hasBlockSettings && (- <Dropdown.ActionItem- startIcon={<IconAdjustments />}- onClick={handleOpenBlockSettings}- >- {t`Style`}- </Dropdown.ActionItem>- )}+ </Dropdown.Section>+ <Dropdown.Separator />+ <Dropdown.Section><Dropdown.ActionItemcolor="danger"startIcon={<IconTrash />}diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsxindex b0535c62a9e..983fb8fbcf6 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuIconButton.tsx@@ -23,7 +23,7 @@ export const BubbleMenuIconButton = ({disabled={disabled}aria-pressed={isActive}onClick={onClick}- emphasis={isActive === true ? 'standard' : 'subtle'}+ variant={isActive ? 'soft' : 'ghost'}size="sm"aria-label={label}>diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuSeparator.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuSeparator.tsxnew file mode 100644index 00000000000..4268d5c12d3--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/BubbleMenuSeparator.tsx@@ -0,0 +1,14 @@+import { styled } from '@linaria/react';+import { Separator } from 'twenty-ui/primitives/layout';+import { themeCssVariables } from 'twenty-ui/theme';++const StyledBubbleMenuSeparatorContainer = styled.div`+ display: flex;+ padding: ${themeCssVariables.spacing[1]} 0;+`;++export const BubbleMenuSeparator = () => (+ <StyledBubbleMenuSeparatorContainer>+ <Separator orientation="vertical" />+ </StyledBubbleMenuSeparatorContainer>+);diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdown.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdown.tsxindex 65b3c35d7f4..755a077606a 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdown.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/EditLinkDropdown.tsx@@ -29,7 +29,7 @@ export const EditLinkDropdown = ({<LightIconButtonaria-label={isActive ? t`Edit link` : t`Add link`}aria-pressed={isActive}- emphasis={isActive ? 'standard' : 'subtle'}+ variant={isActive ? 'soft' : 'ghost'}size="sm">{isActive ? <IconPencil /> : <IconLink />}diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsxindex b07c762b212..e66312e4792 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/FormAdvancedTextFieldInput.tsx@@ -125,7 +125,7 @@ export const FormAdvancedTextFieldInput = ({fullScreenBreadcrumbs,onEditorReady,}: FormAdvancedTextFieldInputProps) => {- const { chrome, minHeight: profileMinHeight } = profile;+ const { chrome, variant, minHeight: profileMinHeight } = profile;const editorMinHeight = minHeight ?? profileMinHeight;const isFullScreenEnabled = enableFullScreen ?? profile.enableFullScreen;@@ -229,6 +229,7 @@ export const FormAdvancedTextFieldInput = ({editor={editor}readonly={readonly}minHeight={editorMinHeight}+ variant={variant}/></StyledFullScreenEditorContainer></div>,@@ -259,6 +260,7 @@ export const FormAdvancedTextFieldInput = ({editor={editor}readonly={readonly}minHeight={editorMinHeight}+ variant={variant}/>)}diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsxindex 87243b2e8ae..64d576a0dfb 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/ImageBubbleMenu.tsx@@ -1,5 +1,6 @@import { t } from '@lingui/core/macro';import { BubbleMenuIconButton } from '@/advanced-text-editor/components/BubbleMenuIconButton';+import { BubbleMenuSeparator } from '@/advanced-text-editor/components/BubbleMenuSeparator';import { StyledBubbleMenuContainer } from '@/advanced-text-editor/components/StyledBubbleMenuContainer';import { useLiveEditorState } from '@/advanced-text-editor/hooks/useLiveEditorState';import { type Editor } from '@tiptap/core';@@ -86,6 +87,7 @@ export const ImageBubbleMenu = ({ editor }: ImageBubbleMenuProps) => {isActive={isActive}/>))}+ <BubbleMenuSeparator /><BubbleMenuIconButtonkey="image-delete"label={t`Delete image`}diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/StyledBubbleMenuContainer.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/StyledBubbleMenuContainer.tsxindex e2e2b76ccb6..d74fe55d53e 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/StyledBubbleMenuContainer.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/StyledBubbleMenuContainer.tsx@@ -3,12 +3,12 @@ import { themeCssVariables } from 'twenty-ui/theme';export const StyledBubbleMenuContainer = styled.div`backdrop-filter: blur(20px);- background-color: ${themeCssVariables.background.primary};+ background-color: ${themeCssVariables.background.transparent.primary};border-radius: ${themeCssVariables.border.radius.md};box-shadow:0px 2px 4px 0px ${themeCssVariables.background.transparent.light},0px 0px 4px 0px ${themeCssVariables.background.transparent.medium};display: inline-flex;gap: 2px;- padding: 2px;+ padding: ${themeCssVariables.spacing[1]};`;diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsxindex 8e536322ce3..594e510772f 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TextBubbleMenu.tsx@@ -1,6 +1,9 @@import { t } from '@lingui/core/macro';+import { isNonEmptyArray } from '@sniptt/guards';+import { Fragment, type ReactNode } from 'react';import { StyledBubbleMenuContainer } from '@/advanced-text-editor/components/StyledBubbleMenuContainer';import { BubbleMenuIconButton } from '@/advanced-text-editor/components/BubbleMenuIconButton';+import { BubbleMenuSeparator } from '@/advanced-text-editor/components/BubbleMenuSeparator';import { EditLinkDropdown } from '@/advanced-text-editor/components/EditLinkDropdown';import { TurnIntoBlockDropdown } from '@/advanced-text-editor/components/TurnIntoBlockDropdown';import { useTextBubbleState } from '@/advanced-text-editor/hooks/useTextBubbleState';@@ -30,6 +33,7 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconBold,label: t`Bold`,extensionName: 'bold',+ group: 'format',onClick: () => editor.chain().focus().toggleBold().run(),isActive: state.isBold,},@@ -37,6 +41,7 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconItalic,label: t`Italic`,extensionName: 'italic',+ group: 'format',onClick: () => editor.chain().focus().toggleItalic().run(),isActive: state.isItalic,},@@ -44,6 +49,7 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconUnderline,label: t`Underline`,extensionName: 'underline',+ group: 'format',onClick: () => editor.chain().focus().toggleUnderline().run(),isActive: state.isUnderline,},@@ -51,6 +57,7 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconStrikethrough,label: t`Strikethrough`,extensionName: 'strike',+ group: 'format',onClick: () => editor.chain().focus().toggleStrike().run(),isActive: state.isStrike,},@@ -58,6 +65,7 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconList,label: t`Bullet list`,extensionName: 'bulletList',+ group: 'list',onClick: () => editor.chain().focus().wrapInList('bulletList').run(),isActive: state.isBulletList,},@@ -65,11 +73,46 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {Icon: IconListNumbers,label: t`Numbered list`,extensionName: 'orderedList',+ group: 'list',onClick: () => editor.chain().focus().wrapInList('orderedList').run(),isActive: state.isOrderedList,},].filter(({ extensionName }) => hasEditorExtension(editor, extensionName));+ const renderActions = (group: string) =>+ menuActions+ .filter((action) => action.group === group)+ .map(({ label, Icon, onClick, isActive }) => (+ <BubbleMenuIconButton+ key={Icon.name || Icon.displayName || 'unknown'}+ label={label}+ Icon={Icon}+ onClick={onClick}+ isActive={isActive}+ />+ ));++ const menuGroups: ReactNode[][] = [+ hasEditorExtension(editor, 'heading')+ ? [<TurnIntoBlockDropdown key="turn-into" editor={editor} />]+ : [],+ renderActions('format'),+ renderActions('list'),+ hasEditorExtension(editor, 'link')+ ? [+ <EditLinkDropdown+ key="link"+ dropdownId={getEditLinkDropdownId({+ editorInstanceId: editor.instanceId,+ bubbleMenuType: 'text',+ })}+ defaultValue={state.linkHref}+ editor={editor}+ />,+ ]+ : [],+ ].filter(isNonEmptyArray);+const handleShouldShow = () => {if (editor.isActive('image')) {return false;@@ -91,30 +134,12 @@ export const TextBubbleMenu = ({ editor }: TextBubbleMenuProps) => {updateDelay={0}><StyledBubbleMenuContainer>- {hasEditorExtension(editor, 'heading') && (- <TurnIntoBlockDropdown editor={editor} />- )}- {menuActions.map(({ label, Icon, onClick, isActive }) => {- return (- <BubbleMenuIconButton- key={Icon.name || Icon.displayName || 'unknown'}- label={label}- Icon={Icon}- onClick={onClick}- isActive={isActive}- />- );- })}- {hasEditorExtension(editor, 'link') && (- <EditLinkDropdown- dropdownId={getEditLinkDropdownId({- editorInstanceId: editor.instanceId,- bubbleMenuType: 'text',- })}- defaultValue={state.linkHref}- editor={editor}- />- )}+ {menuGroups.map((menuGroup, index) => (+ <Fragment key={index}>+ {index > 0 && <BubbleMenuSeparator />}+ {menuGroup}+ </Fragment>+ ))}</StyledBubbleMenuContainer></BubbleMenu>);diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsxindex ff34163a25d..fedabf23f2a 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/TurnIntoBlockDropdown.tsx@@ -3,37 +3,12 @@ import { useTurnIntoBlockOptions } from '@/advanced-text-editor/hooks/useTurnIntimport { Dropdown } from 'twenty-ui/components/navigation';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';-import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { type Editor } from '@tiptap/react';import { useId } from 'react';-import { IconPilcrow } from 'twenty-ui/icon';-import { useTheme, themeCssVariables } from 'twenty-ui/theme';--const StyledMenuItem = styled.button`- align-items: center;- background: none;- border: none;- border-radius: ${themeCssVariables.spacing[1.5]};- color: ${themeCssVariables.font.color.tertiary};- cursor: pointer;- display: flex;- font-size: ${themeCssVariables.font.size.sm};- font-weight: ${themeCssVariables.font.weight.regular};- gap: 4px;- height: ${themeCssVariables.spacing[6]};- padding: 0 ${themeCssVariables.spacing[1.5]};- padding: 0;- width: 100%;-- :hover {- background: ${themeCssVariables.background.transparent.medium};- }-- :focus {- outline: none;- }-`;+import { LightButton } from 'twenty-ui/components/input';+import { IconTextSize } from 'twenty-ui/icon';+import { useTheme } from 'twenty-ui/theme';type TurnIntoBlockDropdownProps = {editor: Editor;@@ -48,17 +23,16 @@ export const TurnIntoBlockDropdown = ({const options = useTurnIntoBlockOptions(editor);const activeItem = options.find((option) => option.isActive());- const { icon: ActiveIcon = IconPilcrow, title: activeTitle = t`Paragraph` } =+ const { icon: ActiveIcon = IconTextSize, title: activeTitle = t`Text` } =activeItem ?? {};return (<DropdownRoot dropdownId={dropdownId} type="picker"><Dropdown.Triggerrender={- <StyledMenuItem>- <ActiveIcon size={theme.icon.size.md} />+ <LightButton size="sm" startIcon={<ActiveIcon />}>{activeTitle}- </StyledMenuItem>+ </LightButton>}/><DropdownContentdiff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsxindex 2a6f3b804ef..12e98a461c8 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/AdvancedTextEditor.stories.tsx@@ -16,6 +16,7 @@ import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecoratoconst STORY_RICH_TEXT_PROFILE = {chrome: 'document',+ variant: 'app',minHeight: 200,enableFullScreen: false,buildExtensions: buildFullRichTextWithVariableTagExtensions,@@ -23,6 +24,7 @@ const STORY_RICH_TEXT_PROFILE = {const STORY_MINIMAL_PROFILE = {chrome: 'document',+ variant: 'app',minHeight: 200,enableFullScreen: false,buildExtensions: () => [],@@ -73,6 +75,7 @@ const EditorWrapper = ({editor={editor}readonly={readonly}minHeight={minHeight}+ variant="app"/>);};@@ -502,7 +505,7 @@ export const TurnIntoHeading: Story = {);const editor = canvasElement.querySelector<HTMLElement>('.tiptap')!;await userEvent.tripleClick(within(editor).getByText('World'));- const trigger = await body.findByRole('button', { name: 'Paragraph' });+ const trigger = await body.findByRole('button', { name: 'Text' });await userEvent.click(trigger);await userEvent.click(await body.findByRole('button', { name: 'Heading 1' }),diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsxindex 7babe4cf133..fedf426028c 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/__stories__/FormAdvancedTextFieldInput.stories.tsx@@ -19,6 +19,7 @@ import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecoratoconst STORY_FORM_EDITOR_PROFILE = {chrome: 'field',+ variant: 'app',minHeight: 340,enableFullScreen: true,buildExtensions: buildFullRichTextWithVariableTagExtensions,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/components/__tests__/FormAdvancedTextFieldInput.test.tsx b/packages/twenty-front/src/modules/advanced-text-editor/components/__tests__/FormAdvancedTextFieldInput.test.tsxindex 94c3225c094..346ca34f01b 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/components/__tests__/FormAdvancedTextFieldInput.test.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/components/__tests__/FormAdvancedTextFieldInput.test.tsx@@ -13,6 +13,7 @@ import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';const TEST_EDITOR_PROFILE = {chrome: 'field',+ variant: 'app',minHeight: 200,enableFullScreen: true,buildExtensions: buildFullRichTextExtensions,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockCatalog.ts b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockCatalog.tsindex 4cb63bb541e..7a2d5d4176b 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockCatalog.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockCatalog.ts@@ -19,6 +19,7 @@ import {import { msg } from '@lingui/core/macro';import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import {+ IconBlockquote,IconBox,IconClick,IconCode,@@ -26,13 +27,13 @@ import {IconH1,IconMinus,IconPhoto,- IconPilcrow,+ IconTextSize,} from 'twenty-ui/icon';export const ADVANCED_TEXT_EDITOR_BLOCK_CATALOG = {[TIPTAP_NODE_TYPES.PARAGRAPH]: {label: msg`Text`,- icon: IconPilcrow,+ icon: IconTextSize,extension: TextBlockStyle,insertionRecipes: [],settingsFields: getAdvancedTextEditorTextBlockSettings(),@@ -44,6 +45,13 @@ export const ADVANCED_TEXT_EDITOR_BLOCK_CATALOG = {insertionRecipes: [],settingsFields: getAdvancedTextEditorTextBlockSettings(),},+ [TIPTAP_NODE_TYPES.BLOCKQUOTE]: {+ label: msg`Quote`,+ icon: IconBlockquote,+ extension: null,+ insertionRecipes: [],+ settingsFields: getAdvancedTextEditorTextBlockSettings(),+ },[TIPTAP_NODE_TYPES.SECTION]: {label: msg`Section`,icon: IconBox,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockContent.ts b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockContent.tsindex 8d7d7023321..ac5c9675a55 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockContent.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorBlockContent.ts@@ -25,6 +25,13 @@ export function createListBlockContent(};}+export function createBlockquoteBlockContent(): JSONContent {+ return {+ type: TIPTAP_NODE_TYPES.BLOCKQUOTE,+ content: [createParagraphBlockContent()],+ };+}+export function createColumnBlockContent(): JSONContent {return {type: TIPTAP_NODE_TYPES.COLUMN,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorCoreExtensions.ts b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorCoreExtensions.tsindex ffc848be4a1..dc48aaf57cd 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorCoreExtensions.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorCoreExtensions.ts@@ -1,9 +1,8 @@-import { t } from '@lingui/core/macro';+import { DropCursor } from '@/advanced-text-editor/extensions/drop-cursor/DropCursor';import { Document } from '@tiptap/extension-document';import { HardBreak } from '@tiptap/extension-hard-break';import { Paragraph } from '@tiptap/extension-paragraph';import { Text } from '@tiptap/extension-text';-import { Dropcursor } from '@tiptap/extensions/drop-cursor';import { Placeholder } from '@tiptap/extensions/placeholder';import { UndoRedo } from '@tiptap/extensions/undo-redo';import { type AnyExtension } from '@tiptap/core';@@ -17,11 +16,11 @@ export const buildAdvancedTextEditorCoreExtensions = ({Paragraph,Text,Placeholder.configure({- placeholder: placeholder ?? t`Enter text or Type '/' for commands`,+ placeholder: placeholder ?? '',}),HardBreak.configure({keepMarks: false,}),UndoRedo,- Dropcursor.configure({ color: false, width: 2, class: 'drop-cursor' }),+ DropCursor,];diff --git a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems.ts b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems.tsindex 460dd1c0a10..334b2aa9a13 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems.ts@@ -1,4 +1,5 @@import {+ createBlockquoteBlockContent,createHeadingBlockContent,createListBlockContent,createParagraphBlockContent,@@ -7,12 +8,13 @@ import { type AdvancedTextEditorBlockInsertionItem } from '@/advanced-text-editoimport { msg } from '@lingui/core/macro';import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import {+ IconBlockquote,IconH1,IconH2,IconH3,IconList,IconListNumbers,- IconPilcrow,+ IconTextSize,} from 'twenty-ui/icon';export const ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS: Pick<@@ -22,7 +24,7 @@ export const ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS: Pick<{id: 'paragraph',title: msg`Text`,- icon: IconPilcrow,+ icon: IconTextSize,createContent: createParagraphBlockContent,},{@@ -55,4 +57,10 @@ export const ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS: Pick<icon: IconListNumbers,createContent: () => createListBlockContent(TIPTAP_NODE_TYPES.ORDERED_LIST),},+ {+ id: 'blockquote',+ title: msg`Quote`,+ icon: IconBlockquote,+ createContent: createBlockquoteBlockContent,+ },];diff --git a/packages/twenty-front/src/modules/advanced-text-editor/constants/__tests__/AdvancedTextEditorBlockCatalog.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/constants/__tests__/AdvancedTextEditorBlockCatalog.test.tsindex b481b8afe64..0c84b2dbf7e 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/constants/__tests__/AdvancedTextEditorBlockCatalog.test.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/constants/__tests__/AdvancedTextEditorBlockCatalog.test.ts@@ -47,6 +47,7 @@ describe('ADVANCED_TEXT_EDITOR_BLOCK_CATALOG', () => {'h1','h2','h3',+ 'blockquote',...ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES.map(({ id }) => id),'bulletList','orderedList',diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blockquote/Blockquote.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blockquote/Blockquote.tsnew file mode 100644index 00000000000..e2f81f4e7d4--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blockquote/Blockquote.ts@@ -0,0 +1,38 @@+import { mergeAttributes, Node, wrappingInputRule } from '@tiptap/core';+import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';++declare module '@tiptap/core' {+ interface Commands<ReturnType> {+ blockquote: {+ toggleBlockquote: () => ReturnType;+ };+ }+}++export const Blockquote = Node.create({+ name: TIPTAP_NODE_TYPES.BLOCKQUOTE,+ group: 'block',+ content: 'paragraph+',+ defining: true,++ parseHTML() {+ return [{ tag: 'blockquote' }];+ },++ renderHTML({ HTMLAttributes }) {+ return ['blockquote', mergeAttributes(HTMLAttributes), 0];+ },++ addCommands() {+ return {+ toggleBlockquote:+ () =>+ ({ commands }) =>+ commands.toggleWrap(this.name),+ };+ },++ addInputRules() {+ return [wrappingInputRule({ find: /^\s*>\s$/, type: this.type })];+ },+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/DividerNode.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/DividerNode.tsindex 369b59d0844..71eac208f6d 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/DividerNode.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/DividerNode.ts@@ -17,11 +17,11 @@ export const DividerNode = Node.create({default: {borderTopWidth: '1px',borderTopStyle: 'solid',- borderTopColor: '#e1e1e1',+ borderTopColor: '#ebebeb',marginTop: '16px',- marginRight: '0px',+ marginRight: '8px',marginBottom: '16px',- marginLeft: '0px',+ marginLeft: '8px',},parseHTML: readBlockStyleAttribute,renderHTML: (attributes) => ({diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/HtmlNodeView.tsx b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/HtmlNodeView.tsxindex 9ada1e5ab73..5d97edecc03 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/HtmlNodeView.tsx+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/HtmlNodeView.tsx@@ -17,7 +17,7 @@ const StyledPreview = styled.div`outline-offset: 2px;&:hover {- outline-color: ${themeCssVariables.border.color.medium};+ outline-color: ${themeCssVariables.border.color.strong};}`;diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/TextBlockStyle.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/TextBlockStyle.tsindex 35d4d306582..c8d2e16d826 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/TextBlockStyle.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/blocks/TextBlockStyle.ts@@ -9,7 +9,11 @@ export const TextBlockStyle = Extension.create({addGlobalAttributes() {return [{- types: [TIPTAP_NODE_TYPES.PARAGRAPH, TIPTAP_NODE_TYPES.HEADING],+ types: [+ TIPTAP_NODE_TYPES.PARAGRAPH,+ TIPTAP_NODE_TYPES.HEADING,+ TIPTAP_NODE_TYPES.BLOCKQUOTE,+ ],attributes: {style: {default: null,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/drop-cursor/DropCursor.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/drop-cursor/DropCursor.tsnew file mode 100644index 00000000000..0397e7c26c5--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/drop-cursor/DropCursor.ts@@ -0,0 +1,177 @@+import { getDropCursorRect } from '@/advanced-text-editor/utils/getDropCursorRect';+import { getDropPosition } from '@/advanced-text-editor/utils/getDropPosition';+import { isBlockSlice } from '@/advanced-text-editor/utils/isBlockSlice';+import { Extension } from '@tiptap/core';+import {+ type EditorState,+ NodeSelection,+ Plugin,+ PluginKey,+ Selection,+} from '@tiptap/pm/state';+import { type EditorView } from '@tiptap/pm/view';+import { isDefined } from 'twenty-shared/utils';++const ABANDONED_DRAG_HIDE_DELAY_MS = 5000;++const createDropCursorView = (view: EditorView) => {+ const cursorElement = document.createElement('div');+ cursorElement.className = 'drop-cursor';++ let cursorPosition: number | null = null;+ let lastDragOverCoordinates: { left: number; top: number } | null = null;+ let hideTimeout: ReturnType<typeof setTimeout> | undefined;++ const hideCursor = () => {+ clearTimeout(hideTimeout);+ cursorPosition = null;+ lastDragOverCoordinates = null;+ cursorElement.remove();+ };++ const renderCursor = (position: number) => {+ const container = view.dom.offsetParent;++ if (!(container instanceof HTMLElement)) {+ return;+ }++ const cursorRect = getDropCursorRect({ view, position });+ const containerRect = container.getBoundingClientRect();++ cursorPosition = position;+ cursorElement.style.left = `${cursorRect.left - containerRect.left + container.scrollLeft}px`;+ cursorElement.style.top = `${cursorRect.top - containerRect.top + container.scrollTop}px`;+ cursorElement.style.width = `${cursorRect.width}px`;+ cursorElement.style.height = `${cursorRect.height}px`;++ if (cursorElement.parentElement !== container) {+ container.appendChild(cursorElement);+ }+ };++ const updateCursor = () => {+ if (!isDefined(lastDragOverCoordinates)) {+ return;+ }++ const position = getDropPosition({+ view,+ coordinates: lastDragOverCoordinates,+ slice: view.dragging?.slice,+ });++ if (isDefined(position)) {+ renderCursor(position);+ }+ };++ const handleDragOver = (event: DragEvent) => {+ if (!view.editable) {+ return;+ }++ lastDragOverCoordinates = { left: event.clientX, top: event.clientY };+ updateCursor();+ clearTimeout(hideTimeout);+ hideTimeout = setTimeout(hideCursor, ABANDONED_DRAG_HIDE_DELAY_MS);+ };++ const handleDragLeave = (event: DragEvent) => {+ if (+ !(event.relatedTarget instanceof Node) ||+ !view.dom.contains(event.relatedTarget)+ ) {+ hideCursor();+ }+ };++ view.dom.addEventListener('dragover', handleDragOver);+ view.dom.addEventListener('dragleave', handleDragLeave);+ view.dom.addEventListener('drop', hideCursor);+ view.dom.addEventListener('dragend', hideCursor);++ return {+ update: (updatedView: EditorView, previousState: EditorState) => {+ if (+ isDefined(cursorPosition) &&+ !previousState.doc.eq(updatedView.state.doc)+ ) {+ updateCursor();+ }+ },+ destroy: () => {+ view.dom.removeEventListener('dragover', handleDragOver);+ view.dom.removeEventListener('dragleave', handleDragLeave);+ view.dom.removeEventListener('drop', hideCursor);+ view.dom.removeEventListener('dragend', hideCursor);+ hideCursor();+ },+ };+};++export const DropCursor = Extension.create({+ name: 'dropCursor',++ addProseMirrorPlugins() {+ return [+ new Plugin({+ key: new PluginKey('dropCursor'),+ view: createDropCursorView,+ props: {+ handleDrop: (view, event, slice, moved) => {+ if (!isDefined(view.dragging) || !isBlockSlice(slice)) {+ return false;+ }++ const position = getDropPosition({+ view,+ coordinates: { left: event.clientX, top: event.clientY },+ slice,+ });++ if (!isDefined(position)) {+ return false;+ }++ const transaction = view.state.tr;++ if (moved) {+ transaction.deleteSelection();+ }++ const insertPosition = transaction.mapping.map(position);+ const droppedNode =+ slice.content.childCount === 1 ? slice.content.firstChild : null;++ if (isDefined(droppedNode)) {+ transaction.replaceRangeWith(+ insertPosition,+ insertPosition,+ droppedNode,+ );+ } else {+ transaction.replaceRange(insertPosition, insertPosition, slice);+ }++ const $insertPosition = transaction.doc.resolve(insertPosition);+ const isDroppedNodeSelectable =+ isDefined(droppedNode) &&+ NodeSelection.isSelectable(droppedNode) &&+ ($insertPosition.nodeAfter?.sameMarkup(droppedNode) ?? false);++ transaction.setSelection(+ isDroppedNodeSelectable+ ? new NodeSelection($insertPosition)+ : Selection.near($insertPosition),+ );+ view.focus();+ view.dispatch(transaction.setMeta('uiEvent', 'drop'));++ return true;+ },+ },+ }),+ ];+ },+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/empty-block-hint/EmptyBlockHint.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/empty-block-hint/EmptyBlockHint.tsnew file mode 100644index 00000000000..f8a259826b8--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/empty-block-hint/EmptyBlockHint.ts@@ -0,0 +1,66 @@+import {+ type EmptyBlockHintTarget,+ getEmptyBlockHint,+} from '@/advanced-text-editor/utils/getEmptyBlockHint';+import { t } from '@lingui/core/macro';+import { Extension } from '@tiptap/core';+import { Plugin, PluginKey } from '@tiptap/pm/state';+import { Decoration, DecorationSet } from '@tiptap/pm/view';+import { isDefined } from 'twenty-shared/utils';++const getHeadingHintText = (headingLevel: number | null) => {+ switch (headingLevel) {+ case 2:+ return t`Heading 2`;+ case 3:+ return t`Heading 3`;+ default:+ return t`Heading 1`;+ }+};++const getEmptyBlockHintText = ({+ kind,+ headingLevel,+}: EmptyBlockHintTarget) => {+ switch (kind) {+ case 'heading':+ return getHeadingHintText(headingLevel);+ case 'listItem':+ return t`List`;+ case 'blockquote':+ return t`Quote`;+ case 'text':+ return t`Type anything or press / for commands`;+ }+};++export const EmptyBlockHint = Extension.create({+ name: 'emptyBlockHint',++ addProseMirrorPlugins() {+ const { editor } = this;++ return [+ new Plugin({+ key: new PluginKey('emptyBlockHint'),+ props: {+ decorations: (state) => {+ const emptyBlockHint = getEmptyBlockHint(editor, state);++ if (!isDefined(emptyBlockHint)) {+ return DecorationSet.empty;+ }++ return DecorationSet.create(state.doc, [+ Decoration.node(emptyBlockHint.from, emptyBlockHint.to, {+ class: 'empty-block-hint',+ 'data-hint': getEmptyBlockHintText(emptyBlockHint),+ }),+ ]);+ },+ },+ }),+ ];+ },+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.tsindex 263db2568f1..aa6597c97af 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/DefaultSlashCommands.ts@@ -2,12 +2,13 @@ import { ADVANCED_TEXT_EDITOR_BLOCK_SLASH_COMMANDS } from '@/advanced-text-editoimport { type SlashCommandConfig } from '@/advanced-text-editor/extensions/slash-command/types/SlashCommandConfig';import { msg } from '@lingui/core/macro';import {+ IconBlockquote,IconH1,IconH2,IconH3,IconList,IconListNumbers,- IconPilcrow,+ IconTextSize,} from 'twenty-ui/icon';const TEXT_SLASH_COMMANDS: SlashCommandConfig[] = [@@ -15,7 +16,7 @@ const TEXT_SLASH_COMMANDS: SlashCommandConfig[] = [id: 'paragraph',title: msg`Text`,description: msg`Plain text paragraph`,- icon: IconPilcrow,+ icon: IconTextSize,keywords: [msg`paragraph`, msg`text`, msg`p`],getIsActive: (editor) => editor.isActive('paragraph'),getIsVisible: (editor) => editor.can().setParagraph?.() ?? false,@@ -55,6 +56,17 @@ const TEXT_SLASH_COMMANDS: SlashCommandConfig[] = [getOnSelect: (editor, range) => () =>editor.chain().focus().deleteRange(range).setHeading({ level: 3 }).run(),},+ {+ id: 'blockquote',+ title: msg`Quote`,+ description: msg`Highlighted quotation`,+ icon: IconBlockquote,+ keywords: [msg`quote`, msg`blockquote`, msg`citation`],+ getIsActive: (editor) => editor.isActive('blockquote'),+ getIsVisible: (editor) => editor.can().toggleBlockquote?.() ?? false,+ getOnSelect: (editor, range) => () =>+ editor.chain().focus().deleteRange(range).toggleBlockquote().run(),+ },];const LIST_SLASH_COMMANDS: SlashCommandConfig[] = [diff --git a/packages/twenty-front/src/modules/advanced-text-editor/hooks/__tests__/useTurnIntoBlockOptions.test.tsx b/packages/twenty-front/src/modules/advanced-text-editor/hooks/__tests__/useTurnIntoBlockOptions.test.tsxnew file mode 100644index 00000000000..30a76d8b1a4--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/hooks/__tests__/useTurnIntoBlockOptions.test.tsx@@ -0,0 +1,104 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { act, renderHook } from '@testing-library/react';+import { Editor } from '@tiptap/core';+import { Document } from '@tiptap/extension-document';+import { Heading } from '@tiptap/extension-heading';+import { Paragraph } from '@tiptap/extension-paragraph';+import { Text } from '@tiptap/extension-text';++import { Blockquote } from '@/advanced-text-editor/extensions/blockquote/Blockquote';+import { useTurnIntoBlockOptions } from '@/advanced-text-editor/hooks/useTurnIntoBlockOptions';+import { getTurnIntoSelection } from '@/advanced-text-editor/utils/getTurnIntoSelection';++const paragraph = (text: string) => ({+ type: 'paragraph',+ content: [{ type: 'text', text }],+});++const heading = (text: string) => ({+ type: 'heading',+ attrs: { level: 1 },+ content: [{ type: 'text', text }],+});++const createEditor = (content: object[]) =>+ new Editor({+ extensions: [Document, Paragraph, Text, Heading, Blockquote],+ content: { type: 'doc', content },+ });++const turnBlockInto = ({+ editor,+ blockPos,+ optionId,+}: {+ editor: Editor;+ blockPos: number;+ optionId: string;+}) => {+ editor.view.dispatch(+ editor.state.tr.setSelection(+ getTurnIntoSelection({ doc: editor.state.doc, blockPos }),+ ),+ );++ const { result } = renderHook(() => useTurnIntoBlockOptions(editor), {+ wrapper: ({ children }) => I18nProvider({ i18n, children }),+ });++ act(() => {+ result.current.find(({ id }) => id === optionId)?.onClick();+ });+};++describe('useTurnIntoBlockOptions', () => {+ it('should turn every paragraph of a quote into text', () => {+ const editor = createEditor([+ {+ type: 'blockquote',+ content: [paragraph('First'), paragraph('Second')],+ },+ ]);++ turnBlockInto({ editor, blockPos: 0, optionId: 'paragraph' });++ expect(editor.getJSON().content).toEqual([+ paragraph('First'),+ paragraph('Second'),+ ]);++ editor.destroy();+ });++ it('should turn every paragraph of a quote into a heading', () => {+ const editor = createEditor([+ {+ type: 'blockquote',+ content: [paragraph('First'), paragraph('Second')],+ },+ ]);++ turnBlockInto({ editor, blockPos: 0, optionId: 'heading1' });++ expect(editor.getJSON().content).toEqual([+ heading('First'),+ heading('Second'),+ ]);++ editor.destroy();+ });++ it('should turn a paragraph into a quote', () => {+ const editor = createEditor([paragraph('First'), paragraph('Second')]);++ turnBlockInto({ editor, blockPos: 0, optionId: 'blockquote' });++ expect(editor.getJSON().content).toEqual([+ { type: 'blockquote', content: [paragraph('First')] },+ paragraph('Second'),+ ]);++ editor.destroy();+ });+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.tsindex 2b8f8c41bcf..18ce78ea3c3 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/hooks/useTurnIntoBlockOptions.ts@@ -1,13 +1,15 @@import { useLiveEditorState } from '@/advanced-text-editor/hooks/useLiveEditorState';import { hasEditorExtension } from '@/advanced-text-editor/utils/hasEditorExtension';import { useLingui } from '@lingui/react/macro';-import { type Editor } from '@tiptap/react';+import { type ChainedCommands, type Editor } from '@tiptap/core';+import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import {type IconComponent,+ IconBlockquote,IconH1,IconH2,IconH3,- IconPilcrow,+ IconTextSize,} from 'twenty-ui/icon';export type TurnIntoBlockOptions = {@@ -34,36 +36,75 @@ export const useTurnIntoBlockOptions = (editor: Editor) => {3: t`Heading 3`,};- return useLiveEditorState(editor, (currentEditor): TurnIntoBlockOptions[] => [- {- id: 'paragraph',- title: t`Paragraph`,- icon: IconPilcrow,- onClick: () => {- return currentEditor.chain().focus().setParagraph().run();- },- disabled: () => {- return !currentEditor.can().setParagraph();- },- isActive: () => {- return currentEditor.isActive('paragraph');+ return useLiveEditorState(editor, (currentEditor): TurnIntoBlockOptions[] => {+ const isInBlockquote = currentEditor.isActive(TIPTAP_NODE_TYPES.BLOCKQUOTE);++ const liftOutOfBlockquote = (chain: ChainedCommands) =>+ isInBlockquote ? chain.lift(TIPTAP_NODE_TYPES.BLOCKQUOTE) : chain;++ return [+ {+ id: 'paragraph',+ title: t`Text`,+ icon: IconTextSize,+ onClick: () => {+ return liftOutOfBlockquote(currentEditor.chain().focus())+ .setParagraph()+ .run();+ },+ disabled: () => {+ return isInBlockquote+ ? !currentEditor.can().lift(TIPTAP_NODE_TYPES.BLOCKQUOTE)+ : !currentEditor.can().setParagraph();+ },+ isActive: () => {+ return currentEditor.isActive('paragraph') && !isInBlockquote;+ },},- },- ...(hasEditorExtension(currentEditor, 'heading')- ? ([1, 2, 3] as const).map((level) => ({- id: `heading${level}`,- title: headingTitles[level],- icon: HEADING_ICONS[level],- onClick: () => {- return currentEditor.chain().focus().setHeading({ level }).run();- },- disabled: () => {- return !currentEditor.can().setHeading({ level });- },- isActive: () => {- return currentEditor.isActive('heading', { level });- },- }))- : []),- ]);+ ...(hasEditorExtension(currentEditor, 'heading')+ ? ([1, 2, 3] as const).map((level) => ({+ id: `heading${level}`,+ title: headingTitles[level],+ icon: HEADING_ICONS[level],+ onClick: () => {+ return liftOutOfBlockquote(currentEditor.chain().focus())+ .setHeading({ level })+ .run();+ },+ disabled: () => {+ return isInBlockquote+ ? !currentEditor.can().lift(TIPTAP_NODE_TYPES.BLOCKQUOTE)+ : !currentEditor.can().setHeading({ level });+ },+ isActive: () => {+ return currentEditor.isActive('heading', { level });+ },+ }))+ : []),+ ...(hasEditorExtension(currentEditor, TIPTAP_NODE_TYPES.BLOCKQUOTE)+ ? [+ {+ id: 'blockquote',+ title: t`Quote`,+ icon: IconBlockquote,+ onClick: () => {+ return currentEditor+ .chain()+ .focus()+ .setParagraph()+ .toggleBlockquote()+ .run();+ },+ disabled: () => {+ return (+ !currentEditor.can().toggleBlockquote() &&+ !currentEditor.can().setParagraph()+ );+ },+ isActive: () => isInBlockquote,+ },+ ]+ : []),+ ];+ });};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorBlockCatalog.ts b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorBlockCatalog.tsindex cd0d4dc9407..9ff3f2be64a 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorBlockCatalog.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorBlockCatalog.ts@@ -6,6 +6,7 @@ import { type IconComponent } from 'twenty-ui/icon';export const ADVANCED_TEXT_EDITOR_BLOCK_NODE_TYPES = [TIPTAP_NODE_TYPES.PARAGRAPH,TIPTAP_NODE_TYPES.HEADING,+ TIPTAP_NODE_TYPES.BLOCKQUOTE,TIPTAP_NODE_TYPES.SECTION,TIPTAP_NODE_TYPES.COLUMNS,TIPTAP_NODE_TYPES.COLUMN,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorComponentProps.ts b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorComponentProps.tsindex 336bebab3b6..e5446d84d28 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorComponentProps.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorComponentProps.ts@@ -1,7 +1,9 @@+import { type AdvancedTextEditorVariant } from '@/advanced-text-editor/types/AdvancedTextEditorProfile';import { type Editor } from '@tiptap/core';export type AdvancedTextEditorComponentProps = {readonly: boolean | undefined;editor: Editor;minHeight: number;+ variant: AdvancedTextEditorVariant;};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorProfile.ts b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorProfile.tsindex 76c33c9a604..e6083b30142 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorProfile.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/types/AdvancedTextEditorProfile.ts@@ -4,8 +4,11 @@ import { type AnyExtension } from '@tiptap/core';export type AdvancedTextEditorChrome = 'field' | 'document';+export type AdvancedTextEditorVariant = 'app' | 'email';+export type AdvancedTextEditorProfile = {chrome: AdvancedTextEditorChrome;+ variant: AdvancedTextEditorVariant;minHeight: number;enableFullScreen: boolean;buildExtensions: (diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/buildAdvancedTextEditorExtensions.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/buildAdvancedTextEditorExtensions.test.tsindex 08ca9fbb092..4f2819483b8 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/buildAdvancedTextEditorExtensions.test.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/buildAdvancedTextEditorExtensions.test.ts@@ -114,6 +114,7 @@ const createProfile = (overrides: Partial<AdvancedTextEditorProfile> = {},): AdvancedTextEditorProfile => ({chrome: 'document',+ variant: 'app',minHeight: 0,enableFullScreen: false,buildExtensions: () => [],diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getDropPosition.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getDropPosition.test.tsnew file mode 100644index 00000000000..2c8876703d8--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getDropPosition.test.ts@@ -0,0 +1,147 @@+import { getDropPosition } from '@/advanced-text-editor/utils/getDropPosition';+import { Editor, Node } from '@tiptap/core';+import { Document } from '@tiptap/extension-document';+import { ListKit } from '@tiptap/extension-list';+import { Paragraph } from '@tiptap/extension-paragraph';+import { Text } from '@tiptap/extension-text';+import { Fragment, Slice } from '@tiptap/pm/model';++const Divider = Node.create({+ name: 'divider',+ group: 'block',+ atom: true,+ parseHTML: () => [{ tag: 'hr' }],+ renderHTML: () => ['hr'],+});++const HOVERED_BLOCK_RECT = { top: 100, height: 40 } as DOMRect;+const UPPER_HALF_TOP = 110;+const LOWER_HALF_TOP = 130;++const paragraph = (text: string) => ({+ type: 'paragraph',+ content: [{ type: 'text', text }],+});++const listItem = (text: string) => ({+ type: 'listItem',+ content: [paragraph(text)],+});++const createEditor = (content: object[]) =>+ new Editor({+ extensions: [Document, Paragraph, Text, ListKit, Divider],+ content: { type: 'doc', content },+ });++const hover = (editor: Editor, position: { pos: number; inside: number }) => {+ jest.spyOn(editor.view, 'posAtCoords').mockReturnValue(position);+ jest.spyOn(editor.view, 'nodeDOM').mockImplementation(() => {+ const blockElement = document.createElement('div');++ blockElement.getBoundingClientRect = () => HOVERED_BLOCK_RECT;++ return blockElement;+ });+};++const createBlockSlice = (editor: Editor, json: object) =>+ new Slice(Fragment.from(editor.schema.nodeFromJSON(json)), 0, 0);++describe('getDropPosition', () => {+ it('should drop a block before a paragraph hovered in its upper half', () => {+ const editor = createEditor([paragraph('First'), paragraph('Second')]);++ hover(editor, { pos: 12, inside: 7 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: UPPER_HALF_TOP },+ slice: createBlockSlice(editor, paragraph('Dragged')),+ }),+ ).toBe(7);+ editor.destroy();+ });++ it('should drop a block after a paragraph hovered in its lower half, even at the start of its text', () => {+ const editor = createEditor([paragraph('First'), paragraph('Second')]);++ hover(editor, { pos: 8, inside: 7 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: LOWER_HALF_TOP },+ slice: createBlockSlice(editor, paragraph('Dragged')),+ }),+ ).toBe(15);+ editor.destroy();+ });++ it('should drop a block after a leaf block hovered in its lower half', () => {+ const editor = createEditor([+ paragraph('First'),+ { type: 'divider' },+ paragraph('Last'),+ ]);++ hover(editor, { pos: 8, inside: 7 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: LOWER_HALF_TOP },+ slice: createBlockSlice(editor, paragraph('Dragged')),+ }),+ ).toBe(8);+ editor.destroy();+ });++ it('should drop a list item after the list item whose text is hovered in its lower half', () => {+ const editor = createEditor([+ { type: 'bulletList', content: [listItem('One'), listItem('Two')] },+ ]);++ hover(editor, { pos: 4, inside: 2 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: LOWER_HALF_TOP },+ slice: createBlockSlice(editor, listItem('Dragged')),+ }),+ ).toBe(8);+ editor.destroy();+ });++ it('should keep the hovered text position for inline slices', () => {+ const editor = createEditor([paragraph('Hello world')]);++ hover(editor, { pos: 8, inside: 0 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: LOWER_HALF_TOP },+ slice: editor.state.doc.slice(1, 6),+ }),+ ).toBe(8);+ editor.destroy();+ });++ it('should keep the hovered position between blocks', () => {+ const editor = createEditor([paragraph('First'), paragraph('Second')]);++ hover(editor, { pos: 15, inside: -1 });++ expect(+ getDropPosition({+ view: editor.view,+ coordinates: { left: 0, top: UPPER_HALF_TOP },+ slice: createBlockSlice(editor, paragraph('Dragged')),+ }),+ ).toBe(15);+ editor.destroy();+ });+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getEmptyBlockHint.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getEmptyBlockHint.test.tsnew file mode 100644index 00000000000..7cd76e3d5da--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getEmptyBlockHint.test.ts@@ -0,0 +1,140 @@+import { Blockquote } from '@/advanced-text-editor/extensions/blockquote/Blockquote';+import { getEmptyBlockHint } from '@/advanced-text-editor/utils/getEmptyBlockHint';+import { Editor } from '@tiptap/core';+import { Document } from '@tiptap/extension-document';+import { Heading } from '@tiptap/extension-heading';+import { ListKit } from '@tiptap/extension-list';+import { Paragraph } from '@tiptap/extension-paragraph';+import { Text } from '@tiptap/extension-text';+import { Placeholder } from '@tiptap/extensions/placeholder';+import { TextSelection } from '@tiptap/pm/state';++const HELLO_PARAGRAPH = {+ type: 'paragraph',+ content: [{ type: 'text', text: 'Hello' }],+};++const createEditor = (content: object[], placeholder = '') =>+ new Editor({+ extensions: [+ Document,+ Paragraph,+ Text,+ Heading.configure({ levels: [1, 2, 3] }),+ ListKit,+ Blockquote,+ Placeholder.configure({ placeholder }),+ ],+ content: { type: 'doc', content },+ });++const focusAt = (editor: Editor, pos: number) => {+ editor.view.dispatch(+ editor.state.tr.setSelection(TextSelection.create(editor.state.doc, pos)),+ );+ editor.isFocused = true;+};++describe('getEmptyBlockHint', () => {+ it('should hint an empty document even when the editor is not focused', () => {+ const editor = createEditor([{ type: 'paragraph' }]);++ expect(getEmptyBlockHint(editor)).toEqual({+ from: 0,+ to: 2,+ kind: 'text',+ headingLevel: null,+ });+ editor.destroy();+ });++ it('should leave an empty document to its custom placeholder', () => {+ const editor = createEditor([{ type: 'paragraph' }], 'Write the email');++ expect(getEmptyBlockHint(editor)).toBeNull();+ editor.destroy();+ });++ it('should hint an empty heading that its custom placeholder does not cover', () => {+ const editor = createEditor(+ [{ type: 'heading', attrs: { level: 1 } }],+ 'Write the email',+ );++ expect(getEmptyBlockHint(editor)).toEqual({+ from: 0,+ to: 2,+ kind: 'heading',+ headingLevel: 1,+ });+ editor.destroy();+ });++ it('should only hint other empty blocks while the editor is focused', () => {+ const editor = createEditor([HELLO_PARAGRAPH, { type: 'paragraph' }]);++ editor.view.dispatch(+ editor.state.tr.setSelection(TextSelection.create(editor.state.doc, 8)),+ );+ expect(getEmptyBlockHint(editor)).toBeNull();++ editor.isFocused = true;+ expect(getEmptyBlockHint(editor)).toEqual({+ from: 7,+ to: 9,+ kind: 'text',+ headingLevel: null,+ });+ editor.destroy();+ });++ it('should not hint a block that has content', () => {+ const editor = createEditor([HELLO_PARAGRAPH, { type: 'paragraph' }]);++ focusAt(editor, 3);+ expect(getEmptyBlockHint(editor)).toBeNull();+ editor.destroy();+ });++ it('should name empty headings, list items and quotes', () => {+ const headingEditor = createEditor([+ HELLO_PARAGRAPH,+ { type: 'heading', attrs: { level: 2 } },+ ]);+ focusAt(headingEditor, 8);+ expect(getEmptyBlockHint(headingEditor)).toEqual({+ from: 7,+ to: 9,+ kind: 'heading',+ headingLevel: 2,+ });+ headingEditor.destroy();++ const listEditor = createEditor([+ HELLO_PARAGRAPH,+ {+ type: 'bulletList',+ content: [{ type: 'listItem', content: [{ type: 'paragraph' }] }],+ },+ ]);+ focusAt(listEditor, 10);+ expect(getEmptyBlockHint(listEditor)).toMatchObject({+ from: 9,+ to: 11,+ kind: 'listItem',+ });+ listEditor.destroy();++ const quoteEditor = createEditor([+ HELLO_PARAGRAPH,+ { type: 'blockquote', content: [{ type: 'paragraph' }] },+ ]);+ focusAt(quoteEditor, 9);+ expect(getEmptyBlockHint(quoteEditor)).toMatchObject({+ from: 8,+ to: 10,+ kind: 'blockquote',+ });+ quoteEditor.destroy();+ });+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInsertedNodePosition.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInsertedNodePosition.test.tsnew file mode 100644index 00000000000..0029b578165--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getInsertedNodePosition.test.ts@@ -0,0 +1,84 @@+import { getInsertedNodePosition } from '@/advanced-text-editor/utils/getInsertedNodePosition';+import { Editor, Node } from '@tiptap/core';+import { Document } from '@tiptap/extension-document';+import { Paragraph } from '@tiptap/extension-paragraph';+import { Text } from '@tiptap/extension-text';+import { UndoRedo } from '@tiptap/extensions';++const HtmlBlock = Node.create({+ name: 'html',+ group: 'block',+ atom: true,+ parseHTML: () => [{ tag: 'div[data-html]' }],+ renderHTML: () => ['div', { 'data-html': '' }],+});++const HELLO_PARAGRAPH = {+ type: 'paragraph',+ content: [{ type: 'text', text: 'Hello' }],+};++const createEditor = (content: object[]) =>+ new Editor({+ extensions: [Document, Paragraph, Text, HtmlBlock, UndoRedo],+ content: { type: 'doc', content },+ });++const recordInsertedHtmlPositions = (editor: Editor) => {+ const positions: (number | null)[] = [];++ editor.on('transaction', ({ transaction }) => {+ positions.push(+ getInsertedNodePosition({ transaction, nodeTypeName: 'html' }),+ );+ });++ return positions;+};++describe('getInsertedNodePosition', () => {+ it('should return the position of a newly inserted node', () => {+ const editor = createEditor([HELLO_PARAGRAPH]);+ const positions = recordInsertedHtmlPositions(editor);++ editor.commands.insertContentAt(7, { type: 'html' });++ expect(positions).toEqual([7]);+ editor.destroy();+ });++ it('should ignore a node that is moved', () => {+ const editor = createEditor([{ type: 'html' }, HELLO_PARAGRAPH]);+ const positions = recordInsertedHtmlPositions(editor);+ const htmlNode = editor.state.doc.child(0);++ editor.view.dispatch(editor.state.tr.delete(0, 1).insert(7, htmlNode));++ expect(positions).toEqual([null]);+ editor.destroy();+ });++ it('should ignore a node restored by undo', () => {+ const editor = createEditor([{ type: 'html' }, HELLO_PARAGRAPH]);++ editor.commands.deleteRange({ from: 0, to: 1 });++ const positions = recordInsertedHtmlPositions(editor);++ editor.commands.undo();++ expect(editor.state.doc.child(0).type.name).toBe('html');+ expect(positions).toEqual([null]);+ editor.destroy();+ });++ it('should ignore edits that do not add the node', () => {+ const editor = createEditor([{ type: 'html' }, HELLO_PARAGRAPH]);+ const positions = recordInsertedHtmlPositions(editor);++ editor.commands.insertContentAt(3, ' world');++ expect(positions).toEqual([null]);+ editor.destroy();+ });+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getPositionAfterCurrentBlock.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getPositionAfterCurrentBlock.test.tsnew file mode 100644index 00000000000..71a3bcda552--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/__tests__/getPositionAfterCurrentBlock.test.ts@@ -0,0 +1,92 @@+import { Blockquote } from '@/advanced-text-editor/extensions/blockquote/Blockquote';+import { getPositionAfterCurrentBlock } from '@/advanced-text-editor/utils/getPositionAfterCurrentBlock';+import { Editor } from '@tiptap/core';+import { Document } from '@tiptap/extension-document';+import { Heading } from '@tiptap/extension-heading';+import { ListKit } from '@tiptap/extension-list';+import { Paragraph } from '@tiptap/extension-paragraph';+import { Text } from '@tiptap/extension-text';+import { TextSelection } from '@tiptap/pm/state';++const paragraph = (text?: string) => ({+ type: 'paragraph',+ ...(text ? { content: [{ type: 'text', text }] } : {}),+});++const HEADING = {+ type: 'heading',+ attrs: { level: 2 },+ content: [{ type: 'text', text: 'New' }],+};++const insertHeadingAfterCursor = (content: object[], cursor: number) => {+ const editor = new Editor({+ extensions: [+ Document,+ Paragraph,+ Text,+ Heading.configure({ levels: [1, 2, 3] }),+ ListKit,+ Blockquote,+ ],+ content: { type: 'doc', content },+ });++ editor.view.dispatch(+ editor.state.tr.setSelection(+ TextSelection.create(editor.state.doc, cursor),+ ),+ );+ editor.commands.insertContentAt(+ getPositionAfterCurrentBlock(editor.state),+ HEADING,+ );++ const topLevelTypes = (editor.getJSON().content ?? []).map(+ (node) => node.type,+ );++ editor.destroy();++ return topLevelTypes;+};++describe('getPositionAfterCurrentBlock', () => {+ it.each([+ {+ case: 'keeps an empty block instead of replacing it',+ content: [paragraph('Hello'), paragraph()],+ cursor: 8,+ expected: ['paragraph', 'paragraph', 'heading'],+ },+ {+ case: 'does not split the block around the cursor',+ content: [paragraph('Hello'), paragraph('World')],+ cursor: 3,+ expected: ['paragraph', 'heading', 'paragraph'],+ },+ {+ case: 'adds the block after a list instead of inside it',+ content: [+ {+ type: 'bulletList',+ content: [{ type: 'listItem', content: [paragraph('Item')] }],+ },+ paragraph('After'),+ ],+ cursor: 4,+ expected: ['bulletList', 'heading', 'paragraph'],+ },+ {+ case: 'adds the block after a quote instead of inside it',+ content: [+ { type: 'blockquote', content: [paragraph('Quote')] },+ paragraph('After'),+ ],+ cursor: 3,+ expected: ['blockquote', 'heading', 'paragraph'],+ },+ ])('$case', ({ content, cursor, expected }) => {+ expect(insertHeadingAfterCursor(content, cursor)).toEqual(expected);+ });+});diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/buildFullRichTextExtensions.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/buildFullRichTextExtensions.tsindex 69da554e9ae..01479f153af 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/utils/buildFullRichTextExtensions.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/buildFullRichTextExtensions.ts@@ -1,3 +1,5 @@+import { Blockquote } from '@/advanced-text-editor/extensions/blockquote/Blockquote';+import { EmptyBlockHint } from '@/advanced-text-editor/extensions/empty-block-hint/EmptyBlockHint';import { ResizableImage } from '@/advanced-text-editor/extensions/resizable-image/ResizableImage';import { UploadImageExtension } from '@/advanced-text-editor/extensions/resizable-image/UploadImageExtension';import { SlashCommand } from '@/advanced-text-editor/extensions/slash-command/SlashCommand';@@ -20,11 +22,13 @@ export const buildFullRichTextExtensions = (Strike,Underline,Heading.configure({ levels: [1, 2, 3] }),- ListKit,+ ListKit.configure({ taskItem: false, taskList: false }),+ Blockquote,Link.configure({ openOnClick: false }),ResizableImage,UploadImageExtension.configure(context),SlashCommand,+ EmptyBlockHint,];export const buildFullRichTextWithVariableTagExtensions = (diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographySettings.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographySettings.tsindex 25119135cf0..9c96362ba18 100644--- a/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographySettings.ts+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographySettings.ts@@ -1,5 +1,6 @@import { type AdvancedTextEditorBlockSetting } from '@/advanced-text-editor/types/AdvancedTextEditorBlockCatalog';import { msg } from '@lingui/core/macro';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';export function getAdvancedTextEditorTypographySettings() {return [@@ -21,7 +22,7 @@ export function getAdvancedTextEditorTypographySettings() {kind: 'style',property: 'lineHeight',input: 'text',- placeholder: '1.5',+ placeholder: EMAIL_TYPOGRAPHY.lineHeight,},{label: msg`Letter spacing`,diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographyStyle.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographyStyle.tsnew file mode 100644index 00000000000..6458f555c94--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getAdvancedTextEditorTypographyStyle.ts@@ -0,0 +1,45 @@+import { type AdvancedTextEditorVariant } from '@/advanced-text-editor/types/AdvancedTextEditorProfile';+import { type CSSProperties } from 'react';+import { EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';+import { themeCssVariables } from 'twenty-ui/theme';++const VARIANT_TYPOGRAPHY: Record<+ AdvancedTextEditorVariant,+ { fontFamily: string; fontSize: string; accentColor: string }+> = {+ app: {+ fontFamily: themeCssVariables.font.family,+ fontSize: themeCssVariables.font.size.md,+ accentColor: themeCssVariables.color.blue,+ },+ email: {+ fontFamily: EMAIL_TYPOGRAPHY.fontFamily,+ fontSize: EMAIL_TYPOGRAPHY.fontSize,+ accentColor: EMAIL_TYPOGRAPHY.accentColor,+ },+};++export const getAdvancedTextEditorTypographyStyle = (+ variant: AdvancedTextEditorVariant,+) => {+ const { fontFamily, fontSize, accentColor } = VARIANT_TYPOGRAPHY[variant];++ return {+ '--editor-font-family': fontFamily,+ '--editor-font-size': fontSize,+ '--editor-accent-color': accentColor,+ '--editor-line-height': EMAIL_TYPOGRAPHY.lineHeight,+ '--editor-block-spacing': EMAIL_TYPOGRAPHY.blockSpacing,+ '--editor-heading-1-font-size': EMAIL_TYPOGRAPHY.headingFontSizes[1],+ '--editor-heading-2-font-size': EMAIL_TYPOGRAPHY.headingFontSizes[2],+ '--editor-heading-3-font-size': EMAIL_TYPOGRAPHY.headingFontSizes[3],+ '--editor-heading-font-weight': EMAIL_TYPOGRAPHY.headingFontWeight,+ '--editor-heading-line-height': EMAIL_TYPOGRAPHY.headingLineHeight,+ '--editor-heading-spacing-top': EMAIL_TYPOGRAPHY.headingSpacingTop,+ '--editor-heading-spacing-bottom': EMAIL_TYPOGRAPHY.headingSpacingBottom,+ '--editor-list-indent': EMAIL_TYPOGRAPHY.listIndent,+ '--editor-list-item-spacing': EMAIL_TYPOGRAPHY.listItemSpacing,+ '--editor-quote-border-width': EMAIL_TYPOGRAPHY.quoteBorderWidth,+ '--editor-quote-indent': EMAIL_TYPOGRAPHY.quoteIndent,+ } as CSSProperties;+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getBlockHandleAnchorRect.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getBlockHandleAnchorRect.tsnew file mode 100644index 00000000000..425215aadf0--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getBlockHandleAnchorRect.ts@@ -0,0 +1,84 @@+import { isNonEmptyString } from '@sniptt/guards';+import { isDefined } from 'twenty-shared/utils';++const acceptFirstLineNode = (node: Node) =>+ (node.nodeType === Node.TEXT_NODE &&+ isNonEmptyString(node.textContent?.trim())) ||+ node.nodeName === 'BR'+ ? NodeFilter.FILTER_ACCEPT+ : NodeFilter.FILTER_SKIP;++const getFirstLineRect = (blockElement: HTMLElement) => {+ const firstLineNode = document+ .createTreeWalker(+ blockElement,+ NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT,+ { acceptNode: acceptFirstLineNode },+ )+ .nextNode();++ if (!isDefined(firstLineNode)) {+ return null;+ }++ const range = document.createRange();+ range.selectNode(firstLineNode);++ return range.getClientRects().item(0);+};++const TEXT_BLOCK_SELECTOR = 'p, h1, h2, h3, h4, h5, h6, ul, ol, li, blockquote';++const getListItemOwningFirstLine = (blockElement: HTMLElement) => {+ if (blockElement instanceof HTMLLIElement) {+ return blockElement;+ }++ const parentElement = blockElement.parentElement;++ return parentElement instanceof HTMLLIElement &&+ parentElement.firstElementChild === blockElement+ ? parentElement+ : null;+};++const getBlockDecorationOwner = (blockElement: HTMLElement) => {+ const quoteElement = blockElement.closest('blockquote');++ if (isDefined(quoteElement)) {+ return quoteElement;+ }++ return (+ getListItemOwningFirstLine(blockElement)?.parentElement ?? blockElement+ );+};++type GetBlockHandleAnchorRectArgs = {+ blockElement: HTMLElement;+ handleHeight: number;+};++export const getBlockHandleAnchorRect = ({+ blockElement,+ handleHeight,+}: GetBlockHandleAnchorRectArgs) => {+ const blockRect = blockElement.getBoundingClientRect();+ const left =+ getBlockDecorationOwner(blockElement).getBoundingClientRect().left;+ const width = blockRect.right - left;+ const firstLineRect = blockElement.matches(TEXT_BLOCK_SELECTOR)+ ? getFirstLineRect(blockElement)+ : null;++ if (isDefined(firstLineRect)) {+ return new DOMRect(left, firstLineRect.top, width, firstLineRect.height);+ }++ return new DOMRect(+ left,+ blockRect.top,+ width,+ Math.min(blockRect.height, handleHeight),+ );+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropCursorRect.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropCursorRect.tsnew file mode 100644index 00000000000..87253685dd4--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropCursorRect.ts@@ -0,0 +1,60 @@+import { type EditorView } from '@tiptap/pm/view';+import { isDefined } from 'twenty-shared/utils';++const DROP_CURSOR_THICKNESS = 2;++const getNodeRect = (view: EditorView, position: number) => {+ const nodeElement = view.nodeDOM(position);++ return nodeElement instanceof HTMLElement+ ? nodeElement.getBoundingClientRect()+ : null;+};++const getLineTop = (rectBefore: DOMRect | null, rectAfter: DOMRect | null) => {+ if (isDefined(rectBefore) && isDefined(rectAfter)) {+ return (rectBefore.bottom + rectAfter.top) / 2;+ }++ return rectBefore?.bottom ?? rectAfter?.top ?? null;+};++type GetDropCursorRectArgs = {+ view: EditorView;+ position: number;+};++export const getDropCursorRect = ({+ view,+ position,+}: GetDropCursorRectArgs) => {+ const $position = view.state.doc.resolve(position);+ const { nodeBefore, nodeAfter } = $position;++ if (!$position.parent.inlineContent) {+ const rectBefore = isDefined(nodeBefore)+ ? getNodeRect(view, position - nodeBefore.nodeSize)+ : null;+ const rectAfter = isDefined(nodeAfter) ? getNodeRect(view, position) : null;+ const referenceRect = rectBefore ?? rectAfter;+ const lineTop = getLineTop(rectBefore, rectAfter);++ if (isDefined(referenceRect) && isDefined(lineTop)) {+ return new DOMRect(+ referenceRect.left,+ lineTop - DROP_CURSOR_THICKNESS / 2,+ referenceRect.width,+ DROP_CURSOR_THICKNESS,+ );+ }+ }++ const caretRect = view.coordsAtPos(position);++ return new DOMRect(+ caretRect.left - DROP_CURSOR_THICKNESS / 2,+ caretRect.top,+ DROP_CURSOR_THICKNESS,+ caretRect.bottom - caretRect.top,+ );+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropPosition.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropPosition.tsnew file mode 100644index 00000000000..9ab2d5fc0f0--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getDropPosition.ts@@ -0,0 +1,84 @@+import { isBlockSlice } from '@/advanced-text-editor/utils/isBlockSlice';+import { type Node, type Slice } from '@tiptap/pm/model';+import { dropPoint } from '@tiptap/pm/transform';+import { type EditorView } from '@tiptap/pm/view';+import { isDefined } from 'twenty-shared/utils';++type DropCoordinates = {+ left: number;+ top: number;+};++const getHoveredBlockPosition = (doc: Node, inside: number) => {+ if (inside < 0) {+ return null;+ }++ const hoveredNode = doc.nodeAt(inside);++ if (!isDefined(hoveredNode)) {+ return null;+ }++ if (hoveredNode.isInline) {+ const $inside = doc.resolve(inside);++ return $inside.depth > 0 ? $inside.before() : null;+ }++ return hoveredNode.isTextblock || hoveredNode.isLeaf ? inside : null;+};++const getHoveredBlockBoundary = (+ view: EditorView,+ inside: number,+ top: number,+) => {+ const blockPosition = getHoveredBlockPosition(view.state.doc, inside);++ if (!isDefined(blockPosition)) {+ return null;+ }++ const block = view.state.doc.nodeAt(blockPosition);+ const blockElement = view.nodeDOM(blockPosition);++ if (!isDefined(block) || !(blockElement instanceof HTMLElement)) {+ return null;+ }++ const blockRect = blockElement.getBoundingClientRect();++ return top < blockRect.top + blockRect.height / 2+ ? blockPosition+ : blockPosition + block.nodeSize;+};++type GetDropPositionArgs = {+ view: EditorView;+ coordinates: DropCoordinates;+ slice: Slice | undefined;+};++export const getDropPosition = ({+ view,+ coordinates,+ slice,+}: GetDropPositionArgs) => {+ const position = view.posAtCoords(coordinates);++ if (!isDefined(position)) {+ return null;+ }++ if (!isDefined(slice)) {+ return position.pos;+ }++ const target =+ (isBlockSlice(slice)+ ? getHoveredBlockBoundary(view, position.inside, coordinates.top)+ : null) ?? position.pos;++ return dropPoint(view.state.doc, target, slice) ?? target;+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getEmptyBlockHint.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getEmptyBlockHint.tsnew file mode 100644index 00000000000..30424a56dd3--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getEmptyBlockHint.ts@@ -0,0 +1,61 @@+import { isNonEmptyString } from '@sniptt/guards';+import { type Editor } from '@tiptap/core';+import { type EditorState } from '@tiptap/pm/state';+import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';++export type EmptyBlockHintTarget = {+ from: number;+ to: number;+ kind: 'text' | 'heading' | 'listItem' | 'blockquote';+ headingLevel: number | null;+};++const hasCustomPlaceholder = (editor: Editor) =>+ isNonEmptyString(+ editor.extensionManager.extensions.find(+ (extension) => extension.name === 'placeholder',+ )?.options.placeholder,+ );++export const getEmptyBlockHint = (+ editor: Editor,+ state: EditorState = editor.state,+): EmptyBlockHintTarget | null => {+ const { selection, doc } = state;+ const { $from } = selection;+ const block = $from.parent;++ if (+ editor.isDestroyed ||+ !editor.isEditable ||+ !selection.empty ||+ !block.isTextblock ||+ block.content.size > 0+ ) {+ return null;+ }++ const isDocumentEmpty = doc.childCount === 1 && doc.firstChild === block;+ const isShownByCustomPlaceholder =+ block.type.name === TIPTAP_NODE_TYPES.PARAGRAPH &&+ hasCustomPlaceholder(editor);++ if (isDocumentEmpty ? isShownByCustomPlaceholder : !editor.isFocused) {+ return null;+ }++ const blockRange = { from: $from.before(), to: $from.after() };++ if (block.type.name === TIPTAP_NODE_TYPES.HEADING) {+ return { ...blockRange, kind: 'heading', headingLevel: block.attrs.level };+ }++ switch ($from.node(-1).type.name) {+ case TIPTAP_NODE_TYPES.LIST_ITEM:+ return { ...blockRange, kind: 'listItem', headingLevel: null };+ case TIPTAP_NODE_TYPES.BLOCKQUOTE:+ return { ...blockRange, kind: 'blockquote', headingLevel: null };+ default:+ return { ...blockRange, kind: 'text', headingLevel: null };+ }+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getInsertedNodePosition.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getInsertedNodePosition.tsnew file mode 100644index 00000000000..f63e82d2d23--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getInsertedNodePosition.ts@@ -0,0 +1,73 @@+import { type Node as ProseMirrorNode } from '@tiptap/pm/model';+import { type Transaction } from '@tiptap/pm/state';+import { ReplaceStep } from '@tiptap/pm/transform';+import { isDefined } from 'twenty-shared/utils';++const HISTORY_PLUGIN_META_KEY = 'history$';++const countNodesOfType = (doc: ProseMirrorNode, nodeTypeName: string) => {+ let count = 0;++ doc.descendants((node) => {+ if (node.type.name === nodeTypeName) {+ count++;+ }+ });++ return count;+};++const stepInsertsNodeOfType = (+ step: Transaction['steps'][number],+ nodeTypeName: string,+) => {+ if (!(step instanceof ReplaceStep)) {+ return false;+ }++ let insertsNode = false;++ step.slice.content.descendants((node) => {+ insertsNode ||= node.type.name === nodeTypeName;++ return !insertsNode;+ });++ return insertsNode;+};++type GetInsertedNodePositionArgs = {+ transaction: Transaction;+ nodeTypeName: string;+};++export const getInsertedNodePosition = ({+ transaction,+ nodeTypeName,+}: GetInsertedNodePositionArgs) => {+ if (+ !transaction.docChanged ||+ isDefined(transaction.getMeta(HISTORY_PLUGIN_META_KEY)) ||+ !transaction.steps.some((step) =>+ stepInsertsNodeOfType(step, nodeTypeName),+ ) ||+ countNodesOfType(transaction.doc, nodeTypeName) <=+ countNodesOfType(transaction.before, nodeTypeName)+ ) {+ return null;+ }++ const invertedMapping = transaction.mapping.invert();+ let insertedPosition: number | null = null;++ transaction.doc.descendants((node, position) => {+ if (+ node.type.name === nodeTypeName &&+ invertedMapping.mapResult(position, 1).deletedAfter+ ) {+ insertedPosition = position;+ }+ });++ return insertedPosition;+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getPositionAfterCurrentBlock.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getPositionAfterCurrentBlock.tsnew file mode 100644index 00000000000..4e9be47661f--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getPositionAfterCurrentBlock.ts@@ -0,0 +1,27 @@+import { type EditorState, NodeSelection } from '@tiptap/pm/state';+import { TIPTAP_NODE_TYPES } from 'twenty-shared/utils';++const BLOCK_CONTAINER_NODE_TYPES: string[] = [+ TIPTAP_NODE_TYPES.DOCUMENT,+ TIPTAP_NODE_TYPES.SECTION,+ TIPTAP_NODE_TYPES.COLUMN,+];++export const getPositionAfterCurrentBlock = ({+ selection,+ doc,+}: EditorState) => {+ if (selection instanceof NodeSelection && selection.node.isBlock) {+ return selection.to;+ }++ const { $from } = selection;++ for (let depth = $from.depth; depth > 0; depth--) {+ if (BLOCK_CONTAINER_NODE_TYPES.includes($from.node(depth - 1).type.name)) {+ return $from.after(depth);+ }+ }++ return doc.content.size;+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/getTurnIntoSelection.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/getTurnIntoSelection.tsnew file mode 100644index 00000000000..09d36ad2a2b--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/getTurnIntoSelection.ts@@ -0,0 +1,25 @@+import { type Node } from '@tiptap/pm/model';+import { TextSelection } from '@tiptap/pm/state';+import { isDefined } from 'twenty-shared/utils';++type GetTurnIntoSelectionArgs = {+ doc: Node;+ blockPos: number;+};++export const getTurnIntoSelection = ({+ doc,+ blockPos,+}: GetTurnIntoSelectionArgs) => {+ const blockNode = doc.nodeAt(blockPos);+ const blockStart = doc.resolve(blockPos + 1);++ if (!isDefined(blockNode) || blockNode.isTextblock) {+ return TextSelection.near(blockStart);+ }++ return TextSelection.between(+ blockStart,+ doc.resolve(blockPos + blockNode.nodeSize - 1),+ );+};diff --git a/packages/twenty-front/src/modules/advanced-text-editor/utils/isBlockSlice.ts b/packages/twenty-front/src/modules/advanced-text-editor/utils/isBlockSlice.tsnew file mode 100644index 00000000000..24443c332ad--- /dev/null+++ b/packages/twenty-front/src/modules/advanced-text-editor/utils/isBlockSlice.ts@@ -0,0 +1,6 @@+import { type Slice } from '@tiptap/pm/model';++export const isBlockSlice = (slice: Slice) =>+ slice.openStart === 0 &&+ slice.openEnd === 0 &&+ (slice.content.firstChild?.isBlock ?? false);diff --git a/packages/twenty-front/src/modules/ai/constants/AiChatEditorProfile.ts b/packages/twenty-front/src/modules/ai/constants/AiChatEditorProfile.tsindex c35c763bc73..a8f859d9be0 100644--- a/packages/twenty-front/src/modules/ai/constants/AiChatEditorProfile.ts+++ b/packages/twenty-front/src/modules/ai/constants/AiChatEditorProfile.ts@@ -6,6 +6,7 @@ import { SkillTag } from '@/skill-suggestion/extensions/SkillTag';export const AI_CHAT_EDITOR_PROFILE = {chrome: 'document',+ variant: 'app',minHeight: 0,enableFullScreen: false,buildExtensions: () => [diff --git a/packages/twenty-front/src/modules/ai/constants/AiInstructionsEditorProfile.ts b/packages/twenty-front/src/modules/ai/constants/AiInstructionsEditorProfile.tsindex 07b87ae3cf6..c7a7ca87071 100644--- a/packages/twenty-front/src/modules/ai/constants/AiInstructionsEditorProfile.ts+++ b/packages/twenty-front/src/modules/ai/constants/AiInstructionsEditorProfile.ts@@ -4,6 +4,7 @@ import { parseLegacyMarkdownDocument } from '@/advanced-text-editor/utils/parseLexport const AI_INSTRUCTIONS_EDITOR_PROFILE = {chrome: 'field',+ variant: 'app',minHeight: 120,enableFullScreen: true,parseLegacyDocument: parseLegacyMarkdownDocument,diff --git a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsxindex 11c93a863c2..608d1f53716 100644--- a/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx+++ b/packages/twenty-front/src/modules/blocknote-editor/components/BlockEditor.tsx@@ -3,11 +3,16 @@ import {SuggestionMenu,} from '@blocknote/core/extensions';import { BlockNoteView } from '@blocknote/mantine';-import { SuggestionMenuController } from '@blocknote/react';+import {+ FormattingToolbar,+ FormattingToolbarController,+ SuggestionMenuController,+} from '@blocknote/react';import { useLingui } from '@lingui/react/macro';import { styled } from '@linaria/react';import { type ClipboardEvent } from 'react';import { type BLOCK_SCHEMA } from '@/blocknote-editor/blocks/Schema';+import { getBlockTypeSelectItems } from '@/blocknote-editor/utils/getBlockTypeSelectItems';import { getSlashMenu } from '@/blocknote-editor/utils/getSlashMenu';import { CustomMentionMenu } from '@/blocknote-editor/components/CustomMentionMenu';import { CustomSideMenu } from '@/blocknote-editor/components/CustomSideMenu';@@ -225,10 +230,18 @@ export const BlockEditor = ({onChange={handleChange}editor={editor}theme={blockNoteTheme}+ formattingToolbar={false}slashMenu={false}sideMenu={false}editable={!readonly}>+ <FormattingToolbarController+ formattingToolbar={() => (+ <FormattingToolbar+ blockTypeSelectItems={getBlockTypeSelectItems(editor.dictionary)}+ />+ )}+ /><CustomSideMenu editor={editor} /><SuggestionMenuControllertriggerCharacter="/"diff --git a/packages/twenty-front/src/modules/blocknote-editor/utils/getBlockTypeSelectItems.tsx b/packages/twenty-front/src/modules/blocknote-editor/utils/getBlockTypeSelectItems.tsxnew file mode 100644index 00000000000..8b8b3db34fa--- /dev/null+++ b/packages/twenty-front/src/modules/blocknote-editor/utils/getBlockTypeSelectItems.tsx@@ -0,0 +1,20 @@+import { type Dictionary } from '@blocknote/core';+import {+ type BlockTypeSelectItem,+ blockTypeSelectItems,+} from '@blocknote/react';+import { t } from '@lingui/core/macro';+import { IconTextSize } from 'twenty-ui/icon';++const TextBlockTypeIcon: BlockTypeSelectItem['icon'] = ({ size }) => (+ <IconTextSize size={size} />+);++export const getBlockTypeSelectItems = (+ dictionary: Dictionary,+): BlockTypeSelectItem[] =>+ blockTypeSelectItems(dictionary).map((item) =>+ item.type === 'paragraph'+ ? { ...item, name: t`Text`, icon: TextBlockTypeIcon }+ : item,+ );diff --git a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.tsindex 464872349a8..474991cf79d 100644--- a/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts+++ b/packages/twenty-front/src/modules/blocknote-editor/utils/getSlashMenu.ts@@ -1,4 +1,5 @@import { getDefaultReactSlashMenuItems } from '@blocknote/react';+import { t } from '@lingui/core/macro';import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';@@ -22,8 +23,8 @@ import {IconMinus,IconMoodSmile,IconPhoto,- IconPilcrow,IconTable,+ IconTextSize,IconVideo,} from 'twenty-ui/icon';@@ -44,7 +45,7 @@ const Icons: Record<string, IconComponent> = {'Bullet List': IconList,'Check List': IconListCheck,'Code Block': IconCode,- Paragraph: IconPilcrow,+ Paragraph: IconTextSize,Table: IconTable,Image: IconPhoto,Video: IconVideo,@@ -58,6 +59,7 @@ export const getSlashMenu = (editor: typeof BLOCK_SCHEMA.BlockNoteEditor) => {.filter((item) => item.title !== 'File').map((x) => ({...x,+ title: x.title === 'Paragraph' ? t`Text` : x.title,Icon: Icons[x.title],})),{diff --git a/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts b/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.tsindex a4d58a8bd77..561cfced85c 100644--- a/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts+++ b/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts@@ -52,6 +52,7 @@ export const COMMAND_MENU_ITEM_SECTION_BY_ENGINE_COMPONENT_KEY = {[EngineComponentKey.SEND_MESSAGE_CAMPAIGN_TEST]: 'SELECTION',[EngineComponentKey.CANCEL_MESSAGE_CAMPAIGN]: 'SELECTION',[EngineComponentKey.EMAIL_BLOCK_SETTINGS]: 'SELECTION',+ [EngineComponentKey.EMAIL_PAGE_STYLE]: 'SELECTION',[EngineComponentKey.DELETE_SINGLE_RECORD]: 'SELECTION',[EngineComponentKey.DELETE_MULTIPLE_RECORDS]: 'SELECTION',[EngineComponentKey.RESTORE_SINGLE_RECORD]: 'SELECTION',diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsxindex 162f1570ac9..4a6517d28d2 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx@@ -9,6 +9,7 @@ import { CancelMessageCampaignSingleRecordCommand } from '@/command-menu-item/enimport { DuplicateMessageCampaignSingleRecordCommand } from '@/command-menu-item/engine-command/record/single-record/message-campaign/components/DuplicateMessageCampaignSingleRecordCommand';import { SendMessageCampaignTestSingleRecordCommand } from '@/command-menu-item/engine-command/record/single-record/message-campaign/components/SendMessageCampaignTestSingleRecordCommand';import { OpenEmailBlockSettingsSingleRecordCommand } from '@/command-menu-item/engine-command/record/components/OpenEmailBlockSettingsSingleRecordCommand';+import { OpenEmailPageStyleSingleRecordCommand } from '@/command-menu-item/engine-command/record/components/OpenEmailPageStyleSingleRecordCommand';import { ComposeEmailCommand } from '@/command-menu-item/engine-command/global/components/ComposeEmailCommand';import { EditLayoutCommand } from '@/command-menu-item/engine-command/global/components/EditLayoutCommand';import { DeleteRecordsCommand } from '@/command-menu-item/engine-command/record/components/DeleteRecordsCommand';@@ -310,6 +311,9 @@ export const ENGINE_COMPONENT_KEY_COMPONENT_MAP: Record<[EngineComponentKey.EMAIL_BLOCK_SETTINGS]: (<OpenEmailBlockSettingsSingleRecordCommand />),+ [EngineComponentKey.EMAIL_PAGE_STYLE]: (+ <OpenEmailPageStyleSingleRecordCommand />+ ),// Deprecated keys kept for backward compatibility until migration runs[EngineComponentKey.DELETE_SINGLE_RECORD]: <DeleteRecordsCommand />,diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/OpenEmailPageStyleSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/OpenEmailPageStyleSingleRecordCommand.tsxnew file mode 100644index 00000000000..670c925bb28--- /dev/null+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/components/OpenEmailPageStyleSingleRecordCommand.tsx@@ -0,0 +1,13 @@+import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useOpenEmailPageStyleInSidePanel } from '@/side-panel/hooks/useOpenEmailPageStyleInSidePanel';++export const OpenEmailPageStyleSingleRecordCommand = () => {+ const { openEmailPageStyleInSidePanel } = useOpenEmailPageStyleInSidePanel();++ return (+ <HeadlessEngineCommandWrapperEffect+ execute={openEmailPageStyleInSidePanel}+ ready+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsxindex 6e7184923c9..ebeb8c4c065 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordFieldChip.tsx@@ -6,6 +6,7 @@ import {} from '@/object-record/record-field/ui/form-types/types/RecordPickerValue';import { VariableChipStandalone } from '@/object-record/record-field/ui/form-types/components/VariableChipStandalone';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';import { isStandaloneVariableString } from 'twenty-shared/workflow';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';@@ -13,20 +14,29 @@ import { isDefined } from 'twenty-shared/utils';import { IconForbid } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-const StyledRecordChipContainer = styled.div`- margin: ${themeCssVariables.spacing[2]};+const getInset = ({ $variant }: { $variant?: FormFieldInputVariant }) =>+ $variant === 'transparent' ? '0' : themeCssVariables.spacing[2];++const StyledRecordChipContainer = styled.div<{+ $variant?: FormFieldInputVariant;+}>`+ margin: ${getInset};`;-const StyledPlaceholderContainer = styled.div`- margin: ${themeCssVariables.spacing[2]};+const StyledPlaceholderContainer = styled.div<{+ $variant?: FormFieldInputVariant;+}>`+ margin: ${getInset};`;-const StyledNoRecordContainer = styled.div`+const StyledNoRecordContainer = styled.div<{+ $variant?: FormFieldInputVariant;+}>`align-items: center;color: ${themeCssVariables.font.color.primary};display: flex;gap: ${themeCssVariables.spacing[1]};- margin: ${themeCssVariables.spacing[2]};+ margin: ${getInset};`;type FormSingleRecordFieldChipProps = {@@ -47,6 +57,7 @@ type FormSingleRecordFieldChipProps = {objectNameSingular: string;onRemove: (event?: React.MouseEvent<HTMLDivElement>) => void;disabled?: boolean;+ variant?: FormFieldInputVariant;};export const FormSingleRecordFieldChip = ({@@ -55,6 +66,7 @@ export const FormSingleRecordFieldChip = ({objectNameSingular,onRemove,disabled,+ variant,}: FormSingleRecordFieldChipProps) => {if (draftValue.type === 'variable' &&@@ -71,7 +83,7 @@ export const FormSingleRecordFieldChip = ({if (draftValue.type === 'no-record') {return (- <StyledNoRecordContainer>+ <StyledNoRecordContainer $variant={variant}><IconForbid size={12} />{t`No record`}</StyledNoRecordContainer>@@ -80,7 +92,7 @@ export const FormSingleRecordFieldChip = ({if (draftValue.type === 'static' && isDefined(selectedRecord)) {return (- <StyledRecordChipContainer>+ <StyledRecordChipContainer $variant={variant}><RecordChiprecord={selectedRecord}objectNameSingular={objectNameSingular}@@ -90,7 +102,7 @@ export const FormSingleRecordFieldChip = ({}return (- <StyledPlaceholderContainer>+ <StyledPlaceholderContainer $variant={variant}><FormFieldPlaceholder>{t`Select`}</FormFieldPlaceholder></StyledPlaceholderContainer>);diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsxindex fe409aaf081..aca88196993 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormSingleRecordPicker.tsx@@ -7,6 +7,7 @@ import {type RecordId,type Variable,} from '@/object-record/record-field/ui/form-types/types/RecordPickerValue';+import { type FormFieldInputVariant } from '@/ui/input/types/FormFieldInputVariant';import { type VariablePickerComponent } from '@/ui/input/types/VariablePickerComponent';import { SingleRecordPicker } from '@/object-record/record-picker/single-record-picker/components/SingleRecordPicker';import { singleRecordPickerSearchFilterComponentState } from '@/object-record/record-picker/single-record-picker/states/singleRecordPickerSearchFilterComponentState';@@ -25,20 +26,29 @@ import { CustomError, isDefined, isValidUuid } from 'twenty-shared/utils';import { IconChevronDown, IconForbid } from 'twenty-ui/icon';import { useTheme, themeCssVariables } from 'twenty-ui/theme';-const StyledFormSelectContainerWrapper = styled.div<{ readonly?: boolean }>`+const StyledFormSelectContainerWrapper = styled.div<{+ readonly?: boolean;+ $variant?: FormFieldInputVariant;+}>`cursor: ${({ readonly }) => (readonly ? 'default' : 'pointer')};display: flex;- height: 32px;+ height: ${({ $variant }) =>+ $variant === 'transparent' ? themeCssVariables.spacing[6] : '32px'};min-width: 0;width: 100%;`;-const StyledIconButton = styled.div`+const StyledIconButton = styled.div<{ $variant?: FormFieldInputVariant }>`display: flex;- padding-right: ${themeCssVariables.spacing[2]};+ padding-right: ${({ $variant }) =>+ $variant === 'transparent' ? '0' : themeCssVariables.spacing[2]};`;-const StyledDropdownContainer = styled.div`+const StyledDropdownContainer = styled.div<{+ $variant?: FormFieldInputVariant;+}>`+ align-items: ${({ $variant }) =>+ $variant === 'transparent' ? 'center' : 'stretch'};display: flex;flex: 1;min-width: 0;@@ -78,6 +88,8 @@ export type FormSingleRecordPickerProps = {testId?: string;VariablePicker?: VariablePickerComponent;shouldDisplayRecordFieldsInVariablePicker?: boolean;+ dropdownId?: string;+ variant?: FormFieldInputVariant;};export const FormSingleRecordPicker = ({@@ -93,6 +105,8 @@ export const FormSingleRecordPicker = ({testId,VariablePicker,shouldDisplayRecordFieldsInVariablePicker = false,+ dropdownId: dropdownIdFromProps,+ variant,}: FormSingleRecordPickerProps) => {const theme = useTheme();@@ -124,7 +138,7 @@ export const FormSingleRecordPicker = ({});const componentId = useId();- const dropdownId = `form-record-picker-${componentId}`;+ const dropdownId = dropdownIdFromProps ?? `form-record-picker-${componentId}`;const variablesDropdownId = `form-record-picker-${componentId}-variables`;const { closeDropdown } = useCloseDropdown();@@ -200,10 +214,11 @@ export const FormSingleRecordPicker = ({{label ? <Field.Label>{label}</Field.Label> : null}<FormFieldInputRowContainer>{disabled ? (- <StyledFormSelectContainerWrapper readonly>+ <StyledFormSelectContainerWrapper readonly $variant={variant}><FormFieldInputInnerContainerformFieldInputInstanceId={componentId}hasRightElement={false}+ variant={variant}><FormSingleRecordFieldChipdraftValue={draftValue}@@ -211,11 +226,12 @@ export const FormSingleRecordPicker = ({objectNameSingular={resolvedObjectNameSingular}onRemove={handleUnlinkVariable}disabled={disabled}+ variant={variant}/></FormFieldInputInnerContainer></StyledFormSelectContainerWrapper>) : (- <StyledDropdownContainer>+ <StyledDropdownContainer $variant={variant}><DropdowndropdownId={dropdownId}dropdownPlacement="bottom-start"@@ -226,12 +242,13 @@ export const FormSingleRecordPicker = ({y: parseInt(theme.spacing[1], 10),}}clickableComponent={- <StyledFormSelectContainerWrapper>+ <StyledFormSelectContainerWrapper $variant={variant}><FormFieldInputInnerContainerformFieldInputInstanceId={componentId}hasRightElement={isDefined(VariablePicker) && !disabled}hoverablepreventFocusStackUpdate={true}+ variant={variant}><FormSingleRecordFieldChipdraftValue={draftValue}@@ -239,11 +256,16 @@ export const FormSingleRecordPicker = ({objectNameSingular={resolvedObjectNameSingular}onRemove={handleUnlinkVariable}disabled={disabled}+ variant={variant}/>- <StyledIconButton>+ <StyledIconButton $variant={variant}><IconChevronDownsize={theme.icon.size.md}- color={theme.font.color.light}+ color={+ variant === 'transparent'+ ? theme.font.color.tertiary+ : theme.font.color.light+ }/></StyledIconButton></FormFieldInputInnerContainer>diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/constants/RecordRichTextEditorProfile.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/constants/RecordRichTextEditorProfile.tsindex 67dbc85413f..d603eec5fd2 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/constants/RecordRichTextEditorProfile.ts+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/constants/RecordRichTextEditorProfile.ts@@ -5,6 +5,7 @@ import { WorkflowVariableTag } from '@/workflow/workflow-variables/extensions/Woexport const RECORD_RICH_TEXT_EDITOR_PROFILE = {chrome: 'field',+ variant: 'app',minHeight: 340,enableFullScreen: true,parseLegacyDocument: parseLegacyRecordRichTextDocument,diff --git a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsxindex 5d2ab866f9f..fd7e7d49755 100644--- a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx@@ -159,6 +159,7 @@ describe('PageLayoutVerticalList', () => {makeWidget('emails', WidgetType.EMAILS),makeWidget('email-thread', WidgetType.EMAIL_THREAD),makeWidget('files', WidgetType.FILES),+ makeWidget('message-campaign-body', WidgetType.MESSAGE_CAMPAIGN_BODY),makeWidget('notes', WidgetType.NOTES),makeWidget('tasks', WidgetType.TASKS),makeWidget('workflow', WidgetType.WORKFLOW),@@ -190,26 +191,6 @@ describe('PageLayoutVerticalList', () => {).toBeNull();});- it('keeps campaign documents fit-content so the tab owns scrolling', () => {- render(- <PageLayoutVerticalList- isInEditMode={false}- widgets={[- makeWidget('message-campaign-body', WidgetType.MESSAGE_CAMPAIGN_BODY),- ]}- />,- );-- expect(- screen- .getByTestId('message-campaign-body')- .closest('.page-layout-viewport-filling-widget-slot'),- ).toBeNull();- expect(- screen.getByTestId('message-campaign-body-sortable-cell'),- ).toHaveAttribute('data-fill', 'false');- });-it('keeps a legacy Canvas tab full-height when only one widget is visible', () => {mockLayoutMode = PageLayoutTabLayoutMode.CANVAS;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsxindex b10186e2e56..d12038d0cf1 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx@@ -7,9 +7,11 @@ import {NestBlockButton,TextAlignButton,UnnestBlockButton,+ useBlockNoteEditor,} from '@blocknote/react';import { flip, offset, shift } from '@floating-ui/react';+import { getBlockTypeSelectItems } from '@/blocknote-editor/utils/getBlockTypeSelectItems';import { DashboardFormattingToolbarColorButton } from '@/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbarColorButton';import { FORMATTING_TOOLBAR_FLOATING_CONFIG } from '@/page-layout/widgets/standalone-rich-text/constants/FormattingToolbarFloatingConfig';import { styled } from '@linaria/react';@@ -33,12 +35,17 @@ const StyledToolbarContainer = styled.div``;export const DashboardFormattingToolbar = () => {+ const editor = useBlockNoteEditor();+return (<FormattingToolbarControllerformattingToolbar={() => (<StyledToolbarContainer><FormattingToolbar>- <BlockTypeSelect key="blockTypeSelect" />+ <BlockTypeSelect+ key="blockTypeSelect"+ items={getBlockTypeSelectItems(editor.dictionary)}+ /><BasicTextStyleButton basicTextStyle="bold" key="boldStyleButton" /><BasicTextStyleButtonbasicTextStyle="italic"diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.tsindex 0ed578d1260..e7123eac4c2 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/getDashboardSlashMenu.ts@@ -1,4 +1,5 @@import { getDefaultReactSlashMenuItems } from '@blocknote/react';+import { t } from '@lingui/core/macro';import { type SuggestionItem } from '@/blocknote-editor/types/SuggestionMenuItems';import { type DASHBOARD_BLOCK_SCHEMA } from '@/page-layout/widgets/standalone-rich-text/constants/DashboardBlockSchema';@@ -16,8 +17,8 @@ import {IconListCheck,IconListNumbers,IconMoodSmile,- IconPilcrow,IconTable,+ IconTextSize,} from 'twenty-ui/icon';const Icons: Record<string, IconComponent> = {@@ -35,7 +36,7 @@ const Icons: Record<string, IconComponent> = {'Bullet List': IconList,'Check List': IconListCheck,'Code Block': IconCode,- Paragraph: IconPilcrow,+ Paragraph: IconTextSize,Table: IconTable,Emoji: IconMoodSmile,};@@ -49,6 +50,7 @@ export const getDashboardSlashMenu = (.filter((item) => !EXCLUDED_BLOCK_TYPES.includes(item.title)).map((item) => ({...item,+ title: item.title === 'Paragraph' ? t`Text` : item.title,Icon: Icons[item.title],}));diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsxindex 6d6134999c9..2b1ea52bcd5 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx@@ -4,8 +4,10 @@ import { SidePanelAskAiInfo } from '@/side-panel/components/SidePanelAskAiInfo';import { SidePanelMultipleRecordsInfo } from '@/side-panel/components/SidePanelMultipleRecordsInfo';import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';import { SidePanelPageLayoutInfo } from '@/side-panel/components/SidePanelPageLayoutInfo';+import { SidePanelSendCampaignInfo } from '@/side-panel/components/SidePanelSendCampaignInfo';import { SidePanelWorkflowStepInfo } from '@/side-panel/components/SidePanelWorkflowStepInfo';import { SidePanelPages } from 'twenty-shared/types';+import { useTheme } from 'twenty-ui/theme';import { type SidePanelContextChipProps } from '@/side-panel/types/SidePanelContextChipProps';@@ -14,6 +16,8 @@ type SidePanelPageInfoProps = {};export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {+ const theme = useTheme();+if (!isDefined(pageChip)) {return null;}@@ -56,11 +60,45 @@ export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {);}+ const isSendCampaignPage =+ pageChip.page?.page === SidePanelPages.SendCampaign;++ if (isSendCampaignPage && isDefined(pageChip.page?.pageId)) {+ return (+ <SidePanelSendCampaignInfo+ sidePanelPageInstanceId={pageChip.page.pageId}+ />+ );+ }+const isAskAiPage = pageChip.page?.page === SidePanelPages.AskAI;if (isAskAiPage) {return <SidePanelAskAiInfo />;}+ const shouldShowPageIcon = pageChip.page?.page+ ? [+ SidePanelPages.EmailBlockSettings,+ SidePanelPages.EmailPageStyle,+ SidePanelPages.EmailBlockStyle,+ SidePanelPages.AddToMessageList,+ ].includes(pageChip.page.page)+ : false;++ if (shouldShowPageIcon && isDefined(pageChip.page)) {+ const PageIcon = pageChip.page.pageIcon;++ return (+ <HeaderIdentifier+ icon={+ <PageIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />+ }+ iconColor={theme.font.color.tertiary}+ title={pageChip.text ?? ''}+ />+ );+ }+return <HeaderIdentifier title={pageChip.text ?? ''} />;};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsxnew file mode 100644index 00000000000..202f79a58f0--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelSendCampaignInfo.tsx@@ -0,0 +1,59 @@+import { plural, t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';+import { CoreObjectNameSingular } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';+import { IconSend } from 'twenty-ui/icon';+import { useTheme } from 'twenty-ui/theme';++import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';+import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';+import { useNumberFormat } from '@/localization/hooks/useNumberFormat';+import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';+import { sendCampaignCampaignIdComponentState } from '@/side-panel/pages/send-campaign/states/sendCampaignCampaignIdComponentState';+import { HeaderIdentifier } from '@/ui/layout/page/components/HeaderIdentifier';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';++type SidePanelSendCampaignInfoProps = {+ sidePanelPageInstanceId: string;+};++export const SidePanelSendCampaignInfo = ({+ sidePanelPageInstanceId,+}: SidePanelSendCampaignInfoProps) => {+ const theme = useTheme();+ const { formatNumber } = useNumberFormat();++ const sendCampaignCampaignId = useAtomComponentStateValue(+ sendCampaignCampaignIdComponentState,+ sidePanelPageInstanceId,+ );++ const { record: campaign } = useFindOneRecord<MessageCampaign>({+ objectNameSingular: CoreObjectNameSingular.MessageCampaign,+ objectRecordId: sendCampaignCampaignId,+ skip: !isNonEmptyString(sendCampaignCampaignId),+ });++ const { audiencePreview } = useCampaignAudiencePreview({+ listId: campaign?.listId ?? null,+ unsubscribeTopicId: campaign?.unsubscribeTopicId ?? null,+ });++ return (+ <HeaderIdentifier+ icon={+ <IconSend size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />+ }+ iconColor={theme.font.color.tertiary}+ title={t`Send Campaign`}+ label={+ isDefined(audiencePreview)+ ? plural(audiencePreview.sendable, {+ one: `${formatNumber(audiencePreview.sendable)} recipient`,+ other: `${formatNumber(audiencePreview.sendable)} recipients`,+ })+ : undefined+ }+ />+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex ceca59a8781..9b032c69a31 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -7,15 +7,15 @@ import { SidePanelRoutedPage } from '@/side-panel/routing/components/SidePanelRoimport { SidePanelEmailBlockSettingsPage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage';import { SidePanelEmailDesignPage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailDesignPage';import { SidePanelEmailPageStylePage } from '@/side-panel/pages/email-block-settings/components/SidePanelEmailPageStylePage';+import { SidePanelAddToMessageListPage } from '@/side-panel/pages/add-to-message-list/components/SidePanelAddToMessageListPage';import { SidePanelAskAiPage } from '@/side-panel/pages/ask-ai/components/SidePanelAskAiPage';import { SidePanelComposeEmailPage } from '@/side-panel/pages/compose-email/components/SidePanelComposeEmailPage';import { SidePanelComposeCalendarEventPage } from '@/side-panel/pages/compose-calendar-event/components/SidePanelComposeCalendarEventPage';import { SidePanelCreateRelatedRecordPage } from '@/side-panel/pages/create-related-record/components/SidePanelCreateRelatedRecordPage';-import { SidePanelSendCampaignPage } from '@/side-panel/pages/send-campaign/components/SidePanelSendCampaignPage';import { SidePanelRecordCreationFormPage } from '@/side-panel/pages/record-creation-form/components/SidePanelRecordCreationFormPage';import { SidePanelRecordCreationFormSettingsPage } from '@/side-panel/pages/record-creation-form-settings/components/SidePanelRecordCreationFormSettingsPage';+import { SidePanelSendCampaignPage } from '@/side-panel/pages/send-campaign/components/SidePanelSendCampaignPage';import { SidePanelSendCampaignTestPage } from '@/side-panel/pages/send-campaign-test/components/SidePanelSendCampaignTestPage';-import { SidePanelAddToMessageListPage } from '@/side-panel/pages/add-to-message-list/components/SidePanelAddToMessageListPage';import { SidePanelShareRecordPage } from '@/side-panel/pages/share-record/components/SidePanelShareRecordPage';import { SidePanelSnoozeAiChatPage } from '@/side-panel/pages/snooze-ai-chat/components/SidePanelSnoozeAiChatPage';import { SidePanelAssignAiChatPage } from '@/side-panel/pages/assign-ai-chat/components/SidePanelAssignAiChatPage';@@ -98,12 +98,12 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<[SidePanelPages.ComposeCalendarEvent, <SidePanelComposeCalendarEventPage />],[SidePanelPages.ComposeEmail, <SidePanelComposeEmailPage />],[SidePanelPages.CreateRelatedRecord, <SidePanelCreateRelatedRecordPage />],- [SidePanelPages.SendCampaign, <SidePanelSendCampaignPage />],[SidePanelPages.RecordCreationForm, <SidePanelRecordCreationFormPage />],[SidePanelPages.RecordCreationFormSettings,<SidePanelRecordCreationFormSettingsPage />,],+ [SidePanelPages.SendCampaign, <SidePanelSendCampaignPage />],[SidePanelPages.SendCampaignTest, <SidePanelSendCampaignTestPage />],[SidePanelPages.AddToMessageList, <SidePanelAddToMessageListPage />],[SidePanelPages.EmailBlockSettings, <SidePanelEmailDesignPage />],diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.tsdeleted file mode 100644index 69a8faff7ca..00000000000--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenCampaignSidePanelPage.ts+++ /dev/null@@ -1,49 +0,0 @@-import { useStore } from 'jotai';-import { useCallback } from 'react';-import { type IconComponent } from 'twenty-ui/icon';-import { v4 } from 'uuid';--import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { type NonPageLayoutPurposeBuiltSidePanelPage } from '@/side-panel/types/SidePanelPage';-import { type sendCampaignCampaignIdComponentState } from '@/side-panel/pages/send-campaign/states/sendCampaignCampaignIdComponentState';--type CampaignIdComponentState = typeof sendCampaignCampaignIdComponentState;--// Both campaign panels seed their campaign id on a page instance that does not-// exist yet, so the id has to be written against the new pageId before the-// navigation that mounts it.-export const useOpenCampaignSidePanelPage = ({- campaignIdComponentState,- page,- pageTitle,- pageIcon,-}: {- campaignIdComponentState: CampaignIdComponentState;- page: NonPageLayoutPurposeBuiltSidePanelPage;- pageTitle: string;- pageIcon: IconComponent;-}) => {- const store = useStore();- const { navigateSidePanelMenu } = useSidePanelMenu();-- return useCallback(- (campaignId: string) => {- const pageId = v4();-- store.set(- campaignIdComponentState.atomFamily({ instanceId: pageId }),- campaignId,- );-- navigateSidePanelMenu({ page, pageTitle, pageIcon, pageId });- },- [- campaignIdComponentState,- navigateSidePanelMenu,- page,- pageIcon,- pageTitle,- store,- ],- );-};diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockSettingsInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockSettingsInSidePanel.tsindex 2af32d887f8..40c4f5784dd 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockSettingsInSidePanel.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockSettingsInSidePanel.ts@@ -1,7 +1,7 @@import { useCallback } from 'react';import { t } from '@lingui/core/macro';import { SidePanelPages } from 'twenty-shared/types';-import { IconAdjustments } from 'twenty-ui/icon';+import { IconPlus } from 'twenty-ui/icon';import { v4 } from 'uuid';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';@@ -12,8 +12,8 @@ export const useOpenEmailBlockSettingsInSidePanel = () => {const openEmailBlockSettingsInSidePanel = useCallback(() => {navigateSidePanelMenu({page: SidePanelPages.EmailBlockSettings,- pageTitle: t`Design`,- pageIcon: IconAdjustments,+ pageTitle: t`Add block`,+ pageIcon: IconPlus,pageId: v4(),resetNavigationStack: true,});diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockStyleInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockStyleInSidePanel.tsindex 0d35dd89a09..65fc9ff4f5e 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockStyleInSidePanel.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailBlockStyleInSidePanel.ts@@ -1,59 +1,23 @@import { t } from '@lingui/core/macro';-import { type Editor } from '@tiptap/core';-import { useStore } from 'jotai';import { useCallback } from 'react';import { SidePanelPages } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';import { IconAdjustments } from 'twenty-ui/icon';import { v4 } from 'uuid';-import { getBlockSelectionTarget } from '@/advanced-text-editor/utils/getBlockSelectionTarget';-import { useOpenEmailBlockSettingsInSidePanel } from '@/side-panel/hooks/useOpenEmailBlockSettingsInSidePanel';-import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';export const useOpenEmailBlockStyleInSidePanel = () => {- const store = useStore();const { navigateSidePanelMenu } = useSidePanelMenu();- const { goBackFromSidePanel } = useSidePanelHistory();- const { openEmailBlockSettingsInSidePanel } =- useOpenEmailBlockSettingsInSidePanel();const openEmailBlockStyleInSidePanel = useCallback(() => {- openEmailBlockSettingsInSidePanel();navigateSidePanelMenu({page: SidePanelPages.EmailBlockStyle,- pageTitle: t`Style`,+ pageTitle: t`Block style`,pageIcon: IconAdjustments,pageId: v4(),+ resetNavigationStack: true,});- }, [navigateSidePanelMenu, openEmailBlockSettingsInSidePanel]);+ }, [navigateSidePanelMenu]);- const followEmailBlockSelectionInSidePanel = useCallback(- (editor: Editor) => {- const hasBlockTarget = isDefined(getBlockSelectionTarget(editor));-- switch (store.get(sidePanelNavigationStackState.atom).at(-1)?.page) {- case SidePanelPages.EmailBlockSettings:- if (hasBlockTarget) {- openEmailBlockStyleInSidePanel();- }- return;- case SidePanelPages.EmailBlockStyle:- if (!hasBlockTarget) {- goBackFromSidePanel();- }- return;- default:- return;- }- },- [goBackFromSidePanel, openEmailBlockStyleInSidePanel, store],- );-- return {- openEmailBlockStyleInSidePanel,- followEmailBlockSelectionInSidePanel,- };+ return { openEmailBlockStyleInSidePanel };};diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailPageStyleInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailPageStyleInSidePanel.tsnew file mode 100644index 00000000000..a6ace381fc7--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenEmailPageStyleInSidePanel.ts@@ -0,0 +1,23 @@+import { useCallback } from 'react';+import { t } from '@lingui/core/macro';+import { SidePanelPages } from 'twenty-shared/types';+import { IconPaint } from 'twenty-ui/icon';+import { v4 } from 'uuid';++import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';++export const useOpenEmailPageStyleInSidePanel = () => {+ const { navigateSidePanelMenu } = useSidePanelMenu();++ const openEmailPageStyleInSidePanel = useCallback(() => {+ navigateSidePanelMenu({+ page: SidePanelPages.EmailPageStyle,+ pageTitle: t`Email style`,+ pageIcon: IconPaint,+ pageId: v4(),+ resetNavigationStack: true,+ });+ }, [navigateSidePanelMenu]);++ return { openEmailPageStyleInSidePanel };+};diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignInSidePanel.tsindex af7a2938f84..3bb8879a617 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignInSidePanel.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignInSidePanel.ts@@ -1,17 +1,37 @@import { t } from '@lingui/core/macro';+import { useStore } from 'jotai';+import { useCallback } from 'react';import { SidePanelPages } from 'twenty-shared/types';import { IconSend } from 'twenty-ui/icon';+import { v4 } from 'uuid';-import { useOpenCampaignSidePanelPage } from '@/side-panel/hooks/useOpenCampaignSidePanelPage';+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { sendCampaignCampaignIdComponentState } from '@/side-panel/pages/send-campaign/states/sendCampaignCampaignIdComponentState';export const useOpenSendCampaignInSidePanel = () => {- const openSendCampaignInSidePanel = useOpenCampaignSidePanelPage({- campaignIdComponentState: sendCampaignCampaignIdComponentState,- page: SidePanelPages.SendCampaign,- pageTitle: t`Send Campaign`,- pageIcon: IconSend,- });+ const store = useStore();+ const { navigateSidePanelMenu } = useSidePanelMenu();++ const openSendCampaignInSidePanel = useCallback(+ (campaignId: string) => {+ const pageId = v4();++ store.set(+ sendCampaignCampaignIdComponentState.atomFamily({+ instanceId: pageId,+ }),+ campaignId,+ );++ navigateSidePanelMenu({+ page: SidePanelPages.SendCampaign,+ pageTitle: t`Send Campaign`,+ pageIcon: IconSend,+ pageId,+ });+ },+ [navigateSidePanelMenu, store],+ );return { openSendCampaignInSidePanel };};diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignTestInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignTestInSidePanel.tsindex 9943a56cee4..f497dabeb6b 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignTestInSidePanel.ts+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenSendCampaignTestInSidePanel.ts@@ -1,17 +1,37 @@import { t } from '@lingui/core/macro';+import { useStore } from 'jotai';+import { useCallback } from 'react';import { SidePanelPages } from 'twenty-shared/types';import { IconMail } from 'twenty-ui/icon';+import { v4 } from 'uuid';-import { useOpenCampaignSidePanelPage } from '@/side-panel/hooks/useOpenCampaignSidePanelPage';+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';import { sendCampaignTestCampaignIdComponentState } from '@/side-panel/pages/send-campaign-test/states/sendCampaignTestCampaignIdComponentState';export const useOpenSendCampaignTestInSidePanel = () => {- const openSendCampaignTestInSidePanel = useOpenCampaignSidePanelPage({- campaignIdComponentState: sendCampaignTestCampaignIdComponentState,- page: SidePanelPages.SendCampaignTest,- pageTitle: t`Send Test Email`,- pageIcon: IconMail,- });+ const store = useStore();+ const { navigateSidePanelMenu } = useSidePanelMenu();++ const openSendCampaignTestInSidePanel = useCallback(+ (campaignId: string) => {+ const pageId = v4();++ store.set(+ sendCampaignTestCampaignIdComponentState.atomFamily({+ instanceId: pageId,+ }),+ campaignId,+ );++ navigateSidePanelMenu({+ page: SidePanelPages.SendCampaignTest,+ pageTitle: t`Send Test Email`,+ pageIcon: IconMail,+ pageId,+ });+ },+ [navigateSidePanelMenu, store],+ );return { openSendCampaignTestInSidePanel };};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailAlignmentInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailAlignmentInput.tsxindex 8358baa4bbb..07b280d8942 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailAlignmentInput.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailAlignmentInput.tsx@@ -1,44 +1,9 @@-import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';import { IconAlignCenter, IconAlignLeft, IconAlignRight } from 'twenty-ui/icon';-import { themeCssVariables } from 'twenty-ui/theme';+import { SegmentedControl } from 'twenty-ui/components/input';+import { Field } from 'twenty-ui/primitives/input';-import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';--const StyledAlignRow = styled.div`- display: flex;- gap: ${themeCssVariables.spacing[1]};-`;--const StyledAlignButton = styled.button<{ isActive: boolean }>`- align-items: center;- background: ${({ isActive }) =>- isActive ? themeCssVariables.background.transparent.medium : 'none'};- border: 1px solid- ${({ isActive }) =>- isActive ? themeCssVariables.border.color.strong : 'transparent'};- border-radius: ${themeCssVariables.border.radius.sm};- box-sizing: border-box;- color: ${({ isActive }) =>- isActive- ? themeCssVariables.font.color.primary- : themeCssVariables.font.color.tertiary};- cursor: pointer;- display: flex;- height: 28px;- justify-content: center;- padding: 0;- width: 32px;-- &:hover {- background: ${themeCssVariables.background.transparent.light};- }-`;--const CAMPAIGN_ALIGN_OPTIONS = [- { align: 'left', Icon: IconAlignLeft },- { align: 'center', Icon: IconAlignCenter },- { align: 'right', Icon: IconAlignRight },-] as const;+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';type EmailAlignmentInputProps = {label: string;@@ -50,23 +15,34 @@ export const EmailAlignmentInput = ({label,value,onChange,-}: EmailAlignmentInputProps) => (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>- <StyledAlignRow>- {CAMPAIGN_ALIGN_OPTIONS.map(({ align, Icon }) => (- <StyledAlignButton- key={align}- type="button"- aria-label={align}- aria-pressed={value === align}- title={align}- isActive={value === align}- onClick={() => onChange(align)}- >- <Icon size={16} />- </StyledAlignButton>- ))}- </StyledAlignRow>- </div>-);+}: EmailAlignmentInputProps) => {+ const { t } = useLingui();++ return (+ <FormFieldInputContainer>+ <Field.Label>{label}</Field.Label>+ <SegmentedControl+ aria-label={label}+ value={value}+ onValueChange={onChange}+ options={[+ {+ value: 'left',+ startIcon: <IconAlignLeft />,+ 'aria-label': t`Align left`,+ },+ {+ value: 'center',+ startIcon: <IconAlignCenter />,+ 'aria-label': t`Align center`,+ },+ {+ value: 'right',+ startIcon: <IconAlignRight />,+ 'aria-label': t`Align right`,+ },+ ]}+ />+ </FormFieldInputContainer>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsxindex 92250fbf2c6..8aa24b3fbe0 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockInsertList.tsx@@ -1,19 +1,13 @@+import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { isNonEmptyArray } from '@sniptt/guards';import { type Editor, type JSONContent } from '@tiptap/core';import { useRef } from 'react';import { EMAIL_IMAGE_MIME_TYPES } from 'twenty-shared/constants';-import { SidePanelPages } from 'twenty-shared/types';import { isDefined, TIPTAP_NODE_TYPES } from 'twenty-shared/utils';import { MenuItem } from 'twenty-ui/components/navigation';-import {- type IconComponent,- IconPaint,- IconPhoto,- IconVariable,-} from 'twenty-ui/icon';+import { type IconComponent, IconPhoto, IconVariable } from 'twenty-ui/icon';import { themeCssVariables } from 'twenty-ui/theme';-import { v4 } from 'uuid';import { useCampaignEmailEditorVariables } from '@/activities/emails/hooks/useCampaignEmailEditorVariables';import { useUploadEmailImage } from '@/activities/emails/hooks/useUploadEmailImage';@@ -21,10 +15,18 @@ import { ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES } from '@/advanced-text-edimport { ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS } from '@/advanced-text-editor/constants/AdvancedTextEditorTextInsertionItems';import { type AdvancedTextEditorBlockInsertionItem } from '@/advanced-text-editor/types/AdvancedTextEditorBlockCatalog';import { AdvancedTextEditorDraggableContent } from '@/advanced-text-editor/components/AdvancedTextEditorDraggableContent';+import { getPositionAfterCurrentBlock } from '@/advanced-text-editor/utils/getPositionAfterCurrentBlock';import { insertUploadingImage } from '@/advanced-text-editor/utils/insertUploadingImage';+import { CommandMenuItemSectionGroup } from '@/command-menu-item/display/components/CommandMenuItemSectionGroup';import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';-import { SidePanelStepListContainer } from '@/workflow/workflow-steps/components/SidePanelWorkflowSelectStepContainer';-import { SidePanelWorkflowSelectStepTitle } from '@/workflow/workflow-steps/components/SidePanelWorkflowSelectStepTitle';++const StyledList = styled.div`+ display: flex;+ flex-direction: column;+ height: 100%;+ overflow-y: auto;+ padding: ${themeCssVariables.spacing[2]};+`;const LAYOUT_NODE_TYPES: string[] = [TIPTAP_NODE_TYPES.SECTION,@@ -49,25 +51,25 @@ export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {const imageFileInputRef = useRef<HTMLInputElement>(null);const { variables } = useCampaignEmailEditorVariables();const { uploadEmailImage } = useUploadEmailImage();- const { navigateSidePanelMenu } = useSidePanelMenu();+ const { closeSidePanelMenu } = useSidePanelMenu();- const insertContent = (content: JSONContent) =>- editor.chain().focus().insertContent(content).scrollIntoView().run();+ const insertContent = (content: JSONContent) => {+ editor+ .chain()+ .focus()+ .insertContentAt(getPositionAfterCurrentBlock(editor.state), content)+ .scrollIntoView()+ .run();+ closeSidePanelMenu();+ };const handleImageFilePicked = (file: File | undefined) => {if (isDefined(file)) {insertUploadingImage({ editor, file, onImageUpload: uploadEmailImage });+ closeSidePanelMenu();}};- const handleOpenPageStyle = () =>- navigateSidePanelMenu({- page: SidePanelPages.EmailPageStyle,- pageTitle: t`Page style`,- pageIcon: IconPaint,- pageId: v4(),- });-const renderDraggableItem = ({id,Icon,@@ -109,7 +111,7 @@ export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {);return (- <SidePanelStepListContainer>+ <StyledList><inputref={imageFileInputRef}type="file"@@ -120,47 +122,38 @@ export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {event.target.value = '';}}/>- <SidePanelWorkflowSelectStepTitle>- {t`Text`}- </SidePanelWorkflowSelectStepTitle>- {renderInsertionItems(- ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS,- themeCssVariables.color.gray9,- )}-- <SidePanelWorkflowSelectStepTitle>- {t`Layout`}- </SidePanelWorkflowSelectStepTitle>- {renderInsertionItems(- ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES.filter(({ nodeType }) =>- LAYOUT_NODE_TYPES.includes(nodeType),- ),- themeCssVariables.color.green9,- )}-- <SidePanelWorkflowSelectStepTitle>- {t`Content`}- </SidePanelWorkflowSelectStepTitle>- <MenuItem- withIconContainer- LeftIcon={() => (- <IconPhoto color={themeCssVariables.color.orange9} size={16} />+ <CommandMenuItemSectionGroup heading={t`Text`}>+ {renderInsertionItems(+ ADVANCED_TEXT_EDITOR_TEXT_INSERTION_ITEMS,+ themeCssVariables.color.gray9,)}- text={t`Image`}- onClick={() => imageFileInputRef.current?.click()}- />- {renderInsertionItems(- ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES.filter(- ({ nodeType }) => !LAYOUT_NODE_TYPES.includes(nodeType),- ),- themeCssVariables.color.orange9,- )}-+ </CommandMenuItemSectionGroup>+ <CommandMenuItemSectionGroup heading={t`Layout`}>+ {renderInsertionItems(+ ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES.filter(({ nodeType }) =>+ LAYOUT_NODE_TYPES.includes(nodeType),+ ),+ themeCssVariables.color.green9,+ )}+ </CommandMenuItemSectionGroup>+ <CommandMenuItemSectionGroup heading={t`Content`}>+ <MenuItem+ withIconContainer+ LeftIcon={() => (+ <IconPhoto color={themeCssVariables.color.orange9} size={16} />+ )}+ text={t`Image`}+ onClick={() => imageFileInputRef.current?.click()}+ />+ {renderInsertionItems(+ ADVANCED_TEXT_EDITOR_BLOCK_INSERTION_RECIPES.filter(+ ({ nodeType }) => !LAYOUT_NODE_TYPES.includes(nodeType),+ ),+ themeCssVariables.color.orange9,+ )}+ </CommandMenuItemSectionGroup>{isNonEmptyArray(variables) && (- <>- <SidePanelWorkflowSelectStepTitle>- {t`Variables`}- </SidePanelWorkflowSelectStepTitle>+ <CommandMenuItemSectionGroup heading={t`Variables`}>{variables.map(({ label, value }) =>renderDraggableItem({id: value,@@ -173,21 +166,8 @@ export const EmailBlockInsertList = ({ editor }: EmailBlockInsertListProps) => {},}),)}- </>+ </CommandMenuItemSectionGroup>)}-- <SidePanelWorkflowSelectStepTitle>- {t`Page`}- </SidePanelWorkflowSelectStepTitle>- <MenuItem- withIconContainer- LeftIcon={() => (- <IconPaint color={themeCssVariables.color.purple9} size={16} />- )}- text={t`Page style`}- hasSubMenu- onClick={handleOpenPageStyle}- />- </SidePanelStepListContainer>+ </StyledList>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockSettingsFieldInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockSettingsFieldInput.tsxindex c2bf0634a1e..35b657b8787 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockSettingsFieldInput.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBlockSettingsFieldInput.tsx@@ -4,7 +4,6 @@ import { type AdvancedTextEditorBlockSetting } from '@/advanced-text-editor/typeimport { EmailAlignmentInput } from '@/side-panel/pages/email-block-settings/components/EmailAlignmentInput';import { EmailColorInput } from '@/side-panel/pages/email-block-settings/components/EmailColorInput';import { EmailSizeInput } from '@/side-panel/pages/email-block-settings/components/EmailSizeInput';-import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';import { TextArea } from '@/ui/input/components/TextArea';import { TextInput } from '@/ui/input/components/TextInput';@@ -50,29 +49,25 @@ export const EmailBlockSettingsFieldInput = ({);case 'textarea':return (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>- <TextArea- textAreaId={`email-block-settings-${label}`}- value={value}- onChange={onChange}- placeholder={field.placeholder ?? ''}- minRows={6}- maxRows={16}- />- </div>+ <TextArea+ textAreaId={`email-block-settings-${label}`}+ label={label}+ value={value}+ onChange={onChange}+ placeholder={field.placeholder ?? ''}+ minRows={6}+ maxRows={16}+ />);default:return (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>- <TextInput- value={value}- onChange={onChange}- placeholder={field.placeholder ?? ''}- fullWidth- />- </div>+ <TextInput+ label={label}+ value={value}+ onChange={onChange}+ placeholder={field.placeholder ?? ''}+ fullWidth+ />);}};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsxindex 95e66a3fe7c..1111372e457 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailBoxSidesInput.tsx@@ -1,17 +1,18 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';-import { LightIconButton } from 'twenty-ui/components/input';import { IconFrame, IconSquare } from 'twenty-ui/icon';+import { SegmentedControl } from 'twenty-ui/components/input';+import { Field } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';import { TextInput } from '@/ui/input/components/TextInput';const StyledRow = styled.div`align-items: center;display: flex;- gap: ${themeCssVariables.spacing[1]};+ gap: ${themeCssVariables.spacing[2]};`;const StyledSidesGrid = styled.div`@@ -19,20 +20,6 @@ const StyledSidesGrid = styled.div`flex: 1;gap: ${themeCssVariables.spacing[1]};grid-template-columns: repeat(4, 1fr);- margin-top: ${themeCssVariables.spacing[1]};-`;--const StyledUnitChip = styled.div`- align-items: center;- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.sm};- box-sizing: border-box;- color: ${themeCssVariables.font.color.tertiary};- display: flex;- flex-shrink: 0;- font-size: ${themeCssVariables.font.size.sm};- height: 32px;- padding: 0 ${themeCssVariables.spacing[2]};`;const SIDE_KEYS = ['top', 'right', 'bottom', 'left'] as const;@@ -98,9 +85,19 @@ export const EmailBoxSidesInput = ({});};+ const handleSidesModeChange = (sidesMode: string) => {+ if (sidesMode === 'each') {+ setIsPerSide(true);+ return;+ }++ setIsPerSide(false);+ commitAllSides(toDisplayAmount(sides.top));+ };+return (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>+ <FormFieldInputContainer>+ <Field.Label>{label}</Field.Label><StyledRow>{isPerSide ? (<StyledSidesGrid>@@ -119,34 +116,29 @@ export const EmailBoxSidesInput = ({value={toDisplayAmount(sides.top)}onChange={commitAllSides}placeholder={placeholder ?? '0'}+ rightAdornment="px"fullWidth/>)}- <StyledUnitChip>px</StyledUnitChip>- <LightIconButton- size="sm"- emphasis={isPerSide ? 'subtle' : 'standard'}- title={t`Same value on every side`}- aria-pressed={!isPerSide}- onClick={() => {- setIsPerSide(false);- commitAllSides(toDisplayAmount(sides.top));- }}- aria-label={t`Same value on every side`}- >- <IconSquare />- </LightIconButton>- <LightIconButton- size="sm"- emphasis={isPerSide ? 'standard' : 'subtle'}- title={t`Edit each side`}- aria-pressed={isPerSide}- onClick={() => setIsPerSide(true)}- aria-label={t`Edit each side`}- >- <IconFrame />- </LightIconButton>+ <SegmentedControl+ aria-label={label}+ itemWidth="content"+ value={isPerSide ? 'each' : 'all'}+ onValueChange={handleSidesModeChange}+ options={[+ {+ value: 'all',+ startIcon: <IconSquare />,+ 'aria-label': t`Same value on every side`,+ },+ {+ value: 'each',+ startIcon: <IconFrame />,+ 'aria-label': t`Edit each side`,+ },+ ]}+ /></StyledRow>- </div>+ </FormFieldInputContainer>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailColorInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailColorInput.tsxindex f0bdf7add16..ade1074c3cd 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailColorInput.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailColorInput.tsx@@ -1,7 +1,12 @@import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { useRef } from 'react';+import { LightIconButton } from 'twenty-ui/components/input';+import { ColorSample } from 'twenty-ui/primitives/data-display';+import { Field } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';-import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';import { TextInput } from '@/ui/input/components/TextInput';const StyledRow = styled.div`@@ -10,25 +15,22 @@ const StyledRow = styled.div`gap: ${themeCssVariables.spacing[2]};`;-const StyledColorSwatchInput = styled.input`- background: none;- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.sm};- box-sizing: border-box;- cursor: pointer;+const StyledColorTrigger = styled.div`+ display: flex;flex-shrink: 0;- height: 32px;- padding: 2px;- width: 32px;-- &::-webkit-color-swatch-wrapper {- padding: 0;- }+ position: relative;+`;- &::-webkit-color-swatch {- border: none;- border-radius: ${themeCssVariables.border.radius.xs};- }+const StyledNativeColorInput = styled.input`+ border: 0;+ height: 100%;+ left: 0;+ opacity: 0;+ padding: 0;+ pointer-events: none;+ position: absolute;+ top: 0;+ width: 100%;`;const HEX_COLOR_PATTERN = /^#[0-9a-fA-F]{6}$/;@@ -49,15 +51,38 @@ export const EmailColorInput = ({onChange,placeholder,}: EmailColorInputProps) => {+ const { t } = useLingui();+ const nativeColorInputRef = useRef<HTMLInputElement>(null);++ const swatchColor = HEX_COLOR_PATTERN.test(value)+ ? value+ : COLOR_SWATCH_FALLBACK;+return (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>+ <FormFieldInputContainer>+ <Field.Label>{label}</Field.Label><StyledRow>- <StyledColorSwatchInput- type="color"- value={HEX_COLOR_PATTERN.test(value) ? value : COLOR_SWATCH_FALLBACK}- onChange={(event) => onChange(event.target.value)}- />+ <StyledColorTrigger>+ <LightIconButton+ size="md"+ aria-label={t`Pick a color`}+ onClick={() => nativeColorInputRef.current?.click()}+ >+ <ColorSample+ colorName="gray"+ color={swatchColor}+ variant="circle"+ />+ </LightIconButton>+ <StyledNativeColorInput+ ref={nativeColorInputRef}+ type="color"+ tabIndex={-1}+ aria-hidden="true"+ value={swatchColor}+ onChange={(event) => onChange(event.target.value)}+ />+ </StyledColorTrigger><TextInputvalue={value}onChange={onChange}@@ -65,6 +90,6 @@ export const EmailColorInput = ({fullWidth/></StyledRow>- </div>+ </FormFieldInputContainer>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailPageStyleSection.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailPageStyleSection.tsxindex fc51cdf6887..fe285a481f7 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailPageStyleSection.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailPageStyleSection.tsx@@ -9,6 +9,8 @@ import {import { themeCssVariables } from 'twenty-ui/theme';import { useLiveEditorState } from '@/advanced-text-editor/hooks/useLiveEditorState';+import { CommandMenuItemSectionGroup } from '@/command-menu-item/display/components/CommandMenuItemSectionGroup';+import { SidePanelGroupFormContainer } from '@/side-panel/components/SidePanelGroupFormContainer';import { EmailBlockSettingsFieldInput } from '@/side-panel/pages/email-block-settings/components/EmailBlockSettingsFieldInput';import {EmailBoxSidesInput,@@ -16,64 +18,29 @@ import {} from '@/side-panel/pages/email-block-settings/components/EmailBoxSidesInput';import { EMAIL_BODY_THEME_FIELDS } from '@/side-panel/pages/email-block-settings/constants/EmailBodyThemeFields';import { EMAIL_PAGE_THEME_FIELDS } from '@/side-panel/pages/email-block-settings/constants/EmailPageThemeFields';+import { themeBoxValueToSides } from '@/side-panel/pages/email-block-settings/utils/themeBoxValueToSides';import { type EmailThemeField } from '@/side-panel/pages/email-block-settings/types/EmailThemeField';const StyledContainer = styled.div`display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[3]};- padding: ${themeCssVariables.spacing[4]};+ padding: ${themeCssVariables.spacing[2]};`;-const StyledGroupTitle = styled.div`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.medium};-- &:not(:first-child) {- margin-top: ${themeCssVariables.spacing[3]};- }+const StyledFields = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+ padding-top: ${themeCssVariables.spacing[2]};`;const StyledHint = styled.div`color: ${themeCssVariables.font.color.tertiary};font-size: ${themeCssVariables.font.size.sm};- padding: ${themeCssVariables.spacing[4]};+ padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;-const themeBoxValueToSides = (value: string): CssBoxSides => {- const tokens = value.trim().split(/\s+/);-- if (tokens.length === 4) {- return {- top: tokens[0],- right: tokens[1],- bottom: tokens[2],- left: tokens[3],- };- }-- if (tokens.length === 3) {- return {- top: tokens[0],- right: tokens[1],- bottom: tokens[2],- left: tokens[1],- };- }-- if (tokens.length === 2) {- return {- top: tokens[0],- right: tokens[1],- bottom: tokens[0],- left: tokens[1],- };- }-- return { top: value, right: value, bottom: value, left: value };-};-const sidesToThemeBoxValue = ({ top, right, bottom, left }: CssBoxSides) =>top === right && right === bottom && bottom === left? top@@ -140,11 +107,20 @@ export const EmailPageStyleSection = ({return (<StyledContainer>- <StyledGroupTitle>{t`Page style`}</StyledGroupTitle>- {EMAIL_PAGE_THEME_FIELDS.map(renderThemeField)}-- <StyledGroupTitle>{t`Body`}</StyledGroupTitle>- {EMAIL_BODY_THEME_FIELDS.map(renderThemeField)}+ <CommandMenuItemSectionGroup heading={t`Page`}>+ <SidePanelGroupFormContainer>+ <StyledFields>+ {EMAIL_PAGE_THEME_FIELDS.map(renderThemeField)}+ </StyledFields>+ </SidePanelGroupFormContainer>+ </CommandMenuItemSectionGroup>+ <CommandMenuItemSectionGroup heading={t`Body`}>+ <SidePanelGroupFormContainer>+ <StyledFields>+ {EMAIL_BODY_THEME_FIELDS.map(renderThemeField)}+ </StyledFields>+ </SidePanelGroupFormContainer>+ </CommandMenuItemSectionGroup></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailSizeInput.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailSizeInput.tsxindex 7788e25f6d3..cb854e04b93 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailSizeInput.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/EmailSizeInput.tsx@@ -1,8 +1,11 @@import { styled } from '@linaria/react';+import { useId } from 'react';+import { Field, type SelectOption } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';import { parseCssSizeValue } from '@/advanced-text-editor/utils/parseCssSizeValue';-import { StyledEmailFieldLabel } from '@/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel';+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';+import { Select } from '@/ui/input/components/Select';import { TextInput } from '@/ui/input/components/TextInput';const StyledRow = styled.div`@@ -11,19 +14,9 @@ const StyledRow = styled.div`gap: ${themeCssVariables.spacing[2]};`;-const StyledUnitSelect = styled.select`- background: ${themeCssVariables.background.transparent.lighter};- border: 1px solid ${themeCssVariables.border.color.medium};- border-radius: ${themeCssVariables.border.radius.sm};- color: ${themeCssVariables.font.color.secondary};- cursor: pointer;- font-family: inherit;- font-size: ${themeCssVariables.font.size.sm};- height: 32px;- padding: 0 ${themeCssVariables.spacing[1]};-`;--const SIZE_UNITS = ['px', '%', 'em'] as const;+const SIZE_UNIT_OPTIONS: SelectOption<string>[] = ['px', '%', 'em'].map(+ (sizeUnit) => ({ label: sizeUnit, value: sizeUnit }),+);type EmailSizeInputProps = {label: string;@@ -38,6 +31,7 @@ export const EmailSizeInput = ({onChange,placeholder,}: EmailSizeInputProps) => {+ const instanceId = useId();const { amount, unit } = parseCssSizeValue(value);const displayedAmount = amount === '' ? value.trim() : amount;@@ -58,8 +52,8 @@ export const EmailSizeInput = ({};return (- <div>- <StyledEmailFieldLabel>{label}</StyledEmailFieldLabel>+ <FormFieldInputContainer>+ <Field.Label>{label}</Field.Label><StyledRow><TextInputvalue={displayedAmount}@@ -67,17 +61,14 @@ export const EmailSizeInput = ({placeholder={placeholder ?? '0'}fullWidth/>- <StyledUnitSelect+ <Select+ dropdownId={`email-size-unit-${instanceId}`}value={unit}- onChange={(event) => commit(displayedAmount, event.target.value)}- >- {SIZE_UNITS.map((sizeUnit) => (- <option key={sizeUnit} value={sizeUnit}>- {sizeUnit}- </option>- ))}- </StyledUnitSelect>+ options={SIZE_UNIT_OPTIONS}+ onChange={(nextUnit) => commit(displayedAmount, nextUnit)}+ dropdownWidthAuto+ /></StyledRow>- </div>+ </FormFieldInputContainer>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsxindex 105fa25c095..9fcdfeb534b 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/SidePanelEmailBlockSettingsPage.tsx@@ -6,8 +6,8 @@ import {isDefined,resolveCanvasTheme,} from 'twenty-shared/utils';-import { LightIconButton } from 'twenty-ui/components/input';import { IconTrash } from 'twenty-ui/icon';+import { Button } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';import { activeEmailEditorState } from '@/activities/emails/states/activeEmailEditorState';@@ -23,26 +23,24 @@ import {} from '@/side-panel/pages/email-block-settings/components/EmailBoxSidesInput';import { StyledEmailSidePanelHint } from '@/side-panel/pages/email-block-settings/components/StyledEmailSidePanelHint';import { getEffectiveSectionStyleValue } from '@/side-panel/pages/email-block-settings/utils/getEffectiveSectionStyleValue';+import { SidePanelPageTitleSyncEffect } from '@/side-panel/components/SidePanelPageTitleSyncEffect';import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';+import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';const StyledContainer = styled.div`display: flex;flex-direction: column;- gap: ${themeCssVariables.spacing[4]};- padding: ${themeCssVariables.spacing[4]};+ height: 100%;`;-const StyledBlockHeader = styled.div`- align-items: center;+const StyledContent = styled.div`display: flex;- justify-content: space-between;-`;--const StyledBlockTitle = styled.div`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.md};- font-weight: ${themeCssVariables.font.weight.medium};+ flex: 1;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[4]};+ overflow-y: auto;+ padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;const BORDER_STYLE_COMPANIONS: Record<string, string> = {@@ -86,9 +84,10 @@ const EmailBlockSettingsContent = ({ editor }: { editor: Editor }) => {switch (target.nodeType) {case TIPTAP_NODE_TYPES.SECTION:case TIPTAP_NODE_TYPES.PARAGRAPH:+ case TIPTAP_NODE_TYPES.BLOCKQUOTE:return true;case TIPTAP_NODE_TYPES.HEADING:- return property !== 'fontSize';+ return property !== 'fontSize' && property !== 'lineHeight';default:return false;}@@ -188,58 +187,64 @@ const EmailBlockSettingsContent = ({ editor }: { editor: Editor }) => {updateTargetAttributes({ style: nextStyles });};+ const blockLabel = i18n._(blockDefinition.label);+return (<StyledContainer>- <StyledBlockHeader>- <StyledBlockTitle>{i18n._(blockDefinition.label)}</StyledBlockTitle>- <LightIconButton- size="sm"- emphasis="subtle"- title={t`Remove block`}- onClick={handleRemoveBlock}- aria-label={t`Remove block`}- >- <IconTrash />- </LightIconButton>- </StyledBlockHeader>- {fields.map((field) => {- const key = `${target.nodeType}-${target.pos}-${field.property}`;- const sideProperties = BOX_FIELD_SIDE_PROPERTIES[field.property];+ <SidePanelPageTitleSyncEffect pageTitle={t`${blockLabel} style`} />+ <StyledContent>+ {fields.map((field) => {+ const key = `${target.nodeType}-${target.pos}-${field.property}`;+ const sideProperties = BOX_FIELD_SIDE_PROPERTIES[field.property];++ if (+ field.kind === 'style' &&+ field.input === 'box' &&+ isDefined(sideProperties)+ ) {+ return (+ <EmailBoxSidesInput+ key={key}+ label={i18n._(field.label)}+ sides={{+ top: displayedStyleValue(sideProperties[0]),+ right: displayedStyleValue(sideProperties[1]),+ bottom: displayedStyleValue(sideProperties[2]),+ left: displayedStyleValue(sideProperties[3]),+ }}+ onChange={(sides) =>+ handleBoxFieldChange(sideProperties, sides)+ }+ placeholder={field.placeholder}+ />+ );+ }- if (- field.kind === 'style' &&- field.input === 'box' &&- isDefined(sideProperties)- ) {return (- <EmailBoxSidesInput+ <EmailBlockSettingsFieldInputkey={key}- label={i18n._(field.label)}- sides={{- top: displayedStyleValue(sideProperties[0]),- right: displayedStyleValue(sideProperties[1]),- bottom: displayedStyleValue(sideProperties[2]),- left: displayedStyleValue(sideProperties[3]),- }}- onChange={(sides) => handleBoxFieldChange(sideProperties, sides)}- placeholder={field.placeholder}+ field={field}+ value={+ field.kind === 'attribute'+ ? String(target.attrs[field.property] ?? '')+ : displayedStyleValue(field.property)+ }+ onChange={(value) => handleFieldChange(field, value)}/>);- }-- return (- <EmailBlockSettingsFieldInput- key={key}- field={field}- value={- field.kind === 'attribute'- ? String(target.attrs[field.property] ?? '')- : displayedStyleValue(field.property)- }- onChange={(value) => handleFieldChange(field, value)}- />- );- })}+ })}+ </StyledContent>+ <SidePanelFooter+ actions={[+ <Button+ key="delete"+ size="sm"+ onClick={handleRemoveBlock}+ startIcon={<IconTrash />}+ color="danger"+ >{t`Delete`}</Button>,+ ]}+ /></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel.tsxdeleted file mode 100644index 1532b03dad9..00000000000--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailFieldLabel.tsx+++ /dev/null@@ -1,9 +0,0 @@-import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme';--export const StyledEmailFieldLabel = styled.div`- color: ${themeCssVariables.font.color.light};- font-size: ${themeCssVariables.font.size.xs};- font-weight: ${themeCssVariables.font.weight.semiBold};- margin-bottom: ${themeCssVariables.spacing[1]};-`;diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailSidePanelHint.tsx b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailSidePanelHint.tsxindex 04167e40d41..49091a4c889 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailSidePanelHint.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/components/StyledEmailSidePanelHint.tsx@@ -4,5 +4,5 @@ import { themeCssVariables } from 'twenty-ui/theme';export const StyledEmailSidePanelHint = styled.div`color: ${themeCssVariables.font.color.tertiary};font-size: ${themeCssVariables.font.size.sm};- padding: ${themeCssVariables.spacing[4]};+ padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/constants/EmailBodyThemeFields.ts b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/constants/EmailBodyThemeFields.tsindex b48be7beb8d..cd5e07611d4 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/constants/EmailBodyThemeFields.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/constants/EmailBodyThemeFields.ts@@ -6,6 +6,7 @@ export const EMAIL_BODY_THEME_FIELDS: EmailThemeField[] = [{ label: msg`Alignment`, property: 'textAlign', input: 'alignment' },{ label: msg`Text`, property: 'textColor', input: 'color' },{ label: msg`Background`, property: 'bodyBackground', input: 'color' },+ { label: msg`Border color`, property: 'borderColor', input: 'color' },{ label: msg`Width`, property: 'width', input: 'size', placeholder: '600' },{ label: msg`Padding`, property: 'padding', input: 'box', placeholder: '24' },{@@ -20,5 +21,4 @@ export const EMAIL_BODY_THEME_FIELDS: EmailThemeField[] = [input: 'size',placeholder: '0',},- { label: msg`Border color`, property: 'borderColor', input: 'color' },];diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/getEffectiveSectionStyleValue.ts b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/getEffectiveSectionStyleValue.tsindex e9504cecb0a..c67e63d2513 100644--- a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/getEffectiveSectionStyleValue.ts+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/getEffectiveSectionStyleValue.ts@@ -1,4 +1,4 @@-import { type CanvasTheme } from 'twenty-shared/utils';+import { type CanvasTheme, EMAIL_TYPOGRAPHY } from 'twenty-shared/utils';export const getEffectiveSectionStyleValue = (property: string,@@ -12,9 +12,9 @@ export const getEffectiveSectionStyleValue = (case 'backgroundColor':return canvasTheme?.bodyBackground ?? '';case 'fontSize':- return '14px';+ return EMAIL_TYPOGRAPHY.fontSize;case 'lineHeight':- return '1.5';+ return EMAIL_TYPOGRAPHY.lineHeight;case 'borderColor':return canvasTheme?.borderColor ?? '';default:diff --git a/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/themeBoxValueToSides.ts b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/themeBoxValueToSides.tsnew file mode 100644index 00000000000..95487007d1a--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/email-block-settings/utils/themeBoxValueToSides.ts@@ -0,0 +1,34 @@+import { type CssBoxSides } from '@/side-panel/pages/email-block-settings/components/EmailBoxSidesInput';++export const themeBoxValueToSides = (value: string): CssBoxSides => {+ const tokens = value.trim().split(/\s+/);++ if (tokens.length === 4) {+ return {+ top: tokens[0],+ right: tokens[1],+ bottom: tokens[2],+ left: tokens[3],+ };+ }++ if (tokens.length === 3) {+ return {+ top: tokens[0],+ right: tokens[1],+ bottom: tokens[2],+ left: tokens[1],+ };+ }++ if (tokens.length === 2) {+ return {+ top: tokens[0],+ right: tokens[1],+ bottom: tokens[0],+ left: tokens[1],+ };+ }++ return { top: value, right: value, bottom: value, left: value };+};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.tsxindex 60f94d90412..7f224cb4795 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@@ -10,12 +10,14 @@ import { Button } from 'twenty-ui/primitives/input';import { useSendMessageCampaignTest } from '@/activities/emails/hooks/useSendMessageCampaignTest';import { isValidEmailRecipientAddress } from '@/activities/emails/recipients/utils/isValidEmailRecipientAddress';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';+import { currentUserState } from '@/auth/states/currentUserState';import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';import { sendCampaignTestCampaignIdComponentState } from '@/side-panel/pages/send-campaign-test/states/sendCampaignTestCampaignIdComponentState';import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { themeCssVariables } from 'twenty-ui/theme';const StyledContainer = styled.div`@@ -30,7 +32,7 @@ const StyledContent = styled.div`flex-direction: column;gap: ${themeCssVariables.spacing[4]};overflow-y: auto;- padding: ${themeCssVariables.spacing[4]};+ padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;export const SidePanelSendCampaignTestPage = () => {@@ -41,7 +43,9 @@ export const SidePanelSendCampaignTestPage = () => {const { goBackFromSidePanel } = useSidePanelHistory();const { sendMessageCampaignTest, loading } = useSendMessageCampaignTest();- const [toAddress, setToAddress] = useState('');+ const currentUser = useAtomStateValue(currentUserState);++ const [toAddress, setToAddress] = useState(currentUser?.email ?? '');const { record: campaign } = useFindOneRecord<MessageCampaign>({objectNameSingular: CoreObjectNameSingular.MessageCampaign,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.tsxindex 1335cd91794..170ec245846 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@@ -1,36 +1,37 @@import { styled } from '@linaria/react';-import { plural, t } from '@lingui/core/macro';+import { t } from '@lingui/core/macro';import { isNonEmptyString } from '@sniptt/guards';import { useState } from 'react';+import { Key } from 'ts-key-enum';import {CoreObjectNameSingular,MessageCampaignStatus,} from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';+import { SegmentedControl } from 'twenty-ui/components/input';import { IconClock, IconSend } from 'twenty-ui/icon';-import { Button, type SelectOption } from 'twenty-ui/primitives/input';-import { Text } from 'twenty-ui/primitives/typography';+import { Button, Field } from 'twenty-ui/primitives/input';import { themeCssVariables } from 'twenty-ui/theme';import { useCampaignAudiencePreview } from '@/activities/emails/hooks/useCampaignAudiencePreview';import { useSendMessageCampaign } from '@/activities/emails/hooks/useSendMessageCampaign';+import { useUnsubscribeTopics } from '@/activities/emails/hooks/useUnsubscribeTopics';+import { type CampaignDeliveryTiming } from '@/activities/emails/types/CampaignDeliveryTiming';import { type MessageCampaign } from '@/activities/emails/types/MessageCampaign';+import { buildCampaignDeliveryHint } from '@/activities/emails/utils/buildCampaignDeliveryHint';+import { buildCampaignSendButtonTitle } from '@/activities/emails/utils/buildCampaignSendButtonTitle';import { buildDefaultCampaignScheduledAt } from '@/activities/emails/utils/buildDefaultCampaignScheduledAt';-import { buildExcludedRecipientReasons } from '@/activities/emails/utils/buildExcludedRecipientReasons';-import { formatCampaignSendTime } from '@/activities/emails/utils/formatCampaignSendTime';-import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';import { useNumberFormat } from '@/localization/hooks/useNumberFormat';-import { RecordChip } from '@/object-record/components/RecordChip';import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';import { FormDateTimeFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput';-import { useSidePanelHistory } from '@/side-panel/hooks/useSidePanelHistory';-import { type CampaignDeliveryTiming } from '@/side-panel/pages/send-campaign/types/CampaignDeliveryTiming';-import { buildCampaignDeliveryHint } from '@/side-panel/pages/send-campaign/utils/buildCampaignDeliveryHint';-import { buildCampaignSendButtonTitle } from '@/side-panel/pages/send-campaign/utils/buildCampaignSendButtonTitle';-import { Select } from '@/ui/input/components/Select';+import { SidePanelInformationBanner } from '@/side-panel/components/SidePanelInformationBanner/SidePanelInformationBanner';+import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';+import { SendCampaignRecipientsCard } from '@/side-panel/pages/send-campaign/components/SendCampaignRecipientsCard';+import { FormFieldInputContainer } from '@/ui/input/components/FormFieldInputContainer';import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { dateLocaleState } from '@/localization/states/dateLocaleState';+import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';+import { formatDisplayList } from '~/utils/format/formatDisplayList';const StyledContainer = styled.div`display: flex;@@ -42,51 +43,9 @@ const StyledContent = styled.div`display: flex;flex: 1;flex-direction: column;- gap: ${themeCssVariables.spacing[5]};+ gap: ${themeCssVariables.spacing[4]};overflow-y: auto;- padding: ${themeCssVariables.spacing[4]};-`;--const StyledSection = styled.div`- align-items: flex-start;- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[1]};-`;--const StyledRecipientCount = styled.span`- color: ${themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.xl};- font-weight: ${themeCssVariables.font.weight.semiBold};-`;--const StyledValue = styled.span<{ $isEmpty: boolean }>`- color: ${({ $isEmpty }) =>- $isEmpty- ? themeCssVariables.font.color.light- : themeCssVariables.font.color.primary};- font-size: ${themeCssVariables.font.size.md};- max-width: 100%;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;-`;--const StyledHint = styled.span`- color: ${themeCssVariables.font.color.tertiary};- font-size: ${themeCssVariables.font.size.sm};-`;--const StyledErrorHint = styled.span`- color: ${themeCssVariables.font.color.danger};- font-size: ${themeCssVariables.font.size.sm};-`;--const StyledDeliveryFields = styled.div`- display: flex;- flex-direction: column;- gap: ${themeCssVariables.spacing[2]};- width: 100%;+ padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[3]};`;type SendCampaignFormProps = {@@ -96,12 +55,12 @@ type SendCampaignFormProps = {export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {const isAlreadyScheduled =campaign.status === MessageCampaignStatus.SCHEDULED;+ const hasList = isNonEmptyString(campaign.listId);- const { goBackFromSidePanel } = useSidePanelHistory();+ const { closeSidePanelMenu } = useSidePanelMenu();const { formatNumber } = useNumberFormat();- const { dateFormat, timeFormat, timeZone } = useDateTimeFormat();- const { localeCatalog } = useAtomStateValue(dateLocaleState);const { sendMessageCampaign, loading: isSending } = useSendMessageCampaign();+ const { unsubscribeTopics } = useUnsubscribeTopics();const [deliveryTiming, setDeliveryTiming] = useState<CampaignDeliveryTiming>(isAlreadyScheduled ? 'LATER' : 'NOW',@@ -113,7 +72,7 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {const { record: list } = useFindOneRecord({objectNameSingular: CoreObjectNameSingular.MessageList,objectRecordId: campaign.listId ?? '',- skip: !isDefined(campaign.listId),+ skip: !hasList,});const { audiencePreview, hasFailed: hasAudiencePreviewFailed } =@@ -122,52 +81,54 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {unsubscribeTopicId: campaign.unsubscribeTopicId,});- const fromAddress = campaign.fromAddress?.primaryEmail;- const subject = campaign.subject;-- const excludedReasons = isDefined(audiencePreview)- ? buildExcludedRecipientReasons({ counts: audiencePreview, formatNumber })- : [];+ const listName = isNonEmptyString(list?.name) ? list.name : null;+ const topicName =+ unsubscribeTopics.find((topic) => topic.id === campaign.unsubscribeTopicId)+ ?.name ?? null;const isScheduling = deliveryTiming === 'LATER';-const isScheduledInTheFuture =isNonEmptyString(scheduledAt) &&new Date(scheduledAt).getTime() > Date.now();-const hasInvalidSendTime = isScheduling && !isScheduledInTheFuture;- const formattedSendTime = isScheduledInTheFuture- ? formatCampaignSendTime({- value: scheduledAt,- timeZone,- dateFormat,- timeFormat,- localeCatalog,- })- : null;-- const isCampaignReady =- isDefined(list) &&- isNonEmptyString(fromAddress) &&- isNonEmptyString(subject) &&- isNonEmptyString(campaign.bodyTemplate) &&- isDefined(audiencePreview) &&- audiencePreview.sendable > 0;-- const canSend = isCampaignReady && !hasInvalidSendTime;-- const deliveryTimingOptions: SelectOption<CampaignDeliveryTiming>[] = [- { label: t`Send now`, value: 'NOW' },- { label: t`Send later`, value: 'LATER' },- ];-const deliveryHint = buildCampaignDeliveryHint({deliveryTiming,isAlreadyScheduled,- formattedSendTime,+ hasValidSendTime: isScheduledInTheFuture,});+ const missingDetails = [+ hasList ? null : t`a list`,+ isNonEmptyString(campaign.fromAddress?.primaryEmail) ? null : t`a sender`,+ isNonEmptyString(campaign.subject) ? null : t`a subject`,+ isNonEmptyString(campaign.bodyTemplate) ? null : t`some content`,+ ].filter(isNonEmptyString);++ const hasNoReachableRecipient =+ isDefined(audiencePreview) && audiencePreview.sendable === 0;++ const blockingMessage =+ missingDetails.length > 0+ ? t`Add ${formatDisplayList(missingDetails)} before sending.`+ : hasNoReachableRecipient+ ? t`No one on this list can receive this campaign.`+ : null;++ const isAudienceSettled =+ isDefined(audiencePreview) || hasAudiencePreviewFailed;++ const canSend =+ !isDefined(blockingMessage) &&+ isAudienceSettled &&+ !hasInvalidSendTime &&+ !isSending;++ const trackingRefusedHint =+ isDefined(audiencePreview) && audiencePreview.trackingRefused > 0+ ? t`${formatNumber(audiencePreview.trackingRefused)} opted out of email tracking, their clicks are not recorded.`+ : null;+const handleDeliveryTimingChange = (timing: CampaignDeliveryTiming) => {setDeliveryTiming(timing);@@ -177,112 +138,101 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {};const handleSend = async () => {- const sent = await sendMessageCampaign({+ if (!canSend) {+ return;+ }++ const isSent = await sendMessageCampaign({campaignId: campaign.id,scheduledAt: isScheduling ? (scheduledAt ?? undefined) : undefined,wasAlreadyScheduled: isAlreadyScheduled,});- if (sent) {- goBackFromSidePanel();+ if (isSent) {+ closeSidePanelMenu();}};+ useHotkeysOnFocusedElement({+ keys: [`${Key.Control}+${Key.Enter}`, `${Key.Meta}+${Key.Enter}`],+ callback: handleSend,+ focusId: SIDE_PANEL_FOCUS_ID,+ dependencies: [handleSend],+ });+return (<StyledContainer><StyledContent>- <StyledSection>- <StyledDisplayLabel>{t`Recipients`}</StyledDisplayLabel>- {isDefined(audiencePreview) ? (- <>- <StyledRecipientCount>- {plural(audiencePreview.sendable, {- one: `${formatNumber(audiencePreview.sendable)} recipient`,- other: `${formatNumber(audiencePreview.sendable)} recipients`,- })}- </StyledRecipientCount>- {excludedReasons.length > 0 && (- <StyledHint>- {t`${formatNumber(audiencePreview.totalMembers)} in the list, skipping ${excludedReasons.join(', ')}`}- </StyledHint>- )}- {audiencePreview.trackingRefused > 0 && (- <StyledHint>- {t`${formatNumber(audiencePreview.trackingRefused)} opted out of email tracking, their clicks are not recorded`}- </StyledHint>- )}- {isScheduling && (- <StyledHint>- {t`Counted again when the campaign sends, so this can change.`}- </StyledHint>- )}- </>- ) : (- <StyledHint>- {hasAudiencePreviewFailed- ? t`Recipient count unavailable`- : t`Counting recipients...`}- </StyledHint>- )}- </StyledSection>- <StyledSection>- <StyledDisplayLabel>{t`List`}</StyledDisplayLabel>- {isDefined(list) ? (- <RecordChip- record={list}- objectNameSingular={CoreObjectNameSingular.MessageList}- />- ) : (- <StyledValue $isEmpty>{t`No list`}</StyledValue>- )}- </StyledSection>- <StyledSection>- <StyledDisplayLabel>{t`From`}</StyledDisplayLabel>- <StyledValue $isEmpty={!isNonEmptyString(fromAddress)}>- {isNonEmptyString(fromAddress) ? fromAddress : t`No sender`}- </StyledValue>- </StyledSection>- <StyledSection>- <StyledDisplayLabel>{t`Subject`}</StyledDisplayLabel>- <StyledValue $isEmpty={!isNonEmptyString(subject)}>- {isNonEmptyString(subject) ? subject : t`No subject`}- </StyledValue>- </StyledSection>- <StyledSection>- <StyledDisplayLabel>{t`Delivery`}</StyledDisplayLabel>- <StyledDeliveryFields>- <Select- dropdownId="send-campaign-delivery-timing"- fullWidth- value={deliveryTiming}- options={deliveryTimingOptions}- onChange={handleDeliveryTimingChange}- />- {hasInvalidSendTime ? (- <StyledErrorHint>{deliveryHint}</StyledErrorHint>+ {isDefined(blockingMessage) && (+ <SidePanelInformationBanner+ variant="warning"+ message={blockingMessage}+ />+ )}+ {hasList && (+ <FormFieldInputContainer>+ <Field.Label>{t`Recipients`}</Field.Label>+ {isDefined(audiencePreview) ? (+ <SendCampaignRecipientsCard+ audiencePreview={audiencePreview}+ listName={listName}+ topicName={topicName}+ />) : (- <StyledHint>{deliveryHint}</StyledHint>+ <Field.Description>+ {hasAudiencePreviewFailed+ ? t`Recipient count unavailable`+ : t`Counting recipients...`}+ </Field.Description>)}- {isScheduling && (- <FormDateTimeFieldInput- label={t`Send at`}- defaultValue={scheduledAt ?? undefined}- onChange={setScheduledAt}- />+ {isDefined(trackingRefusedHint) && (+ <Field.Description>{trackingRefusedHint}</Field.Description>)}- </StyledDeliveryFields>- </StyledSection>+ </FormFieldInputContainer>+ )}+ <FormFieldInputContainer>+ <Field.Label>{t`Delivery`}</Field.Label>+ <SegmentedControl+ aria-label={t`Delivery`}+ value={deliveryTiming}+ onValueChange={handleDeliveryTimingChange}+ options={[+ { value: 'NOW', label: t`Send now` },+ { value: 'LATER', label: t`Send later` },+ ]}+ />+ {hasInvalidSendTime ? (+ <Field.Error match>{deliveryHint}</Field.Error>+ ) : (+ <Field.Description>{deliveryHint}</Field.Description>+ )}+ </FormFieldInputContainer>+ {isScheduling && (+ <FormDateTimeFieldInput+ label={t`Send at`}+ defaultValue={scheduledAt ?? undefined}+ onChange={setScheduledAt}+ />+ )}</StyledContent><SidePanelFooteractions={[+ <Button+ key="cancel"+ size="sm"+ variant="outline"+ onClick={closeSidePanelMenu}+ >{t`Cancel`}</Button>,<Buttonkey="send"- startIcon={isScheduling ? <IconClock /> : <IconSend />}size="sm"- disabled={!canSend || isSending}- onClick={handleSend}variant="solid"color="accent"+ startIcon={isScheduling ? <IconClock /> : <IconSend />}+ shortcut={['Mod', 'Enter']}+ loading={isSending}+ disabled={!canSend}+ onClick={handleSend}>{buildCampaignSendButtonTitle({deliveryTiming,@@ -294,9 +244,3 @@ export const SendCampaignForm = ({ campaign }: SendCampaignFormProps) => {</StyledContainer>);};--const StyledDisplayLabel = styled(Text)`- color: var(--t-font-color-light);- font-size: 11px;- font-weight: var(--t-font-weight-semi-bold);-`;diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignRecipientsCard.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignRecipientsCard.tsxnew file mode 100644index 00000000000..5e41958267b--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignRecipientsCard.tsx@@ -0,0 +1,104 @@+import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';+import { isNonEmptyString } from '@sniptt/guards';+import {+ IconBellOff,+ IconCopy,+ IconForbid,+ IconMailX,+ IconSend,+ IconUserOff,+ IconUsersGroup,+} from 'twenty-ui/icon';+import { Card } from 'twenty-ui/primitives/surfaces';+import { themeCssVariables } from 'twenty-ui/theme';++import { useNumberFormat } from '@/localization/hooks/useNumberFormat';+import { SettingsListItemCardContent } from '@/settings/components/SettingsListItemCardContent';+import { type CampaignAudiencePreviewDto } from '~/generated-metadata/graphql';++const StyledCount = styled.span`+ color: ${themeCssVariables.font.color.tertiary};+ font-variant-numeric: tabular-nums;+ font-weight: ${themeCssVariables.font.weight.regular};+`;++type SendCampaignRecipientsCardProps = {+ audiencePreview: CampaignAudiencePreviewDto;+ listName: string | null;+ topicName: string | null;+};++export const SendCampaignRecipientsCard = ({+ audiencePreview,+ listName,+ topicName,+}: SendCampaignRecipientsCardProps) => {+ const { formatNumber } = useNumberFormat();++ const exclusions = [+ {+ id: 'without-email',+ Icon: IconMailX,+ label: t`Without an email address`,+ count: audiencePreview.withoutEmail,+ },+ {+ id: 'duplicate-emails',+ Icon: IconCopy,+ label: t`Duplicate email addresses`,+ count: audiencePreview.duplicateEmails,+ },+ {+ id: 'hard-suppressed',+ Icon: IconForbid,+ label: t`Bounced or complained`,+ count: audiencePreview.hardSuppressed,+ },+ {+ id: 'globally-unsubscribed',+ Icon: IconUserOff,+ label: t`Unsubscribed from everything`,+ count: audiencePreview.globallyUnsubscribed,+ },+ {+ id: 'topic-unsubscribed',+ Icon: IconBellOff,+ label: isNonEmptyString(topicName)+ ? t`Opted out of ${topicName}`+ : t`Opted out of this topic`,+ count: audiencePreview.topicUnsubscribed,+ },+ ].filter(({ count }) => count > 0);++ return (+ <Card.Root rounded fullWidth>+ <SettingsListItemCardContent+ LeftIcon={IconUsersGroup}+ label={isNonEmptyString(listName) ? t`In ${listName}` : t`In the list`}+ rightComponent={+ <StyledCount>+ {formatNumber(audiencePreview.totalMembers)}+ </StyledCount>+ }+ divider+ />+ {exclusions.map(({ id, Icon, label, count }) => (+ <SettingsListItemCardContent+ key={id}+ LeftIcon={Icon}+ label={label}+ rightComponent={<StyledCount>{formatNumber(-count)}</StyledCount>}+ divider+ />+ ))}+ <SettingsListItemCardContent+ LeftIcon={IconSend}+ label={t`Will get this email`}+ rightComponent={+ <StyledCount>{formatNumber(audiencePreview.sendable)}</StyledCount>+ }+ />+ </Card.Root>+ );+};diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 528d525a3c7..53d12cffc8a 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -128,6 +128,11 @@ export const Select = <TValue extends SelectValue>({};}, [selectedOption, showContextualTextInControl, showIconInControl]);+ const isShowingEmptyPrompt =+ isDefined(emptyOption) &&+ selectedOption === emptyOption &&+ !isDefined(emptyOption.Icon);+if (!isDefined(controlSelectedOption)) {return <></>;}@@ -154,6 +159,7 @@ export const Select = <TValue extends SelectValue>({<SelectControlrenderAsTag={renderAsTag}selectedOption={controlSelectedOption}+ textAccent={isShowingEmptyPrompt ? 'placeholder' : 'default'}isDisabled={isDisabled}selectSizeVariant={selectSizeVariant}hasRightElement={hasRightElement}@@ -173,6 +179,7 @@ export const Select = <TValue extends SelectValue>({<SelectControlrenderAsTag={renderAsTag}selectedOption={controlSelectedOption}+ textAccent={isShowingEmptyPrompt ? 'placeholder' : 'default'}isDisabled={isDisabled}selectSizeVariant={selectSizeVariant}hasRightElement={hasRightElement}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowEmailBodyEditorProfile.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowEmailBodyEditorProfile.tsindex d83f1679e2e..6ab6eb1bd94 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowEmailBodyEditorProfile.ts+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/constants/WorkflowEmailBodyEditorProfile.ts@@ -7,6 +7,7 @@ import { WorkflowVariableTag } from '@/workflow/workflow-variables/extensions/Woexport const WORKFLOW_EMAIL_BODY_EDITOR_PROFILE = {chrome: 'field',+ variant: 'email',minHeight: 200,enableFullScreen: true,parseLegacyDocument: parseLegacyWorkflowEmailBodyDocument,diff --git a/packages/twenty-server/src/engine/core-modules/email/utils/__tests__/compile-outbound-email-content.util.spec.ts b/packages/twenty-server/src/engine/core-modules/email/utils/__tests__/compile-outbound-email-content.util.spec.tsindex f89de9f6191..6fb9c5a04cd 100644--- a/packages/twenty-server/src/engine/core-modules/email/utils/__tests__/compile-outbound-email-content.util.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/email/utils/__tests__/compile-outbound-email-content.util.spec.ts@@ -129,6 +129,79 @@ describe('compileOutboundEmailContent', () => {expect(html).toContain('2px dashed #ff0000');});+ it('should render a blockquote with a neutral left border', async () => {+ const html = await compileDocument({+ type: 'doc',+ content: [+ {+ type: 'blockquote',+ content: [+ {+ type: 'paragraph',+ content: [{ type: 'text', text: 'Quoted text' }],+ },+ ],+ },+ ],+ });++ expect(html).toContain('<blockquote');+ expect(html).toContain('border-left:2px solid #999999');+ expect(html).toContain('Quoted text');+ });++ it('should keep list item text in the text color with neutral markers', async () => {+ const html = await compileDocument({+ type: 'doc',+ content: [+ {+ type: 'bulletList',+ content: [+ {+ type: 'listItem',+ content: [+ {+ type: 'paragraph',+ content: [{ type: 'text', text: 'First item' }],+ },+ ],+ },+ ],+ },+ ],+ });++ expect(html).toMatch(/<li style="[^"]*color:#999999/);+ expect(html).toContain('<div style="color:#333333">First item</div>');+ });++ it('should keep paragraph alignment inside list items', async () => {+ const html = await compileDocument({+ type: 'doc',+ content: [+ {+ type: 'bulletList',+ content: [+ {+ type: 'listItem',+ content: [+ {+ type: 'paragraph',+ attrs: { style: { textAlign: 'center' } },+ content: [{ type: 'text', text: 'Centered item' }],+ },+ ],+ },+ ],+ },+ ],+ });++ expect(html).toContain(+ '<div style="color:#333333;text-align:center">Centered item</div>',+ );+ });+it('should apply text block styles to headings and paragraphs', async () => {const html = await compileDocument({type: 'doc',@@ -148,7 +221,7 @@ describe('compileOutboundEmailContent', () => {expect(html).toContain('color:#0000ff');expect(html).toContain('font-size:40px');- expect(html).not.toContain('font-size:24px');+ expect(html).not.toContain('font-size:20px');expect(html).toContain('text-align:center');expect(html).toContain('letter-spacing:2px');});diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.tsindex f2cce86cb62..89f519ffb1b 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts@@ -70,6 +70,7 @@ export enum EngineComponentKey {CANCEL_MESSAGE_CAMPAIGN = 'CANCEL_MESSAGE_CAMPAIGN',DUPLICATE_MESSAGE_CAMPAIGN = 'DUPLICATE_MESSAGE_CAMPAIGN',EMAIL_BLOCK_SETTINGS = 'EMAIL_BLOCK_SETTINGS',+ EMAIL_PAGE_STYLE = 'EMAIL_PAGE_STYLE',// TODO: Remove deprecated keys once upgrade:1-21:refactor-navigation-commands has run on all workspaces// Deprecated: replaced by NAVIGATION engine key with payloaddiff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.tsindex 79fa08bcaa8..7264f54137c 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts@@ -1306,13 +1306,13 @@ export const STANDARD_COMMAND_MENU_ITEMS = {emailBlockSettings: {universalIdentifier: '5c8a2f41-97be-4f3d-9a46-2f18d17f30a2',label: i18nLabel(- msg({ message: `Block Settings`, context: 'commandMenuItem.label' }),+ msg({ message: `Add Block`, context: 'commandMenuItem.label' }),),- icon: 'IconAdjustments',+ icon: 'IconPlus',isPinned: true,position: 70,shortLabel: i18nLabel(- msg({ message: `Design`, context: 'commandMenuItem.shortLabel' }),+ msg({ message: `Add Block`, context: 'commandMenuItem.shortLabel' }),),availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,conditionalAvailabilityExpression:@@ -1323,6 +1323,26 @@ export const STANDARD_COMMAND_MENU_ITEMS = {engineComponentKey: EngineComponentKey.EMAIL_BLOCK_SETTINGS,hotKeys: null,},+ emailPageStyle: {+ universalIdentifier: 'c1c2d63f-7ec3-46aa-8a79-414cefb42705',+ label: i18nLabel(+ msg({ message: `Email Style`, context: 'commandMenuItem.label' }),+ ),+ icon: 'IconPaint',+ isPinned: false,+ position: 70.5,+ shortLabel: i18nLabel(+ msg({ message: `Email Style`, context: 'commandMenuItem.shortLabel' }),+ ),+ availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,+ conditionalAvailabilityExpression:+ 'pageType == "RECORD_PAGE" and numberOfSelectedRecords == 1 and everyEquals(selectedRecords, "status", "DRAFT") and noneDefined(selectedRecords, "deletedAt")',+ availabilityObjectMetadataUniversalIdentifier:+ STANDARD_OBJECTS.messageCampaign.universalIdentifier,+ frontComponentUniversalIdentifier: null,+ engineComponentKey: EngineComponentKey.EMAIL_PAGE_STYLE,+ hotKeys: null,+ },goToSettings: {universalIdentifier: 'ef9aba44-0068-453e-930a-f8c182af18ee',label: i18nLabel(diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-campaign-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-campaign-standard-flat-field-metadata.util.tsindex 4e53b3211cc..ab830a38912 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-campaign-standard-flat-field-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-campaign-standard-flat-field-metadata.util.ts@@ -414,7 +414,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'sentCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Sent count`, context: 'fieldMetadata.label' }),+ msg({ message: `Sent`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({@@ -434,7 +434,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'deliveredCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Delivered count`, context: 'fieldMetadata.label' }),+ msg({ message: `Delivered`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({@@ -454,7 +454,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'failedCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Failed count`, context: 'fieldMetadata.label' }),+ msg({ message: `Failed`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({@@ -474,7 +474,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'bouncedCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Bounced count`, context: 'fieldMetadata.label' }),+ msg({ message: `Bounced`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({@@ -494,7 +494,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'complainedCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Complained count`, context: 'fieldMetadata.label' }),+ msg({ message: `Complaints`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({@@ -514,7 +514,7 @@ export const buildMessageCampaignStandardFlatFieldMetadatas = ({fieldName: 'skippedCount',type: FieldMetadataType.NUMBER,label: i18nLabel(- msg({ message: `Skipped count`, context: 'fieldMetadata.label' }),+ msg({ message: `Skipped`, context: 'fieldMetadata.label' }),),description: i18nLabel(msg({diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.tsindex 8a17fc66ee0..fc4e985161c 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts@@ -864,6 +864,7 @@ export const STANDARD_FLAT_OBJECT_METADATA_BUILDERS_BY_OBJECT_NAME = {),icon: 'IconUser',isSystem: true,+ isUICreatable: false,labelIdentifierFieldMetadataName: 'id',},workspaceId,diff --git a/packages/twenty-shared/src/types/CoreObjectNameSingular.ts b/packages/twenty-shared/src/types/CoreObjectNameSingular.tsindex 28121d247bd..58de0557c08 100644--- a/packages/twenty-shared/src/types/CoreObjectNameSingular.ts+++ b/packages/twenty-shared/src/types/CoreObjectNameSingular.ts@@ -19,6 +19,7 @@ export enum CoreObjectNameSingular {MessageCampaign = 'messageCampaign',MessageChannel = 'messageChannel',MessageList = 'messageList',+ MessageListMember = 'messageListMember',MessageParticipant = 'messageParticipant',MessageFolder = 'messageFolder',MessageThread = 'messageThread',diff --git a/packages/twenty-shared/src/types/SidePanelPages.ts b/packages/twenty-shared/src/types/SidePanelPages.tsindex 1bb942003d7..a99913023a2 100644--- a/packages/twenty-shared/src/types/SidePanelPages.ts+++ b/packages/twenty-shared/src/types/SidePanelPages.ts@@ -32,9 +32,9 @@ export enum SidePanelPages {ComposeEmail = 'compose-email',ComposeCalendarEvent = 'compose-calendar-event',CreateRelatedRecord = 'create-related-record',- SendCampaign = 'send-campaign',RecordCreationForm = 'record-creation-form',RecordCreationFormSettings = 'record-creation-form-settings',+ SendCampaign = 'send-campaign',SendCampaignTest = 'send-campaign-test',AddToMessageList = 'add-to-message-list',WorkflowVersions = 'workflow-versions',diff --git a/packages/twenty-shared/src/utils/index.ts b/packages/twenty-shared/src/utils/index.tsindex ec3823044f8..2895434871f 100644--- a/packages/twenty-shared/src/utils/index.ts+++ b/packages/twenty-shared/src/utils/index.ts@@ -264,6 +264,7 @@ export { EMAIL_DOCUMENT_SCHEMA_VERSION } from './tiptap/email-document-schema-veexport type { EmailDocument } from './tiptap/email-document-schema';export { emailDocumentSchema } from './tiptap/email-document-schema';export type { EmailDocumentStringContext } from './tiptap/email-document-string-context';+export { EMAIL_TYPOGRAPHY } from './tiptap/email-typography';export { getFullHtmlEmailIfWholeBody } from './tiptap/get-full-html-email-if-whole-body';export { HTML_ELEMENT_NAMES } from './tiptap/html-element-names';export { isCanvasTheme } from './tiptap/is-canvas-theme';diff --git a/packages/twenty-shared/src/utils/pageLayout/__tests__/getPageLayoutWidgetHeightBehavior.test.ts b/packages/twenty-shared/src/utils/pageLayout/__tests__/getPageLayoutWidgetHeightBehavior.test.tsindex e661c2b1c04..c0377fe1a1d 100644--- a/packages/twenty-shared/src/utils/pageLayout/__tests__/getPageLayoutWidgetHeightBehavior.test.ts+++ b/packages/twenty-shared/src/utils/pageLayout/__tests__/getPageLayoutWidgetHeightBehavior.test.ts@@ -19,7 +19,7 @@ const EXPECTED_IS_VIEWPORT_FILLING_BY_WIDGET_TYPE = {[WidgetType.FRONT_COMPONENT]: false,[WidgetType.GRAPH]: false,[WidgetType.IFRAME]: false,- [WidgetType.MESSAGE_CAMPAIGN_BODY]: false,+ [WidgetType.MESSAGE_CAMPAIGN_BODY]: true,[WidgetType.MESSAGE_CAMPAIGN_DETAILS]: false,[WidgetType.NOTES]: true,[WidgetType.FORM_FIELD]: false,diff --git a/packages/twenty-shared/src/utils/pageLayout/getPageLayoutWidgetHeightBehavior.ts b/packages/twenty-shared/src/utils/pageLayout/getPageLayoutWidgetHeightBehavior.tsindex c2429846113..51ac7528e2d 100644--- a/packages/twenty-shared/src/utils/pageLayout/getPageLayoutWidgetHeightBehavior.ts+++ b/packages/twenty-shared/src/utils/pageLayout/getPageLayoutWidgetHeightBehavior.ts@@ -24,6 +24,7 @@ export const getPageLayoutWidgetHeightBehavior = ({case WidgetType.EMAILS:case WidgetType.EMAIL_THREAD:case WidgetType.FILES:+ case WidgetType.MESSAGE_CAMPAIGN_BODY:case WidgetType.NOTES:case WidgetType.TASKS:case WidgetType.TIMELINE:@@ -34,7 +35,6 @@ export const getPageLayoutWidgetHeightBehavior = ({case WidgetType.IFRAME:case WidgetType.RECORD_TABLE:- case WidgetType.MESSAGE_CAMPAIGN_BODY:case WidgetType.MESSAGE_CAMPAIGN_DETAILS:case WidgetType.FIELD:case WidgetType.FIELDS:diff --git a/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-node-catalog.test.ts b/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-node-catalog.test.tsindex 79a4f6d93b2..8c763f217e4 100644--- a/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-node-catalog.test.ts+++ b/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-node-catalog.test.ts@@ -10,6 +10,7 @@ describe('EMAIL_DOCUMENT_NODE_CATALOG', () => {expect(isEmailDocumentNodeType(TIPTAP_NODE_TYPES.SECTION)).toBe(true);expect(isEmailDocumentNodeType(TIPTAP_NODE_TYPES.COLUMNS)).toBe(true);expect(isEmailDocumentNodeType(TIPTAP_NODE_TYPES.HTML)).toBe(true);+ expect(isEmailDocumentNodeType(TIPTAP_NODE_TYPES.BLOCKQUOTE)).toBe(true);});it('distinguishes nodes rendered by their parent from renderer entries', () => {diff --git a/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-schema.test.ts b/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-schema.test.tsindex 1c9f371e578..61623c9d896 100644--- a/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-schema.test.ts+++ b/packages/twenty-shared/src/utils/tiptap/__tests__/email-document-schema.test.ts@@ -249,6 +249,50 @@ describe('parseEmailDocument', () => {expect(result.success).toBe(false);});+ it('should accept a styled blockquote of paragraphs', () => {+ const result = parseEmailDocument({+ type: 'doc',+ content: [+ {+ type: 'blockquote',+ attrs: { style: { color: '#555555' } },+ content: [paragraph('Quoted'), paragraph('Second line')],+ },+ ],+ });++ expect(result.success).toBe(true);+ });++ it('should reject a blockquote with a non-paragraph child', () => {+ const result = parseEmailDocument({+ type: 'doc',+ content: [+ {+ type: 'blockquote',+ content: [+ {+ type: 'heading',+ attrs: { level: 2 },+ content: [{ type: 'text', text: 'Quoted heading' }],+ },+ ],+ },+ ],+ });++ expect(result.success).toBe(false);+ });++ it('should reject an empty blockquote', () => {+ const result = parseEmailDocument({+ type: 'doc',+ content: [{ type: 'blockquote', content: [] }],+ });++ expect(result.success).toBe(false);+ });+it('should reject an image without src', () => {const result = parseEmailDocument({type: 'doc',diff --git a/packages/twenty-shared/src/utils/tiptap/__tests__/tiptap-document.test.ts b/packages/twenty-shared/src/utils/tiptap/__tests__/tiptap-document.test.tsindex a0580280051..a6327b41f66 100644--- a/packages/twenty-shared/src/utils/tiptap/__tests__/tiptap-document.test.ts+++ b/packages/twenty-shared/src/utils/tiptap/__tests__/tiptap-document.test.ts@@ -120,6 +120,28 @@ describe('TipTap document primitives', () => {);});+ it('projects blockquotes to Markdown quotes', () => {+ expect(+ tipTapDocumentToMarkdown({+ type: 'doc',+ attrs: { schemaVersion: TIPTAP_DOCUMENT_SCHEMA_VERSION },+ content: [+ {+ type: 'blockquote',+ content: [+ { type: 'paragraph', content: [{ type: 'text', text: 'First' }] },+ {+ type: 'paragraph',+ content: [{ type: 'text', text: 'Second' }],+ },+ ],+ },+ { type: 'paragraph', content: [{ type: 'text', text: 'After' }] },+ ],+ }),+ ).toBe(['> First', '>', '> Second', '', 'After'].join('\n'));+ });+it('projects skill tags to skill references in Markdown', () => {expect(tipTapDocumentToMarkdown({diff --git a/packages/twenty-shared/src/utils/tiptap/canvas-theme.ts b/packages/twenty-shared/src/utils/tiptap/canvas-theme.tsindex d9e91da1694..e37750a29fd 100644--- a/packages/twenty-shared/src/utils/tiptap/canvas-theme.ts+++ b/packages/twenty-shared/src/utils/tiptap/canvas-theme.ts@@ -16,7 +16,7 @@ export const CANVAS_THEME_DEFAULTS: CanvasTheme = {pagePadding: '24px',textAlign: 'left',bodyBackground: '',- textColor: '#18181b',+ textColor: '#333333',width: '600px',padding: '24px',cornerRadius: '0px',diff --git a/packages/twenty-shared/src/utils/tiptap/email-document-node-catalog.ts b/packages/twenty-shared/src/utils/tiptap/email-document-node-catalog.tsindex 4f618ee8746..112b658f0a3 100644--- a/packages/twenty-shared/src/utils/tiptap/email-document-node-catalog.ts+++ b/packages/twenty-shared/src/utils/tiptap/email-document-node-catalog.ts@@ -50,6 +50,10 @@ export const EMAIL_DOCUMENT_NODE_CATALOG = {renderMode: 'node',stringAttributes: {},},+ [TIPTAP_NODE_TYPES.BLOCKQUOTE]: {+ renderMode: 'node',+ stringAttributes: {},+ },[TIPTAP_NODE_TYPES.HARD_BREAK]: {renderMode: 'node',stringAttributes: {},diff --git a/packages/twenty-shared/src/utils/tiptap/email-document-schema.ts b/packages/twenty-shared/src/utils/tiptap/email-document-schema.tsindex b3b404bbebd..af26ab06ff5 100644--- a/packages/twenty-shared/src/utils/tiptap/email-document-schema.ts+++ b/packages/twenty-shared/src/utils/tiptap/email-document-schema.ts@@ -84,6 +84,12 @@ const orderedListNodeSchema = z.looseObject({content: z.array(listItemNodeSchema).min(1),});+const blockquoteNodeSchema = z.looseObject({+ type: z.literal(TIPTAP_NODE_TYPES.BLOCKQUOTE),+ attrs: z.looseObject({ style: styleAttributeSchema.nullable() }).optional(),+ content: z.array(paragraphNodeSchema).min(1),+});+const imageNodeSchema = z.looseObject({type: z.literal(TIPTAP_NODE_TYPES.IMAGE),attrs: z.looseObject({@@ -151,6 +157,7 @@ const blockNodeSchema = z.discriminatedUnion('type', [headingNodeSchema,bulletListNodeSchema,orderedListNodeSchema,+ blockquoteNodeSchema,imageNodeSchema,sectionNodeSchema,columnsNodeSchema,diff --git a/packages/twenty-shared/src/utils/tiptap/email-typography.ts b/packages/twenty-shared/src/utils/tiptap/email-typography.tsnew file mode 100644index 00000000000..6230775a0bc--- /dev/null+++ b/packages/twenty-shared/src/utils/tiptap/email-typography.ts@@ -0,0 +1,17 @@+export const EMAIL_TYPOGRAPHY = {+ fontFamily:+ "Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif",+ fontSize: '14px',+ lineHeight: '24px',+ blockSpacing: '12px',+ headingFontSizes: { 1: '24px', 2: '20px', 3: '16px' },+ headingFontWeight: '600',+ headingLineHeight: '1.2',+ headingSpacingTop: '24px',+ headingSpacingBottom: '8px',+ listIndent: '16px',+ listItemSpacing: '8px',+ accentColor: '#999999',+ quoteBorderWidth: '2px',+ quoteIndent: '12px',+} as const;diff --git a/packages/twenty-shared/src/utils/tiptap/index.ts b/packages/twenty-shared/src/utils/tiptap/index.tsindex 6021e77d7e6..22def6bd31e 100644--- a/packages/twenty-shared/src/utils/tiptap/index.ts+++ b/packages/twenty-shared/src/utils/tiptap/index.ts@@ -3,6 +3,7 @@ export * from './email-document-node';export * from './email-document-schema';export * from './email-document-schema-version';export * from './email-document-string-context';+export * from './email-typography';export * from './is-canvas-theme';export * from './list-campaign-variables-for-fields';export * from './parse-email-document';diff --git a/packages/twenty-shared/src/utils/tiptap/tiptap-document-to-markdown.ts b/packages/twenty-shared/src/utils/tiptap/tiptap-document-to-markdown.tsindex 955beb6a7fd..720b508a353 100644--- a/packages/twenty-shared/src/utils/tiptap/tiptap-document-to-markdown.ts+++ b/packages/twenty-shared/src/utils/tiptap/tiptap-document-to-markdown.ts@@ -154,6 +154,12 @@ const renderTipTapNodeToMarkdown = (node: TipTapNode): string => {.map((item, index) => renderListItem(item, `${start + index}. `)).join('')}\n`;}+ case TIPTAP_NODE_TYPES.BLOCKQUOTE:+ return `${renderChildren(node)+ .trim()+ .split('\n')+ .map((line) => (line === '' ? '>' : `> ${line}`))+ .join('\n')}\n\n`;case TIPTAP_NODE_TYPES.IMAGE: {const alt = typeof node.attrs?.alt === 'string' ? node.attrs.alt : '';const src = typeof node.attrs?.src === 'string' ? node.attrs.src : '';diff --git a/packages/twenty-shared/src/utils/tiptap/tiptap-node-types.ts b/packages/twenty-shared/src/utils/tiptap/tiptap-node-types.tsindex ac90ac6e9c8..548ee6a46af 100644--- a/packages/twenty-shared/src/utils/tiptap/tiptap-node-types.ts+++ b/packages/twenty-shared/src/utils/tiptap/tiptap-node-types.ts@@ -10,6 +10,7 @@ export const TIPTAP_NODE_TYPES = {BULLET_LIST: 'bulletList',ORDERED_LIST: 'orderedList',LIST_ITEM: 'listItem',+ BLOCKQUOTE: 'blockquote',TASK_LIST: 'taskList',TASK_ITEM: 'taskItem',HARD_BREAK: 'hardBreak',diff --git a/packages/twenty-ui/docs/public-exports.json b/packages/twenty-ui/docs/public-exports.jsonindex bf59259088f..0528a487425 100644--- a/packages/twenty-ui/docs/public-exports.json+++ b/packages/twenty-ui/docs/public-exports.json@@ -117,7 +117,8 @@"PhoneCountryPickerTriggerProps": "components/input/PhoneCountryPicker/types/PhoneCountryPickerTriggerProps","SearchInputProps": "components/input/SearchInput/types/SearchInputProps","SegmentedControlOption": "components/input/SegmentedControl/types/SegmentedControlOption",- "SegmentedControlProps": "components/input/SegmentedControl/types/SegmentedControlProps"+ "SegmentedControlProps": "components/input/SegmentedControl/types/SegmentedControlProps",+ "SegmentedControlSize": "components/input/SegmentedControl/types/SegmentedControlSize"}},"components/layout": {@@ -650,6 +651,7 @@"IconUserPin": "icon/components/TablerIcons","IconUserPlus": "icon/components/TablerIcons","IconUsers": "icon/components/TablerIcons",+ "IconUsersGroup": "icon/components/TablerIcons","IconVariable": "icon/components/TablerIcons","IconVariablePlus": "icon/components/TablerIcons","IconVersions": "icon/components/TablerIcons",diff --git a/packages/twenty-ui/docs/segmentedControlPropDescriptions.ts b/packages/twenty-ui/docs/segmentedControlPropDescriptions.tsindex 54c1d595297..5863e6d0838 100644--- a/packages/twenty-ui/docs/segmentedControlPropDescriptions.ts+++ b/packages/twenty-ui/docs/segmentedControlPropDescriptions.ts@@ -7,6 +7,7 @@ export const SEGMENTED_CONTROL_PROP_DESCRIPTIONS = {itemWidth: 'Use equal-width options or size each option to its content.',options:'Options with a unique string `value`, a `label` or `startIcon`, and optional `disabled`. Icon-only options require an `aria-label`.',+ size: 'Control height: `sm` (24px) or `md` (32px).','aria-label': 'Accessible group name. Supply this or `aria-labelledby`.','aria-labelledby':'ID of an element that labels the group. Supply this or `aria-label`.',diff --git a/packages/twenty-ui/generated/components.docs.json b/packages/twenty-ui/generated/components.docs.jsonindex 1d5ec8d8ecf..f736b44f6be 100644--- a/packages/twenty-ui/generated/components.docs.json+++ b/packages/twenty-ui/generated/components.docs.json@@ -1469,6 +1469,13 @@"defaultValue": "false","description": "Whether the user must choose a value before submitting a form."},+ {+ "name": "size",+ "type": "\"md\" | \"sm\"",+ "required": false,+ "defaultValue": "md",+ "description": "Control height: `sm` (24px) or `md` (32px)."+ },{"name": "style","type": "CSSProperties | ((state: RadioGroupState) => CSSProperties | undefined)",diff --git a/packages/twenty-ui/generated/icons.docs.json b/packages/twenty-ui/generated/icons.docs.jsonindex ed135d56a15..571e0e5445c 100644--- a/packages/twenty-ui/generated/icons.docs.json+++ b/packages/twenty-ui/generated/icons.docs.json@@ -439,6 +439,7 @@"IconUserPin","IconUserPlus","IconUsers",+ "IconUsersGroup","IconVariable","IconVariablePlus","IconVersions",diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scssindex 87daf4ac0d2..fe569f20f0b 100644--- a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss+++ b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss@@ -10,14 +10,26 @@gap: 2px;grid-auto-columns: minmax(0, 1fr);grid-auto-flow: column;- block-size: var(--t-spacing-7);- padding: 3px;+ block-size: var(--tw-segmented-control-block-size);+ padding: var(--tw-segmented-control-padding);&[data-item-width='content'] {grid-auto-columns: max-content;}}+.sm {+ --tw-segmented-control-block-size: var(--t-spacing-6);+ --tw-segmented-control-item-size: var(--t-spacing-5);+ --tw-segmented-control-padding: 1px;+}++.md {+ --tw-segmented-control-block-size: var(--t-spacing-8);+ --tw-segmented-control-item-size: var(--t-spacing-6);+ --tw-segmented-control-padding: 3px;+}+.item {@include focus-ring;@@ -63,7 +75,7 @@}.iconOnly {- min-inline-size: var(--t-spacing-5);+ min-inline-size: var(--tw-segmented-control-item-size);padding: 0;}@@ -71,9 +83,9 @@align-items: center;display: flex;flex-shrink: 0;- block-size: var(--t-spacing-5);+ block-size: calc(var(--t-icon-size-md) * 1px);justify-content: center;- inline-size: var(--t-spacing-5);+ inline-size: calc(var(--t-icon-size-md) * 1px);> svg,> :only-child > svg:only-child {diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss.d.ts b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss.d.tsindex 65f960e330c..33b840db5f0 100644--- a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss.d.ts+++ b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.module.scss.d.ts@@ -4,5 +4,7 @@ declare const classNames: {readonly iconOnly: 'iconOnly';readonly item: 'item';readonly label: 'label';+ readonly md: 'md';+ readonly sm: 'sm';};export default classNames;diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsxindex 574e61a2bfc..013f2e34f05 100644--- a/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx+++ b/packages/twenty-ui/src/components/input/SegmentedControl/SegmentedControl.tsx@@ -13,11 +13,12 @@ export const SegmentedControl = <TValue extends string>({className,itemWidth = 'equal',options,+ size = 'md',...props}: SegmentedControlProps<TValue>) => (<RadioGroupPrimitive{...props}- className={mergeClassNames(styles.container, className)}+ className={mergeClassNames(clsx(styles.container, styles[size]), className)}data-item-width={itemWidth}>{options.map(diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControl.stories.tsx b/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControl.stories.tsxindex 496f8d5dc43..901e67716f6 100644--- a/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControl.stories.tsx+++ b/packages/twenty-ui/src/components/input/SegmentedControl/__stories__/SegmentedControl.stories.tsx@@ -97,6 +97,10 @@ export const IconOnly: Story = {},};+export const Small: Story = {+ args: { size: 'sm' },+};+export const ContentWidth: Story = {args: { itemWidth: 'content' },play: async ({ canvasElement }) => {diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlProps.ts b/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlProps.tsindex 1f835460f4f..7b36f6d684c 100644--- a/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlProps.ts+++ b/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlProps.ts@@ -1,6 +1,7 @@import { type RadioGroupProps } from '@ui/primitives/input/RadioGroup/types/RadioGroupProps';import { type SegmentedControlOption } from './SegmentedControlOption';+import { type SegmentedControlSize } from './SegmentedControlSize';export type SegmentedControlProps<TValue extends string = string> = Omit<RadioGroupProps<TValue>,@@ -8,4 +9,5 @@ export type SegmentedControlProps<TValue extends string = string> = Omit<> & {itemWidth?: 'content' | 'equal';options: readonly SegmentedControlOption<TValue>[];+ size?: SegmentedControlSize;} & ({ 'aria-label': string } | { 'aria-labelledby': string });diff --git a/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlSize.ts b/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlSize.tsnew file mode 100644index 00000000000..db82418bcc2--- /dev/null+++ b/packages/twenty-ui/src/components/input/SegmentedControl/types/SegmentedControlSize.ts@@ -0,0 +1 @@+export type SegmentedControlSize = 'sm' | 'md';diff --git a/packages/twenty-ui/src/components/input/index.ts b/packages/twenty-ui/src/components/input/index.tsindex 7b27ba2f5b7..2523b385599 100644--- a/packages/twenty-ui/src/components/input/index.ts+++ b/packages/twenty-ui/src/components/input/index.ts@@ -35,3 +35,4 @@ export type { SearchInputProps } from './SearchInput/types/SearchInputProps';export { SegmentedControl } from './SegmentedControl/SegmentedControl';export type { SegmentedControlOption } from './SegmentedControl/types/SegmentedControlOption';export type { SegmentedControlProps } from './SegmentedControl/types/SegmentedControlProps';+export type { SegmentedControlSize } from './SegmentedControl/types/SegmentedControlSize';diff --git a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scssindex 6d7accb5f39..8d4da745726 100644--- a/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss+++ b/packages/twenty-ui/src/components/navigation/Dropdown/Dropdown.module.scss@@ -8,6 +8,7 @@[data-dropdown-item]:focus-visible {background: var(--t-background-transparent-light);+ outline: none;}}diff --git a/packages/twenty-ui/src/icon/components/TablerIcons.ts b/packages/twenty-ui/src/icon/components/TablerIcons.tsindex 031a643d20e..8c651557c10 100644--- a/packages/twenty-ui/src/icon/components/TablerIcons.ts+++ b/packages/twenty-ui/src/icon/components/TablerIcons.ts@@ -438,6 +438,7 @@ export {IconUserPin,IconUserPlus,IconUsers,+ IconUsersGroup,IconVariable,IconVariablePlus,IconVersions,diff --git a/packages/twenty-ui/src/icon/index.ts b/packages/twenty-ui/src/icon/index.tsindex 7e5ea94a88d..562dad567dc 100644--- a/packages/twenty-ui/src/icon/index.ts+++ b/packages/twenty-ui/src/icon/index.ts@@ -494,6 +494,7 @@ export {IconUserPin,IconUserPlus,IconUsers,+ IconUsersGroup,IconVariable,IconVariablePlus,IconVersions,diff --git a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scssindex 61104bb9c76..6131e503765 100644--- a/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss+++ b/packages/twenty-ui/src/primitives/navigation/ListItem/ListItem.module.scss@@ -110,6 +110,7 @@}.endDescription {+ color: var(--t-font-color-light);flex-shrink: 1;text-align: end;}diff --git a/yarn.lock b/yarn.lockindex a90c97ff902..0ce78fb7643 100644--- a/yarn.lock+++ b/yarn.lock@@ -20104,6 +20104,21 @@ __metadata:languageName: nodelinkType: hard+"@tiptap/extension-drag-handle@patch:@tiptap/extension-drag-handle@npm%3A3.30.5#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch":+ version: 3.30.5+ resolution: "@tiptap/extension-drag-handle@patch:@tiptap/extension-drag-handle@npm%3A3.30.5#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch::version=3.30.5&hash=5e94fb"+ dependencies:+ "@floating-ui/dom": "npm:^1.6.13"+ peerDependencies:+ "@tiptap/core": 3.30.5+ "@tiptap/extension-collaboration": 3.30.5+ "@tiptap/extension-node-range": 3.30.5+ "@tiptap/pm": 3.30.5+ "@tiptap/y-tiptap": ^3.0.7+ checksum: 10c0/d3e012e5b834178549ad8b08650d8c90d5ba0cca71c2dde3e8caccbca3339e36e1a54554ee550f10b7e17f418e32f84ddede521ee2b6f8cf4bf304534c60f8da+ languageName: node+ linkType: hard+"@tiptap/extension-floating-menu@npm:^3.30.5, @tiptap/extension-floating-menu@npm:^3.31.3":version: 3.31.3resolution: "@tiptap/extension-floating-menu@npm:3.31.3"@@ -50416,7 +50431,7 @@ __metadata:"@tiptap/extension-bold": "npm:3.30.5""@tiptap/extension-collaboration": "npm:3.30.5""@tiptap/extension-document": "npm:3.30.5"- "@tiptap/extension-drag-handle": "npm:3.30.5"+ "@tiptap/extension-drag-handle": "patch:@tiptap/extension-drag-handle@npm%3A3.30.5#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.30.5-e53a22740d.patch""@tiptap/extension-drag-handle-react": "npm:3.30.5""@tiptap/extension-hard-break": "npm:3.30.5""@tiptap/extension-heading": "npm:3.30.5"