From e42bade8cb5af422940ef8763359ca27d08ca23c Mon Sep 17 00:00:00 2001 From: Michal Rentka Date: Tue, 28 Nov 2023 15:08:04 +0100 Subject: [PATCH] Changed tag initializer --- Zotero/Models/Tag.swift | 4 ++-- Zotero/Scenes/General/ViewModels/TagPickerActionHandler.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotero/Models/Tag.swift b/Zotero/Models/Tag.swift index fc2427a89..46b4f99ad 100644 --- a/Zotero/Models/Tag.swift +++ b/Zotero/Models/Tag.swift @@ -16,10 +16,10 @@ struct Tag: Identifiable, Equatable, Hashable { var id: String { return self.name } - init(name: String, color: String, emojiGroup: String?) { + init(name: String, color: String) { self.name = name self.color = color - self.emojiGroup = emojiGroup + self.emojiGroup = EmojiExtractor.extractFirstContiguousGroup(from: name) self.type = .manual } diff --git a/Zotero/Scenes/General/ViewModels/TagPickerActionHandler.swift b/Zotero/Scenes/General/ViewModels/TagPickerActionHandler.swift index 03234efd9..d3c33f59d 100644 --- a/Zotero/Scenes/General/ViewModels/TagPickerActionHandler.swift +++ b/Zotero/Scenes/General/ViewModels/TagPickerActionHandler.swift @@ -50,7 +50,7 @@ struct TagPickerActionHandler: ViewModelActionHandler { private func add(name: String, in viewModel: ViewModel) { guard let snapshot = viewModel.state.snapshot else { return } self.update(viewModel: viewModel) { state in - let tag = Tag(name: name, color: "", emojiGroup: EmojiExtractor.extractFirstContiguousGroup(from: name)) + let tag = Tag(name: name, color: "") state.tags = snapshot let index = state.tags.index(of: tag, sortedBy: { $0.name.caseInsensitiveCompare($1.name) == .orderedAscending })