Skip to content

Fix buttons in navigation bar on iOS 26 #912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 4, 2025
Merged

Fix buttons in navigation bar on iOS 26 #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aaf8ac6
Fix button in nav bar on iOS 26
martinmitrevski Aug 13, 2025
b7e48fb
Merge branch 'develop' of https://github.com/GetStream/stream-chat-sw…
martinmitrevski Aug 13, 2025
afe4727
Merge branch 'develop' of https://github.com/GetStream/stream-chat-sw…
martinmitrevski Sep 4, 2025
59080ed
Fix compiling on Xcode 16
martinmitrevski Sep 4, 2025
eeb8a93
Fixes
martinmitrevski Sep 4, 2025
938751e
Fixes
martinmitrevski Sep 4, 2025
1a7ceb6
Formatting
martinmitrevski Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions DemoAppSwiftUI/ChannelHeader/CustomChannelHeader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public struct CustomChannelHeader: ToolbarContent {
Image(uiImage: images.messageActionEdit)
.resizable()
.scaledToFit()
.frame(width: 24, height: 24)
.foregroundColor(Color.white)
.padding(.all, 8)
.background(colors.tintColor)
Expand All @@ -41,9 +42,12 @@ public struct CustomChannelHeader: ToolbarContent {
Button {
actionsPopupShown = true
} label: {
StreamLazyImage(url: currentUserController.currentUser?.imageURL)
.accessibilityLabel("Account Actions")
.accessibilityAddTraits(.isButton)
StreamLazyImage(
url: currentUserController.currentUser?.imageURL,
size: CGSize(width: 36, height: 36)
)
.accessibilityLabel("Account Actions")
.accessibilityAddTraits(.isButton)
}
}
}
Expand All @@ -62,13 +66,27 @@ struct CustomChannelModifier: ChannelListHeaderViewModifier {

func body(content: Content) -> some View {
ZStack {
content.toolbar {
CustomChannelHeader(
title: title,
currentUserController: chatClient.currentUserController(),
isNewChatShown: $isNewChatShown,
actionsPopupShown: $actionsPopupShown
)
if #available(iOS 26, *) {
content.toolbar {
CustomChannelHeader(
title: title,
currentUserController: chatClient.currentUserController(),
isNewChatShown: $isNewChatShown,
actionsPopupShown: $actionsPopupShown
)
#if compiler(>=6.2)
.sharedBackgroundVisibility(.hidden)
#endif
}
} else {
content.toolbar {
CustomChannelHeader(
title: title,
currentUserController: chatClient.currentUserController(),
isNewChatShown: $isNewChatShown,
actionsPopupShown: $actionsPopupShown
)
}
}

NavigationLink(isActive: $blockedUsersShown) {
Expand Down
28 changes: 21 additions & 7 deletions Sources/StreamChatSwiftUI/ChatChannel/ChannelHeader/ChatChannelHeaderViewModifier.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,27 @@ public struct DefaultChannelHeaderModifier<Factory: ViewFactory>: ChatChannelHea
}

public func body(content: Content) -> some View {
content.toolbar {
DefaultChatChannelHeader(
factory: factory,
channel: channel,
headerImage: channelHeaderLoader.image(for: channel),
isActive: $isActive
)
if #available(iOS 26, *) {
content.toolbar {
DefaultChatChannelHeader(
factory: factory,
channel: channel,
headerImage: channelHeaderLoader.image(for: channel),
isActive: $isActive
)
#if compiler(>=6.2)
.sharedBackgroundVisibility(.hidden)
#endif
}
} else {
content.toolbar {
DefaultChatChannelHeader(
factory: factory,
channel: channel,
headerImage: channelHeaderLoader.image(for: channel),
isActive: $isActive
)
}
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion Sources/StreamChatSwiftUI/ChatChannel/ChatChannelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,11 @@ public struct ChatChannelView<Factory: ViewFactory>: View, KeyboardReadable {
}

private var generatingSnapshot: Bool {
tabBarAvailable && messageDisplayInfo != nil && !viewModel.reactionsShown
if #available(iOS 26, *) {
return false
} else {
return tabBarAvailable && messageDisplayInfo != nil && !viewModel.reactionsShown
}
}

private var bottomPadding: CGFloat {
Expand Down
Loading