diff --git a/components/src/molecules/DropdownMenu/index.tsx b/components/src/molecules/DropdownMenu/index.tsx index 4664cdc04b6..3a367dcf2e4 100644 --- a/components/src/molecules/DropdownMenu/index.tsx +++ b/components/src/molecules/DropdownMenu/index.tsx @@ -27,6 +27,7 @@ import { LiquidIcon } from '../LiquidIcon' import { DeckInfoLabel } from '../DeckInfoLabel' import type { FocusEventHandler } from 'react' +import type { FlattenSimpleInterpolation } from 'styled-components' export interface DropdownOption { name: string @@ -268,7 +269,7 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element { > {currentOption.name} @@ -327,7 +328,10 @@ export function DropdownMenu(props: DropdownMenuProps): JSX.Element { flexDirection={DIRECTION_COLUMN} gridGap={option.subtext != null ? SPACING.spacing4 : '0'} > - + {option.name} css` display: -webkit-box; -webkit-box-orient: vertical; overflow: ${OVERFLOW_HIDDEN}; text-overflow: ellipsis; word-wrap: break-word; - -webkit-line-clamp: 1; - word-break: break-all; + -webkit-line-clamp: ${lineClamp ?? 1}; + word-break: ${title === true + ? 'normal' + : 'break-all'}; // normal for tile and break-all for a non word case like aaaaaaaa ` diff --git a/protocol-designer/src/molecules/DropdownStepFormField/index.tsx b/protocol-designer/src/molecules/DropdownStepFormField/index.tsx index 98ac2d99164..ac6bac171a3 100644 --- a/protocol-designer/src/molecules/DropdownStepFormField/index.tsx +++ b/protocol-designer/src/molecules/DropdownStepFormField/index.tsx @@ -7,6 +7,7 @@ import { DeckInfoLabel, DropdownMenu, Flex, + LINE_CLAMP_TEXT_STYLE, ListItem, SPACING, StyledText, @@ -122,7 +123,10 @@ export function DropdownStepFormField( flexDirection={DIRECTION_COLUMN} gridGap={options[0].subtext != null ? SPACING.spacing4 : '0'} > - + {options[0].name}