Chip untitled modification (#11498)

Fixes https://github.com/twentyhq/core-team-issues/issues/663
This commit is contained in:
Guillim
2025-04-14 17:33:41 +02:00
committed by GitHub
parent d4deca45e8
commit 8a3f8ef324
7 changed files with 67 additions and 17 deletions

View File

@ -43,12 +43,17 @@ const StyledIconsContainer = styled.div`
display: flex; display: flex;
`; `;
const StyledEmptyText = styled.div`
color: ${({ theme }) => theme.font.color.tertiary};
`;
export type CommandMenuContextChipProps = { export type CommandMenuContextChipProps = {
Icons: React.ReactNode[]; Icons: React.ReactNode[];
text?: string; text?: string;
onClick?: () => void; onClick?: () => void;
testId?: string; testId?: string;
maxWidth?: string; maxWidth?: string;
forceEmptyText?: boolean;
}; };
export const CommandMenuContextChip = ({ export const CommandMenuContextChip = ({
@ -57,6 +62,7 @@ export const CommandMenuContextChip = ({
onClick, onClick,
testId, testId,
maxWidth, maxWidth,
forceEmptyText = false,
}: CommandMenuContextChipProps) => { }: CommandMenuContextChipProps) => {
return ( return (
<StyledChip <StyledChip
@ -70,7 +76,13 @@ export const CommandMenuContextChip = ({
<Fragment key={index}>{Icon}</Fragment> <Fragment key={index}>{Icon}</Fragment>
))} ))}
</StyledIconsContainer> </StyledIconsContainer>
{text && <OverflowingTextWithTooltip text={text} />} {text?.trim() ? (
<OverflowingTextWithTooltip text={text} />
) : !forceEmptyText ? (
<StyledEmptyText>Untitled</StyledEmptyText>
) : (
''
)}
</StyledChip> </StyledChip>
); );
}; };

View File

@ -21,8 +21,8 @@ import { useRef } from 'react';
import { useLocation } from 'react-router-dom'; import { useLocation } from 'react-router-dom';
import { useRecoilState, useRecoilValue } from 'recoil'; import { useRecoilState, useRecoilValue } from 'recoil';
import { isDefined } from 'twenty-shared/utils'; import { isDefined } from 'twenty-shared/utils';
import { Button } from 'twenty-ui/input';
import { IconChevronLeft, IconX } from 'twenty-ui/display'; import { IconChevronLeft, IconX } from 'twenty-ui/display';
import { Button } from 'twenty-ui/input';
import { getOsControlSymbol, useIsMobile } from 'twenty-ui/utilities'; import { getOsControlSymbol, useIsMobile } from 'twenty-ui/utilities';
const StyledInputContainer = styled.div` const StyledInputContainer = styled.div`
@ -126,6 +126,7 @@ export const CommandMenuTopBar = () => {
Icons={[<IconChevronLeft size={theme.icon.size.sm} />]} Icons={[<IconChevronLeft size={theme.icon.size.sm} />]}
onClick={goBackFromCommandMenu} onClick={goBackFromCommandMenu}
testId="command-menu-go-back-button" testId="command-menu-go-back-button"
forceEmptyText={true}
/> />
</motion.div> </motion.div>
)} )}

View File

@ -4,6 +4,7 @@ import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlin
import { useRecordValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext'; import { useRecordValue } from '@/object-record/record-store/contexts/RecordFieldValueSelectorContext';
import { TitleInputHotkeyScope } from '@/ui/input/types/TitleInputHotkeyScope'; import { TitleInputHotkeyScope } from '@/ui/input/types/TitleInputHotkeyScope';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope'; import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { Theme, withTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { useContext } from 'react'; import { useContext } from 'react';
import { OverflowingTextWithTooltip } from 'twenty-ui/display'; import { OverflowingTextWithTooltip } from 'twenty-ui/display';
@ -26,10 +27,16 @@ const StyledDiv = styled.div`
} }
`; `;
const StyledEmptyText = withTheme(styled.div<{ theme: Theme }>`
color: ${({ theme }) => theme.font.color.tertiary};
`);
export const RecordTitleCellSingleTextDisplayMode = () => { export const RecordTitleCellSingleTextDisplayMode = () => {
const { recordId, fieldDefinition } = useContext(FieldContext); const { recordId, fieldDefinition } = useContext(FieldContext);
const recordValue = useRecordValue(recordId); const recordValue = useRecordValue(recordId);
const isEmpty =
recordValue?.[fieldDefinition.metadata.fieldName].trim() === '';
const { openInlineCell } = useInlineCell(); const { openInlineCell } = useInlineCell();
@ -46,12 +53,16 @@ export const RecordTitleCellSingleTextDisplayMode = () => {
openInlineCell(); openInlineCell();
}} }}
> >
<OverflowingTextWithTooltip {isEmpty ? (
text={ <StyledEmptyText>Untitled</StyledEmptyText>
recordValue?.[fieldDefinition.metadata.fieldName] || ) : (
fieldDefinition.label <OverflowingTextWithTooltip
} text={
/> recordValue?.[fieldDefinition.metadata.fieldName] ||
fieldDefinition.label
}
/>
)}
</StyledDiv> </StyledDiv>
); );
}; };

