Skip to content

Commit a0d4169

Browse files
committed
MessageView: fix lint errors
1 parent fc6d14e commit a0d4169

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

packages/main/src/components/MessageItem/MessageItem.module.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@
3434
height: 1rem;
3535
}
3636

37+
.titleContainer {
38+
flex: auto;
39+
white-space: nowrap;
40+
overflow: hidden;
41+
text-overflow: ellipsis;
42+
}
43+
3744
.title {
3845
font-family: var(--sapFontHeaderFamily);
3946
font-size: var(--_ui5wcr-MessageItemTitleFontSize);

packages/main/src/components/MessageItem/index.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ const MessageItem = forwardRef<ListItemCustomDomRef, MessageItemPropTypes>((prop
6969
const titleTextRef = useRef<HTMLSpanElement>(null);
7070
const hasDetails = !!(children || isTitleTextOverflowing);
7171
const i18nBundle = useI18nBundle('@ui5/webcomponents-react');
72+
const titleTextStr = (() => {
73+
if (typeof titleText === 'string') {
74+
return titleText;
75+
} else if (isValidElement<LinkPropTypes>(titleText) && typeof titleText.props.children === 'string') {
76+
return titleText.props.children;
77+
}
78+
return '';
79+
})();
7280

7381
useStylesheet(styleData, MessageItem.displayName);
7482

@@ -125,14 +133,6 @@ const MessageItem = forwardRef<ListItemCustomDomRef, MessageItemPropTypes>((prop
125133
};
126134
}, [hasChildren]);
127135

128-
useEffect(() => {
129-
if (typeof titleText === 'string') {
130-
setTitleTextStr(titleText);
131-
} else if (isValidElement<LinkPropTypes>(titleText) && typeof titleText.props.children === 'string') {
132-
setTitleTextStr(titleText.props.children);
133-
}
134-
}, [titleText]);
135-
136136
return (
137137
<ListItemCustom
138138
onClick={handleListItemClick}
@@ -148,10 +148,7 @@ const MessageItem = forwardRef<ListItemCustomDomRef, MessageItemPropTypes>((prop
148148
<div className={classNames.iconContainer}>
149149
<Icon name={getIconNameForType(type as ValueState)} className={classNames.icon} mode={IconMode.Decorative} />
150150
</div>
151-
<FlexBox
152-
direction={FlexBoxDirection.Column}
153-
style={{ flex: 'auto', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis' }}
154-
>
151+
<FlexBox direction={FlexBoxDirection.Column} className={classNames.titleContainer}>
155152
{titleText && (
156153
<span className={classNames.title} ref={titleTextRef}>
157154
{titleText}

packages/main/src/components/MessageView/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const MessageView = forwardRef<MessageViewDomRef, MessageViewPropTypes>((props,
158158
if (internalRef.current) {
159159
internalRef.current.navigateBack = navigateBack;
160160
}
161-
}, [internalRef.current, navigateBack]);
161+
}, [internalRef, navigateBack]);
162162

163163
const handleListFilterChange: SegmentedButtonPropTypes['onSelectionChange'] = (e) => {
164164
setListFilter(e.detail.selectedItems.at(0).dataset.key as never);

0 commit comments

Comments
 (0)