This commit is contained in:
slawk0
2024-12-21 18:12:05 +01:00
parent f33c208d0d
commit 5db3354f9b

View File

@@ -1,4 +1,4 @@
import { useEffect, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { axiosClient } from '@/App.tsx'; import { axiosClient } from '@/App.tsx';
import { ContactsProps } from '@/pages/Chat.tsx'; import { ContactsProps } from '@/pages/Chat.tsx';
import { socket } from '@/socket/socket.tsx'; import { socket } from '@/socket/socket.tsx';
@@ -132,19 +132,17 @@ function ParticipantsBar({
} }
}, [currentContact]); }, [currentContact]);
useEffect(() => { const sortedParticipants = useMemo(() => {
setParticipants((prevParticipants) => { return [...participants].sort((a, b) => {
return [...prevParticipants].sort((a, b) => { if (a.isowner !== b.isowner) {
if (a.isowner !== b.isowner) { return b.isowner ? 1 : -1;
return b.isowner ? 1 : -1; }
}
if (a.isadmin !== b.isadmin) { if (a.isadmin !== b.isadmin) {
return b.isadmin ? 1 : -1; return b.isadmin ? 1 : -1;
} }
return a.username.localeCompare(b.username); return a.username.localeCompare(b.username);
});
}); });
}, [participants]); }, [participants]);
@@ -239,7 +237,7 @@ function ParticipantsBar({
}; };
}, [socket, currentContact, currentContact, user?.user_id]); }, [socket, currentContact, currentContact, user?.user_id]);
const ParticipantsList = participants?.map( const ParticipantsList = sortedParticipants?.map(
(participant: ParticipantsProps) => ( (participant: ParticipantsProps) => (
<ContextMenu key={participant.user_id}> <ContextMenu key={participant.user_id}>
<ContextMenuTrigger> <ContextMenuTrigger>