From 37e184e199cc972f5569f71b854eeb98ed9889f0 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 2 Sep 2024 21:20:26 +0200 Subject: [PATCH] fix issue with player look up with copy paste / predicate --- PadelClub/Extensions/String+Extensions.swift | 2 +- PadelClub/ViewModel/SearchViewModel.swift | 4 ++-- PadelClub/Views/Tournament/Screen/AddTeamView.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PadelClub/Extensions/String+Extensions.swift b/PadelClub/Extensions/String+Extensions.swift index e4d3d81..fba5442 100644 --- a/PadelClub/Extensions/String+Extensions.swift +++ b/PadelClub/Extensions/String+Extensions.swift @@ -14,7 +14,7 @@ extension String { } var trimmed: String { - trimmingCharacters(in: .whitespacesAndNewlines) + replaceCharactersFromSet(characterSet: .newlines).trimmingCharacters(in: .whitespacesAndNewlines) } func replaceCharactersFromSet(characterSet: CharacterSet, replacementString: String = "") -> String { diff --git a/PadelClub/ViewModel/SearchViewModel.swift b/PadelClub/ViewModel/SearchViewModel.swift index 5e27dbb..56eaea8 100644 --- a/PadelClub/ViewModel/SearchViewModel.swift +++ b/PadelClub/ViewModel/SearchViewModel.swift @@ -156,8 +156,8 @@ class SearchViewModel: ObservableObject, Identifiable { func orPredicate() -> NSPredicate? { var predicates : [NSPredicate] = [] let allowedCharacterSet = CharacterSet.alphanumerics.union(.whitespaces) - let canonicalVersionWithoutPunctuation = searchText.canonicalVersion.components(separatedBy: allowedCharacterSet.inverted).joined() - let canonicalVersionWithPunctuation = searchText.canonicalVersionWithPunctuation + let canonicalVersionWithoutPunctuation = searchText.canonicalVersion.components(separatedBy: allowedCharacterSet.inverted).joined().trimmed + let canonicalVersionWithPunctuation = searchText.canonicalVersionWithPunctuation.trimmed switch tokens.first { case .none: if canonicalVersionWithoutPunctuation.isEmpty == false { diff --git a/PadelClub/Views/Tournament/Screen/AddTeamView.swift b/PadelClub/Views/Tournament/Screen/AddTeamView.swift index f42d9f8..555a5ce 100644 --- a/PadelClub/Views/Tournament/Screen/AddTeamView.swift +++ b/PadelClub/Views/Tournament/Screen/AddTeamView.swift @@ -206,7 +206,7 @@ struct AddTeamView: View { let allowedCharacterSet = CharacterSet.alphanumerics.union(.whitespaces) // Remove all characters that are not in the allowedCharacterSet - let text = pasteField.canonicalVersion.components(separatedBy: allowedCharacterSet.inverted).joined() + let text = pasteField.canonicalVersion.components(separatedBy: allowedCharacterSet.inverted).joined().trimmed let textStrings: [String] = text.components(separatedBy: .whitespacesAndNewlines) let nonEmptyStrings: [String] = textStrings.compactMap { $0.isEmpty ? nil : $0 }