The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Keep zoom inside full-height front component widgets (#29521)
Raphaël Bosif96cb63447e1
diff --git a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsxindex 588c81fbb3f..cc8854cf619 100644--- a/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx+++ b/packages/twenty-front-component-renderer/src/__stories__/TwentyUiGallery.stories.tsx@@ -52,6 +52,7 @@ import { SelectPageDecorator } from '@/__stories__/twenty-ui-gallery/components/import { PortalBoundsDecorator } from '@/__stories__/twenty-ui-gallery/components/PortalBoundsDecorator';import { OverflowingListInstancesDecorator } from '@/__stories__/twenty-ui-gallery/components/OverflowingListInstancesDecorator';import { portalBoundsTest } from '@/__stories__/twenty-ui-gallery/utils/portalBoundsTest';+import { portalZoomTest } from '@/__stories__/twenty-ui-gallery/utils/portalZoomTest';import { createGalleryStory } from '@/__stories__/twenty-ui-gallery/utils/createGalleryStory';import { typographyTest } from '@/__stories__/twenty-ui-gallery/utils/typographyTest';@@ -440,6 +441,40 @@ export const PortalBoundsPreact: Story = createGalleryStory({play: portalBoundsTest,});+export const PortalZoomPrevention: Story = {+ ...PortalBoundsReact,+ args: {+ ...PortalBoundsReact.args,+ shouldPreventPageZoom: true,+ },+ play: portalZoomTest,+};++export const PortalZoomPreventionPreact: Story = {+ ...PortalBoundsPreact,+ args: {+ ...PortalBoundsPreact.args,+ shouldPreventPageZoom: true,+ },+ play: portalZoomTest,+};++export const PortalBrowserZoom: Story = {+ ...PortalZoomPrevention,+ args: {+ ...PortalZoomPrevention.args,+ shouldPreventPageZoom: false,+ },+};++export const PortalBrowserZoomPreact: Story = {+ ...PortalZoomPreventionPreact,+ args: {+ ...PortalZoomPreventionPreact.args,+ shouldPreventPageZoom: false,+ },+};+export const DropdownReact: Story = createGalleryStory({frontComponentBundleName: 'twenty-ui-dropdown',runtime: 'react',diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-portals.front-component.tsx b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-portals.front-component.tsxindex 50530f766bf..e2a660b728f 100644--- a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-portals.front-component.tsx+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/twenty-ui-portals.front-component.tsx@@ -19,6 +19,7 @@ const PortalsExample = () => {const [isOpen, setIsOpen] = useState(false);const [isOversizedOpen, setIsOversizedOpen] = useState(false);const [actionCount, setActionCount] = useState(0);+ const [portalWheelCount, setPortalWheelCount] = useState(0);return (<TwentyUiGalleryCard title="Portals">@@ -39,9 +40,15 @@ const PortalsExample = () => {<Text role="status" aria-label="Portal actions">Portal actions: {actionCount}</Text>+ <Text role="status" aria-label="Portal wheel events">+ Portal wheel events: {portalWheelCount}+ </Text>{isOpen &&createPortal(- <div style={{ position: 'absolute', top: '100%', left: 0 }}>+ <div+ style={{ position: 'absolute', top: '100%', left: 0 }}+ onWheel={() => setPortalWheelCount((count) => count + 1)}+ ><Button onClick={() => setActionCount(actionCount + 1)}>Portal action</Button>diff --git a/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/portalZoomTest.ts b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/portalZoomTest.tsnew file mode 100644index 00000000000..f8c99aeac50--- /dev/null+++ b/packages/twenty-front-component-renderer/src/__stories__/twenty-ui-gallery/utils/portalZoomTest.ts@@ -0,0 +1,69 @@+import { expect, userEvent, waitFor, within } from 'storybook/test';++import { expectFrontComponentMounted } from '@/__stories__/shared/test-utils/matchers/expectFrontComponentMounted';+import { type TwentyUiGalleryPlayFunction } from '@/__stories__/twenty-ui-gallery/types/TwentyUiGalleryPlayFunction';++export const portalZoomTest: TwentyUiGalleryPlayFunction = async ({+ canvasElement,+ args,+}) => {+ const canvas = within(canvasElement);+ const page = within(canvasElement.ownerDocument.body);+ await expectFrontComponentMounted(canvas);++ await userEvent.click(canvas.getByRole('button', { name: 'Toggle popup' }));+ const portalAction = await page.findByRole('button', {+ name: 'Portal action',+ });++ expect(canvasElement).not.toContainElement(portalAction);++ for (const modifier of [+ { ctrlKey: true },+ { ctrlKey: true, metaKey: true },+ ]) {+ const zoomEvent = new WheelEvent('wheel', {+ ...modifier,+ bubbles: true,+ cancelable: true,+ deltaY: -100,+ });++ portalAction.dispatchEvent(zoomEvent);++ expect(zoomEvent.defaultPrevented).toBe(+ args.shouldPreventPageZoom ?? false,+ );+ }++ for (const modifier of [{}, { metaKey: true }]) {+ const scrollEvent = new WheelEvent('wheel', {+ ...modifier,+ bubbles: true,+ cancelable: true,+ deltaY: 100,+ });++ portalAction.dispatchEvent(scrollEvent);++ expect(scrollEvent.defaultPrevented).toBe(false);+ }+ await waitFor(() =>+ expect(+ canvas.getByRole('status', { name: 'Portal wheel events' }),+ ).toHaveTextContent('Portal wheel events: 4'),+ );++ const outsideZoomEvent = new WheelEvent('wheel', {+ bubbles: true,+ cancelable: true,+ ctrlKey: true,+ deltaY: -100,+ });++ canvas+ .getByRole('button', { name: 'Host action' })+ .dispatchEvent(outsideZoomEvent);++ expect(outsideZoomEvent.defaultPrevented).toBe(false);+};diff --git a/packages/twenty-front-component-renderer/src/host/components/FrontComponentRenderer.tsx b/packages/twenty-front-component-renderer/src/host/components/FrontComponentRenderer.tsxindex 7db06acd851..5889313d80a 100644--- a/packages/twenty-front-component-renderer/src/host/components/FrontComponentRenderer.tsx+++ b/packages/twenty-front-component-renderer/src/host/components/FrontComponentRenderer.tsx@@ -17,6 +17,7 @@ import { FrontComponentInitializeHostCommunicationApiEffect } from '@/host/effecimport { FrontComponentMediaSessionEffect } from '@/host/effect-components/FrontComponentMediaSessionEffect';import { FrontComponentPointerCaptureEffect } from '@/host/effect-components/FrontComponentPointerCaptureEffect';import { FrontComponentOutsidePressEffect } from '@/host/effect-components/FrontComponentOutsidePressEffect';+import { FrontComponentPreventPageZoomEffect } from '@/host/effect-components/FrontComponentPreventPageZoomEffect';import { FrontComponentUpdateContextEffect } from '@/host/effect-components/FrontComponentUpdateContextEffect';import { FrontComponentUpdateHostCommunicationApiEffect } from '@/host/effect-components/FrontComponentUpdateHostCommunicationApiEffect';import { type FrontComponentMediaSessionHost } from '@/host/media/types/FrontComponentMediaSessionHost';@@ -59,6 +60,7 @@ type FrontComponentRendererProps = {onError: (error?: Error) => void;colorScheme: 'light' | 'dark';loadingFallback?: ReactNode;+ shouldPreventPageZoom?: boolean;};export const FrontComponentRenderer = ({@@ -81,6 +83,7 @@ export const FrontComponentRenderer = ({onError,colorScheme,loadingFallback,+ shouldPreventPageZoom = false,}: FrontComponentRendererProps) => {const [receiver, setReceiver] = useState<RemoteReceiver | null>(null);const [thread, setThread] = useState<FrontComponentThread | null>(null);@@ -119,6 +122,11 @@ export const FrontComponentRenderer = ({onMouseUp={outsidePressController.forwardUnhandledOwnedPress}onClick={outsidePressController.forwardUnhandledOwnedPress}>+ {shouldPreventPageZoom && (+ <FrontComponentPreventPageZoomEffect+ geometryTracker={geometryTracker}+ />+ )}<FrontComponentWorkerEffectcomponentUrl={componentUrl}componentSource={componentSource}diff --git a/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentPreventPageZoomEffect.tsx b/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentPreventPageZoomEffect.tsxnew file mode 100644index 00000000000..502188e2187--- /dev/null+++ b/packages/twenty-front-component-renderer/src/host/effect-components/FrontComponentPreventPageZoomEffect.tsx@@ -0,0 +1,39 @@+import { useEffect } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { isPageZoomGesture } from 'twenty-ui/utilities';++import { type GeometryTracker } from '@/host/geometry/types/GeometryTracker';++type FrontComponentPreventPageZoomEffectProps = {+ geometryTracker: Pick<GeometryTracker, 'findRemoteElementIdContainingNode'>;+};++export const FrontComponentPreventPageZoomEffect = ({+ geometryTracker,+}: FrontComponentPreventPageZoomEffectProps) => {+ useEffect(() => {+ const preventPageZoom = (event: WheelEvent) => {+ if (+ !isPageZoomGesture(event) ||+ !isDefined(+ geometryTracker.findRemoteElementIdContainingNode(event.target),+ )+ ) {+ return;+ }++ event.preventDefault();+ };++ document.addEventListener('wheel', preventPageZoom, {+ capture: true,+ passive: false,+ });++ return () => {+ document.removeEventListener('wheel', preventPageZoom, true);+ };+ }, [geometryTracker]);++ return null;+};diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsxindex 3a66b548224..957e8495b6f 100644--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx@@ -37,6 +37,7 @@ type FrontComponentRendererProps = {toolCall?: FrontComponentToolCall;loadingFallback?: ReactNode;unavailableFallback?: ReactNode;+ shouldPreventPageZoom?: boolean;};type ResolvedFrontComponent = NonNullable<@@ -53,6 +54,7 @@ type FrontComponentRendererContentProps = {toolCall?: FrontComponentToolCall;loadingFallback?: ReactNode;unavailableFallback?: ReactNode;+ shouldPreventPageZoom?: boolean;};export const FrontComponentRenderer = ({@@ -65,6 +67,7 @@ export const FrontComponentRenderer = ({toolCall,loadingFallback,unavailableFallback,+ shouldPreventPageZoom,}: FrontComponentRendererProps) => {const { data, loading, error } = useQuery(FindOneFrontComponentDocument, {variables: { id: frontComponentId },@@ -95,6 +98,7 @@ export const FrontComponentRenderer = ({toolCall={toolCall}loadingFallback={loadingFallback}unavailableFallback={unavailableFallback}+ shouldPreventPageZoom={shouldPreventPageZoom}/>)}</>@@ -111,6 +115,7 @@ const FrontComponentRendererContent = ({toolCall,loadingFallback,unavailableFallback,+ shouldPreventPageZoom,}: FrontComponentRendererContentProps) => {const colorScheme = useThemeColorScheme();const { enqueueToast } = useToast();@@ -276,6 +281,7 @@ const FrontComponentRendererContent = ({storageNamespace={storageNamespace}onError={handleError}loadingFallback={loadingFallback}+ shouldPreventPageZoom={shouldPreventPageZoom}/></FrontComponentRendererProvider>)}diff --git a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListWidgetSlot.tsx b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListWidgetSlot.tsxindex 62f5a6b09c3..7b305700cba 100644--- a/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListWidgetSlot.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/PageLayoutVerticalListWidgetSlot.tsx@@ -1,4 +1,5 @@import { PAGE_LAYOUT_WIDGET_DND_TYPE } from '@/page-layout/constants/PageLayoutWidgetDndType';+import { PageLayoutWidgetViewportContext } from '@/page-layout/contexts/PageLayoutWidgetViewportContext';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { type PageLayoutWidgetDragData } from '@/page-layout/types/PageLayoutWidgetDragData';import { WidgetRenderer } from '@/page-layout/widgets/components/WidgetRenderer';@@ -103,7 +104,9 @@ export const PageLayoutVerticalListWidgetSlot = ({orientation="horizontal"fill={fillsViewport}>- <WidgetRenderer widget={widget} />+ <PageLayoutWidgetViewportContext.Provider value={fillsViewport}>+ <WidgetRenderer widget={widget} />+ </PageLayoutWidgetViewportContext.Provider></DragDropItemSortableCell></StyledWidgetSlot>);diff --git a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsxindex fd7e7d49755..9806906c36d 100644--- a/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx+++ b/packages/twenty-front/src/modules/page-layout/components/__tests__/PageLayoutVerticalList.test.tsx@@ -1,4 +1,5 @@import { PageLayoutVerticalList } from '@/page-layout/components/PageLayoutVerticalList';+import { PageLayoutWidgetViewportContext } from '@/page-layout/contexts/PageLayoutWidgetViewportContext';import { makeWidget as makePageLayoutWidget } from '@/page-layout/testing/pageLayoutDraftFixtures';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { WorkflowDiagramAllowPageScrollContext } from '@/workflow/workflow-diagram/contexts/WorkflowDiagramAllowPageScrollContext';@@ -32,10 +33,12 @@ jest.mock('@/page-layout/hooks/useIsSideColumnContext', () => ({jest.mock('@/page-layout/widgets/components/WidgetRenderer', () => ({WidgetRenderer: ({ widget }: { widget: PageLayoutWidget }) => {const allowPageScroll = useContext(WorkflowDiagramAllowPageScrollContext);+ const fillsViewport = useContext(PageLayoutWidgetViewportContext);return (<divdata-allow-page-scroll={String(allowPageScroll)}+ data-fills-viewport={String(fillsViewport)}data-testid={widget.id}/>);@@ -137,6 +140,10 @@ describe('PageLayoutVerticalList', () => {'data-fill','true',);+ expect(screen.getByTestId('timeline')).toHaveAttribute(+ 'data-fills-viewport',+ 'true',+ );expect(screen.getByTestId('fields')@@ -146,6 +153,10 @@ describe('PageLayoutVerticalList', () => {'data-fill','false',);+ expect(screen.getByTestId('fields')).toHaveAttribute(+ 'data-fills-viewport',+ 'false',+ );});it('gives FILL_VIEWPORT sizing to other viewport-filling widgets', () => {@@ -210,6 +221,10 @@ describe('PageLayoutVerticalList', () => {'data-fill','true',);+ expect(screen.getByTestId('front-component')).toHaveAttribute(+ 'data-fills-viewport',+ 'true',+ );});it.each([@@ -231,6 +246,10 @@ describe('PageLayoutVerticalList', () => {expect(screen.getByTestId('front-component-sortable-cell'),).toHaveAttribute('data-fill', 'false');+ expect(screen.getByTestId('front-component')).toHaveAttribute(+ 'data-fills-viewport',+ 'false',+ );},);@@ -292,6 +311,10 @@ describe('PageLayoutVerticalList', () => {'data-fill','true',);+ expect(screen.getByTestId('front-component')).toHaveAttribute(+ 'data-fills-viewport',+ 'true',+ );});it('keeps an explicit TAB_VIEWPORT front component viewport-filling in a side panel', () => {diff --git a/packages/twenty-front/src/modules/page-layout/contexts/PageLayoutWidgetViewportContext.ts b/packages/twenty-front/src/modules/page-layout/contexts/PageLayoutWidgetViewportContext.tsnew file mode 100644index 00000000000..f3eb1a12e2b--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/contexts/PageLayoutWidgetViewportContext.ts@@ -0,0 +1,3 @@+import { createContext } from 'react';++export const PageLayoutWidgetViewportContext = createContext(false);diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsxindex fec1815ffc3..b00602dfa9a 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/__stories__/WidgetRenderer.stories.tsx@@ -3,7 +3,7 @@ import { useApolloClient } from '@apollo/client/react';import { type MockedResponse } from '@apollo/client/testing';import { type Meta, type StoryObj } from '@storybook/react-vite';import { MemoryRouter } from 'react-router-dom';-import { expect, waitFor, within } from 'storybook/test';+import { expect, fn, waitFor, within } from 'storybook/test';import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';import { currentUserWorkspaceState } from '@/auth/states/currentUserWorkspaceState';@@ -12,9 +12,10 @@ import { ApolloCoreClientContext } from '@/object-metadata/contexts/ApolloCoreClimport { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';import { type ObjectRecord } from '@/object-record/types/ObjectRecord';import { PageLayoutContentProvider } from '@/page-layout/contexts/PageLayoutContentContext';+import { PageLayoutWidgetViewportContext } from '@/page-layout/contexts/PageLayoutWidgetViewportContext';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { CoreObjectNameSingular } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';+import { assertIsDefinedOrThrow, isDefined } from 'twenty-shared/utils';import { setTestObjectMetadataItemsInMetadataStore } from '~/testing/utils/setTestObjectMetadataItemsInMetadataStore';import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';@@ -46,6 +47,7 @@ import {GraphOrderBy,PageLayoutTabLayoutMode,PageLayoutType,+ PageLayoutWidgetVerticalListHeightBehavior,WidgetConfigurationType,WidgetType,} from '~/generated-metadata/graphql';@@ -277,6 +279,16 @@ const FRONT_COMPONENT_WIDGET: PageLayoutWidget = {},};+const FULL_HEIGHT_FRONT_COMPONENT_WIDGET: PageLayoutWidget = {+ ...FRONT_COMPONENT_WIDGET,+ position: {+ __typename: 'PageLayoutWidgetVerticalListPosition',+ layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,+ index: 0,+ heightBehavior: PageLayoutWidgetVerticalListHeightBehavior.TAB_VIEWPORT,+ },+};+const NUMBER_CHART_WIDGET: PageLayoutWidget = {...makeWidget(WIDGET_ID_NUMBER_CHART, 0, TAB_ID_OVERVIEW),type: WidgetType.GRAPH,@@ -296,11 +308,15 @@ const renderWidgetOnPage = ({pageLayoutType,presentation,isInEditMode = false,+ fillsViewport = false,+ layoutMode = PageLayoutTabLayoutMode.VERTICAL_LIST,}: {widget: PageLayoutWidget;pageLayoutType: PageLayoutType;presentation: TabPresentation;isInEditMode?: boolean;+ fillsViewport?: boolean;+ layoutMode?: PageLayoutTabLayoutMode;}): Story['render'] => {return () => {const pageLayoutData = createPageLayoutWithWidget(widget, pageLayoutType);@@ -336,12 +352,14 @@ const renderWidgetOnPage = ({<PageLayoutTestWrapper store={jotaiStore}><PageLayoutContentProvidervalue={{- layoutMode: PageLayoutTabLayoutMode.VERTICAL_LIST,+ layoutMode,presentation,tabId: TAB_ID_OVERVIEW,}}>- <WidgetRenderer widget={widget} />+ <PageLayoutWidgetViewportContext.Provider value={fillsViewport}>+ <WidgetRenderer widget={widget} />+ </PageLayoutWidgetViewportContext.Provider></PageLayoutContentProvider></PageLayoutTestWrapper></CoreClientProviderWrapper>@@ -387,6 +405,78 @@ const expectLoadingFrontComponentFrame = async ({);};+const expectFrontComponentZoomRouting = async ({+ canvasElement,+ shouldPreventPageZoom,+}: {+ canvasElement: HTMLElement;+ shouldPreventPageZoom: boolean;+}) => {+ const card = await within(canvasElement).findByTestId(+ WIDGET_ID_FRONT_COMPONENT,+ );+ const frontComponentContainer = card.querySelector<HTMLElement>(+ ':scope > div:last-child > div',+ );++ assertIsDefinedOrThrow(frontComponentContainer);++ const eventTarget = canvasElement.ownerDocument.createElement('div');+ const handleWheel = fn();++ eventTarget.addEventListener('wheel', handleWheel);+ frontComponentContainer.append(eventTarget);++ try {+ for (const modifier of [+ { ctrlKey: true },+ { ctrlKey: true, metaKey: true },+ ]) {+ const zoomEvent = new WheelEvent('wheel', {+ ...modifier,+ bubbles: true,+ cancelable: true,+ deltaY: -100,+ });++ eventTarget.dispatchEvent(zoomEvent);++ expect(zoomEvent.defaultPrevented).toBe(shouldPreventPageZoom);+ expect(handleWheel).toHaveBeenLastCalledWith(zoomEvent);+ }++ for (const modifier of [{}, { metaKey: true }]) {+ const scrollEvent = new WheelEvent('wheel', {+ ...modifier,+ bubbles: true,+ cancelable: true,+ deltaY: 100,+ });++ eventTarget.dispatchEvent(scrollEvent);++ expect(scrollEvent.defaultPrevented).toBe(false);+ expect(handleWheel).toHaveBeenLastCalledWith(scrollEvent);+ }++ expect(handleWheel).toHaveBeenCalledTimes(4);++ const outsideZoomEvent = new WheelEvent('wheel', {+ bubbles: true,+ cancelable: true,+ ctrlKey: true,+ deltaY: -100,+ });++ canvasElement.dispatchEvent(outsideZoomEvent);++ expect(outsideZoomEvent.defaultPrevented).toBe(false);+ } finally {+ eventTarget.removeEventListener('wheel', handleWheel);+ eventTarget.remove();+ }+};+export const StandaloneFrontComponentLoading: Story = {render: renderWidgetOnPage({widget: FRONT_COMPONENT_WIDGET,@@ -407,6 +497,11 @@ export const StandaloneFrontComponentLoading: Story = {expect(style.borderRadius).toBe('0px');expect(style.padding).toBe('0px');}++ await expectFrontComponentZoomRouting({+ canvasElement,+ shouldPreventPageZoom: true,+ });},};@@ -421,6 +516,11 @@ export const StackedFrontComponentLoading: Story = {canvasElement,outerFrame: true,});++ await expectFrontComponentZoomRouting({+ canvasElement,+ shouldPreventPageZoom: false,+ });},};@@ -435,10 +535,11 @@ export const DashboardFrontComponentLoading: Story = {export const EditingFrontComponentLoading: Story = {render: renderWidgetOnPage({- widget: FRONT_COMPONENT_WIDGET,+ widget: FULL_HEIGHT_FRONT_COMPONENT_WIDGET,pageLayoutType: PageLayoutType.DASHBOARD,presentation: 'solo',isInEditMode: true,+ fillsViewport: true,}),play: StackedFrontComponentLoading.play,};@@ -454,9 +555,44 @@ export const RecordFrontComponentLoading: Story = {canvasElement,outerFrame: false,});++ await expectFrontComponentZoomRouting({+ canvasElement,+ shouldPreventPageZoom: false,+ });},};+export const FullHeightFrontComponentLoading: Story = {+ render: renderWidgetOnPage({+ widget: FULL_HEIGHT_FRONT_COMPONENT_WIDGET,+ pageLayoutType: PageLayoutType.RECORD_PAGE,+ presentation: 'stack',+ fillsViewport: true,+ }),+ play: async ({ canvasElement }) => {+ await expectLoadingFrontComponentFrame({+ canvasElement,+ outerFrame: false,+ });+ await expectFrontComponentZoomRouting({+ canvasElement,+ shouldPreventPageZoom: true,+ });+ },+};++export const LegacyCanvasFrontComponentLoading: Story = {+ render: renderWidgetOnPage({+ widget: FRONT_COMPONENT_WIDGET,+ pageLayoutType: PageLayoutType.RECORD_PAGE,+ presentation: 'solo',+ layoutMode: PageLayoutTabLayoutMode.CANVAS,+ fillsViewport: true,+ }),+ play: FullHeightFrontComponentLoading.play,+};+export const StandaloneChart: Story = {render: renderWidgetOnPage({widget: NUMBER_CHART_WIDGET,diff --git a/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetPreventPageZoomEffect.tsx b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetPreventPageZoomEffect.tsxnew file mode 100644index 00000000000..e2607ea44fc--- /dev/null+++ b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetPreventPageZoomEffect.tsx@@ -0,0 +1,36 @@+import { type RefObject, useEffect } from 'react';+import { isDefined } from 'twenty-shared/utils';+import { isPageZoomGesture } from 'twenty-ui/utilities';++type FrontComponentWidgetPreventPageZoomEffectProps = {+ containerRef: RefObject<HTMLDivElement | null>;+};++export const FrontComponentWidgetPreventPageZoomEffect = ({+ containerRef,+}: FrontComponentWidgetPreventPageZoomEffectProps) => {+ useEffect(() => {+ const container = containerRef.current;++ if (!isDefined(container)) {+ return;+ }++ const preventPageZoom = (event: WheelEvent) => {+ if (isPageZoomGesture(event)) {+ event.preventDefault();+ }+ };++ container.addEventListener('wheel', preventPageZoom, {+ capture: true,+ passive: false,+ });++ return () => {+ container.removeEventListener('wheel', preventPageZoom, true);+ };+ }, [containerRef]);++ return null;+};diff --git a/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsxindex ebf021a9ac3..ab508277efe 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/front-component/components/FrontComponentWidgetRenderer.tsx@@ -1,13 +1,15 @@import { styled } from '@linaria/react';-import { Suspense, lazy } from 'react';+import { Suspense, lazy, useContext, useRef } from 'react';import { isDefined } from 'twenty-shared/utils';import { FrontComponentSkeletonLoader } from '@/front-components/components/FrontComponentSkeletonLoader';import { usePageLayoutContentContext } from '@/page-layout/contexts/PageLayoutContentContext';+import { PageLayoutWidgetViewportContext } from '@/page-layout/contexts/PageLayoutWidgetViewportContext';import { useIsPageLayoutInEditMode } from '@/page-layout/hooks/useIsPageLayoutInEditMode';import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';import { PageLayoutWidgetNoDataDisplay } from '@/page-layout/widgets/components/PageLayoutWidgetNoDataDisplay';+import { FrontComponentWidgetPreventPageZoomEffect } from '@/page-layout/widgets/front-component/components/FrontComponentWidgetPreventPageZoomEffect';import { isFullPageWidget } from '@/page-layout/widgets/utils/isFullPageWidget';import { isWidgetConfigurationOfType } from '@/side-panel/pages/page-layout/utils/isWidgetConfigurationOfType';import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';@@ -41,7 +43,9 @@ export const FrontComponentWidgetRenderer = ({}: FrontComponentWidgetRendererProps) => {const isPageLayoutInEditMode = useIsPageLayoutInEditMode();const { presentation } = usePageLayoutContentContext();+ const fillsViewport = useContext(PageLayoutWidgetViewportContext);const { layoutType, targetRecordIdentifier } = useLayoutRenderingContext();+ const containerRef = useRef<HTMLDivElement>(null);const configuration = widget.configuration;@@ -63,18 +67,27 @@ export const FrontComponentWidgetRenderer = ({const loadingFallback = isFullPageFrontComponent ? null : (<FrontComponentSkeletonLoader />);+ const shouldPreventPageZoom =+ !isPageLayoutInEditMode && (isFullPageFrontComponent || fillsViewport);return (<StyledContainer+ ref={containerRef}isInEditMode={isPageLayoutInEditMode}isSoloLayout={presentation === 'solo'}>+ {shouldPreventPageZoom && (+ <FrontComponentWidgetPreventPageZoomEffect+ containerRef={containerRef}+ />+ )}<Suspense fallback={loadingFallback}><FrontComponentRendererfrontComponentId={frontComponentId}selectedRecordIds={selectedRecordIds}objectNameSingular={targetRecordIdentifier?.targetObjectNameSingular}loadingFallback={loadingFallback}+ shouldPreventPageZoom={shouldPreventPageZoom}/></Suspense></StyledContainer>diff --git a/packages/twenty-ui/docs/public-exports.json b/packages/twenty-ui/docs/public-exports.jsonindex 34b89c1e398..242d7744b09 100644--- a/packages/twenty-ui/docs/public-exports.json+++ b/packages/twenty-ui/docs/public-exports.json@@ -1273,6 +1273,7 @@"getSafeUrl": "utilities/utils/getSafeUrl","getUserDevice": "utilities/device/getUserDevice","isDefined": "utilities/utils/isDefined",+ "isPageZoomGesture": "utilities/zoom/utils/isPageZoomGesture","MOBILE_MEDIA_QUERY": "utilities/responsive/constants/MobileMediaQuery","normalizeSearchText": "utilities/utils/normalizeSearchText","parseThemeColor": "utilities/color/utils/parseThemeColor",diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.tsindex 17439c0e626..5ee9c0d99c6 100644--- a/packages/twenty-ui/src/utilities/index.ts+++ b/packages/twenty-ui/src/utilities/index.ts@@ -27,3 +27,4 @@ export { getSafeUrl } from './utils/getSafeUrl';export { isDefined } from './utils/isDefined';export { normalizeSearchText } from './utils/normalizeSearchText';export { preventDismissingClickActivation } from './utils/preventDismissingClickActivation';+export { isPageZoomGesture } from './zoom/utils/isPageZoomGesture';diff --git a/packages/twenty-ui/src/utilities/zoom/utils/isPageZoomGesture.ts b/packages/twenty-ui/src/utilities/zoom/utils/isPageZoomGesture.tsnew file mode 100644index 00000000000..e5a032e5051--- /dev/null+++ b/packages/twenty-ui/src/utilities/zoom/utils/isPageZoomGesture.ts@@ -0,0 +1,3 @@+export const isPageZoomGesture = (+ event: Pick<WheelEvent, 'ctrlKey'>,+): boolean => event.ctrlKey;