admin/Sportstime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from akatreyt/fix/issue-1

Browse Source
This commit is contained in:
akatreyt
2026-02-21 18:05:39 -06:00
committed by GitHub
parent b062ced000 2a3fc8d5d7
commit 9b7ac7d934
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SportsTime/Features/Trip/Views/Wizard/Steps/TeamPickerStep.swift
View File

@@ -116,7 +116,8 @@ struct TeamPickerStep: View {
.sheet(isPresented: $showTeamPicker) {
TeamPickerSheet(
selectedSport: $selectedSport,
selectedTeamId: $selectedTeamId
selectedTeamId: $selectedTeamId,
isPresented: $showTeamPicker
)
}
}
@@ -125,11 +126,11 @@ struct TeamPickerStep: View {
// MARK: - Team Picker Sheet
private struct TeamPickerSheet: View {
@Environment(\.dismiss) private var dismiss
@Environment(\.colorScheme) private var colorScheme
@Binding var selectedSport: Sport?
@Binding var selectedTeamId: String?
@Binding var isPresented: Bool
var body: some View {
NavigationStack {
@@ -142,7 +143,7 @@ private struct TeamPickerSheet: View {
onSelect: { teamId in
selectedSport = sport
selectedTeamId = teamId
dismiss()
isPresented = false
}
)
} label: {
@@ -171,7 +172,7 @@ private struct TeamPickerSheet: View {
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel") { dismiss() }
Button("Cancel") { isPresented = false }
}
}
}

9
SportsTime/Features/Trip/Views/Wizard/TeamFirstWizardStep.swift
View File

@@ -115,7 +115,8 @@ struct TeamFirstWizardStep: View {
.sheet(isPresented: $showTeamPicker) {
TeamFirstPickerSheet(
selectedSport: $selectedSport,
selectedTeamIds: $selectedTeamIds
selectedTeamIds: $selectedTeamIds,
isPresented: $showTeamPicker
)
}
}
@@ -184,11 +185,11 @@ struct TeamFirstWizardStep: View {
// MARK: - Team First Picker Sheet
private struct TeamFirstPickerSheet: View {
@Environment(\.dismiss) private var dismiss
@Environment(\.colorScheme) private var colorScheme
@Binding var selectedSport: Sport?
@Binding var selectedTeamIds: Set<String>
@Binding var isPresented: Bool
var body: some View {
NavigationStack {
@@ -200,7 +201,7 @@ private struct TeamFirstPickerSheet: View {
selectedTeamIds: $selectedTeamIds,
onDone: {
selectedSport = sport
dismiss()
isPresented = false
}
)
} label: {
@@ -229,7 +230,7 @@ private struct TeamFirstPickerSheet: View {
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button("Cancel") { dismiss() }
Button("Cancel") { isPresented = false }
}
}
}