Merge branch 'dev'

scaleflex · Nov 27, 2024 · eb5f1c2 · eb5f1c2
2 parents 3497b29 + 808cb07
commit eb5f1c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/ui/src/core/ellipsed-text/ellipsed-text.component.tsx b/packages/ui/src/core/ellipsed-text/ellipsed-text.component.tsx
@@ -87,7 +87,7 @@ const EllipsedText = intrinsicComponent<EllipsedTextProps, HTMLDivElement>(
       </Styled.EllipsedTextWrapper>
     );
 
-    return textSuffix ? (
+    return textSuffix && shouldEllipse ? (
       <Styled.EllipsedTextContainer>
         {renderEllipsedText()}
         <Styled.SuffixTextWrapper>{getTextSuffix(textSuffix)}</Styled.SuffixTextWrapper>

diff --git a/packages/ui/src/core/ellipsed-text/ellipsed-text.styles.ts b/packages/ui/src/core/ellipsed-text/ellipsed-text.styles.ts
@@ -39,6 +39,7 @@ const TooltipContent = styled.div.attrs({
 const SuffixTextWrapper = styled.div.attrs({
   className: generateClassNames(baseClassName, 'suffix-text-wrapper'),
 })`
+  word-break: normal;
   display: flex;
   justify-content: flex-end;
   flex-direction: column;