Skip to content

Fix direct chat back button: pop instead of dismiss, enlarge hit area #9

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

Open
topAmity wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix direct chat back button: pop instead of dismiss, enlarge hit area #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 19 additions & 2 deletions UpstraUIKit/AmityUIKit4/AmityUIKit4/Chat/Pages/DirectChat/AmityChatPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,17 +351,34 @@ public struct AmityChatPage: AmityPageView {
VStack(spacing: 0) {
HStack(spacing: 0) {
Button {
host.controller?.dismissOrPop()
// The chat room is PUSHED onto the nav stack by AmityChatHomePage,
// so "back" must POP. dismissOrPop() checks presentingViewController
// first and dismisses the whole modal (closing the UIKit) when the
// nav stack itself was presented — the reported bug. Prefer popping
// whenever we're not the root of the nav stack; fall back otherwise.
if let nav = host.controller?.navigationController,
nav.viewControllers.count > 1 {
nav.popViewController(animated: true)
} else {
host.controller?.dismissOrPop()
}
} label: {
Image(AmityIcon.Chat.backButtonIcon.imageResource)
.renderingMode(.template)
.resizable()
.scaledToFit()
.foregroundColor(Color(viewConfig.theme.baseColor))
.frame(width: 16, height: 16)
// Expand the tappable region to the 44x44 minimum target so a
// tap near the chevron can't fall through to the adjacent avatar.
// contentShape makes the whole frame hit-testable (not just the
// glyph), which also hardens routing when the page is embedded in
// a custom container/nav wrapper.
.frame(width: 44, height: 44)
.contentShape(Rectangle())
}
.buttonStyle(.plain)
.padding(.trailing, 12)
.padding(.trailing, 0)

Button {
if let userId = pageViewModel.otherUserId {
Expand Down