fix(merge): three defects my conflict resolution introduced, all caught by the build
The CSS conflict boundary ran through the middle of a rule, so concatenating both sides swallowed the closing brace of .userStatusEmoji - 27 opening braces against 26 closing ones. Restored. The JSX was worse. Our block is a ternary: show call participants instead of the message preview. Moving it into upstream's new RoomListItemContent carried the preview branch along while upstream's own preview block stayed behind it, leaving a duplicated preview and an unbalanced </div>. Removed the duplicate. getInitials stayed behind unused in RoomListItemView after moving to RoomListItemContent, which the compiler flagged. Removed. None of this was visible by reading the diff; the build found all three. Both packages compile now, and the artifact carries the dfn3 model, so the noise suppression from #0054 came through the merge intact.
This commit is contained in:
-7
@@ -105,13 +105,6 @@ export const RoomListItemContent = memo(function RoomListItemContent({
|
|||||||
vm={vm}
|
vm={vm}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{item.messagePreview && (
|
|
||||||
<Text as="div" size="sm" className={styles.ellipsis} title={item.messagePreview}>
|
|
||||||
{item.messagePreview}
|
|
||||||
</Text>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
{!isDragging && (item.showMoreOptionsMenu || item.showNotificationMenu) && (
|
{!isDragging && (item.showMoreOptionsMenu || item.showNotificationMenu) && (
|
||||||
<RoomListItemHoverMenu
|
<RoomListItemHoverMenu
|
||||||
showMoreOptionsMenu={item.showMoreOptionsMenu}
|
showMoreOptionsMenu={item.showMoreOptionsMenu}
|
||||||
|
|||||||
+2
@@ -106,6 +106,8 @@
|
|||||||
|
|
||||||
.userStatusEmoji {
|
.userStatusEmoji {
|
||||||
padding-left: var(--cpd-space-1-5x);
|
padding-left: var(--cpd-space-1-5x);
|
||||||
|
}
|
||||||
|
|
||||||
.callParticipants {
|
.callParticipants {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
-8
@@ -175,14 +175,6 @@ export interface RoomListItemViewProps extends Omit<React.HTMLAttributes<HTMLBut
|
|||||||
* A presentational room list item component.
|
* A presentational room list item component.
|
||||||
* Displays room name, avatar, message preview, and notifications.
|
* Displays room name, avatar, message preview, and notifications.
|
||||||
*/
|
*/
|
||||||
function getInitials(displayName: string): string {
|
|
||||||
return displayName
|
|
||||||
.trim()
|
|
||||||
.split(/\s+/)
|
|
||||||
.slice(0, 2)
|
|
||||||
.map((word) => word.charAt(0).toUpperCase())
|
|
||||||
.join("");
|
|
||||||
}
|
|
||||||
|
|
||||||
export const RoomListItemView = memo(function RoomListItemView({
|
export const RoomListItemView = memo(function RoomListItemView({
|
||||||
vm,
|
vm,
|
||||||
|
|||||||
Reference in New Issue
Block a user