Skip to content

Commit 6c095de

Browse files
committed
fix(MessageView): fix group order (#6760)
Fixes #6750
1 parent 86edabe commit 6c095de

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.listItem {
2+
min-height: 0;
23
height: var(--_ui5wcr-MessageViewListItemHeightSingle);
34
}
45

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ const meta = {
8787
groupName={'Employees'}
8888
>
8989
Informative message
90-
</MessageItem>
90+
</MessageItem>,
91+
<MessageItem key={7} titleText={'Error Message Type'} type={ValueState.Negative} counter={3} />
9192
]
9293
}
9394
} satisfies Meta<typeof MessageView>;

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,14 @@ export const resolveMessageGroups = (children: ReactElement<MessageItemPropTypes
9292
return acc;
9393
}, {});
9494

95-
return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort((a, b) => {
96-
return a[0].localeCompare(b[0]);
95+
return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort(([keyA], [keyB]) => {
96+
if (keyA === '' && keyB !== '') {
97+
return -1;
98+
}
99+
if (keyA !== '' && keyB === '') {
100+
return 1;
101+
}
102+
return 0;
97103
});
98104
};
99105

0 commit comments

Comments
 (0)