The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Simplify widget rendering surfaces (#24444)
Thomas des Francse500849b4022
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsxindex 94ff654cb6c..9750a2759b0 100644--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarDayCardContent.tsx@@ -13,7 +13,7 @@ type CalendarDayCardContentProps = {};const StyledCardContentContainer = styled.div`- > * {+ > div {align-items: flex-start;display: flex;flex-direction: row;diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsxindex e5da204b45b..2d9530f3f08 100644--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx@@ -3,6 +3,7 @@ import { CalendarContext } from '@/activities/calendar/contexts/CalendarContext'import { useCalendarEvents } from '@/activities/calendar/hooks/useCalendarEvents';import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';import { SkeletonLoader } from '@/activities/components/SkeletonLoader';+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';@@ -20,14 +21,8 @@ import { H3Title } from 'twenty-ui/typography';import { type TimelineCalendarEvent } from '~/generated/graphql';import { dateLocaleState } from '~/localization/states/dateLocaleState';-const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;+const StyledContainer = styled(StyledWidgetScrollContainer)`gap: ${themeCssVariables.spacing[8]};- overflow: scroll;- padding: ${themeCssVariables.spacing[6]};- width: 100%;`;const StyledYear = styled.span`@@ -35,7 +30,13 @@ const StyledYear = styled.span``;const StyledTitleContainer = styled.div`- margin-bottom: ${themeCssVariables.spacing[4]};+ margin-bottom: ${themeCssVariables.spacing[2]};++ h3 {+ color: ${themeCssVariables.font.color.secondary};+ font-size: ${themeCssVariables.font.size.md};+ font-weight: ${themeCssVariables.font.weight.regular};+ }`;type CalendarEventsCardContentProps = {diff --git a/packages/twenty-front/src/modules/activities/components/ActivityList.tsx b/packages/twenty-front/src/modules/activities/components/ActivityList.tsxindex 89f228c245a..d2cc8a4640d 100644--- a/packages/twenty-front/src/modules/activities/components/ActivityList.tsx+++ b/packages/twenty-front/src/modules/activities/components/ActivityList.tsx@@ -5,18 +5,36 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledListContainer = styled.div`width: 100%;+ &[data-scrollable] {+ flex: 1;+ height: 100%;+ min-height: 0;++ > * {+ box-sizing: border-box;+ height: 100%;+ overflow-y: auto;+ }+ }+> * {& > :not(:last-child) {border-bottom: 1px solid ${themeCssVariables.border.color.light};}- overflow: auto;width: calc(100% - 2px);}`;-export const ActivityList = ({ children }: React.PropsWithChildren) => {+type ActivityListProps = React.PropsWithChildren<{+ isScrollable?: boolean;+}>;++export const ActivityList = ({+ children,+ isScrollable = false,+}: ActivityListProps) => {return (- <StyledListContainer>+ <StyledListContainer data-scrollable={isScrollable || undefined}><Card>{children}</Card></StyledListContainer>);diff --git a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsxindex 1cda1416f4a..d46a54867b6 100644--- a/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx+++ b/packages/twenty-front/src/modules/activities/components/ActivityRow.tsx@@ -16,6 +16,10 @@ const StyledRowContentContainer = styled.div`> div[data-clickable='false'] {cursor: default;}++ > div[data-hover-highlight]:hover {+ background: ${themeCssVariables.background.transparent.lighter};+ }`;export const ActivityRow = ({@@ -34,7 +38,11 @@ export const ActivityRow = ({return (<StyledRowContentContainer>- <CardContent onClick={handleClick} isClickable={disabled !== true}>+ <CardContent+ onClick={handleClick}+ isClickable={disabled !== true}+ hasHoverHighlight={disabled !== true}+ >{children}</CardContent></StyledRowContentContainer>diff --git a/packages/twenty-front/src/modules/activities/components/__stories__/ActivityList.stories.tsx b/packages/twenty-front/src/modules/activities/components/__stories__/ActivityList.stories.tsxnew file mode 100644index 00000000000..567cb0b004b--- /dev/null+++ b/packages/twenty-front/src/modules/activities/components/__stories__/ActivityList.stories.tsx@@ -0,0 +1,25 @@+import { ActivityList } from '@/activities/components/ActivityList';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect } from 'storybook/test';++const meta: Meta<typeof ActivityList> = {+ title: 'Modules/Activities/ActivityList',+ component: ActivityList,+ args: {+ children: <div>First activity</div>,+ },+};++export default meta;+type Story = StoryObj<typeof ActivityList>;++export const Scrollable: Story = {+ args: {+ isScrollable: true,+ },+ play: async ({ canvasElement }) => {+ expect(+ canvasElement.querySelector('[data-scrollable="true"]'),+ ).not.toBeNull();+ },+};diff --git a/packages/twenty-front/src/modules/activities/components/__stories__/ActivityRow.stories.tsx b/packages/twenty-front/src/modules/activities/components/__stories__/ActivityRow.stories.tsxnew file mode 100644index 00000000000..210433cdd42--- /dev/null+++ b/packages/twenty-front/src/modules/activities/components/__stories__/ActivityRow.stories.tsx@@ -0,0 +1,34 @@+import { ActivityRow } from '@/activities/components/ActivityRow';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, within } from 'storybook/test';++const meta: Meta<typeof ActivityRow> = {+ title: 'Modules/Activities/ActivityRow',+ component: ActivityRow,+ args: {+ children: 'Activity',+ },+};++export default meta;+type Story = StoryObj<typeof ActivityRow>;++export const Interactive: Story = {+ play: async ({ canvasElement }) => {+ expect(await within(canvasElement).findByText('Activity')).toHaveAttribute(+ 'data-hover-highlight',+ 'true',+ );+ },+};++export const Disabled: Story = {+ args: {+ disabled: true,+ },+ play: async ({ canvasElement }) => {+ expect(+ await within(canvasElement).findByText('Activity'),+ ).not.toHaveAttribute('data-hover-highlight');+ },+};diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsxindex 359666f178e..4869a2c6fac 100644--- a/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailsCardContent.tsx@@ -3,19 +3,21 @@ import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResimport { SkeletonLoader } from '@/activities/components/SkeletonLoader';import { EmailThreadPreview } from '@/activities/emails/components/EmailThreadPreview';import { EmptyInboxPlaceholder } from '@/activities/emails/components/EmptyInboxPlaceholder';+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';import { styled } from '@linaria/react';import { Section } from 'twenty-ui/layout';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type TimelineThread } from '~/generated/graphql';-const StyledContainer = styled.div`- display: flex;- flex-direction: column;+const StyledContainer = styled(StyledWidgetContentContainer)`gap: ${themeCssVariables.spacing[6]};- height: 100%;- overflow: auto;- padding: ${themeCssVariables.spacing[6]} ${themeCssVariables.spacing[6]}- ${themeCssVariables.spacing[2]};+ overflow: hidden;+`;++const StyledSection = styled(Section)`+ display: flex;+ flex: 1;+ min-height: 0;`;type EmailsCardContentProps = {@@ -45,17 +47,17 @@ export const EmailsCardContent = ({return (<StyledContainer>- <Section>- <ActivityList>+ <StyledSection>+ <ActivityList isScrollable>{timelineThreads.map((thread) => (<EmailThreadPreview key={thread.id} thread={thread} />))}+ <CustomResolverFetchMoreLoader+ loading={isFetchingMore}+ onLastRowVisible={onLastRowVisible}+ /></ActivityList>- <CustomResolverFetchMoreLoader- loading={isFetchingMore}- onLastRowVisible={onLastRowVisible}- />- </Section>+ </StyledSection></StyledContainer>);};diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsxindex 9e53df0054d..46d6ff21472 100644--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentList.tsx@@ -44,17 +44,17 @@ const StyledContainer = styled.div`align-items: flex-start;align-self: stretch;display: flex;+ flex: 1;flex-direction: column;height: 100%;- justify-content: center;- padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[6]}- ${themeCssVariables.spacing[6]};- width: calc(100% - ${themeCssVariables.spacing[12]});+ min-height: 0;+ width: 100%;`;const StyledDropZoneContainer = styled.div`+ flex: 1;height: 100%;- overflow: auto;+ min-height: 0;width: 100%;`;diff --git a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsxindex 4b3db811b24..b720ff5e797 100644--- a/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx+++ b/packages/twenty-front/src/modules/activities/files/components/AttachmentRow.tsx@@ -72,6 +72,10 @@ const StyledLinkContainer = styled.div`width: 100%;`;+const StyledTextInputContainer = styled.div`+ width: 100%;+`;+type AttachmentRowProps = {attachment: AttachmentWithFile;onPreview?: (attachment: AttachmentWithFile) => void;@@ -97,6 +101,7 @@ export const AttachmentRow = ({const fileCategory = getFileCategoryFromExtension(attachment.file.extension);const fileUrl = attachment.file.url;+ const safeFileUrl = getSafeUrl(fileUrl);const { destroyOneRecord: destroyOneAttachment } = useDestroyOneRecord({objectNameSingular: CoreObjectNameSingular.Attachment,@@ -153,14 +158,29 @@ export const AttachmentRow = ({downloadFile(fileUrl, `${attachmentFileName}${attachmentFileExtension}`);};- const handleOpenDocument = (e: React.MouseEvent) => {+ const handleRowClick = () => {+ if (isDefined(onPreview)) {+ onPreview(attachment);+ return;+ }++ if (!isDefined(safeFileUrl)) {+ return;+ }++ window.open(safeFileUrl, '_blank', 'noopener,noreferrer');+ };++ const handleFileLinkClick = (event: React.MouseEvent<HTMLAnchorElement>) => {+ event.stopPropagation();+// Cmd/Ctrl+click opens new tab, right click opens context menu- if (isNavigationModifierPressed(e) === true) {+ if (isNavigationModifierPressed(event) === true) {return;}if (isDefined(onPreview)) {- e.preventDefault();+ event.preventDefault();onPreview(attachment);}};@@ -173,23 +193,27 @@ export const AttachmentRow = ({} as GenericFieldContextType}>- <ActivityRow disabled>+ <ActivityRow onClick={handleRowClick} disabled={isEditing}><StyledLeftContent><FileIcon fileCategory={fileCategory} thumbnailUrl={fileUrl} />{isEditing ? (- <SettingsTextInput- instanceId={`attachment-${attachment.id}-name`}- value={attachmentFileName}- onChange={handleOnChange}- onBlur={handleOnBlur}- autoFocus- onKeyDown={handleOnKeyDown}- />+ <StyledTextInputContainer+ onClick={(event) => event.stopPropagation()}+ >+ <SettingsTextInput+ instanceId={`attachment-${attachment.id}-name`}+ value={attachmentFileName}+ onChange={handleOnChange}+ onBlur={handleOnBlur}+ autoFocus+ onKeyDown={handleOnKeyDown}+ />+ </StyledTextInputContainer>) : (<StyledLinkContainer><StyledLink- onClick={handleOpenDocument}- href={getSafeUrl(fileUrl)}+ onClick={handleFileLinkClick}+ href={safeFileUrl}target="_blank"rel="noopener noreferrer">diff --git a/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx b/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsxindex 05f06e6d2fe..e87a9c8a2a1 100644--- a/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx+++ b/packages/twenty-front/src/modules/activities/notes/components/NoteList.tsx@@ -15,7 +15,6 @@ const StyledContainer = styled.div`display: flex;flex-direction: column;justify-content: center;- padding: ${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[6]};`;const StyledNoteContainer = styled.div`diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsxindex b33d6c7eb7d..0dec830a147 100644--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskGroupsContent.tsx@@ -1,10 +1,12 @@import { SkeletonLoader } from '@/activities/components/SkeletonLoader';import { TaskList } from '@/activities/tasks/components/TaskList';import { type Task } from '@/activities/types/Task';+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import groupBy from 'lodash.groupby';import { isDefined } from 'twenty-shared/utils';+import { CoreObjectNameSingular } from 'twenty-shared/types';import {AnimatedPlaceholder,AnimatedPlaceholderEmptyContainer,@@ -32,6 +34,14 @@ export const TaskGroupsContent = ({onCreateTask,tasks,}: TaskGroupsContentProps) => {+ const { objectMetadataItem: taskObjectMetadataItem } = useObjectMetadataItem({+ objectNameSingular: CoreObjectNameSingular.Task,+ });++ const taskStatusOptions = taskObjectMetadataItem.fields.find(+ (field) => field.name === 'status',+ )?.options;+const isTasksEmpty = tasks.length === 0;if (isLoading && isTasksEmpty) {@@ -68,9 +78,23 @@ export const TaskGroupsContent = ({return (<StyledContainer>- {sortedTasksByStatus.map(([status, tasksByStatus]: [string, Task[]]) => (- <TaskList key={status} title={status} tasks={tasksByStatus} />- ))}+ {sortedTasksByStatus.map(+ ([status, tasksByStatus]: [string, Task[]], index) => {+ const statusOption = taskStatusOptions?.find(+ (option) => option.value === status,+ );++ return (+ <TaskList+ key={status}+ title={statusOption?.label ?? status}+ titleColor={statusOption?.color ?? 'transparent'}+ tasks={tasksByStatus}+ isFirst={index === 0}+ />+ );+ },+ )}</StyledContainer>);};diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsxindex 7a4869256ef..989c82b85d5 100644--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskList.tsx@@ -2,12 +2,16 @@ import { styled } from '@linaria/react';import { ActivityList } from '@/activities/components/ActivityList';import { type Task } from '@/activities/types/Task';+import { SelectDisplay } from 'twenty-ui/data-display';+import { type ThemeColor } from 'twenty-ui/theme';import { themeCssVariables } from 'twenty-ui/theme-constants';import { TaskRow } from './TaskRow';type TaskListProps = {title: string;+ titleColor: ThemeColor | 'transparent';tasks: Task[];+ isFirst: boolean;};const StyledContainer = styled.div`@@ -17,22 +21,21 @@ const StyledContainer = styled.div`display: flex;flex-direction: column;justify-content: center;- padding: 8px ${themeCssVariables.spacing[6]};- width: calc(100% - ${themeCssVariables.spacing[12]});+ width: 100%;`;-const StyledTitleBar = styled.div`+const StyledTitleBar = styled.div<{ isFirst: boolean }>`display: flex;justify-content: space-between;- margin-bottom: ${themeCssVariables.spacing[4]};- margin-top: ${themeCssVariables.spacing[4]};+ margin-bottom: ${themeCssVariables.spacing[3]};+ margin-top: ${({ isFirst }) =>+ isFirst ? '0' : themeCssVariables.spacing[4]};place-items: center;width: 100%;`;const StyledTitle = styled.span`- color: ${themeCssVariables.font.color.primary};- font-weight: ${themeCssVariables.font.weight.semiBold};+ display: flex;`;const StyledCount = styled.span`@@ -40,14 +43,20 @@ const StyledCount = styled.span`margin-left: ${themeCssVariables.spacing[2]};`;-export const TaskList = ({ title, tasks }: TaskListProps) => (+export const TaskList = ({+ title,+ titleColor,+ tasks,+ isFirst,+}: TaskListProps) => (<>{tasks.length > 0 && (<StyledContainer>- <StyledTitleBar>+ <StyledTitleBar isFirst={isFirst}>{title && (<StyledTitle>- {title} <StyledCount>{tasks.length}</StyledCount>+ <SelectDisplay color={titleColor} label={title} />+ <StyledCount>{tasks.length}</StyledCount></StyledTitle>)}</StyledTitleBar>diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TasksCard.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TasksCard.tsxindex 41485452356..682e47132e0 100644--- a/packages/twenty-front/src/modules/activities/tasks/components/TasksCard.tsx+++ b/packages/twenty-front/src/modules/activities/tasks/components/TasksCard.tsx@@ -1,27 +1,18 @@-import { styled } from '@linaria/react';-import { TaskGroups } from '@/activities/tasks/components/TaskGroups';import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';-const StyledContainer = styled.div`- display: flex;- flex: 1;- flex-direction: column;- height: 100%;- overflow: auto;-`;-export const TasksCard = () => {const targetRecord = useTargetRecord();return (- <StyledContainer>+ <StyledWidgetScrollContainer><ObjectFilterDropdownComponentInstanceContext.Providervalue={{ instanceId: 'entity-tasks-filter-instance' }}><TaskGroups targetableObject={targetRecord} /></ObjectFilterDropdownComponentInstanceContext.Provider>- </StyledContainer>+ </StyledWidgetScrollContainer>);};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsxindex b6368b5d41e..9e17fdf0f6d 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/EventList.tsx@@ -10,7 +10,6 @@ import { groupEventsByMonth } from '@/activities/timeline-activities/utils/groupimport { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';import { useLingui } from '@lingui/react/macro';import {AnimatedPlaceholderEmptyContainer,@@ -32,7 +31,6 @@ const StyledTimelineContainer = styled.div`align-self: stretch;display: flex;- flex: 1 0 0;flex-direction: column;gap: ${themeCssVariables.spacing[1]};justify-content: flex-start;@@ -81,27 +79,22 @@ export const EventList = ({ events, targetableObject }: EventListProps) => {}return (- <ScrollWrapper- componentInstanceId={`scroll-wrapper-event-list-${targetableObject.id}`}- >- <StyledTimelineContainer>- {groupedEvents.map((group, index) => (- <EventsGroup- mainObjectMetadataItem={mainObjectMetadataItem}- key={group.year.toString() + group.month}- group={group}- month={new Date(group.items[0].happensAt).toLocaleString(- 'default',- { month: 'long' },- )}- year={- index === 0 || group.year !== groupedEvents[index - 1].year- ? group.year- : undefined- }- />- ))}- </StyledTimelineContainer>- </ScrollWrapper>+ <StyledTimelineContainer>+ {groupedEvents.map((group, index) => (+ <EventsGroup+ mainObjectMetadataItem={mainObjectMetadataItem}+ key={group.year.toString() + group.month}+ group={group}+ month={new Date(group.items[0].happensAt).toLocaleString('default', {+ month: 'long',+ })}+ year={+ index === 0 || group.year !== groupedEvents[index - 1].year+ ? group.year+ : undefined+ }+ />+ ))}+ </StyledTimelineContainer>);};diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsxindex 67a07b0561c..2c1c8b51ebb 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx@@ -5,6 +5,7 @@ import { SkeletonLoader } from '@/activities/components/SkeletonLoader';import { EventList } from '@/activities/timeline-activities/components/EventList';import { useTimelineActivities } from '@/activities/timeline-activities/hooks/useTimelineActivities';import { RecordListUpsertRecordsInStoreEffect } from '@/object-record/record-list/components/RecordListUpsertRecordsInStoreEffect';+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { t } from '@lingui/core/macro';@@ -17,24 +18,14 @@ import {} from 'twenty-ui/feedback';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';-const StyledMainContainer = styled.div`+const StyledMainContainer = styled(StyledWidgetScrollContainer)`align-items: flex-start;align-self: stretch;border-top: none;- display: flex;- flex-direction: column;gap: ${themeCssVariables.spacing[4]};- justify-content: center;- overflow: auto;- padding-left: ${themeCssVariables.spacing[6]};- padding-right: ${themeCssVariables.spacing[6]};- padding-top: ${themeCssVariables.spacing[6]};-@media (max-width: ${MOBILE_VIEWPORT}px) {border-top: 1px solid ${themeCssVariables.border.color.medium};- padding-right: ${themeCssVariables.spacing[1]};- padding-left: ${themeCssVariables.spacing[1]};}`;diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsxindex 748214db2bc..196b6d45340 100644--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx@@ -1,4 +1,5 @@import { styled } from '@linaria/react';+import { useRef } from 'react';import { themeCssVariables } from 'twenty-ui/theme-constants';import { ShowPageContainer } from '@/ui/layout/page/components/ShowPageContainer';@@ -11,6 +12,7 @@ import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useimport { useMergeRecordsContainerTabs } from '@/object-record/record-merge/hooks/useMergeRecordsContainerTabs';import { useMergeRecordsSelectedRecords } from '@/object-record/record-merge/hooks/useMergeRecordsSelectedRecords';import { MergeRecordsTabId } from '@/object-record/record-merge/types/MergeRecordsTabId';+import { MergeRecordsContentScrollResetEffect } from '@/object-record/record-merge/components/MergeRecordsContentScrollResetEffect';import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { MergePreviewTab } from './MergePreviewTab';@@ -57,6 +59,8 @@ export const MergeRecordsContainer = ({instanceId,);+ const contentContainerRef = useRef<HTMLDivElement>(null);+return (<SidePanelProvider value={{ isInSidePanel: true }}><ShowPageContainer>@@ -72,7 +76,11 @@ export const MergeRecordsContainer = ({/></StyledTabListContainer></TabListComponentInstanceContext.Provider>- <StyledContentContainer>+ <MergeRecordsContentScrollResetEffect+ activeTabId={activeTabId}+ contentContainerRef={contentContainerRef}+ />+ <StyledContentContainer ref={contentContainerRef}>{activeTabId === MergeRecordsTabId.MERGE_PREVIEW && (<MergePreviewTab objectNameSingular={objectNameSingular} />)}diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContentScrollResetEffect.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContentScrollResetEffect.tsxnew file mode 100644index 00000000000..6794d3eaad9--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContentScrollResetEffect.tsx@@ -0,0 +1,20 @@+import { type RefObject, useEffect } from 'react';+import { isDefined } from 'twenty-shared/utils';++type MergeRecordsContentScrollResetEffectProps = {+ activeTabId: string | null;+ contentContainerRef: RefObject<HTMLDivElement | null>;+};++export const MergeRecordsContentScrollResetEffect = ({+ activeTabId,+ contentContainerRef,+}: MergeRecordsContentScrollResetEffectProps) => {+ useEffect(() => {+ if (isDefined(contentContainerRef.current)) {+ contentContainerRef.current.scrollTop = 0;+ }+ }, [activeTabId, contentContainerRef]);++ return null;+};diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/__stories__/MergeRecordsContentScrollResetEffect.stories.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/__stories__/MergeRecordsContentScrollResetEffect.stories.tsxnew file mode 100644index 00000000000..5827ca5ea3d--- /dev/null+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/__stories__/MergeRecordsContentScrollResetEffect.stories.tsx@@ -0,0 +1,50 @@+import { MergeRecordsContentScrollResetEffect } from '@/object-record/record-merge/components/MergeRecordsContentScrollResetEffect';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { useRef, useState } from 'react';+import { expect, userEvent, waitFor, within } from 'storybook/test';++const MergeRecordsContentScrollResetEffectStory = () => {+ const [activeTabId, setActiveTabId] = useState('record-a');+ const contentContainerRef = useRef<HTMLDivElement>(null);++ return (+ <>+ <button onClick={() => setActiveTabId('record-b')}>Switch tab</button>+ <div+ aria-label="Merge content"+ ref={contentContainerRef}+ role="region"+ style={{ height: 100, overflowY: 'auto' }}+ >+ <div style={{ height: 500 }}>Merge fields</div>+ </div>+ <MergeRecordsContentScrollResetEffect+ activeTabId={activeTabId}+ contentContainerRef={contentContainerRef}+ />+ </>+ );+};++const meta: Meta<typeof MergeRecordsContentScrollResetEffectStory> = {+ title:+ 'Modules/ObjectRecord/RecordMerge/MergeRecordsContentScrollResetEffect',+ component: MergeRecordsContentScrollResetEffectStory,+};++export default meta;+type Story = StoryObj<typeof MergeRecordsContentScrollResetEffectStory>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const contentContainer = canvas.getByRole('region', {+ name: 'Merge content',+ });++ contentContainer.scrollTop = 200;+ await userEvent.click(canvas.getByRole('button', { name: 'Switch tab' }));++ await waitFor(() => expect(contentContainer.scrollTop).toBe(0));+ },+};diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsxindex a288ffdf0f2..06b299240ee 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListEditor.tsx@@ -21,6 +21,10 @@ const StyledVerticalListContainer = styled.div<{variant: PageLayoutVerticalListViewerVariant;shouldUseWhiteBackground: boolean;}>`+ --widget-card-content-overflow: visible;+ --widget-height: auto;+ --widget-scroll-overflow: visible;+background: ${({ shouldUseWhiteBackground }) =>shouldUseWhiteBackground? themeCssVariables.background.primarydiff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListViewer.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListViewer.tsxindex 809b7d96612..3f896867050 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListViewer.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListViewer.tsx@@ -13,6 +13,10 @@ const StyledVerticalListContainer = styled.div<{variant: PageLayoutVerticalListViewerVariant;shouldUseWhiteBackground: boolean;}>`+ --widget-card-content-overflow: visible;+ --widget-height: auto;+ --widget-scroll-overflow: visible;+background: ${({ shouldUseWhiteBackground }) =>shouldUseWhiteBackground? themeCssVariables.background.primary@@ -25,6 +29,15 @@ const StyledVerticalListContainer = styled.div<{variant === 'side-column' ? 0 : themeCssVariables.spacing[2]};`;+const StyledWidgetSlot = styled.div<{ shouldShowDivider: boolean }>`+ &:not(:last-child) {+ border-bottom: ${({ shouldShowDivider }) =>+ shouldShowDivider+ ? `1px solid ${themeCssVariables.border.color.light}`+ : 'none'};+ }+`;+type PageLayoutVerticalListViewerProps = {widgets: PageLayoutWidget[];};@@ -48,9 +61,12 @@ export const PageLayoutVerticalListViewer = ({shouldUseWhiteBackground={!isInPinnedTab || isMobile}>{widgets.map((widget) => (- <div key={widget.id}>+ <StyledWidgetSlot+ key={widget.id}+ shouldShowDivider={variant === 'side-column'}+ ><WidgetRenderer widget={widget} />- </div>+ </StyledWidgetSlot>))}</StyledVerticalListContainer>);diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useIsSideColumnContext.ts b/packages/twenty-front/src/modules/page-layout/hooks/useIsSideColumnContext.tsnew file mode 100644index 00000000000..2a97cbbf43d--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/hooks/useIsSideColumnContext.ts@@ -0,0 +1,27 @@+import { getPageLayoutVerticalListViewerVariant } from '@/page-layout/components/utils/getPageLayoutVerticalListViewerVariant';+import { useIsInPinnedTab } from '@/page-layout/widgets/hooks/useIsInPinnedTab';+import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';+import { useIsMobile } from 'twenty-ui/utilities';++type UseIsSideColumnContextReturn = {+ isInPinnedTab: boolean;+ isMobile: boolean;+ isSideColumnContext: boolean;+};++export const useIsSideColumnContext = (): UseIsSideColumnContextReturn => {+ const { isInPinnedTab } = useIsInPinnedTab();+ const { isInSidePanel } = useLayoutRenderingContext();+ const isMobile = useIsMobile();++ return {+ isInPinnedTab,+ isMobile,+ isSideColumnContext:+ getPageLayoutVerticalListViewerVariant({+ isInPinnedTab,+ isMobile,+ isInSidePanel,+ }) === 'side-column',+ };+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/CalendarWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/CalendarWidget.tsxindex adf18931e44..4ef814bbb6d 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/CalendarWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/calendar/components/CalendarWidget.tsx@@ -1,28 +1,13 @@import { CalendarEventsCard } from '@/activities/calendar/components/CalendarEventsCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type CalendarWidgetProps = {widget: PageLayoutWidget;};-export const CalendarWidget = ({ widget: _widget }: CalendarWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <CalendarEventsCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const CalendarWidget = ({ widget: _widget }: CalendarWidgetProps) => (+ <WidgetContentShell>+ <CalendarEventsCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsxindex 7d96a508d03..043064f73e7 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidget.tsx@@ -1,31 +1,22 @@import { CallRecordingWidgetUnavailableDisplay } from '@/page-layout/widgets/calendar-event-call-recording/components/CallRecordingWidgetUnavailableDisplay';import { useIsCalendarEventCallRecordingWidgetVisible } from '@/page-layout/widgets/calendar-event-call-recording/hooks/useIsCalendarEventCallRecordingWidgetVisible';import { CallRecordingSummaryWidgetContent } from '@/page-layout/widgets/call-recording-summary/components/CallRecordingSummaryWidgetContent';-import { styled } from '@linaria/react';--const StyledWidgetContainer = styled.div`- display: flex;- flex-direction: column;- height: 100%;- min-height: 0;- overflow: auto;- width: 100%;-`;+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';export const CallRecordingSummaryWidget = () => {const isWidgetVisible = useIsCalendarEventCallRecordingWidgetVisible();if (!isWidgetVisible) {return (- <StyledWidgetContainer>+ <StyledWidgetScrollContainer><CallRecordingWidgetUnavailableDisplay />- </StyledWidgetContainer>+ </StyledWidgetScrollContainer>);}return (- <StyledWidgetContainer>+ <StyledWidgetScrollContainer><CallRecordingSummaryWidgetContent />- </StyledWidgetContainer>+ </StyledWidgetScrollContainer>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsxindex 10aa899d315..6d3eb83a7b5 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidget.tsx@@ -1,31 +1,22 @@import { CallRecordingWidgetUnavailableDisplay } from '@/page-layout/widgets/calendar-event-call-recording/components/CallRecordingWidgetUnavailableDisplay';import { useIsCalendarEventCallRecordingWidgetVisible } from '@/page-layout/widgets/calendar-event-call-recording/hooks/useIsCalendarEventCallRecordingWidgetVisible';import { CallRecordingTranscriptWidgetContent } from '@/page-layout/widgets/call-recording-transcript/components/CallRecordingTranscriptWidgetContent';-import { styled } from '@linaria/react';--const StyledWidgetContainer = styled.div`- display: flex;- flex-direction: column;- height: 100%;- min-height: 0;- overflow: auto;- width: 100%;-`;+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';export const CallRecordingTranscriptWidget = () => {const isWidgetVisible = useIsCalendarEventCallRecordingWidgetVisible();if (!isWidgetVisible) {return (- <StyledWidgetContainer>+ <StyledWidgetScrollContainer><CallRecordingWidgetUnavailableDisplay />- </StyledWidgetContainer>+ </StyledWidgetScrollContainer>);}return (- <StyledWidgetContainer>+ <StyledWidgetScrollContainer><CallRecordingTranscriptWidgetContent />- </StyledWidgetContainer>+ </StyledWidgetScrollContainer>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsxindex 8ef562d1e3b..8b1a13afd02 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/DashboardWidgetPlaceholder.tsx@@ -49,7 +49,7 @@ export const DashboardWidgetPlaceholder = () => {return (<WidgetCard- variant="dashboard"+ variant="framed"isEditable={true}isEditing={false}isDragging={false}@@ -58,7 +58,7 @@ export const DashboardWidgetPlaceholder = () => {className="widget"><WidgetCardHeader- variant="dashboard"+ variant="framed"widgetId="widget-placeholder"isInEditMode={isPageLayoutInEditMode}isResizing={false}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsxdeleted file mode 100644index 78b89873258..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/components/NonRecordPageWidgetRenderer.tsx+++ /dev/null@@ -1,38 +0,0 @@-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';-import { useWidgetRendererState } from '@/page-layout/widgets/hooks/useWidgetRendererState';--type NonRecordPageWidgetRendererProps = {- widget: PageLayoutWidget;-};--export const NonRecordPageWidgetRenderer = ({- widget,-}: NonRecordPageWidgetRendererProps) => {- const state = useWidgetRendererState(widget);-- const isSoloVariant = state.variant === 'solo';-- return (- <WidgetCardShell- widget={widget}- variant={state.variant}- isEditable={state.isPageLayoutInEditMode}- isEditing={state.isEditing}- isDragging={state.isDragging}- isResizing={state.isResizing}- isLastWidget={state.isLastWidget}- showHeader={state.showHeader}- hasAccess={state.hasAccess}- restriction={state.restriction}- isInVerticalListTab={state.isInVerticalListTab}- isMobile={state.isMobile}- isReorderEnabled={true}- isDeletingWidgetEnabled={true}- onClick={state.isPageLayoutInEditMode ? state.handleClick : undefined}- onRemove={state.handleRemove}- onMouseEnter={isSoloVariant ? undefined : state.handleMouseEnter}- onMouseLeave={isSoloVariant ? undefined : state.handleMouseLeave}- />- );-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsxdeleted file mode 100644index 0ad3ab1d2ce..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageWidgetRenderer.tsx+++ /dev/null@@ -1,40 +0,0 @@-import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';-import { useWidgetRendererState } from '@/page-layout/widgets/hooks/useWidgetRendererState';--type RecordPageWidgetRendererProps = {- widget: PageLayoutWidget;-};--export const RecordPageWidgetRenderer = ({- widget,-}: RecordPageWidgetRendererProps) => {- const state = useWidgetRendererState(widget);-- const isWidgetEditable = state.isPageLayoutInEditMode;-- const isSoloVariant = state.variant === 'solo';-- return (- <WidgetCardShell- widget={widget}- variant={state.variant}- isEditable={isWidgetEditable}- isEditing={state.isEditing}- isDragging={state.isDragging}- isResizing={state.isResizing}- isLastWidget={state.isLastWidget}- showHeader={state.showHeader}- hasAccess={state.hasAccess}- restriction={state.restriction}- isInVerticalListTab={state.isInVerticalListTab}- isMobile={state.isMobile}- isReorderEnabled={true}- isDeletingWidgetEnabled={true}- onClick={isWidgetEditable ? state.handleClick : undefined}- onRemove={state.handleRemove}- onMouseEnter={isSoloVariant ? undefined : state.handleMouseEnter}- onMouseLeave={isSoloVariant ? undefined : state.handleMouseLeave}- />- );-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsxindex af803eb3478..17308d03ed2 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetCardShell.tsx@@ -1,3 +1,5 @@+import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutContentContext';+import { useCurrentPageLayoutOrThrow } from '@/page-layout/hooks/useCurrentPageLayoutOrThrow';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { PageLayoutWidgetForbiddenDisplay } from '@/page-layout/widgets/components/PageLayoutWidgetForbiddenDisplay';import { PageLayoutWidgetInvalidConfigDisplay } from '@/page-layout/widgets/components/PageLayoutWidgetInvalidConfigDisplay';@@ -5,6 +7,8 @@ import { WidgetContentRenderer } from '@/page-layout/widgets/components/WidgetCoimport { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';import { type WidgetAccessDenialInfo } from '@/page-layout/widgets/types/WidgetAccessDenialInfo';import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';+import { getWidgetContentPadding } from '@/page-layout/widgets/utils/getWidgetContentPadding';+import { isWidgetCardFlushInViewMode } from '@/page-layout/widgets/utils/isWidgetCardFlushInViewMode';import { WidgetCard } from '@/page-layout/widgets/widget-card/components/WidgetCard';import { WidgetCardContent } from '@/page-layout/widgets/widget-card/components/WidgetCardContent';import { WidgetCardHeader } from '@/page-layout/widgets/widget-card/components/WidgetCardHeader';@@ -13,7 +17,11 @@ import { type MouseEvent, useContext } from 'react';import { ErrorBoundary } from 'react-error-boundary';import { IconLock } from 'twenty-ui/icon';import { ThemeContext } from 'twenty-ui/theme-constants';-import { WidgetType } from '~/generated-metadata/graphql';+import {+ PageLayoutTabLayoutMode,+ PageLayoutType,+ WidgetType,+} from '~/generated-metadata/graphql';const StyledNoAccessContainer = styled.div`align-items: center;@@ -28,14 +36,9 @@ type WidgetCardShellProps = {isEditing: boolean;isDragging: boolean;isResizing: boolean;- isLastWidget: boolean;showHeader: boolean;hasAccess: boolean;restriction: WidgetAccessDenialInfo;- isInVerticalListTab: boolean;- isMobile: boolean;- isReorderEnabled: boolean;- isDeletingWidgetEnabled: boolean;onClick?: () => void;onRemove: (e?: MouseEvent) => void;onMouseEnter?: () => void;@@ -49,29 +52,33 @@ export const WidgetCardShell = ({isEditing,isDragging,isResizing,- isLastWidget,showHeader,hasAccess,restriction,- isInVerticalListTab,- isMobile,- isReorderEnabled,- isDeletingWidgetEnabled,onClick,onRemove,onMouseEnter,onMouseLeave,}: WidgetCardShellProps) => {const { theme } = useContext(ThemeContext);+ const { layoutMode } = usePageLayoutContentContext();+ const { currentPageLayout } = useCurrentPageLayoutOrThrow();++ const isVerticalList = layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST;+ const isFixedHeightIframe =+ currentPageLayout.type === PageLayoutType.RECORD_PAGE &&+ isVerticalList &&+ widget.type === WidgetType.IFRAME;+ const contentPadding = isWidgetCardFlushInViewMode({+ isEditable,+ variant,+ })+ ? getWidgetContentPadding(widget.type)+ : 'default';const dataTestId =widget.type === WidgetType.FIELDS ? 'record-fields-widget' : widget.id;- // A widget stacked in the main tab area gets a bounded slot with its own- // scroll, so no single widget swallows the tab. Solo widgets own the tab,- // and pinned/side-column stacks keep their flowing column behavior.- const hasBoundedHeight = variant === 'record-page' && isInVerticalListTab;-return (<WidgetComponentInstanceContext.Provider value={{ instanceId: widget.id }}><WidgetCard@@ -82,7 +89,6 @@ export const WidgetCardShell = ({isEditing={isEditing}isDragging={isDragging}isResizing={isResizing}- isLastWidget={isLastWidget}onMouseEnter={onMouseEnter}onMouseLeave={onMouseLeave}data-widget-id={widget.id}@@ -91,13 +97,12 @@ export const WidgetCardShell = ({>{showHeader && (<WidgetCardHeader+ className="widget-card-header"widgetId={widget.id}variant={variant}isInEditMode={isEditable}hasAccess={hasAccess}isResizing={isResizing}- isReorderEnabled={isReorderEnabled}- isDeletingWidgetEnabled={isDeletingWidgetEnabled}title={widget.title}onRemove={onRemove}forbiddenDisplay={@@ -115,10 +120,9 @@ export const WidgetCardShell = ({variant={variant}hasHeader={showHeader}isEditable={isEditable}- isInVerticalListTab={isInVerticalListTab}- isMobile={isMobile}hasInteractiveContent={widget.type === WidgetType.RECORD_TABLE}- hasBoundedHeight={hasBoundedHeight}+ isFixedHeight={isFixedHeightIframe}+ contentPadding={contentPadding}>{hasAccess ? (<ErrorBoundarydiff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentFrame.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentFrame.tsxnew file mode 100644index 00000000000..90bf7e5ea7e--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentFrame.tsx@@ -0,0 +1,20 @@+import { styled } from '@linaria/react';+import { themeCssVariables } from 'twenty-ui/theme-constants';++// Containment boundary for third-party widget content, which the page cannot+// style and must not let bleed into its neighbours.+export const StyledWidgetContentFrame = styled.div`+ border: 1px solid ${themeCssVariables.border.color.medium};+ border-radius: ${themeCssVariables.border.radius.md};+ box-sizing: border-box;+ width: 100%;+`;++export const StyledWidgetTableOutline = styled.div`+ border: 1px solid ${themeCssVariables.border.color.light};+ border-radius: ${themeCssVariables.border.radius.sm};+ display: flex;+ flex-direction: column;+ min-height: 0;+ overflow: hidden;+`;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentShell.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentShell.tsxnew file mode 100644index 00000000000..e9ad24862ad--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetContentShell.tsx@@ -0,0 +1,18 @@+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';+import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';+import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';+import { type ReactNode } from 'react';++type WidgetContentShellProps = {+ children?: ReactNode;+};++export const WidgetContentShell = ({ children }: WidgetContentShellProps) => {+ const { isInSidePanel } = useLayoutRenderingContext();++ return (+ <SidePanelProvider value={{ isInSidePanel }}>+ <StyledWidgetContentContainer>{children}</StyledWidgetContentContainer>+ </SidePanelProvider>+ );+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsxindex 023959d8fba..d58b8512fa7 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetRenderer.tsx@@ -1,19 +1,31 @@import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { NonRecordPageWidgetRenderer } from '@/page-layout/widgets/components/NonRecordPageWidgetRenderer';-import { RecordPageWidgetRenderer } from '@/page-layout/widgets/components/RecordPageWidgetRenderer';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { PageLayoutType } from '~/generated-metadata/graphql';+import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';+import { useWidgetRendererState } from '@/page-layout/widgets/hooks/useWidgetRendererState';type WidgetRendererProps = {widget: PageLayoutWidget;};export const WidgetRenderer = ({ widget }: WidgetRendererProps) => {- const { layoutType } = useLayoutRenderingContext();+ const state = useWidgetRendererState(widget);- if (layoutType === PageLayoutType.RECORD_PAGE) {- return <RecordPageWidgetRenderer widget={widget} />;- }+ const isWidgetEditable = state.isPageLayoutInEditMode;- return <NonRecordPageWidgetRenderer widget={widget} />;+ return (+ <WidgetCardShell+ widget={widget}+ variant={state.variant}+ isEditable={isWidgetEditable}+ isEditing={state.isEditing}+ isDragging={state.isDragging}+ isResizing={state.isResizing}+ showHeader={state.showHeader}+ hasAccess={state.hasAccess}+ restriction={state.restriction}+ onClick={isWidgetEditable ? state.handleClick : undefined}+ onRemove={state.handleRemove}+ onMouseEnter={state.handleMouseEnter}+ onMouseLeave={state.handleMouseLeave}+ />+ );};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetCardShell.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetCardShell.stories.tsxnew file mode 100644index 00000000000..d56c9d4d895--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetCardShell.stories.tsx@@ -0,0 +1,173 @@+import {+ PAGE_LAYOUT_TEST_INSTANCE_ID,+ PageLayoutTestWrapper,+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';+import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';+import { type PageLayout } from '@/page-layout/types/PageLayout';+import {+ makeDraft,+ makeTab,+ makeWidget,+} from '@/page-layout/testing/pageLayoutDraftFixtures';+import { PageLayoutContentProvider } from '@/page-layout/contexts/PageLayoutContentContext';+import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';+import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { createStore } from 'jotai';+import { expect, waitFor, within } from 'storybook/test';+import {+ PageLayoutTabLayoutMode,+ PageLayoutType,+ WidgetType,+} from '~/generated-metadata/graphql';++type WidgetCardShellStoryProps = {+ isEditable: boolean;+ pageLayoutType: PageLayoutType;+ variant: WidgetCardVariant;+ widgetType: WidgetType;+};++const WidgetCardShellStory = ({+ isEditable,+ pageLayoutType,+ variant,+ widgetType,+}: WidgetCardShellStoryProps) => {+ const store = createStore();+ const widget = {+ ...makeWidget('widget-card-shell-story', 0),+ type: widgetType,+ };+ const pageLayout: PageLayout = {+ ...makeDraft([makeTab('tab-1', [widget])]),+ applicationId: '',+ createdAt: '2026-08-22T00:00:00.000Z',+ deletedAt: null,+ isSystemSideEffect: false,+ type: pageLayoutType,+ universalIdentifier: 'widget-card-shell-layout',+ updatedAt: '2026-08-22T00:00:00.000Z',+ };++ store.set(+ pageLayoutPersistedComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ }),+ pageLayout,+ );+ store.set(+ pageLayoutDraftComponentState.atomFamily({+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,+ }),+ pageLayout,+ );++ return (+ <div style={{ height: 200, width: 300 }}>+ <PageLayoutTestWrapper layoutType={pageLayoutType} store={store}>+ <PageLayoutContentProvider+ value={{+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,+ presentation: 'stack',+ tabId: 'tab-1',+ }}+ >+ <WidgetCardShell+ widget={widget}+ variant={variant}+ isEditable={isEditable}+ isEditing={false}+ isDragging={false}+ isResizing={false}+ showHeader={false}+ hasAccess={false}+ restriction={{ type: null }}+ onRemove={() => undefined}+ />+ </PageLayoutContentProvider>+ </PageLayoutTestWrapper>+ </div>+ );+};++const meta: Meta<typeof WidgetCardShellStory> = {+ title: 'Modules/PageLayout/Widgets/WidgetCardShell',+ component: WidgetCardShellStory,+ args: {+ isEditable: false,+ pageLayoutType: PageLayoutType.RECORD_PAGE,+ variant: 'flush',+ widgetType: WidgetType.IFRAME,+ },+};++export default meta;+type Story = StoryObj<typeof WidgetCardShellStory>;++const getWidgetContent = (canvasElement: HTMLElement) => {+ const canvas = within(canvasElement);+ const card = canvas.getByTestId('widget-card-shell-story');+ const content = card.firstElementChild;++ if (!(content instanceof HTMLElement)) {+ throw new Error('Widget content not found');+ }++ return content;+};++export const RecordPageIframe: Story = {+ play: async ({ canvasElement }) => {+ const content = getWidgetContent(canvasElement);+ const rootFontSizeInPixels = Number.parseFloat(+ getComputedStyle(content.ownerDocument.documentElement).fontSize,+ );++ await waitFor(() =>+ expect(getComputedStyle(content).minHeight).toBe(+ `${40 * rootFontSizeInPixels}px`,+ ),+ );+ },+};++export const StandalonePageIframe: Story = {+ args: {+ pageLayoutType: PageLayoutType.STANDALONE_PAGE,+ },+ play: async ({ canvasElement }) => {+ const content = getWidgetContent(canvasElement);++ await waitFor(() =>+ expect(getComputedStyle(content).minHeight).toBe('0px'),+ );+ },+};++export const FlushWorkflow: Story = {+ args: {+ widgetType: WidgetType.WORKFLOW,+ },+ play: async ({ canvasElement }) => {+ const content = getWidgetContent(canvasElement);++ await waitFor(() =>+ expect(getComputedStyle(content).paddingTop).toBe('0px'),+ );+ },+};++export const FlushTasks: Story = {+ args: {+ widgetType: WidgetType.TASKS,+ },+ play: async ({ canvasElement }) => {+ const content = getWidgetContent(canvasElement);++ await waitFor(() =>+ expect(getComputedStyle(content).paddingTop).not.toBe('0px'),+ );+ },+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsxindex 61acaa11872..806f3cc9577 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx@@ -32,7 +32,6 @@ import { type PageLayout } from '@/page-layout/types/PageLayout';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';-import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';import {AggregateOperations,@@ -1318,8 +1317,7 @@ export const OnMobile: Story = {},docs: {description: {- story:- 'Widget on mobile viewport should use side-column variant instead of record-page variant.',+ story: 'Widget on mobile viewport should use the flush variant.',},},},@@ -1420,8 +1418,7 @@ export const InSidePanel: Story = {parameters: {docs: {description: {- story:- 'Widget in side panel should use side-column variant instead of record-page variant.',+ story: 'Widget in side panel should use the flush variant.',},},},@@ -1571,24 +1568,22 @@ export const Catalog: CatalogStory<Story, typeof WidgetRenderer> = {},render: (args) => {const state = (args as any).catalogState || 'default';- const variantKey = (args as any).catalogVariant || 'record-page';+ const scenarioKey = (args as any).catalogVariant || 'record-page';- const isRestricted = variantKey.includes('-restricted');- const variant = variantKey.replace('-restricted', '') as WidgetCardVariant;+ const isRestricted = scenarioKey.includes('-restricted');+ const scenario = scenarioKey.replace('-restricted', '');const isInEditMode = state !== 'read';const pageLayoutType =- variant === 'dashboard'+ scenario === 'dashboard'? PageLayoutType.DASHBOARD: PageLayoutType.RECORD_PAGE;const layoutMode =- variant === 'solo'- ? PageLayoutTabLayoutMode.CANVAS- : PageLayoutTabLayoutMode.GRID;-- const presentation = variant === 'solo' ? 'solo' : 'stack';+ scenario === 'dashboard'+ ? PageLayoutTabLayoutMode.GRID+ : PageLayoutTabLayoutMode.VERTICAL_LIST;const widget: PageLayoutWidget = {isSystemSideEffect: false,@@ -1598,7 +1593,7 @@ export const Catalog: CatalogStory<Story, typeof WidgetRenderer> = {isActive: true,id: WIDGET_ID_CATALOG,pageLayoutTabId:- variant === 'side-column' ? 'pinned-tab' : TAB_ID_OVERVIEW,+ scenario === 'side-column' ? 'pinned-tab' : TAB_ID_OVERVIEW,type: WidgetType.GRAPH,title: 'Widget name',objectMetadataId: companyObjectMetadataItem.id,@@ -1700,7 +1695,7 @@ export const Catalog: CatalogStory<Story, typeof WidgetRenderer> = {objectMetadataId: companyObjectMetadataItem.id,universalIdentifier: '20202020-0000-0000-0000-000000000001',tabs:- variant === 'side-column'+ scenario === 'side-column'? [{isSystemSideEffect: false,@@ -1798,9 +1793,9 @@ export const Catalog: CatalogStory<Story, typeof WidgetRenderer> = {<PageLayoutContentProvidervalue={{layoutMode,- presentation,+ presentation: 'stack',tabId:- variant === 'side-column'+ scenario === 'side-column'? 'pinned-tab': TAB_ID_OVERVIEW,}}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/constants/StackedWidgetMaxHeight.ts b/packages/twenty-front/src/modules/page-layout/widgets/constants/StackedWidgetMaxHeight.tsdeleted file mode 100644index 9af663f6525..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/constants/StackedWidgetMaxHeight.ts+++ /dev/null@@ -1,3 +0,0 @@-// A widget stacked alongside others in the main tab area gets a bounded slot-// with its own scroll, so no single widget swallows the whole tab.-export const STACKED_WIDGET_MAX_HEIGHT = 640;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsxindex fd61caa930f..32354eba6d8 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/email-thread/components/EmailThreadWidget.tsx@@ -1,4 +1,3 @@-import { styled } from '@linaria/react';import { useCallback, useState } from 'react';import { CustomResolverFetchMoreLoader } from '@/activities/components/CustomResolverFetchMoreLoader';@@ -10,6 +9,10 @@ import { type EmailDraftPrefill } from '@/activities/emails/types/EmailDraftPrefimport { type EmailThreadMessageWithSender } from '@/activities/emails/types/EmailThreadMessageWithSender';import { getEmailDraftPrefillFromMessage } from '@/activities/emails/utils/getEmailDraftPrefillFromMessage';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import {+ StyledWidgetContentContainer,+ StyledWidgetScrollContainer,+} from '@/ui/layout/components/WidgetContentContainer';import { EmailThreadComposer } from '@/page-layout/widgets/email-thread/components/EmailThreadComposer';import { EmailThreadIntermediaryMessages } from '@/page-layout/widgets/email-thread/components/EmailThreadIntermediaryMessages';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';@@ -17,19 +20,6 @@ import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { t } from '@lingui/core/macro';import { isDefined } from 'twenty-shared/utils';-const StyledWrapper = styled.div`- display: flex;- flex-direction: column;- width: 100%;-`;--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- overflow-y: auto;-`;-type EmailThreadWidgetProps = {widget: PageLayoutWidget;};@@ -102,17 +92,17 @@ export const EmailThreadWidget = ({if (threadLoading || !thread || !messages.length) {return (- <StyledWrapper>- <StyledContainer>+ <StyledWidgetContentContainer>+ <StyledWidgetScrollContainer><EmailLoader loadingText={t`Loading thread`} />- </StyledContainer>- </StyledWrapper>+ </StyledWidgetScrollContainer>+ </StyledWidgetContentContainer>);}return (- <StyledWrapper>- <StyledContainer>+ <StyledWidgetContentContainer>+ <StyledWidgetScrollContainer>{firstMessages.map((message) => (<EmailThreadMessagekey={message.id}@@ -135,7 +125,7 @@ export const EmailThreadWidget = ({loading={threadLoading}onLastRowVisible={fetchMoreMessages}/>- </StyledContainer>+ </StyledWidgetScrollContainer>{canReply && (<EmailThreadComposerkey={draftPrefill?.messageId ?? 'reply'}@@ -146,6 +136,6 @@ export const EmailThreadWidget = ({draftPrefill={draftPrefill}/>)}- </StyledWrapper>+ </StyledWidgetContentContainer>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/emails/components/EmailWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/emails/components/EmailWidget.tsxindex 8fd52bbb646..253edd24bc5 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/emails/components/EmailWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/emails/components/EmailWidget.tsx@@ -1,28 +1,13 @@import { EmailsCard } from '@/activities/emails/components/EmailsCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type EmailWidgetProps = {widget: PageLayoutWidget;};-export const EmailWidget = ({ widget: _widget }: EmailWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <EmailsCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const EmailWidget = ({ widget: _widget }: EmailWidgetProps) => (+ <WidgetContentShell>+ <EmailsCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsxindex af252efe8bf..90d5e352489 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetJunctionRelationCard.tsx@@ -18,6 +18,7 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fielimport { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { extractTargetRecordsFromJunction } from '@/object-record/record-field/ui/utils/junction/extractTargetRecordsFromJunction';import { getJunctionConfig } from '@/object-record/record-field/ui/utils/junction/getJunctionConfig';+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';@@ -170,31 +171,37 @@ export const FieldWidgetJunctionRelationCard = ({}}><FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>- <RecordDetailRecordsListContainer>- {visibleRecords.map((item) => (- <Fragment key={item.record.id}>- <RecordDetailRelationRecordsListItemEffect- relationRecordId={item.record.id}- relationObjectMetadataNameSingular={item.objectNameSingular}- />- <RecordDetailRelationRecordsListItem- isExpanded={expandedItem === item.record.id}- onClick={handleItemClick}- relationRecord={item.record}- relationObjectMetadataNameSingular={item.objectNameSingular}- relationFieldMetadataId=""- />- </Fragment>- ))}- {hasMoreRecords && (- <StyledShowMoreButtonContainer>- <FieldWidgetShowMoreButton- remainingCount={remainingCount}- onClick={handleShowMore}- />- </StyledShowMoreButtonContainer>- )}- </RecordDetailRecordsListContainer>+ <StyledWidgetContentContainer>+ <RecordDetailRecordsListContainer>+ {visibleRecords.map((item) => (+ <Fragment key={item.record.id}>+ <RecordDetailRelationRecordsListItemEffect+ relationRecordId={item.record.id}+ relationObjectMetadataNameSingular={+ item.objectNameSingular+ }+ />+ <RecordDetailRelationRecordsListItem+ isExpanded={expandedItem === item.record.id}+ onClick={handleItemClick}+ relationRecord={item.record}+ relationObjectMetadataNameSingular={+ item.objectNameSingular+ }+ relationFieldMetadataId=""+ />+ </Fragment>+ ))}+ {hasMoreRecords && (+ <StyledShowMoreButtonContainer>+ <FieldWidgetShowMoreButton+ remainingCount={remainingCount}+ onClick={handleShowMore}+ />+ </StyledShowMoreButtonContainer>+ )}+ </RecordDetailRecordsListContainer>+ </StyledWidgetContentContainer></FieldInputEventContext.Provider></FieldContext.Provider></RecordFieldsScopeContextProvider>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsxindex 148a0cfaaa5..bdef98db8d5 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetMorphRelationCard.tsx@@ -17,6 +17,7 @@ import {import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';import { type FieldMorphRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';@@ -144,31 +145,37 @@ export const FieldWidgetMorphRelationCard = ({}}><FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>- <RecordDetailRecordsListContainer>- {visibleRecords.map((item) => (- <Fragment key={`${item.value.id}-${item.fieldMetadataId}`}>- <RecordDetailRelationRecordsListItemEffect- relationRecordId={item.value.id}- relationObjectMetadataNameSingular={item.objectNameSingular}- />- <RecordDetailRelationRecordsListItem- isExpanded={expandedItem === item.value.id}- onClick={handleItemClick}- relationRecord={item.value}- relationObjectMetadataNameSingular={item.objectNameSingular}- relationFieldMetadataId={item.fieldMetadataId}- />- </Fragment>- ))}- {hasMoreRecords && (- <StyledShowMoreButtonContainer>- <FieldWidgetShowMoreButton- remainingCount={remainingCount}- onClick={handleShowMore}- />- </StyledShowMoreButtonContainer>- )}- </RecordDetailRecordsListContainer>+ <StyledWidgetContentContainer>+ <RecordDetailRecordsListContainer>+ {visibleRecords.map((item) => (+ <Fragment key={`${item.value.id}-${item.fieldMetadataId}`}>+ <RecordDetailRelationRecordsListItemEffect+ relationRecordId={item.value.id}+ relationObjectMetadataNameSingular={+ item.objectNameSingular+ }+ />+ <RecordDetailRelationRecordsListItem+ isExpanded={expandedItem === item.value.id}+ onClick={handleItemClick}+ relationRecord={item.value}+ relationObjectMetadataNameSingular={+ item.objectNameSingular+ }+ relationFieldMetadataId={item.fieldMetadataId}+ />+ </Fragment>+ ))}+ {hasMoreRecords && (+ <StyledShowMoreButtonContainer>+ <FieldWidgetShowMoreButton+ remainingCount={remainingCount}+ onClick={handleShowMore}+ />+ </StyledShowMoreButtonContainer>+ )}+ </RecordDetailRecordsListContainer>+ </StyledWidgetContentContainer></FieldInputEventContext.Provider></FieldContext.Provider></RecordFieldsScopeContextProvider>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsxindex 8e70e084b99..2fda3e9627e 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationCard.tsx@@ -16,6 +16,7 @@ import {import { usePersistField } from '@/object-record/record-field/ui/hooks/usePersistField';import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';import { type FieldRelationMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';+import { StyledWidgetContentContainer } from '@/ui/layout/components/WidgetContentContainer';import { FieldWidgetShowMoreButton } from '@/page-layout/widgets/field/components/FieldWidgetShowMoreButton';import { FIELD_WIDGET_RELATION_CARD_INITIAL_VISIBLE_ITEMS } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardInitialVisibleItems';import { FIELD_WIDGET_RELATION_CARD_LOAD_MORE_INCREMENT } from '@/page-layout/widgets/field/constants/FieldWidgetRelationCardLoadMoreIncrement';@@ -142,35 +143,37 @@ export const FieldWidgetRelationCard = ({}}><FieldInputEventContext.Provider value={{ onSubmit: handleSubmit }}>- <RecordDetailRecordsListContainer>- {visibleRecords.map((record) => (- <Fragment key={record.id}>- <RecordDetailRelationRecordsListItemEffect- relationRecordId={record.id}- relationObjectMetadataNameSingular={- relationObjectNameSingular- }- />- <RecordDetailRelationRecordsListItem- isExpanded={expandedItem === record.id}- onClick={handleItemClick}- relationRecord={record}- relationObjectMetadataNameSingular={- relationObjectNameSingular- }- relationFieldMetadataId={relationFieldMetadataId}- />- </Fragment>- ))}- {hasMoreRecords && (- <StyledShowMoreButtonContainer>- <FieldWidgetShowMoreButton- remainingCount={remainingCount}- onClick={handleShowMore}- />- </StyledShowMoreButtonContainer>- )}- </RecordDetailRecordsListContainer>+ <StyledWidgetContentContainer>+ <RecordDetailRecordsListContainer>+ {visibleRecords.map((record) => (+ <Fragment key={record.id}>+ <RecordDetailRelationRecordsListItemEffect+ relationRecordId={record.id}+ relationObjectMetadataNameSingular={+ relationObjectNameSingular+ }+ />+ <RecordDetailRelationRecordsListItem+ isExpanded={expandedItem === record.id}+ onClick={handleItemClick}+ relationRecord={record}+ relationObjectMetadataNameSingular={+ relationObjectNameSingular+ }+ relationFieldMetadataId={relationFieldMetadataId}+ />+ </Fragment>+ ))}+ {hasMoreRecords && (+ <StyledShowMoreButtonContainer>+ <FieldWidgetShowMoreButton+ remainingCount={remainingCount}+ onClick={handleShowMore}+ />+ </StyledShowMoreButtonContainer>+ )}+ </RecordDetailRecordsListContainer>+ </StyledWidgetContentContainer></FieldInputEventContext.Provider></FieldContext.Provider></RecordFieldsScopeContextProvider>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsxindex 33ecfa0e236..a67bd806188 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationEditAction.tsx@@ -19,9 +19,10 @@ import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guarimport { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';import { CustomError, isDefined } from 'twenty-shared/utils';import { IconPencil, IconPlus } from 'twenty-ui/icon';-import { LightIconButton } from 'twenty-ui/input';+import { IconButton } from 'twenty-ui/input';import { RelationType } from '~/generated-metadata/graphql';type FieldWidgetRelationEditActionProps = {@@ -83,15 +84,21 @@ export const FieldWidgetRelationEditAction = ({? relationValue.length > 0: isDefined(relationValue);- const triggerIcon =+ const isEditAction =fieldDefinition.metadata.relationType === RelationType.MANY_TO_ONE ||- hasAtLeastOneRelationRecord- ? IconPencil- : IconPlus;+ hasAtLeastOneRelationRecord;++ const triggerIcon = isEditAction ? IconPencil : IconPlus;+ const triggerLabel = isEditAction ? t`Edit relation` : t`Add relation`;const dropdownTriggerClickableComponent = (<StyledEditButtonWrapper>- <LightIconButton Icon={triggerIcon} accent="secondary" />+ <IconButton+ Icon={triggerIcon}+ variant="tertiary"+ size="small"+ ariaLabel={triggerLabel}+ /></StyledEditButtonWrapper>);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsxindex ba2a6cb7bb4..fbb56e810d4 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRelationTable.tsx@@ -5,6 +5,7 @@ import { type FieldRelationMetadata } from '@/object-record/record-field/ui/typeimport { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';import { RECORD_TABLE_ROW_HEIGHT } from '@/object-record/record-table/constants/RecordTableRowHeight';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';+import { StyledWidgetTableOutline } from '@/page-layout/widgets/components/WidgetContentFrame';import { RecordTableWidgetRendererContent } from '@/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent';import { getFieldWidgetNestedRelationCreateThrough } from '@/page-layout/widgets/field/utils/getFieldWidgetNestedRelationCreateThrough';import { isFieldWidget } from '@/page-layout/widgets/field/utils/isFieldWidget';@@ -13,7 +14,6 @@ import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';import { useAtomFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomFamilySelectorValue';import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';import { isNonEmptyString } from '@sniptt/guards';import { useMemo } from 'react';import {@@ -28,14 +28,8 @@ const FIELD_WIDGET_RELATION_TABLE_MAX_HEIGHT_IN_PX =(FIELD_WIDGET_RELATION_TABLE_MAX_VISIBLE_RECORDS + 2) *RECORD_TABLE_ROW_HEIGHT;-const StyledContainer = styled.div`- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.sm};- display: flex;- flex-direction: column;+const StyledContainer = styled(StyledWidgetTableOutline)`max-height: ${FIELD_WIDGET_RELATION_TABLE_MAX_HEIGHT_IN_PX}px;- min-height: 0;- overflow: hidden;`;type FieldWidgetRelationTableProps = {diff --git a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRichTextEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRichTextEditor.tsxindex 89e4bd70829..a7400ff5992 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRichTextEditor.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field/components/FieldWidgetRichTextEditor.tsx@@ -27,7 +27,9 @@ const StyledContainer = styled.div`const StyledEditorContainer = styled.div`box-sizing: border-box;- padding-inline: 44px;+ margin-top: ${themeCssVariables.spacing[2]};+ padding-left: ${themeCssVariables.spacing[6]};+ padding-right: ${themeCssVariables.spacing[2]};width: 100%;`;@@ -45,7 +47,7 @@ const LoadingSkeleton = () => {<SkeletonThemebaseColor={theme.background.tertiary}highlightColor={theme.background.transparent.lighter}- borderRadius={theme.border.radius.sm}+ borderRadius={themeCssVariables.border.radius.md}><Skeleton height={SKELETON_LOADER_HEIGHT_SIZES.standard.s} /></SkeletonTheme>diff --git a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsxindex 29805fa8126..a189159cc10 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/fields/components/FieldsWidget.tsx@@ -2,6 +2,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataimport { RecordFieldsScopeContextProvider } from '@/object-record/record-field-list/contexts/RecordFieldsScopeContext';import { RecordFieldListComponentInstanceContext } from '@/object-record/record-field-list/states/contexts/RecordFieldListComponentInstanceContext';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContentContainer';import { FieldsWidgetCellEditModePortal } from '@/page-layout/widgets/fields/components/FieldsWidgetCellEditModePortal';import { FieldsWidgetCellHoveredPortal } from '@/page-layout/widgets/fields/components/FieldsWidgetCellHoveredPortal';import { FieldsWidgetFieldList } from '@/page-layout/widgets/fields/components/FieldsWidgetFieldList';@@ -23,13 +24,6 @@ import {import { themeCssVariables } from 'twenty-ui/theme-constants';import { type FieldsConfiguration } from '~/generated-metadata/graphql';-const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;-const StyledPropertyBox = styled.div`align-self: stretch;border-radius: ${themeCssVariables.border.radius.sm};@@ -106,7 +100,7 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {if (!hasFieldsToDisplay) {return (<SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>+ <StyledWidgetScrollContainer><AnimatedPlaceholderEmptyContainer><AnimatedPlaceholder type="noRecord" /><AnimatedPlaceholderEmptyTextContainer>@@ -118,14 +112,14 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {</AnimatedPlaceholderEmptySubTitle></AnimatedPlaceholderEmptyTextContainer></AnimatedPlaceholderEmptyContainer>- </StyledContainer>+ </StyledWidgetScrollContainer></SidePanelProvider>);}return (<RecordFieldsScopeContextProvider value={{ scopeInstanceId: instanceId }}>- <StyledContainer>+ <StyledWidgetScrollContainer><RecordFieldListComponentInstanceContext.Providervalue={{instanceId,@@ -178,7 +172,7 @@ export const FieldsWidget = ({ widget }: FieldsWidgetProps) => {flattenedFieldMetadataItems={flattenedFieldMetadataItems}/></RecordFieldListComponentInstanceContext.Provider>- </StyledContainer>+ </StyledWidgetScrollContainer></RecordFieldsScopeContextProvider>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/files/components/FileWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/files/components/FileWidget.tsxindex 7d8d700c5df..8645bdaed0c 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/files/components/FileWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/files/components/FileWidget.tsx@@ -1,28 +1,13 @@import { FilesCard } from '@/activities/files/components/FilesCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type FileWidgetProps = {widget: PageLayoutWidget;};-export const FileWidget = ({ widget: _widget }: FileWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <FilesCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const FileWidget = ({ widget: _widget }: FileWidgetProps) => (+ <WidgetContentShell>+ <FilesCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsxindex fe12241a4a0..5794dd52999 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx@@ -8,17 +8,20 @@ import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutCoimport { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { PageLayoutWidgetNoDataDisplay } from '@/page-layout/widgets/components/PageLayoutWidgetNoDataDisplay';+import { StyledWidgetContentFrame } from '@/page-layout/widgets/components/WidgetContentFrame';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-const StyledContainer = styled.div<{- isSoloLayout: boolean;+const StyledContainer = styled(StyledWidgetContentFrame)<{isInEditMode: boolean;+ isSoloLayout: boolean;}>`- height: 100%;- overflow: ${({ isSoloLayout }) => (isSoloLayout ? 'visible' : 'auto')};+ height: var(--widget-height, 100%);+ overflow: var(+ --widget-scroll-overflow,+ ${({ isSoloLayout }) => (isSoloLayout ? 'visible' : 'auto')}+ );pointer-events: ${({ isInEditMode }) => (isInEditMode ? 'none' : 'auto')};- width: 100%;`;const FrontComponentRenderer = lazy(() =>@@ -54,8 +57,8 @@ export const FrontComponentWidgetRenderer = ({return (<StyledContainer- isSoloLayout={presentation === 'solo'}isInEditMode={isPageLayoutInEditMode}+ isSoloLayout={presentation === 'solo'}><Suspense fallback={<FrontComponentSkeletonLoader />}><FrontComponentRendererdiff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.tsdeleted file mode 100644index 1979519a3d3..00000000000--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab.ts+++ /dev/null@@ -1,45 +0,0 @@-import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';-import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';-import { useWidgetVisibilityContext } from '@/page-layout/hooks/useWidgetVisibilityContext';-import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';-import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';-import { isDefined } from 'twenty-shared/utils';-import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';--export const useIsCurrentWidgetLastOfTab = (widgetId: string): boolean => {- const { currentPageLayout } = useCurrentPageLayout();- const isPageLayoutInEditMode = useIsPageLayoutInEditMode();- const widgetVisibilityContext = useWidgetVisibilityContext();-- if (!isDefined(currentPageLayout)) {- return false;- }-- const tab = currentPageLayout.tabs.find((tab) =>- tab.widgets.some((widget) => widget.id === widgetId),- );-- if (!isDefined(tab)) {- return false;- }-- const filteredWidgets = isPageLayoutInEditMode- ? tab.widgets- : filterVisibleWidgets({- widgets: tab.widgets,- context: widgetVisibilityContext,- });-- const visibleWidgets =- tab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST- ? sortWidgetsByVerticalListPosition(filteredWidgets)- : filteredWidgets;-- if (visibleWidgets.length === 0) {- return false;- }-- const lastWidget = visibleWidgets.at(-1);-- return lastWidget?.id === widgetId;-};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.tsindex 31fccbb6c71..c352e41cb47 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useWidgetRendererState.ts@@ -2,28 +2,22 @@ import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutCoimport { useCurrentPageLayoutOrThrow } from '@/page-layout/hooks/useCurrentPageLayoutOrThrow';import { useDeletePageLayoutWidget } from '@/page-layout/hooks/useDeletePageLayoutWidget';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';+import { useIsSideColumnContext } from '@/page-layout/hooks/useIsSideColumnContext';import { pageLayoutDraggingWidgetIdComponentState } from '@/page-layout/states/pageLayoutDraggingWidgetIdComponentState';import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';import { pageLayoutResizingWidgetIdComponentState } from '@/page-layout/states/pageLayoutResizingWidgetIdComponentState';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useIsCurrentWidgetLastOfTab } from '@/page-layout/widgets/hooks/useIsCurrentWidgetLastOfTab';-import { useIsInPinnedTab } from '@/page-layout/widgets/hooks/useIsInPinnedTab';-import { useWidgetPermissions } from '@/page-layout/widgets/hooks/useWidgetPermissions';import { WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER } from '@/page-layout/widgets/constants/WidgetTypesWithAlwaysVisibleSoloHeader';+import { useWidgetPermissions } from '@/page-layout/widgets/hooks/useWidgetPermissions';import { widgetCardHoveredComponentFamilyState } from '@/page-layout/widgets/states/widgetCardHoveredComponentFamilyState';import { widgetHasHeaderCountComponentFamilySelector } from '@/page-layout/widgets/states/selectors/widgetHasHeaderCountComponentFamilySelector';import { getWidgetCardVariant } from '@/page-layout/widgets/utils/getWidgetCardVariant';import { useOpenWidgetSettingsInSidePanel } from '@/side-panel/hooks/useOpenWidgetSettingsInSidePanel';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useSetAtomComponentFamilyState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentFamilyState';import { type MouseEvent } from 'react';-import {- PageLayoutTabLayoutMode,- WidgetType,-} from '~/generated-metadata/graphql';+import { WidgetType } from '~/generated-metadata/graphql';export const useWidgetRendererState = (widget: PageLayoutWidget) => {const { deletePageLayoutWidget } = useDeletePageLayoutWidget();@@ -49,14 +43,22 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {const { hasAccess, restriction } = useWidgetPermissions(widget);- const { layoutMode, presentation } = usePageLayoutContentContext();- const { isInPinnedTab } = useIsInPinnedTab();- const { isInSidePanel } = useLayoutRenderingContext();- const isMobile = useIsMobile();+ const { isSideColumnContext } = useIsSideColumnContext();++ const { presentation } = usePageLayoutContentContext();const { currentPageLayout } = useCurrentPageLayoutOrThrow();- const isLastWidget = useIsCurrentWidgetLastOfTab(widget.id);+ const isHeaderHiddenInViewMode =+ widget.type === WidgetType.STANDALONE_RICH_TEXT ||+ widget.type === WidgetType.EMAIL_THREAD ||+ widget.type === WidgetType.MESSAGE_CAMPAIGN_BODY ||+ widget.type === WidgetType.MESSAGE_CAMPAIGN_DETAILS ||+ widget.type === WidgetType.WORKFLOW ||+ widget.type === WidgetType.WORKFLOW_VERSION ||+ widget.type === WidgetType.WORKFLOW_RUN;+ const hideHeaderInViewMode =+ isHeaderHiddenInViewMode && !isPageLayoutInEditMode;const hasWidgetHeaderCount = useAtomComponentFamilySelectorValue(widgetHasHeaderCountComponentFamilySelector,@@ -67,16 +69,6 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {hasWidgetHeaderCount ||WIDGET_TYPES_WITH_ALWAYS_VISIBLE_SOLO_HEADER.includes(widget.type);- const isHeaderHiddenInViewMode =- widget.type === WidgetType.STANDALONE_RICH_TEXT ||- widget.type === WidgetType.EMAIL_THREAD ||- widget.type === WidgetType.MESSAGE_CAMPAIGN_BODY ||- widget.type === WidgetType.MESSAGE_CAMPAIGN_DETAILS;- const hideHeaderInViewMode =- isHeaderHiddenInViewMode && !isPageLayoutInEditMode;-- // A solo widget owns its tab, and the tab label already names it: the- // header only appears when the widget content set something to show in it.const showHeader =presentation === 'solo' ? hasWidgetHeaderInfo : !hideHeaderInViewMode;@@ -106,16 +98,10 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {};const variant = getWidgetCardVariant({- presentation,- isInPinnedTab,+ isSideColumnContext,pageLayoutType: currentPageLayout.type,- isMobile,- isInSidePanel,});- const isInVerticalListTab =- layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST;-return {isPageLayoutInEditMode,isEditing,@@ -123,12 +109,8 @@ export const useWidgetRendererState = (widget: PageLayoutWidget) => {isResizing,hasAccess,restriction,- currentPageLayout,- isLastWidget,showHeader,variant,- isMobile,- isInVerticalListTab,handleClick,handleRemove,handleMouseEnter,diff --git a/packages/twenty-front/src/modules/page-layout/widgets/notes/components/NoteWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/notes/components/NoteWidget.tsxindex e803356185f..4c9e9dcaf49 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/notes/components/NoteWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/notes/components/NoteWidget.tsx@@ -1,28 +1,13 @@import { NotesCard } from '@/activities/notes/components/NotesCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type NoteWidgetProps = {widget: PageLayoutWidget;};-export const NoteWidget = ({ widget: _widget }: NoteWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <NotesCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const NoteWidget = ({ widget: _widget }: NoteWidgetProps) => (+ <WidgetContentShell>+ <NotesCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRenderer.tsxindex 791f80dd3b4..37ba854199e 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/record-table/components/RecordTableWidgetRenderer.tsx@@ -1,4 +1,5 @@import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';+import { StyledWidgetTableOutline } from '@/page-layout/widgets/components/WidgetContentFrame';import { RecordTableWidgetRendererContent } from '@/page-layout/widgets/record-table/components/RecordTableWidgetRendererContent';import { isDefined } from 'twenty-shared/utils';import { WidgetConfigurationType } from '~/generated-metadata/graphql';@@ -30,12 +31,14 @@ export const RecordTableWidgetRenderer = ({}return (- <RecordTableWidgetRendererContent- objectMetadataId={widget.objectMetadataId}- viewId={viewId}- widgetId={widget.id}- isEmptyStateHidden- recordLimit={recordLimit}- />+ <StyledWidgetTableOutline>+ <RecordTableWidgetRendererContent+ objectMetadataId={widget.objectMetadataId}+ viewId={viewId}+ widgetId={widget.id}+ isEmptyStateHidden+ recordLimit={recordLimit}+ />+ </StyledWidgetTableOutline>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/TaskWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/TaskWidget.tsxindex f9cd291891b..ee65097e4aa 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/TaskWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/tasks/components/TaskWidget.tsx@@ -1,28 +1,13 @@import { TasksCard } from '@/activities/tasks/components/TasksCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type TaskWidgetProps = {widget: PageLayoutWidget;};-export const TaskWidget = ({ widget: _widget }: TaskWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <TasksCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const TaskWidget = ({ widget: _widget }: TaskWidgetProps) => (+ <WidgetContentShell>+ <TasksCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/TimelineWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/TimelineWidget.tsxindex bd58feafadf..1348dd33d50 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/TimelineWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/timeline/components/TimelineWidget.tsx@@ -1,28 +1,13 @@import { TimelineCard } from '@/activities/timeline-activities/components/TimelineCard';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';-import { SidePanelProvider } from '@/ui/layout/side-panel/contexts/SidePanelContext';-import { styled } from '@linaria/react';--const StyledContainer = styled.div`- box-sizing: border-box;- display: flex;- flex-direction: column;- width: 100%;-`;+import { WidgetContentShell } from '@/page-layout/widgets/components/WidgetContentShell';type TimelineWidgetProps = {widget: PageLayoutWidget;};-export const TimelineWidget = ({ widget: _widget }: TimelineWidgetProps) => {- const { isInSidePanel } = useLayoutRenderingContext();-- return (- <SidePanelProvider value={{ isInSidePanel }}>- <StyledContainer>- <TimelineCard />- </StyledContainer>- </SidePanelProvider>- );-};+export const TimelineWidget = ({ widget: _widget }: TimelineWidgetProps) => (+ <WidgetContentShell>+ <TimelineCard />+ </WidgetContentShell>+);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetCardVariant.ts b/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetCardVariant.tsindex be8ca66350c..2e99b0d83ac 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetCardVariant.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/types/WidgetCardVariant.ts@@ -1,6 +1 @@-export type WidgetCardVariant =- | 'solo'- | 'side-column'- | 'dashboard'- | 'standalone'- | 'record-page';+export type WidgetCardVariant = 'framed' | 'flush';diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetCardVariant.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetCardVariant.test.tsindex 7d69954ed0d..efb884c0c20 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetCardVariant.test.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetCardVariant.test.ts@@ -1,94 +1,40 @@import { getWidgetCardVariant } from '@/page-layout/widgets/utils/getWidgetCardVariant';import { PageLayoutType } from '~/generated-metadata/graphql';-const baseParams = {- isInPinnedTab: false,- isMobile: false,- isInSidePanel: false,-};-describe('getWidgetCardVariant', () => {- describe('when presentation is solo', () => {+ describe('page layout variants', () => {it.each([- PageLayoutType.RECORD_PAGE,- PageLayoutType.STANDALONE_PAGE,- PageLayoutType.DASHBOARD,- PageLayoutType.RECORD_INDEX,- ])("returns 'solo' regardless of pageLayoutType (%s)", (pageLayoutType) => {+ ['DASHBOARD', PageLayoutType.DASHBOARD],+ ['RECORD_PAGE', PageLayoutType.RECORD_PAGE],+ ['STANDALONE_PAGE', PageLayoutType.STANDALONE_PAGE],+ ])("returns 'framed' for %s", (_label, pageLayoutType) => {expect(getWidgetCardVariant({- ...baseParams,- presentation: 'solo',+ isSideColumnContext: false,pageLayoutType,}),- ).toBe('solo');+ ).toBe('framed');});- });- describe('when presentation is stack', () => {- it("returns 'dashboard' for DASHBOARD page", () => {- expect(- getWidgetCardVariant({- ...baseParams,- presentation: 'stack',- pageLayoutType: PageLayoutType.DASHBOARD,- }),- ).toBe('dashboard');- });-- it("returns 'standalone' for STANDALONE_PAGE", () => {- expect(- getWidgetCardVariant({- ...baseParams,- presentation: 'stack',- pageLayoutType: PageLayoutType.STANDALONE_PAGE,- }),- ).toBe('standalone');- });-- it("returns 'record-page' for RECORD_PAGE by default", () => {- expect(- getWidgetCardVariant({- ...baseParams,- presentation: 'stack',- pageLayoutType: PageLayoutType.RECORD_PAGE,- }),- ).toBe('record-page');- });- });-- describe('side-column context for record pages', () => {it.each([- ['isInPinnedTab', { isInPinnedTab: true }],- ['isMobile', { isMobile: true }],- ['isInSidePanel', { isInSidePanel: true }],- ])("returns 'side-column' when %s is true", (_label, override) => {+ ['RECORD_INDEX', PageLayoutType.RECORD_INDEX],+ ['no page layout type', null],+ ])("returns 'flush' for %s", (_label, pageLayoutType) => {expect(getWidgetCardVariant({- ...baseParams,- ...override,- presentation: 'stack',- pageLayoutType: PageLayoutType.RECORD_PAGE,+ isSideColumnContext: false,+ pageLayoutType,}),- ).toBe('side-column');+ ).toBe('flush');});+ });- it.each([- ['isInPinnedTab', { isInPinnedTab: true }],- ['isMobile', { isMobile: true }],- ['isInSidePanel', { isInSidePanel: true }],- ])(- "returns 'side-column' over 'solo' when %s is true",- (_label, override) => {- expect(- getWidgetCardVariant({- ...baseParams,- ...override,- presentation: 'solo',- pageLayoutType: PageLayoutType.RECORD_PAGE,- }),- ).toBe('side-column');- },- );+ it("returns 'flush' in a side column context, even on a framed page", () => {+ expect(+ getWidgetCardVariant({+ isSideColumnContext: true,+ pageLayoutType: PageLayoutType.DASHBOARD,+ }),+ ).toBe('flush');});});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetContentPadding.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetContentPadding.test.tsnew file mode 100644index 00000000000..61d46e18571--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/getWidgetContentPadding.test.ts@@ -0,0 +1,16 @@+import { getWidgetContentPadding } from '@/page-layout/widgets/utils/getWidgetContentPadding';+import { WidgetType } from '~/generated-metadata/graphql';++describe('getWidgetContentPadding', () => {+ it.each([+ WidgetType.WORKFLOW,+ WidgetType.WORKFLOW_RUN,+ WidgetType.WORKFLOW_VERSION,+ ])('returns no padding for %s', (widgetType) => {+ expect(getWidgetContentPadding(widgetType)).toBe('none');+ });++ it('returns default padding for other widget types', () => {+ expect(getWidgetContentPadding(WidgetType.TASKS)).toBe('default');+ });+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/isWidgetCardFlushInViewMode.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/isWidgetCardFlushInViewMode.test.tsnew file mode 100644index 00000000000..c43651dcfaa--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/__tests__/isWidgetCardFlushInViewMode.test.ts@@ -0,0 +1,16 @@+import { isWidgetCardFlushInViewMode } from '@/page-layout/widgets/utils/isWidgetCardFlushInViewMode';++describe('isWidgetCardFlushInViewMode', () => {+ it('returns true for a non-editable flush card', () => {+ expect(+ isWidgetCardFlushInViewMode({ isEditable: false, variant: 'flush' }),+ ).toBe(true);+ });++ it.each([+ { isEditable: true, variant: 'flush' as const },+ { isEditable: false, variant: 'framed' as const },+ ])('returns false for $variant with isEditable=$isEditable', (params) => {+ expect(isWidgetCardFlushInViewMode(params)).toBe(false);+ });+});diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetCardVariant.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetCardVariant.tsindex 9cf200d5133..5fdc3c8d5e8 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetCardVariant.ts+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetCardVariant.ts@@ -1,40 +1,26 @@-import { type TabPresentation } from '@/page-layout/types/TabPresentation';import { PageLayoutType } from '~/generated-metadata/graphql';import { type WidgetCardVariant } from '~/modules/page-layout/widgets/types/WidgetCardVariant';type GetWidgetCardVariantParams = {- presentation: TabPresentation;- isInPinnedTab: boolean;+ isSideColumnContext: boolean;pageLayoutType: PageLayoutType | null;- isMobile: boolean;- isInSidePanel: boolean;};export const getWidgetCardVariant = ({- presentation,- isInPinnedTab,+ isSideColumnContext,pageLayoutType,- isMobile,- isInSidePanel,}: GetWidgetCardVariantParams): WidgetCardVariant => {- const isSideColumnContext = isInPinnedTab || isMobile || isInSidePanel;-if (isSideColumnContext) {- return 'side-column';- }-- if (presentation === 'solo') {- return 'solo';+ return 'flush';}switch (pageLayoutType) {case PageLayoutType.DASHBOARD:- return 'dashboard';- case PageLayoutType.STANDALONE_PAGE:- return 'standalone';case PageLayoutType.RECORD_PAGE:+ case PageLayoutType.STANDALONE_PAGE:+ return 'framed';case PageLayoutType.RECORD_INDEX:case null:- return 'record-page';+ return 'flush';}};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetContentPadding.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetContentPadding.tsnew file mode 100644index 00000000000..d1057b286a3--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/getWidgetContentPadding.ts@@ -0,0 +1,16 @@+import { WidgetType } from '~/generated-metadata/graphql';++export type WidgetContentPadding = 'default' | 'none';++export const getWidgetContentPadding = (+ widgetType: WidgetType,+): WidgetContentPadding => {+ switch (widgetType) {+ case WidgetType.WORKFLOW:+ case WidgetType.WORKFLOW_RUN:+ case WidgetType.WORKFLOW_VERSION:+ return 'none';+ default:+ return 'default';+ }+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/utils/isWidgetCardFlushInViewMode.ts b/packages/twenty-front/src/modules/page-layout/widgets/utils/isWidgetCardFlushInViewMode.tsnew file mode 100644index 00000000000..a6b288aab79--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/utils/isWidgetCardFlushInViewMode.ts@@ -0,0 +1,12 @@+import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';++type IsWidgetCardFlushInViewModeParams = {+ isEditable: boolean;+ variant: WidgetCardVariant;+};++export const isWidgetCardFlushInViewMode = ({+ isEditable,+ variant,+}: IsWidgetCardFlushInViewModeParams): boolean =>+ variant === 'flush' && !isEditable;diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCard.tsxindex ccc88762ef5..38ed2f5a532 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCard.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCard.tsx@@ -2,6 +2,7 @@ import { styled } from '@linaria/react';import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type WidgetCardVariant } from '~/modules/page-layout/widgets/types/WidgetCardVariant';+import { isWidgetCardFlushInViewMode } from '@/page-layout/widgets/utils/isWidgetCardFlushInViewMode';type WidgetCardStyledProps = {variant: WidgetCardVariant;@@ -10,7 +11,6 @@ type WidgetCardStyledProps = {isDragging: boolean;isResizing: boolean;headerLess?: boolean;- isLastWidget?: boolean;hasClickHandler: boolean;};@@ -23,55 +23,52 @@ const computeBorderColor = (if (props.isEditable && (props.isEditing || props.isDragging)) {return themeCssVariables.color.blue;}- if (props.variant === 'dashboard' || props.variant === 'standalone') {+ if (props.variant === 'framed') {return themeCssVariables.border.color.light;}return 'transparent';};+const shouldUseSecondaryBackground = (+ props: Pick<WidgetCardStyledProps, 'variant' | 'isEditable' | 'isDragging'>,+) => (props.isEditable && props.isDragging) || props.variant === 'framed';++// The card is the single owner of how far its header and body are inset:+// WidgetCardHeader and WidgetCardContent both read these, widget bodies never+// declare their own inline padding.// oxlint-disable-next-line twenty/sort-css-properties-alphabeticallyconst StyledWidgetCard = styled.div<WidgetCardStyledProps>`+ --widget-card-padding-inline: ${({ variant, isEditable }) =>+ isWidgetCardFlushInViewMode({ variant, isEditable })+ ? themeCssVariables.spacing[4]+ : themeCssVariables.spacing[2]};+ --widget-card-title-padding-top: ${({ variant, isEditable }) =>+ isWidgetCardFlushInViewMode({ variant, isEditable })+ ? themeCssVariables.spacing[3]+ : themeCssVariables.spacing[2]};+background: ${(props) => {if (props.isEditable && props.isDragging) {return `linear-gradient(0deg, ${themeCssVariables.background.transparent.lighter} 0%, ${themeCssVariables.background.transparent.lighter} 100%), ${themeCssVariables.background.secondary}`;}- if (- props.variant === 'dashboard' ||- props.variant === 'standalone' ||- (props.variant === 'side-column' && props.isEditable)- ) {- return themeCssVariables.background.secondary;- }- if (props.variant === 'record-page') {- return themeCssVariables.background.primary;- }- return 'none';+ return shouldUseSecondaryBackground(props)+ ? themeCssVariables.background.secondary+ : 'transparent';}};+ // Declared only when the card actually paints a surface, so a transparent+ // card leaves the layout container's value in place for its content to read.+ &[data-secondary-background='true'] {+ --record-card-background-color: ${themeCssVariables.background.secondary};+ }+border: ${(props) =>- props.variant === 'dashboard' ||- props.variant === 'standalone' ||- props.variant === 'record-page' ||- props.isEditable+ props.variant === 'framed' || props.isEditable? `1px solid ${computeBorderColor(props)}`: 'none'};- border-bottom: ${(props) => {- const { variant, isEditable, isLastWidget } = props;-- if (variant === 'side-column' && !isEditable) {- return isLastWidget !== true- ? `1px solid ${themeCssVariables.border.color.light}`- : 'none';- }-- return `1px solid ${computeBorderColor(props)}`;- }};border-radius: ${({ variant, isEditable }) =>- variant === 'dashboard' ||- variant === 'standalone' ||- variant === 'record-page' ||- isEditable+ variant === 'framed' || isEditable? themeCssVariables.border.radius.md: '0'};@@ -92,33 +89,19 @@ const StyledWidgetCard = styled.div<WidgetCardStyledProps>`flex-direction: column;- height: 100%;-- padding: ${({ variant, isEditable, headerLess }) => {- if (- (variant === 'dashboard' || variant === 'standalone') &&- headerLess === true- )- return '0';- if (variant === 'dashboard' || variant === 'standalone')- return themeCssVariables.spacing[2];- if (variant === 'side-column' && !isEditable)- return themeCssVariables.spacing[3];- if (variant === 'record-page' || isEditable)- return themeCssVariables.spacing[2];- return '0';- }};+ height: var(--widget-height, 100%);++ padding: ${({ variant, headerLess }) =>+ variant === 'framed' && headerLess !== true+ ? themeCssVariables.spacing[2]+ : '0'};position: relative;width: 100%;&:hover {- // border-color shorthand must precede border-bottom-color longhand for correct CSS cascadeborder-color: ${(props) => {- if (props.variant === 'solo') {- return computeBorderColor(props);- }if (props.isEditable &&!props.isDragging &&@@ -129,29 +112,6 @@ const StyledWidgetCard = styled.div<WidgetCardStyledProps>`}return computeBorderColor(props);}};-- border-bottom-color: ${(props) => {- if (props.variant === 'solo') {- return computeBorderColor(props);- }-- const { variant, isEditable } = props;-- if (variant === 'side-column' && !isEditable) {- return themeCssVariables.border.color.light;- }-- if (- props.isEditable &&- !props.isDragging &&- !props.isEditing &&- !props.isResizing- ) {- return themeCssVariables.border.color.strong;- }-- return computeBorderColor(props);- }};}`;@@ -162,7 +122,6 @@ export type WidgetCardProps = {isDragging: boolean;isResizing: boolean;headerLess?: boolean;- isLastWidget?: boolean;onClick?: React.MouseEventHandler<HTMLDivElement>;className?: string;children?: React.ReactNode;@@ -179,7 +138,6 @@ export const WidgetCard = ({isDragging,isResizing,headerLess,- isLastWidget,onClick,className,children,@@ -196,8 +154,12 @@ export const WidgetCard = ({isDragging={isDragging}isResizing={isResizing}headerLess={headerLess}- isLastWidget={isLastWidget}hasClickHandler={isDefined(onClick)}+ data-secondary-background={shouldUseSecondaryBackground({+ variant,+ isEditable,+ isDragging,+ })}onClick={onClick}className={className}onMouseEnter={onMouseEnter}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardContent.tsxindex b6e764d82f6..0fa308db3f4 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardContent.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardContent.tsx@@ -1,68 +1,46 @@+import { type WidgetContentPadding } from '@/page-layout/widgets/utils/getWidgetContentPadding';+import { isWidgetCardFlushInViewMode } from '@/page-layout/widgets/utils/isWidgetCardFlushInViewMode';import { styled } from '@linaria/react';import { themeCssVariables } from 'twenty-ui/theme-constants';-import { STACKED_WIDGET_MAX_HEIGHT } from '~/modules/page-layout/widgets/constants/StackedWidgetMaxHeight';import { type WidgetCardVariant } from '~/modules/page-layout/widgets/types/WidgetCardVariant';+const VERTICAL_LIST_IFRAME_HEIGHT = '40rem';+type WidgetCardContentStyledProps = {variant: WidgetCardVariant;hasHeader: boolean;isEditable: boolean;- isInVerticalListTab: boolean;- isMobile: boolean;- hasBoundedHeight: boolean;+ isFixedHeight: boolean;+ contentPadding: WidgetContentPadding;};-const StyledRecordWidgetOutline = styled.div`- border: 1px solid ${themeCssVariables.border.color.light};- border-radius: ${themeCssVariables.border.radius.sm};- display: flex;- flex-direction: column;- min-height: 0;- overflow: hidden;-`;-const StyledWidgetCardContent = styled.div<WidgetCardContentStyledProps>`- background-color: ${({ variant, isInVerticalListTab, isMobile }) =>- variant === 'record-page' && isInVerticalListTab && !isMobile- ? themeCssVariables.background.secondary- : 'transparent'};- border: ${({ variant, isEditable }) =>- variant === 'record-page' || (variant === 'side-column' && isEditable)- ? `1px solid ${themeCssVariables.border.color.medium}`- : 'none'};- border-radius: ${({ variant, isEditable }) =>- variant === 'record-page' || (variant === 'side-column' && isEditable)- ? themeCssVariables.border.radius.md- : '0'};box-sizing: border-box;display: grid;grid-template-columns: minmax(0, 1fr);- height: ${({ hasBoundedHeight }) => (hasBoundedHeight ? 'auto' : '100%')};+ height: ${({ isFixedHeight }) =>+ isFixedHeight ? VERTICAL_LIST_IFRAME_HEIGHT : 'var(--widget-height, 100%)'};- margin-top: ${({ hasHeader }) =>- hasHeader ? themeCssVariables.spacing[2] : '0'};+ margin-top: ${({ hasHeader, variant }) =>+ hasHeader && variant === 'framed' ? themeCssVariables.spacing[2] : '0'};- max-height: ${({ hasBoundedHeight }) =>- hasBoundedHeight ? `${STACKED_WIDGET_MAX_HEIGHT}px` : 'none'};+ min-height: ${({ isFixedHeight }) =>+ isFixedHeight ? VERTICAL_LIST_IFRAME_HEIGHT : '0'};- overflow: ${({ hasBoundedHeight }) => (hasBoundedHeight ? 'auto' : 'hidden')};+ overflow: ${({ isFixedHeight }) =>+ isFixedHeight ? 'clip' : 'var(--widget-card-content-overflow, hidden)'};- padding: ${({ variant, isEditable }) => {- if (variant === 'dashboard' || variant === 'standalone')- return themeCssVariables.spacing[2];- if (- variant === 'record-page' ||- (variant === 'side-column' && isEditable)- ) {- return themeCssVariables.spacing[2];- }- return '0';- }};+ padding-block: ${({ contentPadding, hasHeader, isEditable, variant }) =>+ contentPadding === 'none'+ ? '0'+ : hasHeader && isWidgetCardFlushInViewMode({ isEditable, variant })+ ? `${themeCssVariables.spacing[3]} ${themeCssVariables.spacing[2]}`+ : themeCssVariables.spacing[2]};+ padding-inline: ${({ contentPadding }) =>+ contentPadding === 'none' ? '0' : 'var(--widget-card-padding-inline)'};&:empty {- border: none;- border-radius: 0;margin-top: 0;padding: 0;}@@ -72,11 +50,9 @@ type WidgetCardContentProps = {variant: WidgetCardVariant;hasHeader: boolean;isEditable: boolean;- isInVerticalListTab: boolean;- isMobile: boolean;hasInteractiveContent?: boolean;- hasBoundedHeight?: boolean;- className?: string;+ isFixedHeight?: boolean;+ contentPadding?: WidgetContentPadding;children?: React.ReactNode;};@@ -84,11 +60,9 @@ export const WidgetCardContent = ({variant,hasHeader,isEditable,- isInVerticalListTab,- isMobile,hasInteractiveContent = false,- hasBoundedHeight = false,- className,+ isFixedHeight = false,+ contentPadding = 'default',children,}: WidgetCardContentProps) => {const handleContentClick = (event: React.MouseEvent) => {@@ -104,17 +78,11 @@ export const WidgetCardContent = ({variant={variant}hasHeader={hasHeader}isEditable={isEditable}- isInVerticalListTab={isInVerticalListTab}- isMobile={isMobile}- hasBoundedHeight={hasBoundedHeight}- className={className}+ isFixedHeight={isFixedHeight}+ contentPadding={contentPadding}onClick={handleContentClick}>- {hasInteractiveContent ? (- <StyledRecordWidgetOutline>{children}</StyledRecordWidgetOutline>- ) : (- children- )}+ {children}</StyledWidgetCardContent>);};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsxindex bdfff79ae93..f0a21e5b453 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetCardHeader.tsx@@ -7,8 +7,8 @@ import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { type ReactNode, useContext } from 'react';import { IconTrash } from 'twenty-ui/icon';-import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';import { IconButton } from 'twenty-ui/input';+import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';import { type WidgetCardVariant } from '@/page-layout/widgets/types/WidgetCardVariant';import { WidgetGrip } from '@/page-layout/widgets/widget-card/components/WidgetGrip';@@ -26,22 +26,24 @@ export type WidgetCardHeaderProps = {forbiddenDisplay?: ReactNode;className?: string;isResizing?: boolean;- isReorderEnabled?: boolean;- isDeletingWidgetEnabled?: boolean;};-const StyledWidgetCardHeader = styled.div<{ variant: WidgetCardVariant }>`+const StyledWidgetCardHeader = styled.div<{ shouldInset: boolean }>`align-items: center;+ box-sizing: border-box;display: flex;flex-shrink: 0;- height: ${themeCssVariables.spacing[6]};- padding: ${({ variant }) =>- variant === 'solo'- ? `${themeCssVariables.spacing[4]} ${themeCssVariables.spacing[6]} 0`+ height: ${({ shouldInset }) =>+ shouldInset+ ? `calc(${themeCssVariables.spacing[6]} + var(--widget-card-title-padding-top))`+ : themeCssVariables.spacing[6]};+ padding: ${({ shouldInset }) =>+ shouldInset+ ? `var(--widget-card-title-padding-top) var(--widget-card-padding-inline) 0`: '0'};`;-const StyledTitleContainer = styled.div<{ variant: WidgetCardVariant }>`+const StyledTitleContainer = styled.div`align-items: center;color: ${themeCssVariables.font.color.primary};display: flex;@@ -50,11 +52,6 @@ const StyledTitleContainer = styled.div<{ variant: WidgetCardVariant }>`font-weight: ${themeCssVariables.font.weight.medium};gap: ${themeCssVariables.spacing[1]};overflow: hidden;- padding-inline: ${({ variant }) =>- variant === 'side-column' || variant === 'solo'- ? '0'- : themeCssVariables.spacing[1]};-user-select: none;`;@@ -78,14 +75,12 @@ const StyledIconButtonContainerBase = styled.div`const StyledIconButtonContainer = motion.create(StyledIconButtonContainerBase);export const WidgetCardHeader = ({- widgetId,variant,+ widgetId,isEmpty = false,isInEditMode = false,hasAccess = true,isResizing = false,- isReorderEnabled = true,- isDeletingWidgetEnabled = true,title,onRemove,forbiddenDisplay,@@ -103,17 +98,13 @@ export const WidgetCardHeader = ({widgetId,);+ const shouldInset = variant === 'flush';return (- <StyledWidgetCardHeader variant={variant} className={className}>+ <StyledWidgetCardHeader className={className} shouldInset={shouldInset}><AnimatePresence initial={false}>- {!isEmpty && isInEditMode && isReorderEnabled && (- <WidgetGrip- className="drag-handle"- onClick={(e) => e.stopPropagation()}- />- )}+ {!isEmpty && isInEditMode && <WidgetGrip className="drag-handle" />}</AnimatePresence>- <StyledTitleContainer variant={variant}>+ <StyledTitleContainer><OverflowingTextWithTooltip text={isEmpty ? t`Add Widget` : title} />{isDefined(widgetHeaderCount) && (<StyledCount>{formatNumber(widgetHeaderCount)}</StyledCount>@@ -126,7 +117,6 @@ export const WidgetCardHeader = ({{!isResizing &&!isEmpty &&isInEditMode &&- isDeletingWidgetEnabled &&onRemove &&widgetCardHovered && (<StyledIconButtonContainerdiff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsxindex eafba7f7061..73b39dfb988 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/WidgetGrip.tsx@@ -1,8 +1,16 @@import { styled } from '@linaria/react';import { motion } from 'framer-motion';+import { isDefined } from 'twenty-shared/utils';import { IconGripVertical } from 'twenty-ui/icon';import { themeCssVariables, ThemeContext } from 'twenty-ui/theme-constants';-import { useContext } from 'react';+import {+ type MouseEvent as ReactMouseEvent,+ type PointerEvent as ReactPointerEvent,+ useContext,+ useState,+} from 'react';++const DRAG_CLICK_SUPPRESSION_DISTANCE = 5;const StyledGripContainerBase = styled.div`align-items: center;@@ -28,16 +36,45 @@ const StyledGripContainer = motion.create(StyledGripContainerBase);type WidgetGripProps = {className?: string;- onClick?: (e: React.MouseEvent) => void;};-export const WidgetGrip = ({ className, onClick }: WidgetGripProps) => {+export const WidgetGrip = ({ className }: WidgetGripProps) => {const { theme } = useContext(ThemeContext);+ // Only pointerdown is tracked: the compatibility mousedown that touch fires+ // afterwards reports the release point, which would hide every drag.+ const [pointerDownPosition, setPointerDownPosition] = useState<{+ x: number;+ y: number;+ } | null>(null);++ const handlePointerDown = (event: ReactPointerEvent) => {+ event.currentTarget.setPointerCapture(event.pointerId);+ setPointerDownPosition({+ x: event.clientX,+ y: event.clientY,+ });+ };++ const handleClick = (event: ReactMouseEvent) => {+ setPointerDownPosition(null);++ if (+ isDefined(pointerDownPosition) &&+ Math.hypot(+ event.clientX - pointerDownPosition.x,+ event.clientY - pointerDownPosition.y,+ ) > DRAG_CLICK_SUPPRESSION_DISTANCE+ ) {+ event.stopPropagation();+ }+ };+return (<StyledGripContainerlayoutclassName={className}- onClick={onClick}+ onPointerDown={handlePointerDown}+ onClick={handleClick}initial={{ width: 0, opacity: 0 }}animate={{ width: 20, opacity: 1 }}exit={{ width: 0, opacity: 0 }}diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCard.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCard.stories.tsxnew file mode 100644index 00000000000..0532fbdc362--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCard.stories.tsx@@ -0,0 +1,90 @@+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { type CSSProperties } from 'react';+import { expect, within } from 'storybook/test';++import { WidgetCard } from '@/page-layout/widgets/widget-card/components/WidgetCard';+import { ComponentDecorator } from 'twenty-ui/testing';++const meta: Meta<typeof WidgetCard> = {+ title: 'Modules/PageLayout/Widgets/WidgetCard',+ component: WidgetCard,+ decorators: [ComponentDecorator],+ args: {+ variant: 'framed',+ isEditable: false,+ isEditing: false,+ isDragging: false,+ isResizing: false,+ 'data-testid': 'widget-card',+ },+ render: (args) => (+ <div style={{ height: 160, width: 320 }}>+ {/* oxlint-disable-next-line react/jsx-props-no-spreading */}+ <WidgetCard {...args}>Widget content</WidgetCard>+ </div>+ ),+};++export default meta;+type Story = StoryObj<typeof WidgetCard>;++const SURFACE_COLOR = 'rgb(1, 2, 3)';++export const Framed: Story = {+ play: async ({ canvasElement }) => {+ const card = within(canvasElement).getByTestId('widget-card');+ const cardStyle = getComputedStyle(card);++ await expect(+ cardStyle.getPropertyValue('--record-card-background-color').trim(),+ ).toBe(cardStyle.getPropertyValue('--t-background-secondary').trim());+ await expect(cardStyle.backgroundColor).not.toBe('rgba(0, 0, 0, 0)');+ },+};++export const Flush: Story = {+ args: {+ variant: 'flush',+ },+ render: (args) => (+ <div+ style={+ {+ height: 160,+ width: 320,+ '--record-card-background-color': SURFACE_COLOR,+ } as CSSProperties+ }+ >+ {/* oxlint-disable-next-line react/jsx-props-no-spreading */}+ <WidgetCard {...args}>Widget content</WidgetCard>+ </div>+ ),+ play: async ({ canvasElement }) => {+ const card = within(canvasElement).getByTestId('widget-card');+ const cardStyle = getComputedStyle(card);++ await expect(+ cardStyle.getPropertyValue('--record-card-background-color').trim(),+ ).toBe(SURFACE_COLOR);+ await expect(cardStyle.backgroundColor).toBe('rgba(0, 0, 0, 0)');+ },+};++export const FlushWhileDragging: Story = {+ args: {+ variant: 'flush',+ isEditable: true,+ isDragging: true,+ },+ play: async ({ canvasElement }) => {+ const card = within(canvasElement).getByTestId('widget-card');+ const cardStyle = getComputedStyle(card);++ await expect(+ cardStyle.getPropertyValue('--record-card-background-color').trim(),+ ).toBe(cardStyle.getPropertyValue('--t-background-secondary').trim());+ await expect(cardStyle.backgroundImage).toContain('linear-gradient');+ await expect(cardStyle.backgroundColor).not.toBe('rgba(0, 0, 0, 0)');+ },+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsxindex fa347920bd6..171e3696892 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/widget-card/components/__stories__/WidgetCardHeader.stories.tsx@@ -31,7 +31,7 @@ const WidgetCardHeaderStory = ({<WidgetHeaderCountEffect count={count} /><WidgetCardHeaderwidgetId={widgetId}- variant="dashboard"+ variant="framed"isInEditMode={isInEditMode}title={title}/>@@ -100,7 +100,7 @@ const UnmountingContentStory = () => {{isContentMounted && <WidgetHeaderCountEffect count={42} />}<WidgetCardHeaderwidgetId={`${WIDGET_ID}-unmount`}- variant="dashboard"+ variant="framed"isInEditMode={false}title="Call recordings"/>@@ -138,7 +138,7 @@ export const CountEffectNoOpsOutsideWidget: Story = {><WidgetCardHeaderwidgetId={`${WIDGET_ID}-outside`}- variant="dashboard"+ variant="framed"isInEditMode={false}title="Call recordings"/>@@ -152,3 +152,55 @@ export const CountEffectNoOpsOutsideWidget: Story = {expect(canvas.queryByText('7')).toBeNull();},};++const WidgetHeaderClickStory = () => {+ const [parentClickCount, setParentClickCount] = useState(0);++ return (+ <PageLayoutTestWrapper instanceId={PAGE_LAYOUT_TEST_INSTANCE_ID}>+ <div onClick={() => setParentClickCount((count) => count + 1)}>+ <WidgetCardHeader+ widgetId={`${WIDGET_ID}-click`}+ variant="flush"+ isInEditMode+ title="Timeline"+ />+ </div>+ <output aria-label="Parent click count">{parentClickCount}</output>+ </PageLayoutTestWrapper>+ );+};++export const GripClickBehavior: Story = {+ render: () => <WidgetHeaderClickStory />,+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const grip = canvasElement.querySelector('.drag-handle');++ if (!(grip instanceof HTMLElement)) {+ throw new Error('Widget grip not found');+ }++ await userEvent.click(grip);+ expect(canvas.getByLabelText('Parent click count')).toHaveTextContent('1');++ await userEvent.pointer([+ {+ keys: '[MouseLeft>]',+ target: grip,+ coords: { clientX: 10, clientY: 10 },+ },+ {+ target: grip,+ coords: { clientX: 30, clientY: 10 },+ },+ {+ keys: '[/MouseLeft]',+ target: grip,+ coords: { clientX: 30, clientY: 10 },+ },+ ]);++ expect(canvas.getByLabelText('Parent click count')).toHaveTextContent('1');+ },+};diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsxindex b0602a6de56..a70f2b41a4c 100644--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsToggleSettingCard.tsx@@ -15,7 +15,7 @@ type SettingsAccountsToggleSettingCardProps = {};const StyledCardContentContainer = styled.div`- > * {+ > div {align-items: center;cursor: pointer;display: flex;diff --git a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsxindex fe4a074438a..9847efcfe48 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsCard.tsx@@ -32,13 +32,13 @@ const StyledCardWrapper = styled.div<{disabled ? 'not-allowed' : clickable ? 'pointer' : 'default'};width: 100%;- > * {+ > div {color: inherit;}`;const StyledCardContentContainer = styled.div`- > * {+ > div {display: flex;flex-direction: column;gap: ${themeCssVariables.spacing[2]};diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsxindex 5fde81f9440..2e7f841ff93 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsListCard.tsx@@ -9,7 +9,7 @@ import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { SettingsListItemCardContent } from './SettingsListItemCardContent';const StyledFooterContainer = styled.div`- > * {+ > div {align-items: center;display: flex;padding: ${themeCssVariables.spacing[1]};diff --git a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsxindex abed8668624..adfc8073399 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsListItemCardContent.tsx@@ -7,7 +7,7 @@ import { CardContent } from 'twenty-ui/surfaces';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';const StyledRowContainer = styled.div`- > * {+ > div {align-items: center;box-sizing: border-box;display: flex;@@ -91,14 +91,15 @@ export const SettingsListItemCardContent = ({to,}: SettingsListItemCardContentProps) => {const { theme } = useContext(ThemeContext);+ const isInteractive = isDefined(onClick) || isDefined(to);const content = (<StyledRowContainer><CardContentonClick={onClick}divider={divider}- isClickable={!!onClick || !!to}- hasHoverHighlight={!!to}+ isClickable={isInteractive}+ hasHoverHighlight={isInteractive}>{!!LeftIcon && (<LeftIcondiff --git a/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsxindex f1d8157764f..0d59a58e86d 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsListSkeletonCard.tsx@@ -5,7 +5,7 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledCardContainer = styled.div`height: 40px;- > * {+ > div {background-color: ${themeCssVariables.background.secondary};height: 100%;}diff --git a/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsxindex fd701967971..b39d151496d 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsRadioCard.tsx@@ -6,7 +6,7 @@ import { Radio } from 'twenty-ui/input';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';const StyledRadioCardContentContainer = styled.div`- > * {+ > div {align-items: center;border: 1px solid ${themeCssVariables.border.color.medium};border-radius: ${themeCssVariables.border.radius.sm};diff --git a/packages/twenty-front/src/modules/settings/components/SettingsRadioSettingsCard.tsx b/packages/twenty-front/src/modules/settings/components/SettingsRadioSettingsCard.tsxindex 0ddf108e557..5cd3c939297 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsRadioSettingsCard.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsRadioSettingsCard.tsx@@ -15,7 +15,7 @@ type SettingsRadioSettingsCardProps<Option extends { value: string }> = {};const StyledCardContentContainer = styled.div`- > * {+ > div {cursor: pointer;&:hover {diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/SettingsListItemCardContent.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsListItemCardContent.stories.tsxnew file mode 100644index 00000000000..61e9ef948c8--- /dev/null+++ b/packages/twenty-front/src/modules/settings/components/__stories__/SettingsListItemCardContent.stories.tsx@@ -0,0 +1,26 @@+import { SettingsListItemCardContent } from '@/settings/components/SettingsListItemCardContent';+import { type Meta, type StoryObj } from '@storybook/react-vite';+import { expect, fn, within } from 'storybook/test';++const meta: Meta<typeof SettingsListItemCardContent> = {+ title: 'Modules/Settings/SettingsListItemCardContent',+ component: SettingsListItemCardContent,+ args: {+ label: 'Callback row',+ onClick: fn(),+ rightComponent: null,+ },+};++export default meta;+type Story = StoryObj<typeof SettingsListItemCardContent>;++export const Default: Story = {+ play: async ({ canvasElement }) => {+ expect(+ (await within(canvasElement).findByText('Callback row')).closest(+ '[data-clickable]',+ ),+ ).toHaveAttribute('data-hover-highlight', 'true');+ },+};diff --git a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsxindex a4ae57c71c1..4d6fd174e6c 100644--- a/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/components/SettingsDataModelPreviewFormCard.tsx@@ -15,13 +15,13 @@ type SettingsDataModelPreviewFormCardProps = {};const StyledPreviewContainerWrapper = styled.div`- > * {+ > div {background-color: ${themeCssVariables.background.transparent.lighter};}`;const StyledFormContainerWrapper = styled.div`- > * {+ > div {padding: 0;}`;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsxindex 211dfe7f613..ee8d223853f 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/components/SettingsDataModelFieldSelectForm.tsx@@ -68,7 +68,7 @@ type SettingsDataModelFieldSelectFormProps = {};const StyledContainerWrapper = styled.div`- > * {+ > div {padding-bottom: 14px;}`;@@ -128,7 +128,7 @@ const StyledIconPointContainer = styled.span``;const StyledFooterContainer = styled.div`- > * {+ > div {background-color: ${themeCssVariables.background.secondary};padding: ${themeCssVariables.spacing[1]};}diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsxindex b4adbfc6a22..89ab5f8c871 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget.tsx@@ -22,14 +22,14 @@ type SettingsDataModelFieldPreviewWidgetProps = {};const StyledCardContainer = styled.div`- > * {+ > div {border-radius: ${themeCssVariables.border.radius.md};color: ${themeCssVariables.font.color.primary};}`;const StyledCardContentContainer = styled.div`- > * {+ > div {padding: ${themeCssVariables.spacing[2]};}`;diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsxindex 8466a02d68d..a2ca71d721f 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelRelationFieldPreviewSubWidget.tsx@@ -26,14 +26,14 @@ const StyledCardContainer = styled.div`flex: 1 1 0;min-width: 0;- > * {+ > div {border-radius: ${themeCssVariables.border.radius.md};color: ${themeCssVariables.font.color.primary};}`;const StyledCardContentContainer = styled.div`- > * {+ > div {padding: ${themeCssVariables.spacing[2]};}`;diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsxindex 14b2562813f..18d8acaf56e 100644--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectSettingsFormCard.tsx@@ -16,7 +16,7 @@ type SettingsDataModelObjectSettingsFormCardProps = {};const StyledTopCardContentContainer = styled.div`- > * {+ > div {background-color: ${themeCssVariables.background.transparent.lighter};}`;@@ -24,14 +24,14 @@ const StyledTopCardContentContainer = styled.div`const StyledObjectSummaryCardContainer = styled.div`max-width: 480px;- > * {+ > div {border-radius: ${themeCssVariables.border.radius.md};color: ${themeCssVariables.font.color.primary};}`;const StyledObjectSummaryCardContentContainer = styled.div`- > * {+ > div {padding: ${themeCssVariables.spacing[2]};}`;diff --git a/packages/twenty-front/src/modules/ui/layout/components/WidgetContentContainer.tsx b/packages/twenty-front/src/modules/ui/layout/components/WidgetContentContainer.tsxnew file mode 100644index 00000000000..1840fbbf565--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/components/WidgetContentContainer.tsx@@ -0,0 +1,15 @@+import { styled } from '@linaria/react';++export const StyledWidgetContentContainer = styled.div`+ box-sizing: border-box;+ display: flex;+ flex-direction: column;+ height: var(--widget-height, 100%);+ min-height: 0;+ width: 100%;+`;++export const StyledWidgetScrollContainer = styled(StyledWidgetContentContainer)`+ flex: 1;+ overflow: var(--widget-scroll-overflow, auto);+`;diff --git a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsxindex 2b01b86623d..36ad8e9cc9b 100644--- a/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx+++ b/packages/twenty-front/src/modules/views/components/ViewBarFilterDropdownAdvancedFilterButton.tsx@@ -30,7 +30,7 @@ import { themeCssVariables } from 'twenty-ui/theme-constants';import { v4 } from 'uuid';const StyledPillContainer = styled.span`- & > * {+ & > span {background: ${themeCssVariables.color.blue3};color: ${themeCssVariables.color.blue};}diff --git a/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss b/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scssindex 350564f33fb..49e6da56c25 100644--- a/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss+++ b/packages/twenty-ui/src/surfaces/CardContent/CardContent.module.scss@@ -14,10 +14,6 @@cursor: pointer;}- &:hover {- background: transparent;- }-&[data-hover-highlight]:hover {background: var(--t-background-transparent-light);}