View File

@ -1,6 +1,7 @@
import { FieldContext } from '@/object-record/record-field/contexts/FieldContext'; import { FieldContext } from '@/object-record/record-field/contexts/FieldContext';
import { useFullNameFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useFullNameFieldDisplay'; import { useFullNameFieldDisplay } from '@/object-record/record-field/meta-types/hooks/useFullNameFieldDisplay';
import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell'; import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
import { Theme, withTheme } from '@emotion/react';
import styled from '@emotion/styled'; import styled from '@emotion/styled';
import { isNonEmptyString } from '@sniptt/guards'; import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react'; import { useContext } from 'react';
@ -25,6 +26,10 @@ const StyledDiv = styled.div`
} }
`; `;
const StyledEmptyText = withTheme(styled.div<{ theme: Theme }>`
color: ${({ theme }) => theme.font.color.tertiary};
`);
export const RecordTitleFullNameFieldDisplay = () => { export const RecordTitleFullNameFieldDisplay = () => {
const { fieldDefinition } = useContext(FieldContext); const { fieldDefinition } = useContext(FieldContext);
@ -39,9 +44,13 @@ export const RecordTitleFullNameFieldDisplay = () => {
return ( return (
<StyledDiv onClick={() => openInlineCell()}> <StyledDiv onClick={() => openInlineCell()}>
<OverflowingTextWithTooltip {!content ? (
text={isNonEmptyString(content) ? content : fieldDefinition.label} <StyledEmptyText>Untitled</StyledEmptyText>
/> ) : (
<OverflowingTextWithTooltip
text={isNonEmptyString(content) ? content : fieldDefinition.label}
/>
)}
</StyledDiv> </StyledDiv>
); );
}; };

View File

@ -35,6 +35,10 @@ export type ChipProps = {
className?: string; className?: string;
}; };
const StyledDiv = withTheme(styled.div<{ theme: Theme }>`
color: ${({ theme }) => theme.font.color.tertiary};
`);
const StyledContainer = withTheme(styled.div< const StyledContainer = withTheme(styled.div<
Pick< Pick<
ChipProps, ChipProps,
@ -147,8 +151,10 @@ export const Chip = ({
maxWidth={maxWidth} maxWidth={maxWidth}
> >
{leftComponent} {leftComponent}
{!isLabelHidden && ( {!isLabelHidden && label.trim() ? (
<OverflowingTextWithTooltip size={size} text={label} /> <OverflowingTextWithTooltip size={size} text={label} />
) : (
<StyledDiv>Untitled</StyledDiv>
)} )}
{rightComponent?.()} {rightComponent?.()}
</StyledContainer> </StyledContainer>

View File

@ -21,3 +21,9 @@ export default meta;
type Story = StoryObj<typeof AvatarChip>; type Story = StoryObj<typeof AvatarChip>;
export const Default: Story = {}; export const Default: Story = {};
export const Empty: Story = {
args: {
name: '',
},
};

View File

@ -90,7 +90,10 @@ export const Avatar = ({
}) })
: null; : null;
const placeholderChar = placeholder?.[0]?.toLocaleUpperCase(); const placeholderFirstChar = placeholder?.trim()?.charAt(0);
const isPlaceholderFirstCharEmpty =
!placeholderFirstChar || placeholderFirstChar === '';
const placeholderChar = placeholderFirstChar?.toUpperCase() || '-';
const showPlaceholder = const showPlaceholder =
isNull(avatarImageURI) || invalidAvatarUrls.includes(avatarImageURI); isNull(avatarImageURI) || invalidAvatarUrls.includes(avatarImageURI);
@ -101,10 +104,12 @@ export const Avatar = ({
} }
}; };
const fixedColor = const fixedColor = isPlaceholderFirstCharEmpty
color ?? stringToHslColor(placeholderColorSeed ?? '', 75, 25); ? theme.font.color.tertiary
const fixedBackgroundColor = : (color ?? stringToHslColor(placeholderColorSeed ?? '', 75, 25));
backgroundColor ?? stringToHslColor(placeholderColorSeed ?? '', 75, 85); const fixedBackgroundColor = isPlaceholderFirstCharEmpty
? theme.background.transparent.light
: (backgroundColor ?? stringToHslColor(placeholderColorSeed ?? '', 75, 85));
const showBackgroundColor = showPlaceholder; const showBackgroundColor = showPlaceholder;