Skip to content

The open alternative to Salesforce, designed for AI.

Add Note widgets to record page layouts (#25086)

Thomas des Francs95abdfb7cd5e
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateRecordPageNoteWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateRecordPageNoteWidget.test.tsx
new file mode 100644
index 00000000000..dbbe9599288
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateRecordPageNoteWidget.test.tsx
@@ -0,0 +1,276 @@
+import {
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+ PageLayoutTestWrapper,
+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';
+import { useCreateRecordPageNoteWidget } from '@/page-layout/hooks/useCreateRecordPageNoteWidget';
+import { useInsertCreatedWidgetAtContext } from '@/page-layout/hooks/useInsertCreatedWidgetAtContext';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { widgetInsertionContextComponentState } from '@/page-layout/states/widgetInsertionContextComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { isVerticalListPosition } from '@/page-layout/utils/isVerticalListPosition';
+import { removeWidgetFromTab } from '@/page-layout/utils/removeWidgetFromTab';
+import { act, renderHook } from '@testing-library/react';
+import { createStore } from 'jotai';
+import { type ReactNode } from 'react';
+import { SidePanelPages } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ PageLayoutTabLayoutMode,
+ WidgetConfigurationType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+
+const mockNavigatePageLayoutSidePanel = jest.fn();
+
+type NotePlacementTestCase = {
+ mode: string;
+ hasTasks?: boolean;
+ widgetIdToReplace?: string;
+ insertAboveWidgetId?: string;
+ expectedTitles: string[];
+};
+
+jest.mock(
+ '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel',
+ () => ({
+ useNavigatePageLayoutSidePanel: () => ({
+ navigatePageLayoutSidePanel: mockNavigatePageLayoutSidePanel,
+ }),
+ }),
+);
+
+describe('useCreateRecordPageNoteWidget', () => {
+ beforeEach(() => jest.resetAllMocks());
+
+ it.each<NotePlacementTestCase>([
+ { mode: 'append', expectedTitles: ['first', 'second', 'third', 'Note'] },
+ {
+ mode: 'append with Tasks',
+ hasTasks: true,
+ expectedTitles: ['first', 'second', 'third', 'Note', 'Tasks'],
+ },
+ {
+ mode: 'replace first',
+ widgetIdToReplace: 'first',
+ expectedTitles: ['Note', 'second', 'third'],
+ },
+ {
+ mode: 'replace middle',
+ widgetIdToReplace: 'second',
+ expectedTitles: ['first', 'Note', 'third'],
+ },
+ {
+ mode: 'replace last',
+ widgetIdToReplace: 'third',
+ expectedTitles: ['first', 'second', 'Note'],
+ },
+ {
+ mode: 'replace with Tasks',
+ hasTasks: true,
+ widgetIdToReplace: 'second',
+ expectedTitles: ['first', 'Note', 'third', 'Tasks'],
+ },
+ {
+ mode: 'replace Tasks',
+ hasTasks: true,
+ widgetIdToReplace: 'tasks',
+ expectedTitles: ['first', 'second', 'third', 'Note'],
+ },
+ {
+ mode: 'insert above',
+ insertAboveWidgetId: 'second',
+ expectedTitles: ['first', 'Note', 'second', 'third'],
+ },
+ {
+ mode: 'insert above with Tasks',
+ hasTasks: true,
+ insertAboveWidgetId: 'second',
+ expectedTitles: ['first', 'Note', 'second', 'third', 'Tasks'],
+ },
+ {
+ mode: 'insert before Tasks',
+ hasTasks: true,
+ insertAboveWidgetId: 'tasks',
+ expectedTitles: ['first', 'second', 'third', 'Note', 'Tasks'],
+ },
+ {
+ mode: 'insert first with Tasks',
+ hasTasks: true,
+ insertAboveWidgetId: 'first',
+ expectedTitles: ['Note', 'first', 'second', 'third', 'Tasks'],
+ },
+ ])(
+ 'should $mode a Note in the requested position',
+ ({ hasTasks, widgetIdToReplace, insertAboveWidgetId, expectedTitles }) => {
+ const store = createStore();
+ const instanceId = PAGE_LAYOUT_TEST_INSTANCE_ID;
+ const draftAtom = pageLayoutDraftComponentState.atomFamily({
+ instanceId,
+ });
+ const editingWidgetAtom =
+ pageLayoutEditingWidgetIdComponentState.atomFamily({ instanceId });
+ const widgets = [
+ makeWidget('first', 0),
+ makeWidget('second', 1),
+ makeWidget('third', 2),
+ ...(hasTasks
+ ? [
+ {
+ ...makeWidget('tasks', 3),
+ title: 'Tasks',
+ type: WidgetType.TASKS,
+ },
+ ]
+ : []),
+ ];
+ const otherTab = makeTab('other-tab', []);
+ store.set(draftAtom, makeDraft([otherTab, makeTab('tab-1', widgets)]));
+ if (insertAboveWidgetId !== undefined) {
+ store.set(
+ widgetInsertionContextComponentState.atomFamily({ instanceId }),
+ { targetWidgetId: insertAboveWidgetId, direction: 'above' },
+ );
+ }
+ const { result } = renderHook(
+ () => ({
+ ...useCreateRecordPageNoteWidget(),
+ ...useInsertCreatedWidgetAtContext(),
+ }),
+ {
+ wrapper: ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper store={store}>
+ {children}
+ </PageLayoutTestWrapper>
+ ),
+ },
+ );
+ act(() => {
+ const widgetToReplace = widgets.find(
+ ({ id }) => id === widgetIdToReplace,
+ );
+ if (isDefined(widgetToReplace)) {
+ store.set(draftAtom, (draft) => ({
+ ...draft,
+ tabs: removeWidgetFromTab(draft.tabs, 'tab-1', widgetToReplace.id),
+ }));
+ }
+ const note = result.current.createRecordPageNoteWidget({
+ tabId: 'tab-1',
+ positionIndex:
+ isDefined(widgetToReplace?.position) &&
+ isVerticalListPosition(widgetToReplace.position)
+ ? widgetToReplace.position.index
+ : undefined,
+ });
+ result.current.insertCreatedWidgetAtContext(note.id);
+ });
+ const draft = store.get(draftAtom);
+ expect(draft.tabs[0]).toEqual(otherTab);
+ expect(draft.tabs[1].widgets.map(({ title }) => title)).toEqual(
+ expectedTitles,
+ );
+ expect(
+ draft.tabs[1].widgets.map(({ position }) => position),
+ ).toMatchObject(
+ expectedTitles.map((_, index) => ({
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index,
+ })),
+ );
+ expect(
+ draft.tabs[1].widgets.find(
+ ({ id }) => id === store.get(editingWidgetAtom),
+ ),
+ ).toMatchObject({ title: 'Note', type: WidgetType.STANDALONE_RICH_TEXT });
+ },
+ );
+
+ it('should append a shared Note to the target tab and start editing it', () => {
+ const store = createStore();
+ const draftAtom = pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+ const otherTab = makeTab('other-tab', []);
+
+ store.set(
+ draftAtom,
+ makeDraft([makeTab('tab-1', [makeWidget('fields', 0)]), otherTab]),
+ );
+
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper store={store}>{children}</PageLayoutTestWrapper>
+ );
+
+ const { result } = renderHook(() => useCreateRecordPageNoteWidget(), {
+ wrapper,
+ });
+
+ act(() => {
+ result.current.createRecordPageNoteWidget({ tabId: 'tab-1' });
+ });
+
+ const draft = store.get(draftAtom);
+ const note = draft.tabs[0].widgets[1];
+
+ expect(draft.tabs[0].widgets).toHaveLength(2);
+ expect(draft.tabs[1]).toEqual(otherTab);
+ expect(note).toMatchObject({
+ title: 'Note',
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ objectMetadataId: null,
+ pageLayoutTabId: 'tab-1',
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: 1,
+ },
+ configuration: {
+ configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
+ body: { blocknote: '', markdown: null },
+ },
+ });
+ expect(
+ store.get(
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ }),
+ ),
+ ).toBe(note.id);
+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({
+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: 'Note',
+ resetNavigationStack: true,
+ });
+ });
+
+ it('keeps the new Note selected when opening it interrupts a closing panel', () => {
+ const store = createStore();
+ const draftAtom = pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+ const editingWidgetAtom =
+ pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ });
+ store.set(draftAtom, makeDraft([makeTab('tab-1', [])]));
+ mockNavigatePageLayoutSidePanel.mockImplementationOnce(() => {
+ store.set(editingWidgetAtom, null);
+ });
+
+ const { result } = renderHook(() => useCreateRecordPageNoteWidget(), {
+ wrapper: ({ children }: { children: ReactNode }) => (
+ <PageLayoutTestWrapper store={store}>{children}</PageLayoutTestWrapper>
+ ),
+ });
+
+ act(() => result.current.createRecordPageNoteWidget({ tabId: 'tab-1' }));
+
+ expect(store.get(editingWidgetAtom)).toBe(
+ store.get(draftAtom).tabs[0].widgets[0].id,
+ );
+ });
+});
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts
index 52ad5d7ce18..0b59420333e 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutStandaloneRichTextWidget.ts
@@ -78,19 +78,18 @@ export const useCreatePageLayoutStandaloneRichTextWidget = ({
minimumSize,
);
- const newWidget = createDefaultStandaloneRichTextWidget(
- widgetId,
- activeTabId,
-
+ const newWidget = createDefaultStandaloneRichTextWidget({
+ id: widgetId,
+ pageLayoutTabId: activeTabId,
body,
- {
+ position: {
layoutMode: PageLayoutTabLayoutMode.GRID,
row: position.y,
column: position.x,
rowSpan: position.h,
columnSpan: position.w,
},
- );
+ });
const newLayout = {
i: widgetId,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageNoteWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageNoteWidget.ts
new file mode 100644
index 00000000000..6d2413688e6
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreateRecordPageNoteWidget.ts
@@ -0,0 +1,65 @@
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
+import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/createDefaultStandaloneRichTextWidget';
+import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
+import { useAtomComponentStateCallbackState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateCallbackState';
+import { t } from '@lingui/core/macro';
+import { useStore } from 'jotai';
+import { SidePanelPages } from 'twenty-shared/types';
+import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
+import { v4 as uuidv4 } from 'uuid';
+
+export const useCreateRecordPageNoteWidget = (pageLayoutId?: string) => {
+ const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();
+
+ const pageLayoutDraftState = useAtomComponentStateCallbackState(
+ pageLayoutDraftComponentState,
+ pageLayoutId,
+ );
+
+ const pageLayoutEditingWidgetIdState = useAtomComponentStateCallbackState(
+ pageLayoutEditingWidgetIdComponentState,
+ pageLayoutId,
+ );
+
+ const store = useStore();
+
+ const createRecordPageNoteWidget = ({
+ tabId,
+ positionIndex,
+ }: {
+ tabId: string;
+ positionIndex?: number;
+ }) => {
+ const pageLayoutDraft = store.get(pageLayoutDraftState);
+ const activeTab = pageLayoutDraft.tabs.find((tab) => tab.id === tabId);
+ const widgetId = uuidv4();
+
+ const newWidget = createDefaultStandaloneRichTextWidget({
+ id: widgetId,
+ pageLayoutTabId: tabId,
+ body: { blocknote: '', markdown: null },
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: positionIndex ?? activeTab?.widgets.length ?? 0,
+ },
+ title: t`Note`,
+ });
+
+ store.set(pageLayoutDraftState, (previousDraft) => ({
+ ...previousDraft,
+ tabs: addWidgetToTab(previousDraft.tabs, tabId, newWidget),
+ }));
+
+ navigatePageLayoutSidePanel({
+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: t`Note`,
+ resetNavigationStack: true,
+ });
+ store.set(pageLayoutEditingWidgetIdState, widgetId);
+ return newWidget;
+ };
+
+ return { createRecordPageNoteWidget };
+};
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
index b518472d015..6e41231a6e1 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
@@ -1,4 +1,8 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
+import {
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
import {
AggregateOperations,
@@ -9,6 +13,35 @@ import {
} from '~/generated-metadata/graphql';
describe('addWidgetToTab', () => {
+ it.each([0, 1, 2])(
+ 'keeps a replacement at vertical-list index %s',
+ (index) => {
+ const widgets = [
+ makeWidget('first', 0),
+ makeWidget('middle', 1),
+ makeWidget('last', 2),
+ ];
+ const tabs = [
+ makeTab(
+ 'tab-1',
+ widgets.filter((_, widgetIndex) => widgetIndex !== index),
+ ),
+ ];
+ const replacement = makeWidget('replacement', index);
+
+ const result = addWidgetToTab(tabs, 'tab-1', replacement);
+
+ expect(result[0].widgets.map(({ id }) => id)).toEqual(
+ widgets.map((widget, widgetIndex) =>
+ widgetIndex === index ? replacement.id : widget.id,
+ ),
+ );
+ expect(result[0].widgets.map(({ position }) => position)).toMatchObject(
+ widgets.map((_, widgetIndex) => ({ index: widgetIndex })),
+ );
+ },
+ );
+
const mockWidget: PageLayoutWidget = {
isSystemSideEffect: false,
universalIdentifier: 'universal-identifier-mock',
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
index 7fb25b2944b..b1e66de92c5 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
@@ -6,18 +6,18 @@ import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/creat
describe('createDefaultStandaloneRichTextWidget', () => {
it('should create a standalone rich text widget with correct structure', () => {
- const widget = createDefaultStandaloneRichTextWidget(
- 'widget-1',
- 'tab-1',
- { blocknote: '[{"type":"paragraph","content":"Test"}]' },
- {
+ const widget = createDefaultStandaloneRichTextWidget({
+ id: 'widget-1',
+ pageLayoutTabId: 'tab-1',
+ body: { blocknote: '[{"type":"paragraph","content":"Test"}]' },
+ position: {
layoutMode: PageLayoutTabLayoutMode.GRID,
row: 0,
column: 0,
rowSpan: 4,
columnSpan: 4,
},
- );
+ });
expect(widget).toMatchObject({
__typename: 'PageLayoutWidget',
@@ -40,34 +40,63 @@ describe('createDefaultStandaloneRichTextWidget', () => {
});
it('should use provided objectMetadataId or default to null', () => {
- const withObjectId = createDefaultStandaloneRichTextWidget(
- 'w1',
- 't1',
- { blocknote: '[]' },
- {
+ const withObjectId = createDefaultStandaloneRichTextWidget({
+ id: 'w1',
+ pageLayoutTabId: 't1',
+ body: { blocknote: '[]' },
+ position: {
layoutMode: PageLayoutTabLayoutMode.GRID,
row: 0,
column: 0,
rowSpan: 1,
columnSpan: 1,
},
- 'object-1',
- );
+ objectMetadataId: 'object-1',
+ title: 'Dashboard guidance',
+ });
- const withoutObjectId = createDefaultStandaloneRichTextWidget(
- 'w2',
- 't1',
- { blocknote: '[]' },
- {
+ const withoutObjectId = createDefaultStandaloneRichTextWidget({
+ id: 'w2',
+ pageLayoutTabId: 't1',
+ body: { blocknote: '[]' },
+ position: {
layoutMode: PageLayoutTabLayoutMode.GRID,
row: 0,
column: 0,
rowSpan: 1,
columnSpan: 1,
},
- );
+ });
expect(withObjectId.objectMetadataId).toBe('object-1');
+ expect(withObjectId.title).toBe('Dashboard guidance');
expect(withoutObjectId.objectMetadataId).toBeNull();
});
+
+ it('should create a Note with a vertical list position for record pages', () => {
+ const widget = createDefaultStandaloneRichTextWidget({
+ id: 'note-widget',
+ pageLayoutTabId: 'record-tab',
+ body: { blocknote: '', markdown: null },
+ position: {
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: 2,
+ },
+ title: 'Note',
+ });
+
+ expect(widget).toMatchObject({
+ title: 'Note',
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ objectMetadataId: null,
+ position: {
+ __typename: 'PageLayoutWidgetVerticalListPosition',
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ index: 2,
+ },
+ configuration: {
+ body: { blocknote: '', markdown: null },
+ },
+ });
+ });
});
diff --git a/packages/twenty-front/src/modules/page-layout/utils/addWidgetToTab.ts b/packages/twenty-front/src/modules/page-layout/utils/addWidgetToTab.ts
index c037a1a3338..b720564b0b0 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/addWidgetToTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/addWidgetToTab.ts
@@ -1,7 +1,9 @@
import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { isVerticalListPosition } from '@/page-layout/utils/isVerticalListPosition';
import { reindexWidgetsToVerticalListPositions } from '@/page-layout/utils/reindexWidgetsToVerticalListPositions';
import { sortWidgetsByVerticalListPosition } from '@/page-layout/utils/sortWidgetsByVerticalListPosition';
+import { isDefined } from 'twenty-shared/utils';
import { PageLayoutTabLayoutMode } from '~/generated-metadata/graphql';
export const addWidgetToTab = (
@@ -15,7 +17,13 @@ export const addWidgetToTab = (
tab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST
? sortWidgetsByVerticalListPosition(tab.widgets)
: tab.widgets;
- const widgets = [...existingWidgets, newWidget];
+ const insertionIndex =
+ tab.layoutMode === PageLayoutTabLayoutMode.VERTICAL_LIST &&
+ isDefined(newWidget.position) &&
+ isVerticalListPosition(newWidget.position)
+ ? newWidget.position.index
+ : existingWidgets.length;
+ const widgets = existingWidgets.toSpliced(insertionIndex, 0, newWidget);
return {
...tab,
diff --git a/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts b/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
index 9763bb5ad59..5054b04fbff 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/createDefaultStandaloneRichTextWidget.ts
@@ -1,18 +1,30 @@
+import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
+import { isVerticalListPosition } from '@/page-layout/utils/isVerticalListPosition';
import {
- type PageLayoutWidget,
type PageLayoutWidgetGridPosition,
+ type PageLayoutWidgetVerticalListPosition,
type RichTextBody,
WidgetConfigurationType,
WidgetType,
} from '~/generated-metadata/graphql';
-export const createDefaultStandaloneRichTextWidget = (
- id: string,
- pageLayoutTabId: string,
- body: RichTextBody,
- position: PageLayoutWidgetGridPosition,
- objectMetadataId?: string | null,
-): PageLayoutWidget => {
+type CreateDefaultStandaloneRichTextWidgetParams = {
+ id: string;
+ pageLayoutTabId: string;
+ body: RichTextBody;
+ position: PageLayoutWidgetGridPosition | PageLayoutWidgetVerticalListPosition;
+ objectMetadataId?: string | null;
+ title?: string;
+};
+
+export const createDefaultStandaloneRichTextWidget = ({
+ id,
+ pageLayoutTabId,
+ body,
+ position,
+ objectMetadataId,
+ title = 'Untitled Rich Text',
+}: CreateDefaultStandaloneRichTextWidgetParams): PageLayoutWidget => {
return {
__typename: 'PageLayoutWidget',
id,
@@ -20,17 +32,16 @@ export const createDefaultStandaloneRichTextWidget = (
universalIdentifier: id,
isSystemSideEffect: false,
pageLayoutTabId,
- title: 'Untitled Rich Text',
+ title,
isActive: true,
type: WidgetType.STANDALONE_RICH_TEXT,
configuration: {
configurationType: WidgetConfigurationType.STANDALONE_RICH_TEXT,
body,
},
- position: {
- ...position,
- __typename: 'PageLayoutWidgetGridPosition',
- },
+ position: isVerticalListPosition(position)
+ ? { ...position, __typename: 'PageLayoutWidgetVerticalListPosition' }
+ : { ...position, __typename: 'PageLayoutWidgetGridPosition' },
objectMetadataId: objectMetadataId ?? null,
createdAt: new Date().toISOString(),
updatedAt: new Date().toISOString(),
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
index 760a2b3e235..d55a4a28b7b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/RecordPageAddWidgetSection.tsx
@@ -1,10 +1,17 @@
+import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutContentContext';
+import { useCreateRecordPageNoteWidget } from '@/page-layout/hooks/useCreateRecordPageNoteWidget';
import { useCreateRecordPageFieldWidget } from '@/page-layout/hooks/useCreateRecordPageFieldWidget';
import { useCreateRecordPageFieldsWidget } from '@/page-layout/hooks/useCreateRecordPageFieldsWidget';
import { useNavigateToMoreWidgets } from '@/page-layout/hooks/useNavigateToMoreWidgets';
import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { useContext } from 'react';
-import { IconListDetails, IconPlus, IconSquarePlus } from 'twenty-ui/icon';
+import {
+ IconListDetails,
+ IconNotes,
+ IconPlus,
+ IconSquarePlus,
+} from 'twenty-ui/icon';
import { MenuItem } from 'twenty-ui/navigation';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -41,6 +48,8 @@ const StyledMenuItemList = styled.div`
export const RecordPageAddWidgetSection = () => {
const { theme } = useContext(ThemeContext);
+ const { tabId } = usePageLayoutContentContext();
+ const { createRecordPageNoteWidget } = useCreateRecordPageNoteWidget();
const { createRecordPageFieldsWidget } = useCreateRecordPageFieldsWidget();
@@ -73,6 +82,13 @@ export const RecordPageAddWidgetSection = () => {
contextualText={t`Single field with smart formats`}
onClick={createRecordPageFieldWidget}
/>
+ <MenuItem
+ LeftIcon={IconNotes}
+ withIconContainer
+ text={t`Note`}
+ contextualText={t`Static text shared across all record pages`}
+ onClick={() => createRecordPageNoteWidget({ tabId })}
+ />
<MenuItem
LeftIcon={IconPlus}
withIconContainer
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.tsx
index 17308d03ed2..24c4b1d9013 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
@@ -120,7 +120,10 @@ export const WidgetCardShell = ({
variant={variant}
hasHeader={showHeader}
isEditable={isEditable}
- hasInteractiveContent={widget.type === WidgetType.RECORD_TABLE}
+ hasInteractiveContent={
+ widget.type === WidgetType.RECORD_TABLE ||
+ widget.type === WidgetType.STANDALONE_RICH_TEXT
+ }
isFixedHeight={isFixedHeightIframe}
contentPadding={contentPadding}
>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx
index 34f4801f93e..b10186e2e56 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbar.tsx
@@ -15,23 +15,28 @@ import { FORMATTING_TOOLBAR_FLOATING_CONFIG } from '@/page-layout/widgets/standa
import { styled } from '@linaria/react';
const StyledToolbarContainer = styled.div`
+ max-width: calc(
+ 100vw - ${FORMATTING_TOOLBAR_FLOATING_CONFIG.boundaryPadding * 2}px
+ );
+
+ & .bn-formatting-toolbar.bn-toolbar {
+ box-sizing: border-box;
+ flex-wrap: wrap;
+ max-width: 100%;
+ overflow: visible;
+ }
+
& .bn-formatting-toolbar .mantine-Button-root {
height: 24px;
min-height: 24px;
}
`;
-type DashboardFormattingToolbarProps = {
- boundaryElement?: HTMLElement | null;
-};
-
-export const DashboardFormattingToolbar = ({
- boundaryElement,
-}: DashboardFormattingToolbarProps) => {
+export const DashboardFormattingToolbar = () => {
return (
- <StyledToolbarContainer>
- <FormattingToolbarController
- formattingToolbar={() => (
+ <FormattingToolbarController
+ formattingToolbar={() => (
+ <StyledToolbarContainer>
<FormattingToolbar>
<BlockTypeSelect key="blockTypeSelect" />
<BasicTextStyleButton basicTextStyle="bold" key="boldStyleButton" />
@@ -58,22 +63,19 @@ export const DashboardFormattingToolbar = ({
<UnnestBlockButton key="unnestBlockButton" />
<CreateLinkButton key="createLinkButton" />
</FormattingToolbar>
- )}
- floatingUIOptions={{
- useFloatingOptions: {
- middleware: [
- offset(FORMATTING_TOOLBAR_FLOATING_CONFIG.offsetFromSelection),
- shift({
- boundary: boundaryElement ?? undefined,
- padding: FORMATTING_TOOLBAR_FLOATING_CONFIG.boundaryPadding,
- }),
- flip({
- boundary: boundaryElement ?? undefined,
- }),
- ],
- },
- }}
- />
- </StyledToolbarContainer>
+ </StyledToolbarContainer>
+ )}
+ floatingUIOptions={{
+ useFloatingOptions: {
+ middleware: [
+ offset(FORMATTING_TOOLBAR_FLOATING_CONFIG.offsetFromSelection),
+ shift({
+ padding: FORMATTING_TOOLBAR_FLOATING_CONFIG.boundaryPadding,
+ }),
+ flip(),
+ ],
+ },
+ }}
+ />
);
};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbarColorButton.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbarColorButton.tsx
index b29fa9a1997..3f300a91b10 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbarColorButton.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardFormattingToolbarColorButton.tsx
@@ -53,6 +53,7 @@ export const DashboardFormattingToolbarColorButton = () => {
);
const { refs, floatingStyles } = useFloating({
+ strategy: 'fixed',
placement: 'bottom-start',
whileElementsMounted: autoUpdate,
middleware: [
@@ -126,7 +127,10 @@ export const DashboardFormattingToolbarColorButton = () => {
menuRef as React.MutableRefObject<HTMLDivElement | null>
).current = node;
}}
- style={floatingStyles}
+ style={{
+ ...floatingStyles,
+ zIndex: COLOR_DROPDOWN_FLOATING_CONFIG.zIndex,
+ }}
className="bn-ui-container"
data-click-outside-id={COLOR_BUTTON_CLICK_OUTSIDE_ID}
>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
index f895f81cba6..020e8855ea9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor.tsx
@@ -1,6 +1,7 @@
import { filterSuggestionItems } from '@blocknote/core/extensions';
import { BlockNoteView } from '@blocknote/mantine';
import { SuggestionMenuController } from '@blocknote/react';
+import { css } from '@linaria/core';
import { styled } from '@linaria/react';
import { type ClipboardEvent, useContext } from 'react';
@@ -20,16 +21,18 @@ type DashboardsBlockEditorProps = {
onPaste?: (event: ClipboardEvent) => void;
onChange?: () => void;
readonly?: boolean;
- boundaryElement?: HTMLElement | null;
};
+const StyledEditor = styled.div`
+ width: 100%;
+`;
+
// TODO: Refactor these BlockNote CSS overrides - some may be dead code now that we have custom components
// (DashboardEditorSideMenu, DashboardColorSelectionMenu).
// Test removing each selector and move necessary styles to appropriate components.
+// BlockNote shares this class with its body portal to preserve menu styles outside the widget.
// oxlint-disable-next-line twenty/no-hardcoded-colors
-const StyledEditor = styled.div`
- width: 100%;
-
+const editorStyles = css`
& .editor {
background: transparent;
color: ${themeCssVariables.font.color.primary};
@@ -48,7 +51,7 @@ const StyledEditor = styled.div`
height: 20px;
width: 20px;
}
- & .bn-container .bn-drag-handle {
+ & .bn-drag-handle {
height: 20px;
width: 20px;
}
@@ -90,7 +93,7 @@ const StyledEditor = styled.div`
min-width: 0;
}
- & .bn-container .bn-suggestion-menu-item:hover {
+ & .bn-suggestion-menu-item:hover {
background-color: blue;
}
@@ -125,7 +128,7 @@ const StyledEditor = styled.div`
width: 16px;
}
- & .bn-mantine .bn-side-menu > [draggable='true'] {
+ & .bn-side-menu > [draggable='true'] {
margin-bottom: 5px;
}
& .bn-color-picker-dropdown {
@@ -154,7 +157,6 @@ export const DashboardsBlockEditor = ({
onChange,
onPaste,
readonly,
- boundaryElement,
}: DashboardsBlockEditorProps) => {
const { colorScheme } = useContext(ThemeContext);
const blockNoteTheme = colorScheme === 'light' ? 'light' : 'dark';
@@ -178,6 +180,7 @@ export const DashboardsBlockEditor = ({
return (
<StyledEditor>
<BlockNoteView
+ className={editorStyles}
onFocus={handleFocus}
onBlur={handleBlur}
onPaste={handlePaste}
@@ -188,10 +191,11 @@ export const DashboardsBlockEditor = ({
sideMenu={false}
formattingToolbar={false}
editable={!readonly}
+ portalElements={{ default: null }}
>
{!readonly && (
<>
- <DashboardFormattingToolbar boundaryElement={boundaryElement} />
+ <DashboardFormattingToolbar />
<DashboardEditorSideMenu editor={editor} />
<SuggestionMenuController
triggerCharacter="/"
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextEditorContent.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextEditorContent.tsx
index 364f845a118..450ba37f604 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextEditorContent.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextEditorContent.tsx
@@ -1,8 +1,8 @@
import { useCallback, useState } from 'react';
+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';
import { isDashboardInEditModeComponentState } from '@/page-layout/states/isDashboardInEditModeComponentState';
-import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
import { DashboardsBlockEditor } from '@/page-layout/widgets/standalone-rich-text/components/DashboardsBlockEditor';
import { StandaloneRichTextWidgetAutoFocusEffect } from '@/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidgetAutoFocusEffect';
@@ -27,6 +27,7 @@ type StandaloneRichTextEditorContentProps = {
widget: PageLayoutWidget;
currentBody: string;
isEditable: boolean;
+ shouldFocus: boolean;
containerElement: HTMLDivElement | null;
};
@@ -34,6 +35,7 @@ export const StandaloneRichTextEditorContent = ({
widget,
currentBody,
isEditable,
+ shouldFocus,
containerElement,
}: StandaloneRichTextEditorContentProps) => {
const { updatePageLayoutWidget } = useUpdatePageLayoutWidget();
@@ -43,23 +45,17 @@ export const StandaloneRichTextEditorContent = ({
const isDashboardInEditModeState = useAtomComponentStateCallbackState(
isDashboardInEditModeComponentState,
);
- const pageLayoutEditingWidgetIdState = useAtomComponentStateCallbackState(
- pageLayoutEditingWidgetIdComponentState,
- );
-
const store = useStore();
const shouldPersistDraft = useCallback(() => {
const isDashboardInEditMode = store.get(isDashboardInEditModeState);
- const editingWidgetId = store.get(pageLayoutEditingWidgetIdState);
-
- return isDashboardInEditMode && editingWidgetId === widget.id;
- }, [
- isDashboardInEditModeState,
- pageLayoutEditingWidgetIdState,
- widget.id,
- store,
- ]);
+ const isLayoutCustomizationModeEnabled = store.get(
+ isLayoutCustomizationModeEnabledState.atom,
+ );
+ return (
+ isEditable && (isDashboardInEditMode || isLayoutCustomizationModeEnabled)
+ );
+ }, [isDashboardInEditModeState, isEditable, store]);
const [initialContent] = useState(() =>
filterSupportedBlocks(parseInitialBlocknote(currentBody)),
@@ -116,7 +112,7 @@ export const StandaloneRichTextEditorContent = ({
return (
<>
<StandaloneRichTextWidgetAutoFocusEffect
- shouldFocus={isEditable}
+ shouldFocus={shouldFocus}
editor={editor}
containerElement={containerElement}
/>
@@ -126,7 +122,6 @@ export const StandaloneRichTextEditorContent = ({
onChange={handleEditorChange}
editor={editor}
readonly={!isEditable}
- boundaryElement={containerElement}
/>
</>
);
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx
index 51dcb9dd777..7f6aed64a1f 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/StandaloneRichTextWidget.tsx
@@ -42,7 +42,7 @@ export const StandaloneRichTextWidget = ({
const currentBody = configuration?.body?.blocknote ?? '';
const isThisWidgetBeingEdited = pageLayoutEditingWidgetId === widget.id;
- const isEditable = isPageLayoutInEditMode && isThisWidgetBeingEdited;
+ const isEditable = isPageLayoutInEditMode;
return (
<StyledContainer
@@ -57,6 +57,7 @@ export const StandaloneRichTextWidget = ({
widget={widget}
currentBody={currentBody}
isEditable={isEditable}
+ shouldFocus={isEditable && isThisWidgetBeingEdited}
containerElement={containerElementRef.current}
/>
</ScrollWrapper>
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx
new file mode 100644
index 00000000000..020223c53af
--- /dev/null
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/components/__stories__/RecordPageNoteWidget.stories.tsx
@@ -0,0 +1,391 @@
+import { MAIN_CONTEXT_STORE_INSTANCE_ID } from '@/context-store/constants/MainContextStoreInstanceId';
+import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
+import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
+import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
+import { metadataStoreState } from '@/metadata-store/states/metadataStoreState';
+import { PageLayoutContentProvider } from '@/page-layout/contexts/PageLayoutContentContext';
+import {
+ PAGE_LAYOUT_TEST_INSTANCE_ID,
+ PageLayoutTestWrapper,
+} from '@/page-layout/hooks/__tests__/PageLayoutTestWrapper';
+import { useOpenWidgetSettingsInSidePanel } from '@/side-panel/hooks/useOpenWidgetSettingsInSidePanel';
+import { isDashboardInEditModeComponentState } from '@/page-layout/states/isDashboardInEditModeComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
+import { widgetCreationTargetTabIdComponentState } from '@/page-layout/states/widgetCreationTargetTabIdComponentState';
+import {
+ makeDraft,
+ makeTab,
+ makeWidget,
+} from '@/page-layout/testing/pageLayoutDraftFixtures';
+import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/createDefaultStandaloneRichTextWidget';
+import { RecordPageAddWidgetSection } from '@/page-layout/widgets/components/RecordPageAddWidgetSection';
+import { WidgetCardShell } from '@/page-layout/widgets/components/WidgetCardShell';
+import { SidePanelPageLayoutRecordPageWidgetTypeSelect } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect';
+import { isSidePanelOpenedState } from '@/side-panel/states/isSidePanelOpenedState';
+import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
+import { LayoutRenderingProvider } from '@/ui/layout/contexts/LayoutRenderingContext';
+import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { graphql, HttpResponse } from 'msw';
+import { MemoryRouter } from 'react-router-dom';
+import { expect, userEvent, waitFor, within } from 'storybook/test';
+import { SidePanelPages } from 'twenty-shared/types';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ PageLayoutTabLayoutMode,
+ PageLayoutType,
+ WidgetType,
+} from '~/generated-metadata/graphql';
+import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
+import { getTestEnrichedObjectMetadataItemsMock } from '~/testing/utils/getTestEnrichedObjectMetadataItemsMock';
+import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';
+
+const NOTE_WIDGET = createDefaultStandaloneRichTextWidget({
+ id: 'note-widget-story',
+ pageLayoutTabId: 'tab-1',
+ title: 'Note',
+ body: {
+ blocknote: JSON.stringify([
+ { id: 'instructions', type: 'paragraph', content: 'Shared instructions' },
+ ]),
+ markdown: null,
+ },
+ position: { layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST, index: 0 },
+});
+const DRAFT_ATOM = pageLayoutDraftComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+});
+const EDITING_WIDGET_ATOM = pageLayoutEditingWidgetIdComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+});
+
+type RecordPageNoteWidgetStoryProps = {
+ isEditable: boolean;
+ layoutType: PageLayoutType;
+ surface: 'widget' | 'inline-picker' | 'side-panel';
+ replacementPosition?: number;
+};
+
+const RecordPageNoteWidgetStory = ({
+ isEditable,
+ surface,
+}: RecordPageNoteWidgetStoryProps) => {
+ const { openWidgetSettingsInSidePanel } = useOpenWidgetSettingsInSidePanel();
+
+ if (surface === 'inline-picker') {
+ return <RecordPageAddWidgetSection />;
+ }
+
+ if (surface === 'side-panel') {
+ return <SidePanelPageLayoutRecordPageWidgetTypeSelect />;
+ }
+
+ return (
+ <WidgetCardShell
+ widget={NOTE_WIDGET}
+ variant="flush"
+ isEditable={isEditable}
+ isEditing={false}
+ isDragging={false}
+ isResizing={false}
+ showHeader
+ hasAccess
+ restriction={{ type: null }}
+ onClick={() =>
+ openWidgetSettingsInSidePanel({
+ widgetId: NOTE_WIDGET.id,
+ widgetType: NOTE_WIDGET.type,
+ })
+ }
+ onRemove={() => undefined}
+ />
+ );
+};
+
+const meta: Meta<typeof RecordPageNoteWidgetStory> = {
+ title: 'Modules/PageLayout/Widgets/RecordPageNoteWidget',
+ component: RecordPageNoteWidgetStory,
+ args: {
+ isEditable: true,
+ layoutType: PageLayoutType.RECORD_PAGE,
+ surface: 'widget',
+ },
+ parameters: {
+ msw: {
+ handlers: [
+ graphql.query('FindManyFrontComponents', () =>
+ HttpResponse.json({ data: { frontComponents: [] } }),
+ ),
+ ],
+ },
+ },
+ beforeEach: ({ args }) => {
+ setTestObjectMetadataItemsInMetadataStore(
+ jotaiStore,
+ getTestEnrichedObjectMetadataItemsMock(),
+ );
+ const company = getMockObjectMetadataItemOrThrow('company');
+ const widgets = isDefined(args.replacementPosition)
+ ? [
+ makeWidget('first', 0),
+ makeWidget('second', 1),
+ { ...makeWidget('tasks', 2), type: WidgetType.TASKS },
+ ]
+ : args.surface === 'widget'
+ ? [NOTE_WIDGET]
+ : [];
+ const layout = {
+ ...makeDraft([makeTab('tab-1', widgets)]),
+ id: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ type: args.layoutType,
+ objectMetadataId: company.id,
+ applicationId: '',
+ universalIdentifier: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ isSystemSideEffect: false,
+ createdAt: '2026-08-01T00:00:00.000Z',
+ updatedAt: '2026-08-01T00:00:00.000Z',
+ deletedAt: null,
+ };
+ jotaiStore.set(DRAFT_ATOM, layout);
+ jotaiStore.set(
+ pageLayoutPersistedComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ }),
+ layout,
+ );
+ jotaiStore.set(metadataStoreState.atomFamily('pageLayouts'), {
+ current: [layout],
+ draft: [],
+ status: 'up-to-date',
+ });
+ jotaiStore.set(
+ isLayoutCustomizationModeEnabledState.atom,
+ args.isEditable && args.layoutType === PageLayoutType.RECORD_PAGE,
+ );
+ jotaiStore.set(
+ isDashboardInEditModeComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ }),
+ args.isEditable && args.layoutType === PageLayoutType.DASHBOARD,
+ );
+ jotaiStore.set(
+ EDITING_WIDGET_ATOM,
+ isDefined(args.replacementPosition)
+ ? widgets[args.replacementPosition].id
+ : args.surface === 'widget'
+ ? 'other-widget'
+ : null,
+ );
+ jotaiStore.set(
+ widgetCreationTargetTabIdComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ }),
+ 'tab-1',
+ );
+ jotaiStore.set(
+ contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({
+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
+ }),
+ company.id,
+ );
+ jotaiStore.set(
+ contextStoreTargetedRecordsRuleComponentState.atomFamily({
+ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID,
+ }),
+ { mode: 'selection', selectedRecordIds: ['company-record'] },
+ );
+ },
+ decorators: [
+ SnackBarDecorator,
+ (Story, { args }) => (
+ <MemoryRouter>
+ <PageLayoutTestWrapper store={jotaiStore} layoutType={args.layoutType}>
+ <LayoutRenderingProvider
+ value={{
+ isInSidePanel: false,
+ layoutType: args.layoutType,
+ targetRecordIdentifier: {
+ id: 'company-record',
+ targetObjectNameSingular: 'company',
+ },
+ }}
+ >
+ <ContextStoreComponentInstanceContext.Provider
+ value={{ instanceId: MAIN_CONTEXT_STORE_INSTANCE_ID }}
+ >
+ <PageLayoutContentProvider
+ value={{
+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,
+ presentation: 'stack',
+ tabId: 'tab-1',
+ }}
+ >
+ <div style={{ width: 360, height: 180, marginTop: 48 }}>
+ <Story />
+ </div>
+ </PageLayoutContentProvider>
+ </ContextStoreComponentInstanceContext.Provider>
+ </LayoutRenderingProvider>
+ </PageLayoutTestWrapper>
+ </MemoryRouter>
+ ),
+ ],
+};
+
+export default meta;
+type Story = StoryObj<typeof RecordPageNoteWidgetStory>;
+
+export const ReadOnly: Story = {
+ args: { isEditable: false },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await expect(await canvas.findByText('Shared instructions')).toBeVisible();
+ await expect(canvas.getByRole('textbox')).toHaveAttribute(
+ 'contenteditable',
+ 'false',
+ );
+ await expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(false);
+ },
+};
+
+export const SelectAndFormatText: Story = {
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const body = within(canvasElement.ownerDocument.body);
+ const editor = await canvas.findByRole('textbox');
+ await userEvent.tripleClick(canvas.getByText('Shared instructions'));
+ const bold = await body.findByRole('button', { name: /^Bold/ });
+ await waitFor(() => expect(bold).toBeVisible());
+ await expect(canvasElement.contains(bold)).toBe(false);
+ await expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(false);
+ await expect(jotaiStore.get(EDITING_WIDGET_ATOM)).toBe('other-widget');
+ await userEvent.click(bold);
+ await waitFor(() =>
+ expect(canvas.getByText('instructions').closest('strong')).not.toBeNull(),
+ );
+ await expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(false);
+ await expect(await canvas.findByRole('textbox')).toBe(editor);
+ await waitFor(() =>
+ expect(
+ jotaiStore.get(DRAFT_ATOM).tabs[0].widgets[0].configuration,
+ ).toMatchObject({
+ body: { blocknote: expect.stringContaining('"bold":true') },
+ }),
+ );
+ if (args.layoutType === PageLayoutType.RECORD_PAGE) {
+ await userEvent.click(canvas.getByText('Note', { exact: true }));
+ await expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(true);
+ await expect(jotaiStore.get(EDITING_WIDGET_ATOM)).toBe(NOTE_WIDGET.id);
+ }
+ },
+};
+
+export const DashboardSelection: Story = {
+ args: { layoutType: PageLayoutType.DASHBOARD },
+ play: SelectAndFormatText.play,
+};
+
+export const CancelPendingEdit: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const initialBody =
+ jotaiStore.get(DRAFT_ATOM).tabs[0].widgets[0].configuration;
+ const editor = await canvas.findByRole('textbox');
+ await userEvent.type(editor, 'New');
+ await expect(editor).toHaveTextContent('New');
+ jotaiStore.set(isLayoutCustomizationModeEnabledState.atom, false);
+ jotaiStore.set(
+ isDashboardInEditModeComponentState.atomFamily({
+ instanceId: PAGE_LAYOUT_TEST_INSTANCE_ID,
+ }),
+ false,
+ );
+ await canvas.findByText('Shared instructions');
+ await expect(canvas.getByRole('textbox')).toHaveAttribute(
+ 'contenteditable',
+ 'false',
+ );
+ // A cancelled edit must stay discarded after the 300ms draft debounce.
+ await new Promise((resolve) => setTimeout(resolve, 350));
+ await expect(
+ jotaiStore.get(DRAFT_ATOM).tabs[0].widgets[0].configuration,
+ ).toEqual(initialBody);
+ },
+};
+
+export const CancelPendingDashboardEdit: Story = {
+ args: { layoutType: PageLayoutType.DASHBOARD },
+ play: CancelPendingEdit.play,
+};
+
+export const AddFromInlinePicker: Story = {
+ args: { surface: 'inline-picker' },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ await expect(
+ await canvas.findByText(/Static text shared across all record pages/),
+ ).toBeVisible();
+ await userEvent.click(canvas.getByText('Note', { exact: true }));
+ const note = jotaiStore.get(DRAFT_ATOM).tabs[0].widgets[0];
+ await expect(note.title).toBe('Note');
+ await expect(jotaiStore.get(EDITING_WIDGET_ATOM)).toBe(note.id);
+ await expect(jotaiStore.get(sidePanelPageState.atom)).toBe(
+ SidePanelPages.PageLayoutWidgetSettings,
+ );
+ },
+};
+
+export const AddFromSidePanel: Story = {
+ args: { surface: 'side-panel' },
+ play: AddFromInlinePicker.play,
+};
+
+export const ReplaceFirstFromSidePanel: Story = {
+ args: { surface: 'side-panel', replacementPosition: 0 },
+ play: async ({ args, canvasElement }) => {
+ await userEvent.click(
+ await within(canvasElement).findByText('Note', { exact: true }),
+ );
+ const widgets = jotaiStore.get(DRAFT_ATOM).tabs[0].widgets;
+ await expect(widgets.map(({ title }) => title)).toEqual(
+ ['first', 'second', 'tasks'].map((title, index) =>
+ index === args.replacementPosition ? 'Note' : title,
+ ),
+ );
+ await expect(widgets.map(({ position }) => position)).toMatchObject(
+ [0, 1, 2].map((index) => ({ index })),
+ );
+ await expect(
+ widgets.find(({ id }) => id === jotaiStore.get(EDITING_WIDGET_ATOM))
+ ?.title,
+ ).toBe('Note');
+ },
+};
+
+export const ReplaceMiddleFromSidePanel: Story = {
+ args: { surface: 'side-panel', replacementPosition: 1 },
+ play: ReplaceFirstFromSidePanel.play,
+};
+
+export const ReplaceTasksFromSidePanel: Story = {
+ args: { surface: 'side-panel', replacementPosition: 2 },
+ play: ReplaceFirstFromSidePanel.play,
+};
+
+export const MoreWidgets: Story = {
+ args: { surface: 'inline-picker' },
+ play: async ({ canvasElement }) => {
+ await userEvent.click(
+ await within(canvasElement).findByText('More widgets'),
+ );
+ await expect(jotaiStore.get(DRAFT_ATOM).tabs[0].widgets).toHaveLength(0);
+ await expect(jotaiStore.get(isSidePanelOpenedState.atom)).toBe(true);
+ await expect(jotaiStore.get(sidePanelPageState.atom)).toBe(
+ SidePanelPages.PageLayoutRecordPageWidgetTypeSelect,
+ );
+ },
+};
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/constants/ColorDropdownFloatingConfig.ts b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/constants/ColorDropdownFloatingConfig.ts
index 03c5a527633..4c2a07db36a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/constants/ColorDropdownFloatingConfig.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/constants/ColorDropdownFloatingConfig.ts
@@ -1,4 +1,6 @@
export const COLOR_DROPDOWN_FLOATING_CONFIG = {
offsetFromButton: 8,
boundaryPadding: 8,
+ // BlockNote's formatting toolbar uses z-index 40.
+ zIndex: 41,
};
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
index 81c666a5192..1d70935b5e3 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/hooks/__tests__/useOpenWidgetSettingsInSidePanel.test.tsx
@@ -168,6 +168,61 @@ describe('useOpenWidgetSettingsInSidePanel', () => {
expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
});
+ it.each([false, true])(
+ 'opens Note settings on record pages and keeps dashboard inline editing (dashboard: %s)',
+ (isDashboard) => {
+ (useIsDashboardPageLayout as jest.Mock).mockReturnValue(isDashboard);
+ const store = createStore();
+ const widget = {
+ ...makeWidget('note', 0),
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ };
+ store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widget])]));
+ const { result } = renderOpenWidgetSettingsHook(store);
+ act(() =>
+ result.current.openWidgetSettingsInSidePanel({
+ widgetId: widget.id,
+ widgetType: widget.type,
+ }),
+ );
+
+ expect(store.get(getEditingWidgetIdAtom())).toBe(widget.id);
+ if (isDashboard) {
+ expect(mockCloseSidePanelMenu).toHaveBeenCalledTimes(1);
+ expect(mockNavigatePageLayoutSidePanel).not.toHaveBeenCalled();
+ } else {
+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
+ expect(mockNavigatePageLayoutSidePanel).toHaveBeenCalledWith({
+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: 'Note',
+ resetNavigationStack: true,
+ });
+ }
+ },
+ );
+
+ it('keeps Note settings selected when interrupting a closing panel', () => {
+ const store = createStore();
+ const widget = {
+ ...makeWidget('note', 0),
+ type: WidgetType.STANDALONE_RICH_TEXT,
+ };
+ store.set(getDraftAtom(), makeDraft([makeTab('tab-1', [widget])]));
+ mockNavigatePageLayoutSidePanel.mockImplementationOnce(() => {
+ store.set(getEditingWidgetIdAtom(), null);
+ });
+
+ const { result } = renderOpenWidgetSettingsHook(store);
+ act(() =>
+ result.current.openWidgetSettingsInSidePanel({
+ widgetId: widget.id,
+ widgetType: widget.type,
+ }),
+ );
+
+ expect(store.get(getEditingWidgetIdAtom())).toBe(widget.id);
+ });
+
it.each([WidgetType.IFRAME, WidgetType.GRAPH, WidgetType.RECORD_TABLE])(
'opens generic widget settings for a %s widget on a record page',
(widgetType) => {
diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
index 55ec362728c..65c12521d3f 100644
--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenWidgetSettingsInSidePanel.ts
@@ -111,8 +111,16 @@ export const useOpenWidgetSettingsInSidePanel = (
}
if (widgetType === WidgetType.STANDALONE_RICH_TEXT) {
+ if (isDashboardPageLayout) {
+ closeSidePanelMenu();
+ } else {
+ navigatePageLayoutSidePanel({
+ sidePanelPage: SidePanelPages.PageLayoutWidgetSettings,
+ pageTitle: t`Note`,
+ resetNavigationStack: true,
+ });
+ }
setPageLayoutEditingWidgetId(widgetId);
- closeSidePanelMenu();
return;
}
diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
index 3816e38784e..36d45d95f74 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/SidePanelPageLayoutRecordPageWidgetTypeSelect.tsx
@@ -2,6 +2,7 @@ import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';
import { FIND_MANY_FRONT_COMPONENTS } from '@/front-components/graphql/queries/findManyFrontComponents';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useInsertCreatedWidgetAtContext } from '@/page-layout/hooks/useInsertCreatedWidgetAtContext';
+import { useCreateRecordPageNoteWidget } from '@/page-layout/hooks/useCreateRecordPageNoteWidget';
import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
import { widgetCreationTargetTabIdComponentState } from '@/page-layout/states/widgetCreationTargetTabIdComponentState';
@@ -31,7 +32,7 @@ import { useStore } from 'jotai';
import { useCallback } from 'react';
import { SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { IconApps, IconListDetails } from 'twenty-ui/icon';
+import { IconApps, IconListDetails, IconNotes } from 'twenty-ui/icon';
import { v4 as uuidv4 } from 'uuid';
import {
type FrontComponent,
@@ -45,6 +46,8 @@ export const SidePanelPageLayoutRecordPageWidgetTypeSelect = () => {
usePageLayoutIdFromContextStore();
const { closeSidePanelMenu } = useSidePanelMenu();
+ const { createRecordPageNoteWidget } =
+ useCreateRecordPageNoteWidget(pageLayoutId);
const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();
@@ -264,6 +267,18 @@ export const SidePanelPageLayoutRecordPageWidgetTypeSelect = () => {
tabId,
]);
+ const handleCreateNoteWidget = () => {
+ const replacePositionIndex = getExistingWidgetPositionIndex();
+ removeExistingWidgetIfReplacing();
+
+ const newWidget = createRecordPageNoteWidget({
+ tabId,
+ positionIndex: replacePositionIndex,
+ });
+
+ insertCreatedWidgetAtContext(newWidget.id);
+ };
+
const handleCreateFrontComponentWidget = useCallback(
(frontComponent: FrontComponent) => {
const replacePositionIndex = getExistingWidgetPositionIndex();
@@ -326,6 +341,7 @@ export const SidePanelPageLayoutRecordPageWidgetTypeSelect = () => {
const selectableItemIds = [
'fields',
'field',
+ 'note',
...frontComponentsWithSelectItemId.map(({ selectItemId }) => selectItemId),
];
@@ -348,6 +364,15 @@ export const SidePanelPageLayoutRecordPageWidgetTypeSelect = () => {
onClick={handleCreateFieldWidget}
/>
</SelectableListItem>
+ <SelectableListItem itemId="note" onEnter={handleCreateNoteWidget}>
+ <CommandMenuItem
+ Icon={IconNotes}
+ label={t`Note`}
+ description={t`Static text shared across all record pages`}
+ id="note"
+ onClick={handleCreateNoteWidget}
+ />
+ </SelectableListItem>
</SidePanelGroup>
{frontComponentsWithSelectItemId.length > 0 && (