Skip to content

The open alternative to Salesforce, designed for AI.

Add workflow node actions and side panel controls (#24411)

Thomas des Francsb275322422cf
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelCloseButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelCloseButton.tsx
new file mode 100644
index 00000000000..ec4916ea91a
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelCloseButton.tsx
@@ -0,0 +1,22 @@
+import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
+import { useLingui } from '@lingui/react/macro';
+import { IconX } from 'twenty-ui/icon';
+import { IconButtonWithTooltip } from 'twenty-ui/input';
+
+export const SidePanelCloseButton = () => {
+ const { t } = useLingui();
+ const { closeSidePanelMenu } = useSidePanelMenu();
+
+ const closeSidePanelLabel = t`Close side panel`;
+
+ return (
+ <IconButtonWithTooltip
+ tooltipContent={closeSidePanelLabel}
+ Icon={IconX}
+ size="small"
+ variant="primary"
+ onClick={closeSidePanelMenu}
+ ariaLabel={closeSidePanelLabel}
+ />
+ );
+};
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelExpandButton.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelExpandButton.tsx
index cb12d6a41b3..4ca63432b06 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelExpandButton.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelExpandButton.tsx
@@ -1,7 +1,11 @@
import { isNonEmptyString } from '@sniptt/guards';
import { isDefined } from 'twenty-shared/utils';
-import { IconLayoutSidebarRightExpand } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/input';
+import { IconMaximize } from 'twenty-ui/icon';
+import { IconButtonWithTooltip } from 'twenty-ui/input';
+import {
+ getOsControlSymbol,
+ getOsShortcutSeparator,
+} from 'twenty-ui/utilities';
import { useSidePanelExpandTarget } from '@/side-panel/hooks/useSidePanelExpandTarget';
import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
@@ -29,13 +33,20 @@ const SidePanelExpandButtonContent = () => {
return null;
}
+ const tooltipContent = expandTarget.hasExpandShortcut
+ ? `${expandTarget.label} | ${[getOsControlSymbol(), '⏎'].join(
+ getOsShortcutSeparator(),
+ )}`
+ : expandTarget.label;
+
return (
<>
{expandTarget.hasExpandShortcut && (
<SidePanelExpandShortcutEffect expand={expandTarget.expand} />
)}
- <IconButton
- Icon={IconLayoutSidebarRightExpand}
+ <IconButtonWithTooltip
+ tooltipContent={tooltipContent}
+ Icon={IconMaximize}
size="small"
variant="tertiary"
onClick={expandTarget.expand}
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
index e751858e443..f06b76dba10 100644
--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBar.tsx
@@ -1,5 +1,7 @@
import { SidePanelBackButton } from '@/side-panel/components/SidePanelBackButton';
+import { SidePanelCloseButton } from '@/side-panel/components/SidePanelCloseButton';
import { SidePanelPageInfo } from '@/side-panel/components/SidePanelPageInfo';
+import { SidePanelTopBarEscapeHotkeyEffect } from '@/side-panel/components/SidePanelTopBarEscapeHotkeyEffect';
import { SidePanelTopBarInputFocusEffect } from '@/side-panel/components/SidePanelTopBarInputFocusEffect';
import { SidePanelExpandButton } from '@/side-panel/components/SidePanelExpandButton';
import { SidePanelTopBarRightCornerIcon } from '@/side-panel/components/SidePanelTopBarRightCornerIcon';
@@ -9,7 +11,6 @@ import { SIDE_PANEL_TOP_BAR_HEIGHT } from '@/side-panel/constants/SidePanelTopBa
import { SIDE_PANEL_TOP_BAR_HEIGHT_MOBILE } from '@/side-panel/constants/SidePanelTopBarHeightMobile';
import { useHandleSidePanelBackspace } from '@/side-panel/hooks/useHandleSidePanelBackspace';
import { useHandleSidePanelEscape } from '@/side-panel/hooks/useHandleSidePanelEscape';
-import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useSidePanelContextChips } from '@/side-panel/hooks/useSidePanelContextChips';
import { sidePanelNavigationStackState } from '@/side-panel/states/sidePanelNavigationStackState';
import { sidePanelPageState } from '@/side-panel/states/sidePanelPageState';
@@ -24,8 +25,6 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useContext, useRef } from 'react';
import { Key } from 'ts-key-enum';
-import { IconX } from 'twenty-ui/icon';
-import { IconButton } from 'twenty-ui/input';
import { useIsMobile } from 'twenty-ui/utilities';
import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';
@@ -99,8 +98,6 @@ export const SidePanelTopBar = () => {
const isMobile = useIsMobile();
- const { closeSidePanelMenu } = useSidePanelMenu();
-
const sidePanelPage = useAtomStateValue(sidePanelPageState);
const sidePanelNavigationStack = useAtomStateValue(
@@ -152,7 +149,12 @@ export const SidePanelTopBar = () => {
return;
}
- if (event.key === Key.Backspace && handleSidePanelBackspace()) {
+ if (
+ event.key === Key.Backspace &&
+ !event.metaKey &&
+ !event.ctrlKey &&
+ handleSidePanelBackspace()
+ ) {
event.preventDefault();
event.stopPropagation();
event.nativeEvent.stopImmediatePropagation();
@@ -177,6 +179,10 @@ export const SidePanelTopBar = () => {
return (
<StyledInputContainer isMobile={isMobile}>
+ <SidePanelTopBarEscapeHotkeyEffect
+ inputRef={inputRef}
+ onEscape={handleSidePanelEscape}
+ />
<StyledContentContainer>
<AnimatePresence>
{shouldShowBackButton && (
@@ -213,15 +219,7 @@ export const SidePanelTopBar = () => {
<StyledRightControlsContainer>
<SidePanelTopBarRightCornerIcon />
<SidePanelExpandButton />
- {!shouldHideCloseButton && (
- <IconButton
- Icon={IconX}
- size="small"
- variant="primary"
- onClick={closeSidePanelMenu}
- ariaLabel={t`Close side panel`}
- />
- )}
+ {shouldHideCloseButton ? null : <SidePanelCloseButton />}
</StyledRightControlsContainer>
</StyledInputContainer>
);
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarEscapeHotkeyEffect.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarEscapeHotkeyEffect.tsx
new file mode 100644
index 00000000000..029bf6e754b
--- /dev/null
+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelTopBarEscapeHotkeyEffect.tsx
@@ -0,0 +1,41 @@
+import { type RefObject } from 'react';
+import { Key } from 'ts-key-enum';
+
+import { useGlobalHotkeys } from '@/ui/utilities/hotkey/hooks/useGlobalHotkeys';
+
+type SidePanelTopBarEscapeHotkeyEffectProps = {
+ inputRef: RefObject<HTMLInputElement | null>;
+ onEscape: () => void;
+};
+
+export const SidePanelTopBarEscapeHotkeyEffect = ({
+ inputRef,
+ onEscape,
+}: SidePanelTopBarEscapeHotkeyEffectProps) => {
+ const handleEscape = (event: KeyboardEvent) => {
+ if (document.activeElement === inputRef.current) {
+ return;
+ }
+
+ event.preventDefault();
+ event.stopPropagation();
+ event.stopImmediatePropagation();
+
+ onEscape();
+ };
+
+ useGlobalHotkeys({
+ keys: [Key.Escape],
+ callback: handleEscape,
+ containsModifier: false,
+ dependencies: [handleEscape],
+ options: {
+ eventListenerOptions: {
+ capture: true,
+ },
+ preventDefault: false,
+ },
+ });
+
+ return null;
+};
diff --git a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
index fed3987aba5..790513b5460 100644
--- a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelTopBar.test.tsx
@@ -196,6 +196,26 @@ describe('SidePanelTopBar', () => {
expect(mockCloseSidePanelMenu).toHaveBeenCalledTimes(1);
});
+ it('handles Escape before the underlying page hotkeys', () => {
+ const underlyingPageEscapeHandler = jest.fn();
+
+ document.addEventListener('keydown', underlyingPageEscapeHandler);
+
+ try {
+ renderSidePanelCommandMenu();
+
+ fireEvent.keyDown(document.body, {
+ key: 'Escape',
+ code: 'Escape',
+ });
+
+ expect(mockCloseSidePanelMenu).toHaveBeenCalledTimes(1);
+ expect(underlyingPageEscapeHandler).not.toHaveBeenCalled();
+ } finally {
+ document.removeEventListener('keydown', underlyingPageEscapeHandler);
+ }
+ });
+
it('does not navigate with Backspace while search has text', () => {
const { store } = renderSidePanelCommandMenu(
createSidePanelTopBarStore({
@@ -281,6 +301,36 @@ describe('SidePanelTopBar', () => {
expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
});
+ it('goes back with Escape while the search input is not focused', () => {
+ const { store } = renderSidePanelCommandMenu(
+ createSidePanelTopBarStore({
+ sidePanelPage: SidePanelPages.SearchRecords,
+ sidePanelNavigationStack: [
+ {
+ page: SidePanelPages.CommandMenuDisplay,
+ pageTitle: 'Command Menu',
+ pageIcon: IconDotsVertical,
+ pageId: 'command-menu',
+ },
+ {
+ page: SidePanelPages.SearchRecords,
+ pageTitle: 'Search',
+ pageIcon: IconDotsVertical,
+ pageId: 'search-records',
+ },
+ ],
+ }),
+ );
+
+ fireEvent.keyDown(document.body, {
+ key: 'Escape',
+ code: 'Escape',
+ });
+
+ expect(store.get(sidePanelNavigationStackState.atom)).toHaveLength(1);
+ expect(mockCloseSidePanelMenu).not.toHaveBeenCalled();
+ });
+
it('renders the close button after the command menu content', () => {
renderSidePanelCommandMenu();
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx
index c72d1f13cc0..c1aafff43ab 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/OptionsDropdownMenu.tsx
@@ -1,5 +1,8 @@
import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
-import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import {
+ Dropdown,
+ type DropdownProps,
+} from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useToggleDropdown } from '@/ui/layout/dropdown/hooks/useToggleDropdown';
@@ -15,31 +18,22 @@ type OptionsDropdownMenuProps = {
dropdownId?: string;
selectableListId?: string;
selectableItemIdArray?: string[];
+ clickableComponent?: ReactNode;
+ dropdownPlacement?: DropdownProps['dropdownPlacement'];
+ dropdownOffset?: DropdownProps['dropdownOffset'];
+ shouldRegisterOptionsHotkey?: boolean;
onOpen?: () => void;
children: ReactNode;
};
-export const OptionsDropdownMenu = ({
- dropdownId: dropdownIdFromProps,
- selectableListId,
- selectableItemIdArray = [],
- onOpen,
- children,
-}: OptionsDropdownMenuProps) => {
- const generatedDropdownId = useId();
- const dropdownId = dropdownIdFromProps ?? generatedDropdownId;
- const { t } = useLingui();
- const { toggleDropdown } = useToggleDropdown();
+const DEFAULT_OPTIONS_DROPDOWN_OFFSET = { y: 8 };
- const listId = selectableListId ?? dropdownId;
- const { setSelectedItemId } = useSelectableList(listId);
-
- const handleOpen = () => {
- if (selectableItemIdArray.length > 0) {
- setSelectedItemId(selectableItemIdArray[0]);
- }
- onOpen?.();
- };
+const OptionsDropdownMenuHotkeyEffect = ({
+ dropdownId,
+}: {
+ dropdownId: string;
+}) => {
+ const { toggleDropdown } = useToggleDropdown();
const hotkeysConfig = {
keys: ['ctrl+o', 'meta+o'],
@@ -61,38 +55,73 @@ export const OptionsDropdownMenu = ({
focusId: dropdownId,
});
+ return null;
+};
+
+export const OptionsDropdownMenu = ({
+ dropdownId: dropdownIdFromProps,
+ selectableListId,
+ selectableItemIdArray = [],
+ clickableComponent,
+ dropdownPlacement = 'top-end',
+ dropdownOffset = DEFAULT_OPTIONS_DROPDOWN_OFFSET,
+ shouldRegisterOptionsHotkey = true,
+ onOpen,
+ children,
+}: OptionsDropdownMenuProps) => {
+ const generatedDropdownId = useId();
+ const dropdownId = dropdownIdFromProps ?? generatedDropdownId;
+ const { t } = useLingui();
+
+ const listId = selectableListId ?? dropdownId;
+ const { setSelectedItemId } = useSelectableList(listId);
+
+ const handleOpen = () => {
+ if (selectableItemIdArray.length > 0) {
+ setSelectedItemId(selectableItemIdArray[0]);
+ }
+ onOpen?.();
+ };
+
return (
- <Dropdown
- dropdownId={dropdownId}
- data-select-disable
- clickableComponent={
- <IconButton
- Icon={IconDotsVertical}
- ariaLabel={t`Options`}
- size="small"
- variant="primary"
- />
- }
- dropdownPlacement="top-end"
- dropdownOffset={{ y: 8 }}
- globalHotkeysConfig={{
- enableGlobalHotkeysWithModifiers: true,
- enableGlobalHotkeysConflictingWithKeyboard: false,
- }}
- onOpen={handleOpen}
- dropdownComponents={
- <DropdownContent>
- <DropdownMenuItemsContainer>
- <SelectableList
- selectableListInstanceId={listId}
- focusId={dropdownId}
- selectableItemIdArray={selectableItemIdArray}
- >
- {children}
- </SelectableList>
- </DropdownMenuItemsContainer>
- </DropdownContent>
- }
- />
+ <>
+ {shouldRegisterOptionsHotkey ? (
+ <OptionsDropdownMenuHotkeyEffect dropdownId={dropdownId} />
+ ) : null}
+ <Dropdown
+ dropdownId={dropdownId}
+ data-select-disable
+ clickableComponent={
+ clickableComponent ?? (
+ <IconButton
+ Icon={IconDotsVertical}
+ ariaLabel={t`Options`}
+ size="small"
+ variant="primary"
+ />
+ )
+ }
+ dropdownPlacement={dropdownPlacement}
+ dropdownOffset={dropdownOffset}
+ globalHotkeysConfig={{
+ enableGlobalHotkeysWithModifiers: true,
+ enableGlobalHotkeysConflictingWithKeyboard: false,
+ }}
+ onOpen={handleOpen}
+ dropdownComponents={
+ <DropdownContent>
+ <DropdownMenuItemsContainer>
+ <SelectableList
+ selectableListInstanceId={listId}
+ focusId={dropdownId}
+ selectableItemIdArray={selectableItemIdArray}
+ >
+ {children}
+ </SelectableList>
+ </DropdownMenuItemsContainer>
+ </DropdownContent>
+ }
+ />
+ </>
);
};
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
index d48a0d13f86..f6e7d145303 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeys.ts
@@ -75,6 +75,7 @@ export const useGlobalHotkeys = ({
{
enableOnContentEditable,
enableOnFormTags,
+ eventListenerOptions: options?.eventListenerOptions,
ignoreModifiers,
},
dependencies,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
index 620c6e467d8..cd34782bb96 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
@@ -7,6 +7,7 @@ import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diag
import '@xyflow/react/dist/style.css';
import { useStore } from 'jotai';
import { useEffect } from 'react';
+import { expect, fn, userEvent, waitFor, within } from 'storybook/test';
import { isDefined } from 'twenty-shared/utils';
import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';
import { ReactflowDecorator } from '~/testing/decorators/ReactflowDecorator';
@@ -48,6 +49,10 @@ export default meta;
type Story = StoryObj<typeof WorkflowDiagramStepNodeEditableContent>;
+const onChangeNode = fn();
+const onDuplicateNode = fn();
+const onDelete = fn();
+
const ALL_STEPS = [
{
nodeType: 'trigger',
@@ -147,6 +152,9 @@ export const Catalog: CatalogStory<
id: 'story-node',
data: ALL_STEPS[0],
selected: false,
+ onChangeNode,
+ onDuplicateNode,
+ onDelete,
},
parameters: {
pseudo: { hover: ['.hover'] },
@@ -161,7 +169,11 @@ export const Catalog: CatalogStory<
{
name: 'step type',
values: ALL_STEPS,
- props: (data: WorkflowDiagramStepNodeData) => ({ data }),
+ props: (data: WorkflowDiagramStepNodeData) => ({
+ data,
+ onDuplicateNode:
+ data.nodeType === 'action' ? onDuplicateNode : undefined,
+ }),
},
{
name: 'selected',
@@ -190,4 +202,43 @@ export const Catalog: CatalogStory<
CatalogDecorator,
ReactflowDecorator,
],
+ play: async ({ canvasElement, args }) => {
+ const canvas = within(canvasElement);
+ const optionsButtons = await canvas.findAllByRole('button', {
+ name: 'Node options',
+ });
+
+ expect(optionsButtons).toHaveLength(ALL_STEPS.length);
+
+ const canvasBody = within(canvasElement.ownerDocument.body);
+
+ const triggerOptionsButton = optionsButtons[0];
+
+ await userEvent.click(triggerOptionsButton);
+
+ await canvasBody.findByText('Change node');
+ expect(canvasBody.queryByText('Duplicate node')).not.toBeInTheDocument();
+
+ await userEvent.click(triggerOptionsButton);
+
+ await waitFor(() => {
+ expect(canvasBody.queryByText('Change node')).not.toBeInTheDocument();
+ });
+
+ const firstActionStepIndex = ALL_STEPS.findIndex(
+ (step) => step.nodeType === 'action',
+ );
+
+ await userEvent.click(optionsButtons[firstActionStepIndex]);
+
+ await canvasBody.findByText('Duplicate node');
+
+ await userEvent.keyboard('{ArrowDown}{Enter}');
+
+ await waitFor(() => {
+ expect(args.onDuplicateNode).toHaveBeenCalledTimes(1);
+ });
+ expect(args.onChangeNode).not.toHaveBeenCalled();
+ expect(args.onDelete).not.toHaveBeenCalled();
+ },
};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
index 88e23ff6f35..49350d52759 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditable.tsx
@@ -11,6 +11,7 @@ import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/ty
import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIconKey';
import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent';
import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
+import { useDuplicateStep } from '@/workflow/workflow-steps/hooks/useDuplicateStep';
import { useContext } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { useIcons } from 'twenty-ui/icon';
@@ -23,6 +24,8 @@ export const WorkflowDiagramStepNodeEditable = ({
data: WorkflowDiagramStepNodeData;
}) => {
const { getIcon } = useIcons();
+ const { deleteStep } = useDeleteStep();
+ const { duplicateStep } = useDuplicateStep();
const workflowVisualizerWorkflowId = useAtomComponentStateValue(
workflowVisualizerWorkflowIdComponentState,
@@ -34,12 +37,14 @@ export const WorkflowDiagramStepNodeEditable = ({
const selected = workflowSelectedNode === id;
- const { openWorkflowEditStepInSidePanel } = useSidePanelWorkflowNavigation();
+ const {
+ openWorkflowEditStepInSidePanel,
+ openWorkflowEditStepTypeInSidePanel,
+ openWorkflowTriggerTypeInSidePanel,
+ } = useSidePanelWorkflowNavigation();
const { resetWorkflowInsertStepIds } = useResetWorkflowInsertStepIds();
- const { deleteStep } = useDeleteStep();
-
const { commandMenuContextApi } = useContext(CommandMenuContext);
const isInSidePanel = commandMenuContextApi.isInSidePanel;
@@ -63,9 +68,20 @@ export const WorkflowDiagramStepNodeEditable = ({
getIcon(getWorkflowNodeIconKey(data)),
id,
);
+ }
+ };
+ const handleChangeNode = () => {
+ if (!isDefined(workflowVisualizerWorkflowId)) {
return;
}
+
+ if (data.nodeType === 'trigger') {
+ openWorkflowTriggerTypeInSidePanel(workflowVisualizerWorkflowId);
+ return;
+ }
+
+ openWorkflowEditStepTypeInSidePanel(workflowVisualizerWorkflowId);
};
const handleDelete = () => {
@@ -78,6 +94,12 @@ export const WorkflowDiagramStepNodeEditable = ({
data={data}
selected={selected}
onClick={handleClick}
+ onChangeNode={handleChangeNode}
+ onDuplicateNode={
+ data.nodeType === 'action'
+ ? () => duplicateStep({ stepId: data.stepId })
+ : undefined
+ }
onDelete={handleDelete}
/>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
index 97d57451210..9955ef13b32 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent.tsx
@@ -9,8 +9,8 @@ import { useEdgeState } from '@/workflow/workflow-diagram/workflow-edges/hooks/u
import { WorkflowDiagramHandleSource } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleSource';
import { WorkflowDiagramHandleTarget } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramHandleTarget';
import { WorkflowDiagramStepNodeIcon } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeIcon';
+import { WorkflowDiagramStepNodeOptionsDropdown } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown';
import { WorkflowNodeContainer } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeContainer';
-import { WorkflowNodeDeleteButton } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton';
import { WorkflowNodeIconContainer } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeIconContainer';
import { WorkflowNodeLabel } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabel';
import { WorkflowNodeLabelWithCounterPart } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeLabelWithCounterPart';
@@ -46,13 +46,17 @@ export const WorkflowDiagramStepNodeEditableContent = ({
data,
selected,
onClick,
+ onChangeNode,
+ onDuplicateNode,
onDelete,
}: {
id: string;
data: WorkflowDiagramStepNodeData;
selected: boolean;
onClick?: () => void;
- onDelete?: () => void;
+ onChangeNode: () => void;
+ onDuplicateNode?: () => void;
+ onDelete: () => void;
}) => {
const { i18n } = useLingui();
@@ -128,9 +132,10 @@ export const WorkflowDiagramStepNodeEditableContent = ({
</WorkflowNodeTitle>
</WorkflowNodeRightPart>
- {id !== EMPTY_NODE_ID && isDefined(onDelete) && (
- <WorkflowNodeDeleteButton
- shouldDisplay={isHovered && !isConnectionInProgress}
+ {id !== EMPTY_NODE_ID && selected && (
+ <WorkflowDiagramStepNodeOptionsDropdown
+ onChangeNode={onChangeNode}
+ onDuplicateNode={onDuplicateNode}
onDelete={onDelete}
/>
)}
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
new file mode 100644
index 00000000000..fd3f915182a
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeOptionsDropdown.tsx
@@ -0,0 +1,93 @@
+import { OptionsDropdownMenu } from '@/ui/layout/dropdown/components/OptionsDropdownMenu';
+import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
+import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
+import { ParentClickOutsideIdContext } from '@/ui/utilities/pointer-event/contexts/ParentClickOutsideIdContext';
+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID } from '@/workflow/workflow-diagram/constants/WorkflowDiagramStepNodeClickOutsideId';
+import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';
+import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
+import { styled } from '@linaria/react';
+import { useLingui } from '@lingui/react/macro';
+import { useId } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { IconDotsVertical } from 'twenty-ui/icon';
+import { FloatingIconButton } from 'twenty-ui/input';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+
+const StyledOptionsButtonContainer = styled.div`
+ align-items: center;
+ bottom: 0;
+ display: flex;
+ position: absolute;
+ right: calc(0px - ${themeCssVariables.spacing[4]});
+ top: 0;
+ transform: translateX(100%);
+`;
+
+export const WorkflowDiagramStepNodeOptionsDropdown = ({
+ onChangeNode,
+ onDuplicateNode,
+ onDelete,
+}: {
+ onChangeNode: () => void;
+ onDuplicateNode?: () => void;
+ onDelete: () => void;
+}) => {
+ const { t } = useLingui();
+ const { closeDropdown } = useCloseDropdown();
+
+ const dropdownId = useId();
+ const selectableItemIds = [
+ WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode,
+ ...(isDefined(onDuplicateNode)
+ ? [WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode]
+ : []),
+ WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode,
+ ];
+
+ const selectedItemId = useAtomComponentStateValue(
+ selectedItemIdComponentState,
+ dropdownId,
+ );
+
+ const closeDropdownThen = (action: () => void) => () => {
+ closeDropdown(dropdownId);
+ action();
+ };
+
+ const handleChangeNode = closeDropdownThen(onChangeNode);
+ const handleDeleteNode = closeDropdownThen(onDelete);
+ const handleDuplicateNode = isDefined(onDuplicateNode)
+ ? closeDropdownThen(onDuplicateNode)
+ : undefined;
+
+ return (
+ <StyledOptionsButtonContainer className="nodrag nopan">
+ <ParentClickOutsideIdContext.Provider
+ value={WORKFLOW_DIAGRAM_STEP_NODE_BASE_CLICK_OUTSIDE_ID}
+ >
+ <OptionsDropdownMenu
+ dropdownId={dropdownId}
+ selectableItemIdArray={selectableItemIds}
+ clickableComponent={
+ <FloatingIconButton
+ size="medium"
+ Icon={IconDotsVertical}
+ ariaLabel={t`Node options`}
+ />
+ }
+ dropdownPlacement="right-start"
+ shouldRegisterOptionsHotkey={false}
+ >
+ <WorkflowStepOptionsMenuItems
+ selectedItemId={selectedItemId}
+ changeNodeText={t`Change node`}
+ onChangeNode={handleChangeNode}
+ onDuplicateNode={handleDuplicateNode}
+ onDeleteNode={handleDeleteNode}
+ />
+ </OptionsDropdownMenu>
+ </ParentClickOutsideIdContext.Provider>
+ </StyledOptionsButtonContainer>
+ );
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx
deleted file mode 100644
index 08c74a827ce..00000000000
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/workflow-nodes/components/WorkflowNodeDeleteButton.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { styled } from '@linaria/react';
-import { useLingui } from '@lingui/react/macro';
-import { type MouseEvent } from 'react';
-import { IconTrash } from 'twenty-ui/icon';
-import { IconButtonGroup } from 'twenty-ui/input';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-
-const StyledDeleteButtonContainer = styled.div<{ shouldDisplay: boolean }>`
- left: 100%;
- opacity: ${({ shouldDisplay }) => (shouldDisplay ? 1 : 0)};
- padding-left: ${themeCssVariables.spacing[2]};
- pointer-events: ${({ shouldDisplay }) => (shouldDisplay ? 'all' : 'none')};
- position: absolute;
- top: 50%;
- transform: translateY(-50%);
-`;
-
-type WorkflowNodeDeleteButtonProps = {
- shouldDisplay: boolean;
- onDelete: () => void;
-};
-
-export const WorkflowNodeDeleteButton = ({
- shouldDisplay,
- onDelete,
-}: WorkflowNodeDeleteButtonProps) => {
- const { t } = useLingui();
-
- const handleClick = (event: MouseEvent) => {
- event.stopPropagation();
-
- onDelete();
- };
-
- return (
- <StyledDeleteButtonContainer shouldDisplay={shouldDisplay}>
- <IconButtonGroup
- className="nodrag nopan"
- iconButtons={[
- {
- Icon: IconTrash,
- ariaLabel: t`Delete node`,
- onClick: handleClick,
- },
- ]}
- />
- </StyledDeleteButtonContainer>
- );
-};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
index 00b2f13e9a7..f48e9e232a5 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepFooter.tsx
@@ -6,6 +6,8 @@ import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFoot
import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
+import { WorkflowStepOptionsMenuItems } from '@/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems';
+import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
import { useDuplicateStep } from '@/workflow/workflow-steps/hooks/useDuplicateStep';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
@@ -15,13 +17,7 @@ import { useId } from 'react';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import {
- IconCopyPlus,
- IconPencil,
- IconRobot,
- IconTrash,
- IconUsers,
-} from 'twenty-ui/icon';
+import { IconRobot, IconTrash, IconUsers } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/input';
import { MenuItem } from 'twenty-ui/navigation';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -55,11 +51,15 @@ export const WorkflowStepFooter = ({
const hasViewRoleOption = isDefined(workflowAiAgentActionAgent?.roleId);
const selectableItemIdArray = [
- 'change-node-type',
- ...(stepId !== TRIGGER_STEP_ID ? ['duplicate'] : []),
+ WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode,
+ ...(stepId !== TRIGGER_STEP_ID
+ ? [WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode]
+ : []),
...(hasViewAgentOption ? ['view-agent'] : []),
...(hasViewRoleOption ? ['view-role'] : []),
- ...(!shouldPinDeleteButton ? ['delete'] : []),
+ ...(!shouldPinDeleteButton
+ ? [WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode]
+ : []),
];
const handleChangeNodeType = () => {
@@ -106,60 +106,38 @@ export const WorkflowStepFooter = ({
const OptionsDropdown = (
<OptionsDropdownMenu
dropdownId={dropdownId}
- selectableListId={dropdownId}
selectableItemIdArray={selectableItemIdArray}
>
- <SelectableListItem
- itemId="change-node-type"
- onEnter={handleChangeNodeType}
+ <WorkflowStepOptionsMenuItems
+ selectedItemId={selectedItemId}
+ changeNodeText={t`Change node type`}
+ onChangeNode={handleChangeNodeType}
+ onDuplicateNode={
+ stepId !== TRIGGER_STEP_ID ? handleDuplicateNode : undefined
+ }
+ onDeleteNode={!shouldPinDeleteButton ? handleDeleteNode : undefined}
>
- <MenuItem
- focused={selectedItemId === 'change-node-type'}
- onClick={handleChangeNodeType}
- text={t`Change node type`}
- LeftIcon={IconPencil}
- />
- </SelectableListItem>
- {stepId !== TRIGGER_STEP_ID && (
- <SelectableListItem itemId="duplicate" onEnter={handleDuplicateNode}>
- <MenuItem
- focused={selectedItemId === 'duplicate'}
- onClick={handleDuplicateNode}
- text={t`Duplicate node`}
- LeftIcon={IconCopyPlus}
- />
- </SelectableListItem>
- )}
- {hasViewAgentOption && (
- <SelectableListItem itemId="view-agent" onEnter={handleViewAgent}>
- <MenuItem
- focused={selectedItemId === 'view-agent'}
- onClick={handleViewAgent}
- text={t`View Agent`}
- LeftIcon={IconRobot}
- />
- </SelectableListItem>
- )}
- {hasViewRoleOption && (
- <SelectableListItem itemId="view-role" onEnter={handleViewRole}>
- <MenuItem
- focused={selectedItemId === 'view-role'}
- onClick={handleViewRole}
- text={t`View Role`}
- LeftIcon={IconUsers}
- />
- </SelectableListItem>
- )}
- {!shouldPinDeleteButton && (
- <SelectableListItem itemId="delete" onEnter={handleDeleteNode}>
- <MenuItem
- focused={selectedItemId === 'delete'}
- onClick={handleDeleteNode}
- text={t`Delete node`}
- LeftIcon={IconTrash}
- />
- </SelectableListItem>
- )}
+ {hasViewAgentOption ? (
+ <SelectableListItem itemId="view-agent" onEnter={handleViewAgent}>
+ <MenuItem
+ focused={selectedItemId === 'view-agent'}
+ onClick={handleViewAgent}
+ text={t`View Agent`}
+ LeftIcon={IconRobot}
+ />
+ </SelectableListItem>
+ ) : null}
+ {hasViewRoleOption ? (
+ <SelectableListItem itemId="view-role" onEnter={handleViewRole}>
+ <MenuItem
+ focused={selectedItemId === 'view-role'}
+ onClick={handleViewRole}
+ text={t`View Role`}
+ LeftIcon={IconUsers}
+ />
+ </SelectableListItem>
+ ) : null}
+ </WorkflowStepOptionsMenuItems>
</OptionsDropdownMenu>
);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx
new file mode 100644
index 00000000000..6444b091f29
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowStepOptionsMenuItems.tsx
@@ -0,0 +1,78 @@
+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';
+import { WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS } from '@/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds';
+import { useLingui } from '@lingui/react/macro';
+import { type ReactNode } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { IconCopyPlus, IconPencil, IconTrash } from 'twenty-ui/icon';
+import { MenuItem } from 'twenty-ui/navigation';
+
+type WorkflowStepOptionsMenuItemsProps = {
+ selectedItemId: string | null;
+ changeNodeText: string;
+ onChangeNode: () => void;
+ onDuplicateNode?: () => void;
+ onDeleteNode?: () => void;
+ children?: ReactNode;
+};
+
+export const WorkflowStepOptionsMenuItems = ({
+ selectedItemId,
+ changeNodeText,
+ onChangeNode,
+ onDuplicateNode,
+ onDeleteNode,
+ children,
+}: WorkflowStepOptionsMenuItemsProps) => {
+ const { t } = useLingui();
+
+ return (
+ <>
+ <SelectableListItem
+ itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode}
+ onEnter={onChangeNode}
+ >
+ <MenuItem
+ LeftIcon={IconPencil}
+ text={changeNodeText}
+ focused={
+ selectedItemId === WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.changeNode
+ }
+ onClick={onChangeNode}
+ />
+ </SelectableListItem>
+ {isDefined(onDuplicateNode) ? (
+ <SelectableListItem
+ itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode}
+ onEnter={onDuplicateNode}
+ >
+ <MenuItem
+ LeftIcon={IconCopyPlus}
+ text={t`Duplicate node`}
+ focused={
+ selectedItemId ===
+ WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.duplicateNode
+ }
+ onClick={onDuplicateNode}
+ />
+ </SelectableListItem>
+ ) : null}
+ {children}
+ {isDefined(onDeleteNode) ? (
+ <SelectableListItem
+ itemId={WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode}
+ onEnter={onDeleteNode}
+ >
+ <MenuItem
+ LeftIcon={IconTrash}
+ text={t`Delete node`}
+ accent="danger"
+ focused={
+ selectedItemId === WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS.deleteNode
+ }
+ onClick={onDeleteNode}
+ />
+ </SelectableListItem>
+ ) : null}
+ </>
+ );
+};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts
new file mode 100644
index 00000000000..7e46e3ec7dd
--- /dev/null
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/constants/WorkflowStepOptionsMenuItemIds.ts
@@ -0,0 +1,5 @@
+export const WORKFLOW_STEP_OPTIONS_MENU_ITEM_IDS = {
+ changeNode: 'change-node',
+ duplicateNode: 'duplicate-node',
+ deleteNode: 'delete-node',
+} as const;
diff --git a/packages/twenty-ui/src/input/IconButton/IconButton.module.scss b/packages/twenty-ui/src/input/IconButton/IconButton.module.scss
index e6231c38d75..1399ebdb71a 100644
--- a/packages/twenty-ui/src/input/IconButton/IconButton.module.scss
+++ b/packages/twenty-ui/src/input/IconButton/IconButton.module.scss
@@ -201,7 +201,7 @@ $primary-accents: (
}
.button[data-variant='tertiary'][data-accent='default'] {
- --icon-button-color: var(--t-font-color-tertiary);
+ --icon-button-color: var(--t-font-color-secondary);
}
// background follows the raw focus flag (it stays on for disabled+focus).
diff --git a/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx b/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
index 5fc52f19740..03cdc2d430c 100644
--- a/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
+++ b/packages/twenty-ui/src/input/IconButton/__stories__/IconButton.stories.tsx
@@ -1,5 +1,6 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
import { IconSearch } from '@ui/icon';
+import { expect, within } from 'storybook/test';
import {
A11Y_DEFER_COLOR_CONTRAST,
CatalogDecorator,
@@ -36,6 +37,22 @@ export const Default: Story = {
decorators: [ComponentDecorator],
};
+export const TertiaryDefaultUsesSecondaryTextColor: Story = {
+ args: {
+ ...Default.args,
+ variant: 'tertiary',
+ accent: 'default',
+ },
+ play: async ({ canvasElement }) => {
+ const button = within(canvasElement).getByRole('button');
+ const computedStyle = getComputedStyle(button);
+
+ await expect(
+ computedStyle.getPropertyValue('--icon-button-color').trim(),
+ ).toBe(computedStyle.getPropertyValue('--t-font-color-secondary').trim());
+ },
+};
+
export const Catalog: CatalogStory<Story, typeof IconButton> = {
args: { Icon: IconSearch, ariaLabel: 'Search' },
argTypes: {
diff --git a/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx b/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx
new file mode 100644
index 00000000000..bd8fa09babe
--- /dev/null
+++ b/packages/twenty-ui/src/input/IconButtonWithTooltip/IconButtonWithTooltip.tsx
@@ -0,0 +1,52 @@
+import {
+ IconButton,
+ type IconButtonProps,
+} from '@ui/input/IconButton/IconButton';
+import { AppTooltip, TooltipDelay, TooltipPosition } from '@ui/surfaces';
+import { useId } from 'react';
+
+export type IconButtonWithTooltipProps = Pick<
+ IconButtonProps,
+ 'Icon' | 'ariaLabel' | 'onClick' | 'size' | 'variant'
+> & {
+ tooltipContent: string;
+ tooltipPlace?: TooltipPosition;
+ tooltipDelay?: TooltipDelay;
+ tooltipOffset?: number;
+};
+
+export const IconButtonWithTooltip = ({
+ tooltipContent,
+ tooltipPlace = TooltipPosition.Bottom,
+ tooltipDelay = TooltipDelay.longDelay,
+ tooltipOffset = 5,
+ Icon,
+ ariaLabel,
+ onClick,
+ size,
+ variant,
+}: IconButtonWithTooltipProps) => {
+ const tooltipId = useId();
+
+ return (
+ <>
+ <div data-tooltip-id={tooltipId}>
+ <IconButton
+ Icon={Icon}
+ ariaLabel={ariaLabel}
+ onClick={onClick}
+ size={size}
+ variant={variant}
+ />
+ </div>
+ <AppTooltip
+ anchorSelect={`[data-tooltip-id='${tooltipId}'] > button`}
+ content={tooltipContent}
+ delay={tooltipDelay}
+ place={tooltipPlace}
+ offset={tooltipOffset}
+ noArrow
+ />
+ </>
+ );
+};
diff --git a/packages/twenty-ui/src/input/IconButtonWithTooltip/__stories__/IconButtonWithTooltip.stories.tsx b/packages/twenty-ui/src/input/IconButtonWithTooltip/__stories__/IconButtonWithTooltip.stories.tsx
new file mode 100644
index 00000000000..1acb7cfff3e
--- /dev/null
+++ b/packages/twenty-ui/src/input/IconButtonWithTooltip/__stories__/IconButtonWithTooltip.stories.tsx
@@ -0,0 +1,40 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { IconSearch } from '@ui/icon';
+import { IconButtonWithTooltip } from '@ui/input/IconButtonWithTooltip/IconButtonWithTooltip';
+import { TooltipDelay } from '@ui/surfaces';
+import { ComponentDecorator } from '@ui/testing';
+import { expect, userEvent, within } from 'storybook/test';
+
+const meta: Meta<typeof IconButtonWithTooltip> = {
+ title: 'UI/Input/Button/IconButtonWithTooltip',
+ component: IconButtonWithTooltip,
+ decorators: [ComponentDecorator],
+};
+
+export default meta;
+type Story = StoryObj<typeof IconButtonWithTooltip>;
+
+export const Default: Story = {
+ args: {
+ Icon: IconSearch,
+ ariaLabel: 'Search',
+ variant: 'tertiary',
+ size: 'small',
+ tooltipContent: 'Search',
+ tooltipDelay: TooltipDelay.noDelay,
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+ const button = canvas.getByRole('button', { name: 'Search' });
+
+ await userEvent.tab();
+
+ await expect(button).toHaveFocus();
+
+ const canvasBody = within(canvasElement.ownerDocument.body);
+
+ await expect(await canvasBody.findByRole('tooltip')).toHaveTextContent(
+ 'Search',
+ );
+ },
+};
diff --git a/packages/twenty-ui/src/input/index.ts b/packages/twenty-ui/src/input/index.ts
index 5c1b5c1ea60..b6670f3d280 100644
--- a/packages/twenty-ui/src/input/index.ts
+++ b/packages/twenty-ui/src/input/index.ts
@@ -71,6 +71,8 @@ export type {
export { IconButton } from './IconButton/IconButton';
export type { IconButtonGroupProps } from './IconButtonGroup/IconButtonGroup';
export { IconButtonGroup } from './IconButtonGroup/IconButtonGroup';
+export type { IconButtonWithTooltipProps } from './IconButtonWithTooltip/IconButtonWithTooltip';
+export { IconButtonWithTooltip } from './IconButtonWithTooltip/IconButtonWithTooltip';
export { IconListViewGrip } from './IconListViewGrip/IconListViewGrip';
export { InputHint } from './InputHint/InputHint';
export { InputLabel } from './InputLabel/InputLabel';
diff --git a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
index 19463553744..422906684f4 100644
--- a/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
+++ b/packages/twenty-ui/src/surfaces/AppTooltip/AppTooltip.tsx
@@ -297,6 +297,7 @@ export const AppTooltip = ({
style={{ maxWidth: width ?? '40%' }}
>
<Tooltip.Popup
+ role="tooltip"
className={clsx(
styles.tooltip,
clickable && styles.clickable,