Fix safari broken table (#11399)

Fixes #11254
This commit is contained in:
Charles Bochet
2025-04-04 19:16:33 +02:00
committed by GitHub
parent 241d8820d7
commit 8fa09e21ec
4 changed files with 7 additions and 23 deletions

View File

@ -20,21 +20,12 @@ import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkey
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys'; import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { Key } from 'ts-key-enum'; import { Key } from 'ts-key-enum';
const StyledTableWithHeader = styled.div`
height: 100%;
`;
const StyledTableContainer = styled.div` const StyledTableContainer = styled.div`
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%;
position: relative; position: relative;
`; `;
const StyledTableInternalContainer = styled.div`
height: 100%;
`;
type RecordTableWithWrappersProps = { type RecordTableWithWrappersProps = {
objectNameSingular: string; objectNameSingular: string;
recordTableId: string; recordTableId: string;
@ -105,13 +96,9 @@ export const RecordTableWithWrappers = ({
componentInstanceId={`record-table-scroll-${recordTableId}`} componentInstanceId={`record-table-scroll-${recordTableId}`}
> >
<RecordUpdateContext.Provider value={updateRecordMutation}> <RecordUpdateContext.Provider value={updateRecordMutation}>
<StyledTableWithHeader> <StyledTableContainer>
<StyledTableContainer> <RecordTable />
<StyledTableInternalContainer> </StyledTableContainer>
<RecordTable />
</StyledTableInternalContainer>
</StyledTableContainer>
</StyledTableWithHeader>
</RecordUpdateContext.Provider> </RecordUpdateContext.Provider>
</ScrollWrapper> </ScrollWrapper>
</EntityDeleteContext.Provider> </EntityDeleteContext.Provider>

View File

@ -16,6 +16,7 @@ import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
const StyledInnerContainer = styled.div` const StyledInnerContainer = styled.div`
height: 100%; height: 100%;
width: 100%;
`; `;
export const SettingsNavigationDrawerItems = () => { export const SettingsNavigationDrawerItems = () => {

View File

@ -7,8 +7,8 @@ import { useRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import * as React from 'react'; import * as React from 'react';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { Tab } from './Tab';
import { IconComponent } from 'twenty-ui/display'; import { IconComponent } from 'twenty-ui/display';
import { Tab } from './Tab';
export type SingleTabProps<T extends string = string> = { export type SingleTabProps<T extends string = string> = {
title: string; title: string;
@ -37,6 +37,7 @@ const StyledContainer = styled.div`
gap: ${({ theme }) => theme.spacing(1)}; gap: ${({ theme }) => theme.spacing(1)};
height: 40px; height: 40px;
user-select: none; user-select: none;
width: 100%;
`; `;
const StyledOuterContainer = styled.div` const StyledOuterContainer = styled.div`

View File

@ -19,11 +19,6 @@ const StyledScrollWrapper = styled.div`
height: 100%; height: 100%;
`; `;
const StyledInnerContainer = styled.div`
height: 100%;
width: 100%;
`;
export type ScrollWrapperProps = { export type ScrollWrapperProps = {
children: React.ReactNode; children: React.ReactNode;
className?: string; className?: string;
@ -76,7 +71,7 @@ export const ScrollWrapper = ({
className={className} className={className}
onScroll={handleScroll} onScroll={handleScroll}
> >
<StyledInnerContainer>{children}</StyledInnerContainer> {children}
</StyledScrollWrapper> </StyledScrollWrapper>
</ScrollWrapperComponentInstanceContext.Provider> </ScrollWrapperComponentInstanceContext.Provider>
); );