From 7943ae99928058f852c092e0574d6c83169ae7da Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Thu, 8 Dec 2022 15:34:43 +0800 Subject: [PATCH] PhraseEditorUI // Remove redrawTrigger, using alternative methods instead. --- .../Sources/PhraseEditorUI/PhraseEditorUI.swift | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift b/Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift index 907ae0c2..c4fb44eb 100644 --- a/Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift +++ b/Packages/vChewing_PhraseEditorUI/Sources/PhraseEditorUI/PhraseEditorUI.swift @@ -44,7 +44,6 @@ public struct VwrPhraseEditorUI: View { @State public var selUserDataType: vChewingLM.ReplacableUserDataType = .thePhrases @State private var isLoading = false @State private var isSaved = false - @State private var redrawTrigger = false public var currentIMEInputMode: Shared.InputMode { delegate?.currentInputMode ?? selInputMode @@ -76,12 +75,10 @@ public struct VwrPhraseEditorUI: View { guard let delegate = delegate else { return } updateLabels() clearAllFields() - isLoading = true txtContent = NSLocalizedString("Loading…", comment: "") - redrawTrigger.toggle() + isLoading = true DispatchQueue.main.async { txtContent = delegate.retrieveData(mode: selInputMode, type: selUserDataType) - redrawTrigger.toggle() isSaved = true isLoading = false } @@ -166,12 +163,10 @@ public struct VwrPhraseEditorUI: View { private func saveAndReload() { guard let delegate = delegate, selInputMode != .imeModeNULL, !isSaved else { return } let toSave = txtContent - isLoading = true txtContent = NSLocalizedString("Loading…", comment: "") - redrawTrigger.toggle() + isLoading = true let newResult = delegate.saveData(mode: selInputMode, type: selUserDataType, data: toSave) txtContent = newResult - redrawTrigger.toggle() isLoading = false isSaved = true } @@ -302,7 +297,6 @@ public struct VwrPhraseEditorUI: View { selInputMode = .imeModeNULL selUserDataType = .thePhrases txtContent = NSLocalizedString("Please select Simplified / Traditional Chinese mode above.", comment: "") - redrawTrigger.toggle() }.onAppear { guard let delegate = delegate else { return } selInputMode = delegate.currentInputMode