From 1eb58a465e5b123b21fa35de05c6fbe97f03b75b Mon Sep 17 00:00:00 2001
From: Doug <6060466+pixlwave@users.noreply.github.com>
Date: Fri, 22 May 2026 14:32:41 +0100
Subject: [PATCH] Revert "Fixing Room List in Spaces View Not Rendering Some
 Rooms (#5595)" (#5616)

This reverts commit 96230fcc36b09b14f32a8153a190cd64cad226dc.

* Use the newer geometryGroup instead of drawingGroup.
---
 ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
index ec3f1ae43..6b6796f53 100644
--- a/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
+++ b/ElementX/Sources/Screens/Spaces/Common/SpaceRoomCell.swift
@@ -81,6 +81,8 @@ struct SpaceRoomCell: View {
                 }
             }
             .padding(.horizontal, horizontalInsets)
+            // Ensure the EditMode transition stays inside this cell if there are other insertions/removals in the list.
+            .geometryGroup()
             .accessibilityElement(children: .combine)
         }
         .buttonStyle(SpaceRoomCellButtonStyle(isHighlighted: isHighlighted))