From 2b82959430fa476759369e0962dea1f1305f81ea Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:26:53 +0100 Subject: [PATCH] Fix a bug where the pinned items banner could overlay the composer. (#3441) --- .../Screens/RoomScreen/View/RoomScreen.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift index 72a77e448..33023ad76 100644 --- a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift +++ b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift @@ -28,6 +28,14 @@ struct RoomScreen: View { var body: some View { timeline .background(Color.compound.bgCanvasDefault.ignoresSafeArea()) + .overlay(alignment: .top) { + Group { + if roomContext.viewState.shouldShowPinnedEventsBanner { + pinnedItemsBanner + } + } + .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner) + } .safeAreaInset(edge: .bottom, spacing: 0) { VStack(spacing: 0) { RoomScreenFooterView(details: roomContext.viewState.footerDetails, @@ -52,14 +60,6 @@ struct RoomScreen: View { .environment(\.shouldAutomaticallyLoadImages, !timelineContext.viewState.hideTimelineMedia) } } - .overlay(alignment: .top) { - Group { - if roomContext.viewState.shouldShowPinnedEventsBanner { - pinnedItemsBanner - } - } - .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner) - } .navigationTitle(L10n.screenRoomTitle) // Hidden but used for back button text. .navigationBarTitleDisplayMode(.inline) .navigationBarHidden(isNavigationBarHidden)