Skip to content

Commit 4d7c8e1

Browse files
authored
fix(MessageView): fix group order (#6760)
Fixes #6750
1 parent b41f735 commit 4d7c8e1

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
@@ -73,7 +73,8 @@ const meta = {
7373
groupName={'Employees'}
7474
>
7575
Informative message
76-
</MessageItem>
76+
</MessageItem>,
77+
<MessageItem key={7} titleText={'Error Message Type'} type={ValueState.Negative} counter={3} />
7778
]
7879
}
7980
} 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
@@ -91,8 +91,14 @@ export const resolveMessageGroups = (children: ReactElement<MessageItemPropTypes
9191
return acc;
9292
}, {});
9393

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

0 commit comments

Comments
 (0)