From 82367645011ccf2677ee29deffd27b985cec376f Mon Sep 17 00:00:00 2001
From: hmuresan <horatiu.muresan@8x8.com>
Date: Thu, 13 Jan 2022 12:48:48 +0200
Subject: [PATCH] fix(raised-hand) Preserve raised hand order for active
 speaker

- fixes: https://github.com/jitsi/jitsi-meet/issues/10609
---
 react/features/participants-pane/functions.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/react/features/participants-pane/functions.js b/react/features/participants-pane/functions.js
index 2f0f8a942..2636e037b 100644
--- a/react/features/participants-pane/functions.js
+++ b/react/features/participants-pane/functions.js
@@ -225,13 +225,14 @@ export function getSortedParticipantIds(stateful: Object | Function): Array<stri
     }
 
     const dominant = [];
+    const dominantId = dominantSpeaker?.id;
     const local = remoteRaisedHandParticipants.has(id) ? [] : [ id ];
 
-    // Remove dominant speaker.
-    if (dominantSpeaker && dominantSpeaker.id !== id) {
-        remoteRaisedHandParticipants.delete(dominantSpeaker.id);
-        reorderedParticipants.delete(dominantSpeaker.id);
-        dominant.push(dominantSpeaker.id);
+    // In case dominat speaker has raised hand, keep the order in the raised hand queue.
+    // In case they don't have raised hand, goes first in the participants list.
+    if (dominantId && dominantId !== id && !remoteRaisedHandParticipants.has(dominantId)) {
+        reorderedParticipants.delete(dominantId);
+        dominant.push(dominantId);
     }
 
     // Move self and participants with raised hand to the top of the list.