Skip to content

Commit abf298d

Browse files
graycreategraycreate
authored
Merge pull request #79 from v2er-app/bugfix/navigation-detail-page-closes
Fix: Detail page auto-dismissal caused by nested navigation
2 parents 8de6a40 + 33f5183 commit abf298d

File tree

10 files changed

+64
-65
lines changed

10 files changed

+64
-65
lines changed

‎V2er/View/Feed/FeedItemView.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@ import SwiftUI
1010

1111
struct FeedItemView<Data: FeedItemProtocol>: View {
1212
let data: Data
13-
13+
1414
var body: some View {
1515
VStack(spacing: 0) {
1616
HStack(alignment: .top) {
17-
NavigationLink(destination: UserDetailPage(userId: data.userName ?? .empty)) {
18-
AvatarView(url: data.avatar)
19-
}
17+
AvatarView(url: data.avatar)
2018
VStack(alignment: .leading, spacing: 2) {
2119
Text(data.userName.safe)
2220
.font(.footnote)
@@ -26,7 +24,9 @@ struct FeedItemView<Data: FeedItemProtocol>: View {
2624
.lineLimit(1)
2725
.foregroundColor(Color.tintColor)
2826
Spacer()
29-
NodeView(id: data.nodeId.safe, name: data.nodeName.safe)
27+
Text(data.nodeName.safe)
28+
.font(.footnote)
29+
.foregroundColor(.gray)
3030
}
3131
Text(data.title.safe)
3232
// .fontWeight(.medium)

‎V2er/View/Feed/FeedPage.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@ struct FeedPage: BaseHomePageView {
1616
var selecedTab: TabId
1717

1818
var isSelected: Bool {
19-
let selected = selecedTab == .feed
20-
if selected && !state.hasLoadedOnce {
21-
dispatch(FeedActions.FetchData.Start(autoLoad: true))
22-
}
23-
return selected
19+
selecedTab == .feed
2420
}
2521

2622
var body: some View {

‎V2er/View/FeedDetail/FeedDetailPage.swift‎

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
5656
return state.showProgressView
5757
|| (!isContentEmpty && !self.rendered)
5858
}
59-
59+
6060
var body: some View {
6161
contentView
62-
.navigatable()
6362
.sheet(isPresented: $showingSafari) {
6463
if let url = safariURL {
6564
SafariView(url: url)
@@ -70,7 +69,6 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
7069
@ViewBuilder
7170
private var contentView: some View {
7271
VStack (spacing: 0) {
73-
// TODO: improve here
7472
VStack(spacing: 0) {
7573
AuthorInfoView(initData: initData, data: state.model.headerInfo)
7674
if !isContentEmpty {
@@ -89,7 +87,6 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
8987
withAnimation {
9088
hideTitleViews = !(scrollY <= -100)
9189
}
92-
// replyIsFocused = false
9390
}
9491
.onTapGesture {
9592
replyIsFocused = false
@@ -111,16 +108,15 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
111108
dispatch(FeedDetailActions.FetchData.Start(id: instanceId, feedId: initData?.id, autoLoad: !state.hasLoadedOnce))
112109
}
113110
.onDisappear {
114-
if !isPresented {
115-
log("onPageClosed----->")
116-
let data: FeedInfo.Item?
117-
if state.model.headerInfo != nil {
118-
data = state.model.headerInfo?.toFeedItemInfo()
119-
} else {
120-
data = initData
121-
}
122-
dispatch(MyRecentActions.RecordAction(data: data))
111+
guard !isPresented else { return }
112+
log("onPageClosed----->")
113+
let data: FeedInfo.Item?
114+
if state.model.headerInfo != nil {
115+
data = state.model.headerInfo?.toFeedItemInfo()
116+
} else {
117+
data = initData
123118
}
119+
dispatch(MyRecentActions.RecordAction(data: data))
124120
}
125121
}
126122

@@ -150,18 +146,14 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
150146
}
151147
.background(Color.lightGray)
152148
.clipShape(RoundedRectangle(cornerRadius: 12))
153-
// if isKeyboardVisiable {
154-
// actionBar
155-
// .transition(.opacity)
156-
// }
157149
}
158150
.padding(.bottom, isKeyboardVisiable ? 0 : topSafeAreaInset().bottom * 0.9)
159151
.padding(.top, 10)
160152
.padding(.horizontal, 10)
161153
.background(Color.itemBg)
162154
}
163155
}
164-
156+
165157
@ViewBuilder
166158
private var actionBar: some View {
167159
HStack (spacing: 10) {
@@ -182,7 +174,7 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
182174
.padding(.vertical, 10)
183175
.padding(.horizontal, 16)
184176
}
185-
177+
186178
@ViewBuilder
187179
private var navBar: some View {
188180
NavbarHostView(paddingH: 0) {
@@ -197,10 +189,7 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
197189
.foregroundColor(.tintColor)
198190
}
199191
Group {
200-
// FIXME: use real value
201-
NavigationLink(destination: UserDetailPage(userId: initData?.id ?? .empty)) {
202-
AvatarView(url: state.model.headerInfo?.avatar ?? .empty, size: 32)
203-
}
192+
AvatarView(url: state.model.headerInfo?.avatar ?? .empty, size: 32)
204193
VStack(alignment: .leading) {
205194
Text("话题")
206195
.font(.headline)
@@ -271,7 +260,7 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
271260
}
272261
.visualBlur()
273262
}
274-
263+
275264
@ViewBuilder
276265
private var replayListView: some View {
277266
LazyVStack(spacing: 0) {
@@ -280,12 +269,5 @@ struct FeedDetailPage: StateView, KeyboardReadable, InstanceIdentifiable {
280269
}
281270
}
282271
}
283-
284-
}
285272

286-
//struct NewsDetailPage_Previews: PreviewProvider {
287-
// static var previews: some View {
288-
// FeedDetailPage(id: .empty)
289-
// .environmentObject(Store.shared)
290-
// }
291-
//}
273+
}

‎V2er/View/MainPage.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct MainPage: StateView {
5858
}
5959

6060
var body: some View {
61-
NavigationView {
61+
NavigationStack {
6262
ZStack {
6363
TabView(selection: tabSelection) {
6464
// Feed Tab

‎V2er/View/Me/MyFavoritePage.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ struct MyFavoritePage: StateView {
1818

1919
var body: some View {
2020
contentView
21-
.navigatable()
2221
}
2322

2423
@ViewBuilder

‎V2er/View/Me/MyRecentPage.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@ struct RecentItemView<Data: FeedItemProtocol>: View {
4545
var body: some View {
4646
VStack(spacing: 0) {
4747
HStack(alignment: .top) {
48-
NavigationLink(destination: UserDetailPage(userId: data.userName.safe)) {
49-
AvatarView(url: data.avatar)
50-
}
48+
AvatarView(url: data.avatar)
5149
VStack(alignment: .leading, spacing: 5) {
5250
Text(data.userName.safe)
5351
.lineLimit(1)
@@ -57,7 +55,9 @@ struct RecentItemView<Data: FeedItemProtocol>: View {
5755
.foregroundColor(Color.tintColor)
5856
}
5957
Spacer()
60-
NodeView(id: data.nodeId.safe, name: data.nodeName.safe)
58+
Text(data.nodeName.safe)
59+
.font(.footnote)
60+
.foregroundColor(.gray)
6161
}
6262
Text(data.title.safe)
6363
.greedyWidth(.leading)

‎V2er/View/Me/UserDetailPage.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ struct UserDetailPage: StateView {
4747

4848
var body: some View {
4949
contentView
50-
.navigatable()
5150
.statusBarStyle(statusBarStyle, original: .darkContent)
5251
}
5352

‎V2er/View/Tag/TagDetailPage.swift‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ struct TagDetailPage: StateView, InstanceIdentifiable {
4949

5050
var body: some View {
5151
contentView
52-
.navigatable()
5352
.statusBarStyle(statusBarStyle, original: .darkContent)
5453
}
5554

‎V2er/View/Widget/NavbarHostView.swift‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,22 +110,18 @@ struct NavBarModifier: ViewModifier {
110110
let title: String
111111

112112
func body(content: Content) -> some View {
113-
NavigationView {
114-
content
115-
.safeAreaInset(edge: .top, spacing: 0) {
116-
NavbarTitleView {
117-
Text(title)
118-
.font(.headline)
119-
} onBackPressed: {
120-
dismiss()
121-
}
113+
content
114+
.safeAreaInset(edge: .top, spacing: 0) {
115+
NavbarTitleView {
116+
Text(title)
117+
.font(.headline)
118+
} onBackPressed: {
119+
dismiss()
122120
}
123-
.background(Color.bgColor)
124-
.navigationBarHidden(true)
125-
.ignoresSafeArea(.all)
126-
}
127-
.navigationBarHidden(true)
128-
.ignoresSafeArea(.all)
121+
}
122+
.background(Color.bgColor)
123+
.navigationBarHidden(true)
124+
.ignoresSafeArea(.container)
129125
}
130126
}
131127

‎V2erUITests/V2erUITests.swift‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ class V2erUITests: XCTestCase {
3232
// Use XCTAssert and related functions to verify your tests produce the correct results.
3333
}
3434

35+
func testFeedNavigationStaysOpen() throws {
36+
let app = XCUIApplication()
37+
app.launch()
38+
39+
// Wait for feed to load by waiting for the first comment label to appear
40+
let commentLabels = app.staticTexts.matching(NSPredicate(format: "label CONTAINS '评论'"))
41+
let firstCommentLabel = commentLabels.element(boundBy: 0)
42+
XCTAssertTrue(firstCommentLabel.waitForExistence(timeout: 15), "Feed should load and show at least one comment label")
43+
44+
// Tap on the first comment label's parent area
45+
firstCommentLabel.tap()
46+
47+
// Wait for navigation animation by waiting for detail page element to appear
48+
let topicLabel = app.staticTexts["话题"]
49+
let replyPlaceholder = app.textViews.firstMatch
50+
let appeared = topicLabel.waitForExistence(timeout: 5) || replyPlaceholder.waitForExistence(timeout: 5)
51+
XCTAssertTrue(appeared, "Detail page did not appear after tapping comment label")
52+
53+
// Wait to verify page stays open (the original bug was page dismissing immediately)
54+
let expectation = XCTestExpectation(description: "Wait 3 seconds to verify detail page stays open")
55+
let result = XCTWaiter.wait(for: [expectation], timeout: 3.0)
56+
XCTAssertEqual(result, .timedOut, "Expected to wait full 3 seconds")
57+
58+
// Verify still on detail page
59+
let stillOnDetail = topicLabel.exists || replyPlaceholder.exists
60+
XCTAssertTrue(stillOnDetail, "Detail page should remain open after 3 seconds")
61+
}
62+
3563
func testLaunchPerformance() throws {
3664
if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) {
3765
// This measures how long it takes to launch your application.

0 commit comments

Comments
 (0)