Skip to content

fix: 도서 상세 이전 화면 복귀 경로 수정 #175

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
dltldn1234 merged 1 commit into from
Sep 12, 2026
Merged

fix: 도서 상세 이전 화면 복귀 경로 수정 #175

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
22 changes: 17 additions & 5 deletions Projects/Feature/Sources/Utilities/AppShellView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public struct AppShellView: View {

@State private var selectedTab: BottomTabBar.Item = .home
@State private var destination: Destination?
@State private var previousDestination: Destination?
private let onLogout: () -> Void

public init(onLogout: @escaping () -> Void = {}) {
Expand All @@ -46,14 +47,14 @@ public struct AppShellView: View {
onShowNotifications: { destination = .notifications },
onShowNotices: { destination = .notices },
onShowNewArrivals: { destination = .newArrivals },
onShowBookDetail: { destination = .bookDetail($0) }
onShowBookDetail: showBookDetail
)
case .ranking:
RankingView(onSelectTab: selectTab)
case .library:
LibraryView(
onSelectTab: selectTab,
onShowBookDetail: { destination = .bookDetail($0) }
onShowBookDetail: showBookDetail
)
case .my:
MyView(
Expand Down Expand Up @@ -83,7 +84,7 @@ public struct AppShellView: View {
switch destination {
case .search:
SearchView(
onShowBookDetail: { self.destination = .bookDetail($0) },
onShowBookDetail: showBookDetail,
showsDismissButton: true,
onDismiss: dismissDestination
)
Expand All @@ -94,9 +95,9 @@ public struct AppShellView: View {
case .loanHistory:
LoanHistoryView(onBack: dismissDestination)
case .newArrivals:
NewArrivalsView(showsDismissButton: true, onDismiss: dismissDestination, onShowBookDetail: { self.destination = .bookDetail($0) })
NewArrivalsView(showsDismissButton: true, onDismiss: dismissDestination, onShowBookDetail: showBookDetail)
case let .bookDetail(bookId):
BookDetailView(bookId: bookId, onBack: dismissDestination)
BookDetailView(bookId: bookId, onBack: dismissBookDetail)
case .passwordReset:
PasswordResetView(
onBack: dismissDestination,
Expand All @@ -113,6 +114,17 @@ public struct AppShellView: View {

private func dismissDestination() {
destination = nil
previousDestination = nil
}

private func showBookDetail(_ bookId: Int) {
previousDestination = destination
destination = .bookDetail(bookId)
}

private func dismissBookDetail() {
destination = previousDestination
previousDestination = nil
}
}

Expand Down
Loading