Update create button to only use Menu

Author: intitni

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -78,9 +78,6 @@ struct ChatTabBar: View {
         var selectedTabId: String
     }
 
-    @State var isHoveringCreateButton = false
-    @State var isHoveringMenuButton = false
-
     var body: some View {
         WithViewStore(
             store,
@@ -120,77 +117,45 @@ struct ChatTabBar: View {
 
     @ViewBuilder
     var createButton: some View {
-        HStack(spacing: 0) {
-            Button(action: {
-                store.send(.createNewTapButtonClicked(kind: nil))
-            }) {
-                Image(systemName: "plus")
-                    .foregroundColor(.secondary)
-                    .padding(.leading, 8)
-                    .padding(.trailing, 4)
-                    .frame(maxHeight: .infinity)
-            }
-            .buttonStyle(.plain)
-            .background {
-                if isHoveringCreateButton {
-                    RoundedRectangle(cornerRadius: 2)
-                        .fill(Color(nsColor: .controlTextColor).opacity(0.1))
-                }
-            }
-            .onHover { isHoveringCreateButton = $0 }
-
-            Menu {
-                WithViewStore(store, observe: { $0.chatTapGroup.tabCollection }) { viewStore in
-                    ForEach(0..<viewStore.state.endIndex, id: \.self) { index in
-                        switch viewStore.state[index] {
-                        case let .kind(kind):
-                            Button(action: {
-                                store.send(.createNewTapButtonClicked(kind: kind))
-                            }) {
-                                Text(kind.title)
-                            }
-                        case let .folder(title, list):
-                            Menu {
-                                ForEach(0..<list.endIndex, id: \.self) { index in
-                                    Button(action: {
-                                        store
-                                            .send(
-                                                .createNewTapButtonClicked(
-                                                    kind: list[index]
-                                                )
+        Menu {
+            WithViewStore(store, observe: { $0.chatTapGroup.tabCollection }) { viewStore in
+                ForEach(0..<viewStore.state.endIndex, id: \.self) { index in
+                    switch viewStore.state[index] {
+                    case let .kind(kind):
+                        Button(action: {
+                            store.send(.createNewTapButtonClicked(kind: kind))
+                        }) {
+                            Text(kind.title)
+                        }
+                    case let .folder(title, list):
+                        Menu {
+                            ForEach(0..<list.endIndex, id: \.self) { index in
+                                Button(action: {
+                                    store
+                                        .send(
+                                            .createNewTapButtonClicked(
+                                                kind: list[index]
                                             )
-                                    }) {
-                                        Text(list[index].title)
-                                    }
+                                        )
+                                }) {
+                                    Text(list[index].title)
                                 }
-                            } label: {
-                                Text(title)
                             }
+                        } label: {
+                            Text(title)
                         }
                     }
                 }
-            } label: {
-                // SwiftUI Menu in macOS is...
-                Button("   ", action: {})
-            }
-            .menuStyle(.borderlessButton)
-            .menuIndicator(.hidden)
-            .frame(maxHeight: .infinity)
-            .fixedSize(horizontal: true, vertical: false)
-            .overlay {
-                Image(systemName: "chevron.down")
-                    .resizable()
-                    .frame(width: 7, height: 4)
-                    .foregroundColor(.secondary)
-            }
-            .background {
-                if isHoveringMenuButton {
-                    RoundedRectangle(cornerRadius: 2)
-                        .fill(Color(nsColor: .controlTextColor).opacity(0.1))
-                }
             }
-            .onHover { isHoveringMenuButton = $0 }
+        } label: {
+            Image(systemName: "plus")
+        } primaryAction: {
+            store.send(.createNewTapButtonClicked(kind: nil))
         }
+        .foregroundColor(.secondary)
+        .menuStyle(.borderedButton)
+        .padding(.horizontal, 4)
+        .fixedSize(horizontal: true, vertical: false)
         .onHover { isHovering in
             if isHovering {
                 store.send(.createNewTapButtonHovered)