c53a13417e
## Summary
Eliminates all ~350 `styled(Component)` usages across `twenty-front` and
`twenty-ui` (212 files changed). Each was replaced following these
rules:
- **Margin/layout CSS** (margin, padding, flex, align-self, width) →
wrapped in a `styled.div`/`styled.span` parent container
- **Third-party components** (Link, TextareaAutosize,
ReactPhoneNumberInput, Handle, etc.) → parent container with child CSS
selectors (`> a`, `> textarea`, `> input`, etc.)
- **Intrinsic behavior via existing props** (TableRow
`gridTemplateColumns`, TableCell `color`/`align`) → replaced
`styled(TableRow)` / `styled(TableCell)` with direct prop usage
- **Other visual overrides on twenty-ui components** (Card, Section,
TabList, Button, MenuItem, ScrollWrapper, etc.) → parent wrappers with
`> div` / `> *` child selectors
- **Extending styled.div/span** → merged all CSS into a single
`styled.div`/`styled.span`
Also adds `overflow: hidden` to parent containers wrapping
`ScrollWrapper` so scroll activates correctly with the new wrapper
structure.
### Migration patterns
| Before | After |
|--------|-------|
| `styled(Avatar)` with `margin-right` | `<StyledAvatarContainer><Avatar
/></StyledAvatarContainer>` |
| `styled(Link)` with `text-decoration: none` |
`<StyledLinkContainer><Link /></StyledLinkContainer>` with `> a { ... }`
|
| `styled(TableRow)` with `grid-template-columns` | `<TableRow
gridTemplateColumns="..." />` |
| `styled(TableCell)` with `color` / `align` | `<TableCell color={...}
align="right" />` |
| `styled(Card)` with `margin-top` | `<StyledCardContainer><Card
/></StyledCardContainer>` |
| `styled(TabList)` with `background` |
`<StyledTabListContainer><TabList /></StyledTabListContainer>` with `>
div { ... }` |
| `styled(StyledBase)` extending a `styled.div` | Single merged
`styled.div` with all styles inlined |
162 lines
6.5 KiB
TypeScript
162 lines
6.5 KiB
TypeScript
import { useNavigatePageLayoutSidePanel } from '@/side-panel/pages/page-layout/hooks/useNavigatePageLayoutSidePanel';
|
|
import { PageLayoutLeftPanel } from '@/page-layout/components/PageLayoutLeftPanel';
|
|
import { PageLayoutTabList } from '@/page-layout/components/PageLayoutTabList';
|
|
import { PageLayoutTabListEffect } from '@/page-layout/components/PageLayoutTabListEffect';
|
|
import { PAGE_LAYOUT_LEFT_PANEL_CONTAINER_WIDTH } from '@/page-layout/constants/PageLayoutLeftPanelContainerWidth';
|
|
import { useCreatePageLayoutTab } from '@/page-layout/hooks/useCreatePageLayoutTab';
|
|
import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';
|
|
import { useReorderPageLayoutTabs } from '@/page-layout/hooks/useReorderPageLayoutTabs';
|
|
import { PageLayoutMainContent } from '@/page-layout/PageLayoutMainContent';
|
|
import { isPageLayoutInEditModeComponentState } from '@/page-layout/states/isPageLayoutInEditModeComponentState';
|
|
import { pageLayoutTabSettingsOpenTabIdComponentState } from '@/page-layout/states/pageLayoutTabSettingsOpenTabIdComponentState';
|
|
import { getScrollWrapperInstanceIdFromPageLayoutId } from '@/page-layout/utils/getScrollWrapperInstanceIdFromPageLayoutId';
|
|
import { getTabListInstanceIdFromPageLayoutAndRecord } from '@/page-layout/utils/getTabListInstanceIdFromPageLayoutAndRecord';
|
|
import { getTabsByDisplayMode } from '@/page-layout/utils/getTabsByDisplayMode';
|
|
import { getTabsWithVisibleWidgets } from '@/page-layout/utils/getTabsWithVisibleWidgets';
|
|
import { shouldEnableTabEditingFeatures } from '@/page-layout/utils/shouldEnableTabEditingFeatures';
|
|
import { sortTabsByPosition } from '@/page-layout/utils/sortTabsByPosition';
|
|
import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
|
|
import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
|
|
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
|
|
import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';
|
|
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
|
|
import { styled } from '@linaria/react';
|
|
import { t } from '@lingui/core/macro';
|
|
import { SidePanelPages } from 'twenty-shared/types';
|
|
import { isDefined } from 'twenty-shared/utils';
|
|
import { useIsMobile } from 'twenty-ui/utilities';
|
|
import { themeCssVariables } from 'twenty-ui/theme-constants';
|
|
|
|
const StyledContainer = styled.div<{ hasPinnedTab: boolean }>`
|
|
display: grid;
|
|
grid-template-columns: ${({ hasPinnedTab }) =>
|
|
hasPinnedTab ? `${PAGE_LAYOUT_LEFT_PANEL_CONTAINER_WIDTH}px 1fr` : '1fr'};
|
|
grid-template-rows: minmax(0, 1fr);
|
|
height: 100%;
|
|
width: 100%;
|
|
`;
|
|
|
|
const StyledTabsAndDashboardContainer = styled.div`
|
|
display: flex;
|
|
flex-direction: column;
|
|
overflow: hidden;
|
|
`;
|
|
|
|
const StyledPageLayoutTabListContainer = styled.div`
|
|
padding-left: ${themeCssVariables.spacing[2]};
|
|
`;
|
|
|
|
const StyledScrollWrapperContainer = styled.div`
|
|
flex: 1;
|
|
`;
|
|
|
|
export const PageLayoutRendererContent = () => {
|
|
const { currentPageLayout } = useCurrentPageLayout();
|
|
|
|
const { isInSidePanel, layoutType, targetRecordIdentifier } =
|
|
useLayoutRenderingContext();
|
|
|
|
const isPageLayoutInEditMode = useAtomComponentStateValue(
|
|
isPageLayoutInEditModeComponentState,
|
|
);
|
|
|
|
const activeTabId = useAtomComponentStateValue(activeTabIdComponentState);
|
|
|
|
const { createPageLayoutTab } = useCreatePageLayoutTab(currentPageLayout?.id);
|
|
const { reorderTabs } = useReorderPageLayoutTabs(currentPageLayout?.id ?? '');
|
|
const setPageLayoutTabSettingsOpenTabId = useSetAtomComponentState(
|
|
pageLayoutTabSettingsOpenTabIdComponentState,
|
|
);
|
|
const { navigatePageLayoutSidePanel } = useNavigatePageLayoutSidePanel();
|
|
|
|
const isMobile = useIsMobile();
|
|
|
|
if (!isDefined(currentPageLayout)) {
|
|
return null;
|
|
}
|
|
|
|
const handleAddTab =
|
|
isPageLayoutInEditMode &&
|
|
shouldEnableTabEditingFeatures(currentPageLayout.type)
|
|
? () => {
|
|
const newTabId = createPageLayoutTab(t`Untitled`);
|
|
setPageLayoutTabSettingsOpenTabId(newTabId);
|
|
navigatePageLayoutSidePanel({
|
|
sidePanelPage: SidePanelPages.PageLayoutTabSettings,
|
|
focusTitleInput: true,
|
|
});
|
|
}
|
|
: undefined;
|
|
|
|
const canEnableTabEditing =
|
|
isPageLayoutInEditMode &&
|
|
shouldEnableTabEditingFeatures(currentPageLayout.type);
|
|
|
|
const tabsWithVisibleWidgets = getTabsWithVisibleWidgets({
|
|
tabs: currentPageLayout.tabs,
|
|
isMobile,
|
|
isInSidePanel,
|
|
isEditMode: isPageLayoutInEditMode,
|
|
});
|
|
|
|
const { tabsToRenderInTabList, pinnedLeftTab } = getTabsByDisplayMode({
|
|
tabs: tabsWithVisibleWidgets,
|
|
pageLayoutType: currentPageLayout.type,
|
|
isMobile,
|
|
isInSidePanel,
|
|
});
|
|
|
|
const tabListInstanceId = getTabListInstanceIdFromPageLayoutAndRecord({
|
|
pageLayoutId: currentPageLayout.id,
|
|
layoutType,
|
|
targetRecordIdentifier,
|
|
});
|
|
|
|
const sortedTabs = sortTabsByPosition(tabsToRenderInTabList);
|
|
|
|
return (
|
|
<StyledContainer hasPinnedTab={isDefined(pinnedLeftTab)}>
|
|
{isDefined(pinnedLeftTab) && (
|
|
<PageLayoutLeftPanel pinnedLeftTabId={pinnedLeftTab.id} />
|
|
)}
|
|
|
|
<StyledTabsAndDashboardContainer>
|
|
<PageLayoutTabListEffect
|
|
tabs={sortedTabs}
|
|
componentInstanceId={tabListInstanceId}
|
|
defaultTabToFocusOnMobileAndSidePanelId={
|
|
currentPageLayout.defaultTabToFocusOnMobileAndSidePanelId ??
|
|
undefined
|
|
}
|
|
/>
|
|
{(sortedTabs.length > 1 || isPageLayoutInEditMode) && (
|
|
<StyledPageLayoutTabListContainer>
|
|
<PageLayoutTabList
|
|
tabs={sortedTabs}
|
|
behaveAsLinks={!isInSidePanel && !isPageLayoutInEditMode}
|
|
componentInstanceId={tabListInstanceId}
|
|
onAddTab={handleAddTab}
|
|
isReorderEnabled={canEnableTabEditing}
|
|
onReorder={canEnableTabEditing ? reorderTabs : undefined}
|
|
pageLayoutType={currentPageLayout.type}
|
|
/>
|
|
</StyledPageLayoutTabListContainer>
|
|
)}
|
|
|
|
<StyledScrollWrapperContainer>
|
|
<ScrollWrapper
|
|
componentInstanceId={getScrollWrapperInstanceIdFromPageLayoutId(
|
|
currentPageLayout.id,
|
|
)}
|
|
defaultEnableXScroll={false}
|
|
>
|
|
{isDefined(activeTabId) && (
|
|
<PageLayoutMainContent tabId={activeTabId} />
|
|
)}
|
|
</ScrollWrapper>
|
|
</StyledScrollWrapperContainer>
|
|
</StyledTabsAndDashboardContainer>
|
|
</StyledContainer>
|
|
);
|
|
};
|