Skip to content

The open alternative to Salesforce, designed for AI.

Fix dropdown anchoring at non-default interface scales (#25667)

Thomas des Francs0d5ada9a466a
diff --git a/packages/twenty-front/src/index.css b/packages/twenty-front/src/index.css
index 06e9bed7574..7c5f6296509 100644
--- a/packages/twenty-front/src/index.css
+++ b/packages/twenty-front/src/index.css
@@ -1,3 +1,5 @@
+@import './viewport-zoom.css';
+
body {
margin: 0;
font-family: 'Inter', sans-serif;
@@ -47,16 +49,6 @@ form {
/* dnd-kit can reuse the source node as its moving feedback. In that case,
feedback opacity must win over the source fade applied by the component. */
opacity: var(--dnd-drag-feedback-opacity) !important;
- /* dnd-kit positions and sizes the feedback from visual-viewport pixel
- measurements, so inside the zoomed root those inline values would be
- multiplied a second time. The inverse zoom makes them render one to one,
- and the child rule restores the interface scale for the dragged content
- so it keeps matching the rest of the page. */
- zoom: calc(1 / var(--t-zoom, 1));
-}
-
-[data-dnd-dragging='true'] > * {
- zoom: var(--t-zoom, 1);
}
/* https://stackoverflow.com/questions/44543157/how-to-hide-the-google-invisible-recaptcha-badge */
diff --git a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
index 9d46a4bab10..a0598c77182 100644
--- a/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/components/RecordIndexCommandMenuDropdown.tsx
@@ -77,7 +77,6 @@ export const RecordIndexCommandMenuDropdown = () => {
dropdownId={dropdownId}
data-select-disable
dropdownPlacement="bottom-start"
- dropdownStrategy="absolute"
dropdownOffset={{
x: recordIndexCommandMenuDropdownPosition.x ?? 0,
y: recordIndexCommandMenuDropdownPosition.y ?? 0,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
index d4b290947cb..a50c4c4ba51 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateFieldInput.tsx
@@ -112,6 +112,7 @@ export const FormDateFieldInput = ({
const { refs, floatingStyles } = useFloating({
open: displayDatePicker,
placement: 'bottom-start',
+ strategy: 'fixed',
middleware: [offset(4), flip()],
whileElementsMounted: autoUpdate,
});
@@ -302,6 +303,7 @@ export const FormDateFieldInput = ({
!readonly ? (
<FloatingPortal>
<div
+ data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
data-click-outside-id={FORM_DATE_FIELD_PICKER_CLICK_OUTSIDE_ID}
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
index c32d1ad8447..523e2e8e800 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput.tsx
@@ -108,6 +108,7 @@ export const FormDateTimeFieldInput = ({
const { refs, floatingStyles } = useFloating({
open: displayDatePicker,
placement: 'bottom-start',
+ strategy: 'fixed',
middleware: [offset(4), flip()],
whileElementsMounted: autoUpdate,
});
@@ -297,6 +298,7 @@ export const FormDateTimeFieldInput = ({
{draftValue.type === 'static' && draftValue.mode === 'edit' ? (
<FloatingPortal>
<div
+ data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
data-click-outside-id={
diff --git a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
index 84da5c1130d..1953bb05ef8 100644
--- a/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
@@ -3,6 +3,7 @@ import { recordFieldInputIsFieldInErrorComponentState } from '@/object-record/re
import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionComponentState';
import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionLoadingComponentState';
import { RecordInlineCellContext } from '@/object-record/record-inline-cell/components/RecordInlineCellContext';
+import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
@@ -70,19 +71,20 @@ export const RecordInlineCellEditMode = ({
const { refs, floatingStyles } = useFloating({
placement: isCentered ? 'bottom' : 'bottom-start',
+ strategy: 'fixed',
middleware: [
flip(),
- offset(
- isCentered
- ? {
- mainAxis: -26,
- crossAxis: 0,
- }
- : {
- mainAxis: -29,
- crossAxis: -5,
- },
- ),
+ offset(({ rects, elements }) => {
+ const referenceScale =
+ elements.reference instanceof HTMLElement
+ ? rects.reference.width / elements.reference.offsetWidth
+ : 1;
+
+ return {
+ mainAxis: (isCentered ? -26 : -29) * referenceScale,
+ crossAxis: (isCentered ? 0 : -5) * referenceScale,
+ };
+ }),
shift({ padding: 8 }),
setFieldInputLayoutDirectionMiddleware,
],
@@ -96,14 +98,18 @@ export const RecordInlineCellEditMode = ({
>
<>
{createPortal(
- <OverlayContainer
+ <StyledDropdownContentContainer
+ data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
- borderRadius="sm"
- hasDangerBorder={recordFieldInputIsFieldInError}
>
- {children}
- </OverlayContainer>,
+ <OverlayContainer
+ borderRadius="sm"
+ hasDangerBorder={recordFieldInputIsFieldInError}
+ >
+ {children}
+ </OverlayContainer>
+ </StyledDropdownContentContainer>,
document.body,
)}
</>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
index 840a09ca0f5..5cef6d7eee9 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
@@ -5,12 +5,14 @@ import { recordFieldInputLayoutDirectionComponentState } from '@/object-record/r
import { recordFieldInputLayoutDirectionLoadingComponentState } from '@/object-record/record-field/ui/states/recordFieldInputLayoutDirectionLoadingComponentState';
import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
import { useFocusRecordTableCell } from '@/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell';
+import { StyledDropdownContentContainer } from '@/ui/layout/dropdown/components/internal/DropdownInternalContainer';
import { OverlayContainer } from '@/ui/layout/overlay/components/OverlayContainer';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
import { styled } from '@linaria/react';
import {
+ FloatingPortal,
autoUpdate,
flip,
offset,
@@ -75,11 +77,19 @@ export const RecordTableCellEditMode = ({
const { refs, floatingStyles } = useFloating({
placement: 'bottom-start',
+ strategy: 'fixed',
middleware: [
flip(),
- offset({
- mainAxis: -33,
- crossAxis: -3,
+ offset(({ rects, elements }) => {
+ const referenceScale =
+ elements.reference instanceof HTMLElement
+ ? rects.reference.width / elements.reference.offsetWidth
+ : 1;
+
+ return {
+ mainAxis: -33 * referenceScale,
+ crossAxis: -3 * referenceScale,
+ };
}),
setFieldInputLayoutDirectionMiddleware,
],
@@ -108,14 +118,20 @@ export const RecordTableCellEditMode = ({
{children}
</StyledInputModeOnlyContainer>
) : (
- <OverlayContainer
- ref={refs.setFloating}
- style={floatingStyles}
- borderRadius="sm"
- hasDangerBorder={recordFieldInputIsFieldInError}
- >
- {children}
- </OverlayContainer>
+ <FloatingPortal>
+ <StyledDropdownContentContainer
+ data-floating-ui-viewport
+ ref={refs.setFloating}
+ style={floatingStyles}
+ >
+ <OverlayContainer
+ borderRadius="sm"
+ hasDangerBorder={recordFieldInputIsFieldInError}
+ >
+ {children}
+ </OverlayContainer>
+ </StyledDropdownContentContainer>
+ </FloatingPortal>
)}
</StyledEditableCellEditModeContainer>
);
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
index 2980939328f..8142fa96abe 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/Dropdown.tsx
@@ -56,7 +56,6 @@ export type DropdownProps = {
dropdownId: string;
dropdownPlacement?: Placement;
dropdownOffset?: DropdownOffset;
- dropdownStrategy?: 'fixed' | 'absolute';
onClickOutside?: () => void;
onClose?: () => void;
onOpen?: () => void;
@@ -78,7 +77,6 @@ export const Dropdown = ({
dropdownId,
globalHotkeysConfig,
dropdownPlacement = 'bottom-end',
- dropdownStrategy = 'absolute',
dropdownOffset,
onClickOutside,
onClose,
@@ -173,7 +171,7 @@ export const Dropdown = ({
}),
],
whileElementsMounted: autoUpdate,
- strategy: dropdownStrategy,
+ strategy: 'fixed',
});
const handleClickableComponentClick = useCallback(
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
index a760302b0cd..03ab6a40869 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
@@ -109,6 +109,61 @@ export const Empty: Story = {
},
};
+export const InterfaceScale: Story = {
+ args: {
+ clickableComponent: <span>Open Dropdown</span>,
+ dropdownPlacement: 'bottom-start',
+ dropdownOffset: { x: 0, y: 0 },
+ dropdownComponents: (
+ <div style={{ width: 200, height: 100 }}>Scaled dropdown</div>
+ ),
+ },
+ render: (args) => (
+ <div style={{ paddingLeft: 200, paddingTop: 100 }}>
+ <Dropdown {...args} />
+ </div>
+ ),
+ play: async ({ canvasElement }) => {
+ const document = canvasElement.ownerDocument;
+ const canvas = within(document.body);
+ const rootStyle = document.documentElement.style;
+ const previousZoom = rootStyle.getPropertyValue('zoom');
+ const previousScale = rootStyle.getPropertyValue('--t-zoom');
+
+ try {
+ for (const scale of [0.9, 1, 1.1, 1.25, 14 / 13]) {
+ rootStyle.setProperty('--t-zoom', String(scale));
+ rootStyle.setProperty('zoom', 'var(--t-zoom)');
+
+ const button = canvas.getByRole('button', { name: 'Open Dropdown' });
+ await userEvent.click(button);
+
+ const menu = await canvas.findByRole('listbox');
+ await waitFor(() => {
+ const anchorBounds = button.getBoundingClientRect();
+ const menuBounds = menu.getBoundingClientRect();
+
+ const contentBounds = canvas
+ .getByText('Scaled dropdown')
+ .getBoundingClientRect();
+ expect(Math.abs(contentBounds.width - 200 * scale)).toBeLessThan(1);
+ expect(Math.abs(contentBounds.height - 100 * scale)).toBeLessThan(1);
+
+ expect(Math.abs(menuBounds.left - anchorBounds.left)).toBeLessThan(1);
+ expect(Math.abs(menuBounds.top - anchorBounds.bottom)).toBeLessThan(
+ 1,
+ );
+ });
+
+ await userEvent.click(button);
+ }
+ } finally {
+ rootStyle.setProperty('zoom', previousZoom);
+ rootStyle.setProperty('--t-zoom', previousScale);
+ }
+ },
+};
+
const avatarUrl =
'https://s3-alpha-sig.figma.com/img/bbb5/4905/f0a52cc2b9aaeb0a82a360d478dae8bf?Expires=1687132800&Signature=iVBr0BADa3LHoFVGbwqO-wxC51n1o~ZyFD-w7nyTyFP4yB-Y6zFawL-igewaFf6PrlumCyMJThDLAAc-s-Cu35SBL8BjzLQ6HymzCXbrblUADMB208PnMAvc1EEUDq8TyryFjRO~GggLBk5yR0EXzZ3zenqnDEGEoQZR~TRqS~uDF-GwQB3eX~VdnuiU2iittWJkajIDmZtpN3yWtl4H630A3opQvBnVHZjXAL5YPkdh87-a-H~6FusWvvfJxfNC2ZzbrARzXofo8dUFtH7zUXGCC~eUk~hIuLbLuz024lFQOjiWq2VKyB7dQQuGFpM-OZQEV8tSfkViP8uzDLTaCg__&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4';
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
index 15957b01ad6..785f165184e 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/internal/DropdownInternalContainer.tsx
@@ -156,6 +156,7 @@ export const DropdownInternalContainer = ({
<FloatingPortal>
<StyledDropdownContentContainer
+ data-floating-ui-viewport
ref={floatingUiRefs.setFloating}
style={dropdownMenuStyles}
role="listbox"
diff --git a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
index bc4c2e1beaa..b1b84e5cd23 100644
--- a/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/expandable-list/components/ExpandedListDropdown.tsx
@@ -28,6 +28,7 @@ export const ExpandedListDropdown = ({
}: ExpandedListDropdownProps) => {
const { refs, floatingStyles } = useFloating({
placement: 'bottom-start',
+ strategy: 'fixed',
middleware: [offset({ mainAxis: -9, crossAxis: -7 }), shift()],
elements: { reference: anchorElement },
});
@@ -41,12 +42,13 @@ export const ExpandedListDropdown = ({
});
const dropdownContentWidth = anchorElement
- ? Math.max(220, anchorElement.getBoundingClientRect().width)
+ ? Math.max(220, anchorElement.offsetWidth)
: undefined;
return (
<FloatingPortal>
<StyledDropdownContentContainer
+ data-floating-ui-viewport
ref={refs.setFloating}
style={floatingStyles}
>
diff --git a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
index dbb577b0670..104a63f9a94 100644
--- a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
@@ -1,3 +1,4 @@
+import '~/viewport-zoom.css';
import { ApolloProvider } from '@apollo/client/react';
import { type Decorator } from '@storybook/react-vite';
import { Provider as JotaiProvider } from 'jotai';
diff --git a/packages/twenty-front/src/viewport-zoom.css b/packages/twenty-front/src/viewport-zoom.css
new file mode 100644
index 00000000000..566c6b72756
--- /dev/null
+++ b/packages/twenty-front/src/viewport-zoom.css
@@ -0,0 +1,15 @@
+/* dnd-kit positions and sizes the feedback from visual-viewport pixel
+ measurements, so inside the zoomed root those inline values would be
+ multiplied a second time. The inverse zoom makes them render one to one,
+ and the child rule restores the interface scale for the dragged content
+ so it keeps matching the rest of the page. */
+
+[data-dnd-dragging='true'],
+[data-floating-ui-viewport] {
+ zoom: calc(1 / var(--t-zoom, 1));
+}
+
+[data-dnd-dragging='true'] > *,
+[data-floating-ui-viewport] > * {
+ zoom: var(--t-zoom, 1);
+}