Merge pull request #125 from DeveloperAcademy-POSTECH/fix/#123

[#123] URL 관련 버그, Tag 생성시 엔터로 추가 등 fix 작업

Author: chongin12

LabDuck/View/EditSheetView.swift

@@ -44,7 +44,7 @@ struct EditSheetView: View {
             relatedNodes = findNodes(node)
             tempNodeTitle = self.node.unwrappedTitle
             tempNodeNote = self.node.unwrappedNote
-            tempNodeURL = self.tempNodeURL
+            tempNodeURL = self.node.unwrappedURL
         }
 
         colorSelectionView
@@ -167,9 +167,9 @@ struct EditSheetView: View {
         Section(header: sectionHeader("URL")) {
             styledTextEditor(
                 text: $tempNodeURL,
-                lineLimit: 2,
+                lineLimit: 4,
                 fontSize: 13,
-                height: 40
+                height: 80
             )
             .onAppear {
                 tempNodeURL = node.unwrappedURL

LabDuck/View/MainView.swift

@@ -134,13 +134,6 @@ struct MainView: View {
 
             // MARK: - Toolbar
             .toolbar {
-                ToolbarItem(placement: .navigation) {
-                    Button(action: {}, 
-                           label: {
-                        Image(systemName: "chevron.backward")
-                    })
-                }
-
                 ToolbarItem(placement: .principal) {
                     Picker("View", selection: $viewType) {
                         ForEach(KPBoard.BoardViewType.allCases, id: \.self) { view in

LabDuck/View/NodeView.swift

@@ -35,9 +35,7 @@ struct NodeView: View {
     @Binding var clickingOutput: Bool
     @Environment(\.searchText) private var searchText
 
-    @State private var selectedAction = "normal"
     @State private var initialWidth: CGFloat = 0
-    @State private var resizeOffset: CGPoint = .zero
     @State private var isNodeHovered: Bool = false
 
     @State private var showAlert = false
@@ -50,7 +48,7 @@ struct NodeView: View {
             InputPointsView()
             ZStack() {
                 VStack(spacing: 0) {
-                    VStack(alignment: .center, spacing: 10) {
+                    VStack(alignment: .leading, spacing: 10) {
                         ZStack{
                             if isEditing {
                                 HStack{
@@ -119,7 +117,6 @@ struct NodeView: View {
                 //태그 팝업창
                 if isEditingForTag {
                     TagPopupView(isEditingForTag: $isEditingForTag, node: node)
-                        .transition(.scale)
                         .zIndex(1)
                 }
 
@@ -159,6 +156,8 @@ struct NodeView: View {
             .shadow(color: .black.opacity(0.1), radius: 5, x: 0, y: 4)
             OutputPointsView()
         }
+        .animation(.easeInOut, value: isEditing)
+        .animation(.easeInOut, value: isEditingForTag)
         .onChange(of: isEditing) { oldValue, newValue in
             if oldValue && !newValue {
                 var newNode = node

LabDuck/View/TableView.swift

@@ -46,11 +46,28 @@ struct TableView: View {
                 .width(77)
 
                 TableColumn("Title", value: \.unwrappedTitle) { node in
-                    if let _ = node.title {
-                        styledText(node.unwrappedTitle, node: node)
-                    } else {
-                        styledText(node.unwrappedTitle, node: node)
-                            .foregroundColor(.secondary)
+                    HStack {
+                        if let _ = node.title {
+                            styledText(node.unwrappedTitle, node: node)
+                        } else {
+                            styledText(node.unwrappedTitle, node: node)
+                                .foregroundColor(.secondary)
+                        }
+
+                        Spacer()
+
+                        Button {
+                            if editingNodeID == node.id {
+                                isSheet.toggle()
+                            } else {
+                                editingNodeID = node.id
+                                isSheet = true
+                            }
+                        } label: {
+                            Label("Open", systemImage: "rectangle.trailinghalf.inset.filled")
+                        }
+                        .buttonStyle(.bordered)
+
                     }
                 }.width(min: 100)
 

LabDuck/View/TagPopupView.swift

@@ -14,7 +14,6 @@ struct TagPopupView: View {
     var node: KPNode
     @State private var hoveredForClosingTagView: Bool = false
     @State private var textForTags: String = ""
-    @State private var previewTag: KPTag?
 
     @State private var hovered: Bool = false
 
@@ -51,7 +50,8 @@ struct TagPopupView: View {
                             .padding(.horizontal)
                     }
                     TextField("", text: $textForTags, onCommit: {
-                        addPreviewTag()
+                        createTag(name: textForTags)
+                        textForTags = ""
                     })
                     .padding(.horizontal)
                     .foregroundColor(.black)
@@ -65,41 +65,6 @@ struct TagPopupView: View {
 
 
             VStack(alignment: .leading){
-                if previewTag != nil {
-                    HStack(spacing: 20){
-
-
-                        //태그 생성 버튼
-                        Button {
-                            createTag()
-                        } label: {
-                            Text("생성").foregroundColor(.black)
-                        }.buttonStyle(BorderlessButtonStyle())
-                            .padding(.leading, 10)
-                            .padding(.top,10)
-                            .padding(.bottom,10)
-
-
-
-                        //태그 프리뷰
-
-                        Text("#\(textForTags)")
-                            .padding(8)
-                            .background(previewTag!.colorTheme.backgroundColor)
-                            .cornerRadius(6)
-                            .foregroundColor(.white)
-                            .padding(.top,10)
-                            .padding(.bottom,10)
-
-
-                        Spacer()
-
-                    }.background(Color(hex: 0xF0F0F0))
-                        .frame(width: 234, height: 40)
-                        .cornerRadius(6)
-                        .padding(10)
-                }
-
                 if !node.tags.isEmpty {
                     Text("선택된 태그")
                         .foregroundColor(.gray)
@@ -179,25 +144,17 @@ struct TagPopupView: View {
         .shadow(radius: 10)
     }
 
-    private func addPreviewTag() {
-        guard !textForTags.isEmpty else { return }
-        if !document.board.allTags.contains(where: { $0.name == textForTags }) {
-            let newTagForPreview = KPTag(id: UUID(), name: textForTags, colorTheme: KPTagColor.random())
-            previewTag = newTagForPreview
+    private func createTag(name: String) {
+        if document.board.getTag(name) == nil {
+            document.createTag(name, undoManager: undoManager)
         }
-    }
-
-    private func createTag() {
-        guard let previewTag = previewTag else { return }
 
-        document.createTag(textForTags, color: previewTag.colorTheme, undoManager: undoManager)
         var tags = document.board.getTags(node.id).map { $0.id }
-        guard let createdTag = document.board.getTag(textForTags)?.id else { return }
-        tags.append(createdTag)
-
-        document.updateNode(node.id, tags: tags, undoManager: undoManager)
-        self.previewTag = nil
-        self.textForTags = ""
+        guard let createdTag = document.board.getTag(name)?.id else { return }
+        if !tags.contains(where: { $0 == createdTag }) {
+            tags.append(createdTag)
+            document.updateNode(node.id, tags: tags, undoManager: undoManager)
+        }
     }
 }
 

LabDuck/View/TextView.swift

@@ -32,8 +32,9 @@ struct TextView: View {
                             newText.text = tempText
                             document.updateText(newText, undoManager: undoManager, animation: nil)
                         })
-                            .border(Color.blue.opacity(0.6))
-                            .frame(width: 200, height: 50)
+                        .font(.title)
+                        .border(Color.blue.opacity(0.6))
+                        .frame(width: 200, height: 50)
 
                         Button(action: {
                             document.deleteText(self.text.id, undoManager: undoManager)
@@ -49,6 +50,7 @@ struct TextView: View {
                     .onTapGesture(count: 1) {
                         self.isEditing = true
                     }
+                    .font(.title)
             }
         }
         .onAppear {