From 7530b281305a351fa32274cc88011ee7148363a0 Mon Sep 17 00:00:00 2001 From: RMidhunSuresh Date: Thu, 22 Jul 2021 16:24:06 +0530 Subject: [PATCH] Improve segment adding logic Signed-off-by: RMidhunSuresh --- src/domain/navigation/index.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js index b315e187..f443d415 100644 --- a/src/domain/navigation/index.js +++ b/src/domain/navigation/index.js @@ -132,10 +132,12 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) { segments.push(roomsSegmentWithRoom(rooms, roomId, currentNavPath)); } segments.push(new Segment("room", roomId)); - if (currentNavPath.get("details")?.value) { - pushRightPanelSegment(segments, "details"); - } else if (currentNavPath.get("members")?.value) { - pushRightPanelSegment(segments, "members"); + // Add right-panel segments from previous path + const previousSegments = currentNavPath.segments; + const i = previousSegments.findIndex(s => s.type === "right-panel"); + if (i !== -1) { + segments.push(previousSegments[i]); + segments.push(previousSegments[i + 1]); } } else if (type === "last-session") { let sessionSegment = currentNavPath.get("session");