fix: service toggle issue after switch focus (tisfeng#424)

* fix: service toggle issue after switch focus * fix: onChange modifier issue --------- Co-authored-by: Tisfeng <[email protected]>
rz8yzk · Feb 25, 2024 · 2888379 · 2888379
1 parent 74389fd
commit 2888379
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift b/Easydict/NewApp/View/SettingView/Tabs/ServiceTab.swift
@@ -121,28 +121,29 @@ private struct ServiceItems: View {
  }
 }
 
+private class ServiceItemViewModel: ObservableObject {
+ @Published var isEnable = false
+
+ init(isEnable: Bool) {
+ self.isEnable = isEnable
+ }
+}
+
 @available(macOS 13.0, *)
 private struct ServiceItemView: View {
  let service: QueryService
 
  @EnvironmentObject private var viewModel: ServiceTabViewModel
 
- private var enabled: Binding<Bool> {
- .init {
- service.enabled
- } set: { newValue in
- guard service.enabled != newValue else { return }
- service.enabled = newValue
- if newValue {
- service.enabledQuery = newValue
- }
- EZLocalStorage.shared().setService(service, windowType: viewModel.windowType)
- viewModel.postUpdateServiceNotification()
- }
+ @ObservedObject private var serviceItemViewModel: ServiceItemViewModel
+
+ init(service: QueryService) {
+ self.service = service
+ serviceItemViewModel = ServiceItemViewModel(isEnable: service.enabled)
  }
 
  var body: some View {
- Toggle(isOn: enabled) {
+ Toggle(isOn: $serviceItemViewModel.isEnable) {
  HStack {
  Image(service.serviceType().rawValue)
  .resizable()
@@ -153,6 +154,15 @@ private struct ServiceItemView: View {
  .fixedSize()
  }
  }
+ .onReceive(serviceItemViewModel.$isEnable) { newValue in
+ guard service.enabled != newValue else { return }
+ service.enabled = newValue
+ if newValue {
+ service.enabledQuery = newValue
+ }
+ EZLocalStorage.shared().setService(service, windowType: viewModel.windowType)
+ viewModel.postUpdateServiceNotification()
+ }
  .padding(4.0)
  .toggleStyle(.switch)
  .controlSize(.small)