fix(MessageView): fix group order (#6760)

Fixes #6750
SAP · Dec 19, 2024 · 6c095de · 6c095de
1 parent 86edabe
commit 6c095de
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/main/src/components/MessageView/MessageItem.module.css b/packages/main/src/components/MessageView/MessageItem.module.css
@@ -1,4 +1,5 @@
 .listItem {
+  min-height: 0;
   height: var(--_ui5wcr-MessageViewListItemHeightSingle);
 }
 

diff --git a/packages/main/src/components/MessageView/MessageView.stories.tsx b/packages/main/src/components/MessageView/MessageView.stories.tsx
@@ -87,7 +87,8 @@ const meta = {
         groupName={'Employees'}
       >
         Informative message
-      </MessageItem>
+      </MessageItem>,
+      <MessageItem key={7} titleText={'Error Message Type'} type={ValueState.Negative} counter={3} />
     ]
   }
 } satisfies Meta<typeof MessageView>;

diff --git a/packages/main/src/components/MessageView/index.tsx b/packages/main/src/components/MessageView/index.tsx
@@ -92,8 +92,14 @@ export const resolveMessageGroups = (children: ReactElement<MessageItemPropTypes
     return acc;
   }, {});
 
-  return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort((a, b) => {
-    return a[0].localeCompare(b[0]);
+  return Object.entries<ReactElement<MessageItemPropTypes>[]>(groups).sort(([keyA], [keyB]) => {
+    if (keyA === '' && keyB !== '') {
+      return -1;
+    }
+    if (keyA !== '' && keyB === '') {
+      return 1;
+    }
+    return 0;
   });
 };