The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Revert "Slide the side panel with transform instead of animating its width" (#26592)
Charles Bochet319cb15d94bf
diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsxindex 7c03c9005c3..2ebc4aba5b8 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx@@ -21,19 +21,20 @@ import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomStatimport { styled } from '@linaria/react';import { useReducedMotion } from 'framer-motion';import { useStore } from 'jotai';-import {- type AnimationEvent,- type TransitionEvent,- useCallback,- useState,-} from 'react';+import { type AnimationEvent, useCallback, useState } from 'react';import { themeCssVariables } from 'twenty-ui/theme';-const StyledSidePanelWrapper = styled.div<{ isOpen: boolean }>`- background: ${themeCssVariables.background.primary};+const StyledSidePanelWrapper = styled.div<{+ isOpen: boolean;+ isResizing: boolean;+}>`flex-shrink: 0;min-width: 0;- position: relative;+ overflow: hidden;+ transition: ${({ isResizing }) =>+ isResizing+ ? 'none'+ : `width calc(${themeCssVariables.animation.duration.normal} * 1s)`};width: ${({ isOpen }) => (isOpen ? `var(${SIDE_PANEL_WIDTH_VAR})` : '0px')};@keyframes sidePanelShrinkFromFullWidth {@@ -48,10 +49,7 @@ const StyledSidePanelWrapper = styled.div<{ isOpen: boolean }>`}`;-const StyledSidePanel = styled.aside<{- isOpen: boolean;- isShrinkingFromFullWidth: boolean;-}>`+const StyledSidePanel = styled.aside<{ isShrinkingFromFullWidth: boolean }>`background: ${themeCssVariables.background.primary};border-left: 1px solid ${themeCssVariables.border.color.medium};box-sizing: border-box;@@ -59,12 +57,7 @@ const StyledSidePanel = styled.aside<{flex-direction: column;height: 100%;overflow: hidden;- position: absolute;- right: 0;- top: 0;- transform: ${({ isOpen }) => (isOpen ? 'none' : 'translateX(100%)')};- transition: transform- calc(${themeCssVariables.animation.duration.normal} * 1s);+ position: relative;width: ${({ isShrinkingFromFullWidth }) =>isShrinkingFromFullWidth ? '100%' : `var(${SIDE_PANEL_WIDTH_VAR})`};`;@@ -91,6 +84,7 @@ export const SidePanelForDesktop = () => {const [modalContainer, setModalContainer] = useState<HTMLDivElement | null>(null,);+ const [isResizing, setIsResizing] = useState(false);const [shouldRenderContent, setShouldRenderContent] =useState(isSidePanelOpened);const [isShrinkingFromFullWidth, setIsShrinkingFromFullWidth] =@@ -114,7 +108,7 @@ export const SidePanelForDesktop = () => {setShouldRenderContent(true);}- const handleCloseAnimationComplete = () => {+ const handleTransitionEnd = () => {if (isSidePanelOpened) {return;}@@ -126,24 +120,13 @@ export const SidePanelForDesktop = () => {}};- const handleTransitionEnd = (event: TransitionEvent<HTMLElement>) => {- if (- event.target !== event.currentTarget ||- event.propertyName !== 'transform'- ) {- return;- }-- handleCloseAnimationComplete();- };-const handleAnimationEnd = (event: AnimationEvent<HTMLDivElement>) => {if (event.target !== event.currentTarget) {return;}setIsShrinkingFromFullWidth(false);- handleCloseAnimationComplete();+ handleTransitionEnd();};const handleModalContainerRef = useCallback(@@ -156,17 +139,20 @@ export const SidePanelForDesktop = () => {const handleWidthChange = useCallback((width: number) => {setSidePanelWidth(width);+ setIsResizing(false);setTableWidthResizeIsActive(true);},[setSidePanelWidth, setTableWidthResizeIsActive],);const handleResizeStart = useCallback(() => {+ setIsResizing(true);setTableWidthResizeIsActive(false);}, [setTableWidthResizeIsActive]);const handleCollapse = useCallback(() => {closeSidePanelMenu();+ setIsResizing(false);setTableWidthResizeIsActive(true);}, [closeSidePanelMenu, setTableWidthResizeIsActive]);@@ -189,16 +175,14 @@ export const SidePanelForDesktop = () => {<StyledSidePanelWrapperisOpen={isSidePanelOpened}+ isResizing={isResizing}+ onTransitionEnd={handleTransitionEnd}onAnimationEnd={handleAnimationEnd}data-shrink-from-full-width={isShrinkingFromFullWidth}data-side-panel=""data-click-outside-id={SIDE_PANEL_CLICK_OUTSIDE_ID}>- <StyledSidePanel- onTransitionEnd={handleTransitionEnd}- isOpen={isSidePanelOpened}- isShrinkingFromFullWidth={isShrinkingFromFullWidth}- >+ <StyledSidePanel isShrinkingFromFullWidth={isShrinkingFromFullWidth}><StyledModalContainer ref={handleModalContainerRef} /><DialogContainerContext.Providervalue={{ container: modalContainer }}diff --git a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelForDesktop.test.tsx b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelForDesktop.test.tsxindex 809361b1591..d86e6493c6a 100644--- a/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelForDesktop.test.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/__tests__/SidePanelForDesktop.test.tsx@@ -1,10 +1,4 @@-import {- act,- createEvent,- fireEvent,- render,- screen,-} from '@testing-library/react';+import { act, fireEvent, render } from '@testing-library/react';import { Provider as JotaiProvider } from 'jotai';import { type ReactNode } from 'react';@@ -194,12 +188,7 @@ describe('SidePanelForDesktop', () => {});fireEvent.animationEnd(wrapperElement);- const transition = createEvent.transitionEnd(- screen.getByRole('complementary'),- );-- Object.defineProperty(transition, 'propertyName', { value: 'transform' });- fireEvent(screen.getByRole('complementary'), transition);+ fireEvent.transitionEnd(wrapperElement);expect(sidePanelCloseAnimationCompleteCleanupMock).toHaveBeenCalledTimes(1);});@@ -214,39 +203,4 @@ describe('SidePanelForDesktop', () => {'false',);});- it('keeps content mounted until the panel itself finishes sliding closed', () => {- jotaiStore.set(isSidePanelOpenedState.atom, true);- render(<SidePanelForDesktop />, { wrapper: Wrapper });-- act(() => {- jotaiStore.set(isSidePanelOpenedState.atom, false);- jotaiStore.set(isSidePanelClosingState.atom, true);- });-- const panel = screen.getByRole('complementary');- const content = screen.getByTestId('side-panel-content');-- for (const [target, propertyName] of [- [content, 'transform'],- [panel, 'opacity'],- ] as const) {- const transition = createEvent.transitionEnd(target);-- Object.defineProperty(transition, 'propertyName', {- value: propertyName,- });- fireEvent(target, transition);- }-- expect(content).toBeInTheDocument();- expect(sidePanelCloseAnimationCompleteCleanupMock).not.toHaveBeenCalled();-- const transition = createEvent.transitionEnd(panel);-- Object.defineProperty(transition, 'propertyName', { value: 'transform' });- fireEvent(panel, transition);-- expect(content).not.toBeInTheDocument();- expect(sidePanelCloseAnimationCompleteCleanupMock).toHaveBeenCalledTimes(1);- });});