mirror of
https://github.com/neon443/NearFuture.git
synced 2026-03-11 14:56:15 +00:00
fix "new edit event window" on mac not working
- it would save events with the same id and modify the previous one if u opened another one add symbols to ios date picker looks better mac
This commit is contained in:
@@ -32,23 +32,30 @@ struct NearFutureApp: App {
|
||||
}
|
||||
|
||||
WindowGroup("Edit Event", for: Event.ID.self) { $eventID in
|
||||
EditEventView(
|
||||
viewModel: viewModel,
|
||||
event: Binding(
|
||||
get: {
|
||||
viewModel.events.first(where: {$0.id == eventID}) ?? viewModel.template
|
||||
},
|
||||
set: { newValue in
|
||||
if let eventIndex = viewModel.events.firstIndex(where: {
|
||||
$0.id == eventID
|
||||
}) {
|
||||
viewModel.events[eventIndex] = newValue
|
||||
}
|
||||
viewModel.saveEvents()
|
||||
}
|
||||
if viewModel.events.first(where: {$0.id == eventID}) == nil {
|
||||
AddEventView(
|
||||
viewModel: viewModel
|
||||
)
|
||||
)
|
||||
} else {
|
||||
EditEventView(
|
||||
viewModel: viewModel,
|
||||
event: Binding(
|
||||
get: {
|
||||
viewModel.events.first(where: {$0.id == eventID}) ?? viewModel.template
|
||||
},
|
||||
set: { newValue in
|
||||
if let eventIndex = viewModel.events.firstIndex(where: {
|
||||
$0.id == eventID
|
||||
}) {
|
||||
viewModel.events[eventIndex] = newValue
|
||||
}
|
||||
viewModel.saveEvents()
|
||||
}
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
.defaultSize(width: 480, height: 550)
|
||||
.windowIdealSize(.fitToContent)
|
||||
.restorationBehavior(.disabled)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user