Merge pull request #120 from DeveloperAcademy-POSTECH/fix/#118

[#118] 추가 버그 픽스

Author: chongin12

LabDuck/Model/KPBoard.swift

@@ -91,7 +91,8 @@ struct KPBoard: Identifiable {
     }
 
     public func getTag(_ name: String) -> KPTag? {
-        self.allTags.first(where: { $0.name == name })
+        let name = name.trimmingCharacters(in: .whitespacesAndNewlines)
+        return self.allTags.first(where: { $0.name == name })
     }
 
     public func getTag(_ id: KPTag.ID) -> KPTag? {
@@ -121,6 +122,16 @@ struct KPBoard: Identifiable {
         }
     }
 
+    public mutating func createTag(_ name: String, _ color: KPTagColor) -> KPTag {
+        if let tag = getTag(name) {
+            return tag
+        } else {
+            let tag = KPTag(id: UUID(), name: name, colorTheme: color)
+            self.allTags.append(tag)
+            return tag
+        }
+    }
+
     public mutating func deleteTag(_ tagID: KPTag.ID) {
         self.allTags.removeAll(where: { $0.id == tagID })
     }

LabDuck/Model/KPBoardDocument.swift

@@ -396,13 +396,20 @@ extension KPBoardDocument {
         }
     }
 
+    func changeViewType(to viewType: KPBoard.BoardViewType, animation: Animation? = .default) {
+        withAnimation(animation) {
+            self.board.viewType = viewType
+        }
+    }
+
 }
 
 // MARK: - 태그
 extension KPBoardDocument {
     // tag를 새로 만들 때 사용.
     // 보드에 해당 tag가 있으면 무시. 아니면 새로 생성.
     func createTag(_ name: String, undoManager: UndoManager?, animation: Animation? = .default) {
+        let name = name.trimmingCharacters(in: .whitespacesAndNewlines)
         if let tag = self.board.getTag(name) {
             print("Already there : \(tag)")
         } else {
@@ -416,6 +423,21 @@ extension KPBoardDocument {
         }
     }
 
+    func createTag(_ name: String, color: KPTagColor, undoManager: UndoManager?, animation: Animation? = .default) {
+        let name = name.trimmingCharacters(in: .whitespacesAndNewlines)
+        if let tag = self.board.getTag(name) {
+            print("Already there : \(tag)")
+        } else {
+            let tag = withAnimation(animation) {
+                self.board.createTag(name, color)
+            }
+
+            undoManager?.registerUndo(withTarget: self) { doc in
+                doc.deleteTag(tagID: tag.id, undoManager: undoManager)
+            }
+        }
+    }
+
     // tag를 삭제할 때 사용.
     // 보드에 해당 tag가 없으면 무시. 아니면 지우기
     func deleteTag(tagID: KPTag.ID, undoManager: UndoManager?, animation: Animation? = .default) {

LabDuck/Util/CSVConvertManager.swift

@@ -39,8 +39,9 @@ class CSVConvertManager {
             } else if writableKeyPath(from: key, type: [KPTag.ID].self) != nil {
                 let values = value.components(separatedBy: ",")
                 values
+                    .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
                     .filter { name in
-                        !name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+                        !name.isEmpty
                     }
                     .forEach { name in
                     if let tag = board.getTag(name) {

LabDuck/View/MainView.swift

@@ -19,14 +19,15 @@ struct MainDocumentView: View {
 
     }
     var body: some View {
-        MainView(board: $document.board)
+        MainView(board: document.board)
     }
 }
 
 struct MainView: View {
     @EnvironmentObject var document: KPBoardDocument
     @Environment(\.undoManager) var undoManager
-    @Binding var board: KPBoard
+    var board: KPBoard
+    @State private var viewType: KPBoard.BoardViewType = .table
 //    @State private var uniqueTags: [KPTag] = []
 
     // MARK: - Zoom
@@ -141,7 +142,7 @@ struct MainView: View {
                 }
 
                 ToolbarItem(placement: .principal) {
-                    Picker("View", selection: $board.viewType) {
+                    Picker("View", selection: $viewType) {
                         ForEach(KPBoard.BoardViewType.allCases, id: \.self) { view in
                             Text(view.rawValue).tag(view)
                         }
@@ -179,11 +180,24 @@ struct MainView: View {
             .navigationTitle("\(board.title)")
             .toolbarBackground(Color(hex: 0xEAEAEA))
         }
+        .onAppear {
+            self.viewType = self.board.viewType
+        }
+        .onChange(of: self.viewType) { oldValue, newValue in
+            self.document.changeViewType(to: newValue)
+        }
     }
 
     var trackWheelScrollPublisher = NSApp.publisher(for: \.currentEvent)
         .eraseToAnyPublisher()
-        .filter { event in event?.type == .scrollWheel }
+        .filter { event in
+            if event?.type == .scrollWheel {
+                if let window = NSApp.keyWindow, event?.window == window {
+                    return true
+                }
+            }
+            return false
+        }
 
     private func calculateCenterCoordinate(_ size: CGSize) -> CGPoint {
         let scaledWidth = size.width * scaleValue