Remove reference to data-testid from styling (#10407)

Fixes https://github.com/twentyhq/core-team-issues/issues/204

---------

Co-authored-by: ad-elias <elias@autodiligence.com>
This commit is contained in:
eliasylonen
2025-02-28 16:37:14 +01:00
committed by GitHub
parent 47b7c696d5
commit 2773dde714
9 changed files with 62 additions and 25 deletions

View File

@ -22,6 +22,7 @@ export type RecordChipProps = {
maxWidth?: number; maxWidth?: number;
to?: string | undefined; to?: string | undefined;
size?: ChipSize; size?: ChipSize;
isLabelHidden?: boolean;
}; };
export const RecordChip = ({ export const RecordChip = ({
@ -33,6 +34,7 @@ export const RecordChip = ({
to, to,
size, size,
forceDisableClick = false, forceDisableClick = false,
isLabelHidden = false,
}: RecordChipProps) => { }: RecordChipProps) => {
const { recordChipData } = useRecordChipData({ const { recordChipData } = useRecordChipData({
objectNameSingular, objectNameSingular,
@ -76,6 +78,7 @@ export const RecordChip = ({
maxWidth={maxWidth} maxWidth={maxWidth}
placeholderColorSeed={record.id} placeholderColorSeed={record.id}
name={recordChipData.name} name={recordChipData.name}
isLabelHidden={isLabelHidden}
avatarType={recordChipData.avatarType} avatarType={recordChipData.avatarType}
avatarUrl={recordChipData.avatarUrl ?? ''} avatarUrl={recordChipData.avatarUrl ?? ''}
className={className} className={className}

View File

@ -1,4 +1,5 @@
import { RecordChip } from '@/object-record/components/RecordChip'; import { RecordChip } from '@/object-record/components/RecordChip';
import { useIsChipFieldDisplayLabelHidden } from '@/object-record/record-field/meta-types/display/hooks/useIsChipFieldDisplayLabelHidden';
import { useChipFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useChipFieldDisplay'; import { useChipFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useChipFieldDisplay';
import { isDefined } from 'twenty-shared'; import { isDefined } from 'twenty-shared';
import { ChipSize } from 'twenty-ui'; import { ChipSize } from 'twenty-ui';
@ -7,6 +8,8 @@ export const ChipFieldDisplay = () => {
const { recordValue, objectNameSingular, labelIdentifierLink } = const { recordValue, objectNameSingular, labelIdentifierLink } =
useChipFieldDisplay(); useChipFieldDisplay();
const isChipFieldDisplayLabelHidden = useIsChipFieldDisplayLabelHidden();
if (!isDefined(recordValue)) { if (!isDefined(recordValue)) {
return null; return null;
} }
@ -17,6 +20,7 @@ export const ChipFieldDisplay = () => {
record={recordValue} record={recordValue}
size={ChipSize.Small} size={ChipSize.Small}
to={labelIdentifierLink} to={labelIdentifierLink}
isLabelHidden={isChipFieldDisplayLabelHidden}
/> />
); );
}; };

View File

@ -5,6 +5,7 @@ import { CoreObjectNamePlural } from '@/object-metadata/types/CoreObjectNamePlur
import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular'; import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
import { ChipFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ChipFieldDisplay'; import { ChipFieldDisplay } from '@/object-record/record-field/meta-types/display/components/ChipFieldDisplay';
import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext'; import { RecordIndexContextProvider } from '@/object-record/record-index/contexts/RecordIndexContext';
import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
import { ChipGeneratorsDecorator } from '~/testing/decorators/ChipGeneratorsDecorator'; import { ChipGeneratorsDecorator } from '~/testing/decorators/ChipGeneratorsDecorator';
import { getFieldDecorator } from '~/testing/decorators/getFieldDecorator'; import { getFieldDecorator } from '~/testing/decorators/getFieldDecorator';
import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator'; import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
@ -22,18 +23,25 @@ const meta: Meta = {
)!; )!;
return ( return (
<RecordIndexContextProvider <RecordTableComponentInstanceContext.Provider
value={{ value={{
indexIdentifierUrl: () => '', instanceId,
onIndexRecordsLoaded: () => {}, onColumnsChange: () => {},
objectNamePlural: CoreObjectNamePlural.Company,
objectNameSingular: CoreObjectNameSingular.Company,
objectMetadataItem: companyObjectMetadataItem,
recordIndexId: instanceId,
}} }}
> >
<Story /> <RecordIndexContextProvider
</RecordIndexContextProvider> value={{
indexIdentifierUrl: () => '',
onIndexRecordsLoaded: () => {},
objectNamePlural: CoreObjectNamePlural.Company,
objectNameSingular: CoreObjectNameSingular.Company,
objectMetadataItem: companyObjectMetadataItem,
recordIndexId: instanceId,
}}
>
<Story />
</RecordIndexContextProvider>
</RecordTableComponentInstanceContext.Provider>
); );
}, },
MemoryRouterDecorator, MemoryRouterDecorator,

View File

@ -0,0 +1,22 @@
import { RecordTableCellContext } from '@/object-record/record-table/contexts/RecordTableCellContext';
import { isRecordTableScrolledLeftComponentState } from '@/object-record/record-table/states/isRecordTableScrolledLeftComponentState';
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
import { useContext } from 'react';
import { useIsMobile } from 'twenty-ui';
export const useIsChipFieldDisplayLabelHidden = () => {
const isMobile = useIsMobile();
const isRecordTableScrolledLeft = useRecoilComponentValueV2(
isRecordTableScrolledLeftComponentState,
);
const { columnDefinition } = useContext(RecordTableCellContext);
const isLabelIdentifierInRecordTable = columnDefinition?.isLabelIdentifier;
const isLabelHidden =
isMobile && !isRecordTableScrolledLeft && isLabelIdentifierInRecordTable;
return isLabelHidden;
};

View File

@ -1,5 +1,4 @@
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { MOBILE_VIEWPORT } from 'twenty-ui';
const StyledTbody = styled.tbody` const StyledTbody = styled.tbody`
&.first-columns-sticky { &.first-columns-sticky {
@ -22,18 +21,6 @@ const StyledTbody = styled.tbody`
z-index: 5; z-index: 5;
transition: 0.3s ease; transition: 0.3s ease;
@media (max-width: ${MOBILE_VIEWPORT}px) {
& [data-testid='editable-cell-display-mode'] {
[data-testid='tooltip'] {
display: none;
}
[data-testid='chip'] {
gap: 0;
}
}
}
&:not(.disable-shadow)::after { &:not(.disable-shadow)::after {
content: ''; content: '';
position: absolute; position: absolute;

View File

@ -1,6 +1,6 @@
import { ReactElement, useContext, useEffect, useRef } from 'react'; import { ReactElement, useContext, useEffect, useRef } from 'react';
import { useRecoilValue } from 'recoil'; import { useRecoilValue } from 'recoil';
import { IconArrowUpRight } from 'twenty-ui'; import { IconArrowUpRight, useIsMobile } from 'twenty-ui';
import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon'; import { useGetButtonIcon } from '@/object-record/record-field/hooks/useGetButtonIcon';
import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty'; import { useIsFieldEmpty } from '@/object-record/record-field/hooks/useIsFieldEmpty';
@ -80,8 +80,12 @@ export const RecordTableCellSoftFocusMode = ({
? IconArrowUpRight // IconLayoutSidebarRightExpand - Disabling sidepanel access for now ? IconArrowUpRight // IconLayoutSidebarRightExpand - Disabling sidepanel access for now
: customButtonIcon; : customButtonIcon;
const isMobile = useIsMobile();
const showButton = const showButton =
isDefined(buttonIcon) && !editModeContentOnly && !isFieldReadOnly; isDefined(buttonIcon) &&
!editModeContentOnly &&
!isFieldReadOnly &&
!(isMobile && isFirstColumn);
const dontShowContent = isEmpty && isFieldReadOnly; const dontShowContent = isEmpty && isFieldReadOnly;

View File

@ -8,6 +8,7 @@ export type LinkAvatarChipProps = Omit<AvatarChipsCommonProps, 'clickable'> & {
to: string; to: string;
onClick?: LinkChipProps['onClick']; onClick?: LinkChipProps['onClick'];
variant?: AvatarChipVariant; variant?: AvatarChipVariant;
isLabelHidden?: boolean;
}; };
export const LinkAvatarChip = ({ export const LinkAvatarChip = ({
@ -24,11 +25,13 @@ export const LinkAvatarChip = ({
placeholderColorSeed, placeholderColorSeed,
size, size,
variant, variant,
isLabelHidden,
}: LinkAvatarChipProps) => ( }: LinkAvatarChipProps) => (
<LinkChip <LinkChip
to={to} to={to}
onClick={onClick} onClick={onClick}
label={name} label={name}
isLabelHidden={isLabelHidden}
variant={ variant={
//Regular but Highlighted -> missleading //Regular but Highlighted -> missleading
variant === AvatarChipVariant.Regular variant === AvatarChipVariant.Regular

View File

@ -26,6 +26,7 @@ export type ChipProps = {
disabled?: boolean; disabled?: boolean;
clickable?: boolean; clickable?: boolean;
label: string; label: string;
isLabelHidden?: boolean;
maxWidth?: number; maxWidth?: number;
variant?: ChipVariant; variant?: ChipVariant;
accent?: ChipAccent; accent?: ChipAccent;
@ -124,6 +125,7 @@ const StyledContainer = withTheme(styled.div<
export const Chip = ({ export const Chip = ({
size = ChipSize.Small, size = ChipSize.Small,
label, label,
isLabelHidden = false,
disabled = false, disabled = false,
clickable = true, clickable = true,
variant = ChipVariant.Regular, variant = ChipVariant.Regular,
@ -145,7 +147,9 @@ export const Chip = ({
maxWidth={maxWidth} maxWidth={maxWidth}
> >
{leftComponent?.()} {leftComponent?.()}
<OverflowingTextWithTooltip size={size} text={label} /> {!isLabelHidden && (
<OverflowingTextWithTooltip size={size} text={label} />
)}
{rightComponent?.()} {rightComponent?.()}
</StyledContainer> </StyledContainer>
); );

View File

@ -27,6 +27,7 @@ export const LinkChip = ({
to, to,
size = ChipSize.Small, size = ChipSize.Small,
label, label,
isLabelHidden = false,
variant = ChipVariant.Regular, variant = ChipVariant.Regular,
leftComponent = null, leftComponent = null,
rightComponent = null, rightComponent = null,
@ -40,6 +41,7 @@ export const LinkChip = ({
<Chip <Chip
size={size} size={size}
label={label} label={label}
isLabelHidden={isLabelHidden}
clickable={true} clickable={true}
variant={variant} variant={variant}
leftComponent={leftComponent} leftComponent={leftComponent}