chore: PR fix: Remove keyEquivalents from MessageMenu items

Also format
prose-im · Aug 2, 2022 · faf4703 · faf4703
1 parent d620ec5
commit faf4703
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/Prose/ProseLib/Sources/ConversationFeature/Chat/Chat.swift b/Prose/ProseLib/Sources/ConversationFeature/Chat/Chat.swift
@@ -218,7 +218,7 @@ struct ChatView: NSViewRepresentable {
 }
 
 extension ChatView.Coordinator: NSMenuDelegate {
-  func menuDidClose(_ menu: NSMenu) {
+  func menuDidClose(_: NSMenu) {
     self.viewStore.send(.menuDidClose)
   }
 }
@@ -282,7 +282,7 @@ final class ViewStoreScriptMessageHandler: NSObject, WKScriptMessageHandler {
 
 extension WKUserContentController {
   func addEventHandler(_ handler: JSEventHandler, viewStore: ViewStore<Void, MessageAction>) {
-    let handlerName: String = "handler_" + handler.event.replacingOccurrences(of: ":", with: "_")
+    let handlerName = "handler_" + handler.event.replacingOccurrences(of: ":", with: "_")
 
     self.add(
       ViewStoreScriptMessageHandler(handler: handler, viewStore: viewStore),

diff --git a/Prose/ProseLib/Sources/ConversationFeature/Chat/ChatReducer.swift b/Prose/ProseLib/Sources/ConversationFeature/Chat/ChatReducer.swift
@@ -1,8 +1,6 @@
 //
-//  File.swift
-//  
-//
-//  Created by Rémi Bardon on 02/08/2022.
+// This file is part of prose-app-macos.
+// Copyright (c) 2022 Prose Foundation
 //
 
 import ComposableArchitecture
@@ -163,7 +161,8 @@ let chatReducer = Reducer<
     guard let reaction = payload.reaction.first else { return .none }
 
     if let messageId = payload.ids.first {
-      return environment.proseClient.toggleReaction(state.chatId, messageId, reaction).fireAndForget()
+      return environment.proseClient.toggleReaction(state.chatId, messageId, reaction)
+        .fireAndForget()
     } else {
       logger.notice("Could not toggle reaction: No message selected")
       return .none

diff --git a/Prose/ProseLib/Sources/ConversationFeature/Chat/MessageMenu.swift b/Prose/ProseLib/Sources/ConversationFeature/Chat/MessageMenu.swift
@@ -17,15 +17,6 @@ public enum MessageMenuAction: Equatable {
   enum Tag: Int {
     case copyText, edit, addReaction, remove
 
-    var keyEquivalent: String {
-      switch self {
-      case .copyText: return "c"
-      case .edit: return "e"
-      case .addReaction: return "r"
-      case .remove: return "d"
-      }
-    }
-
     var systemImage: String? {
       switch self {
       case .copyText: return "doc.on.clipboard"
@@ -61,11 +52,7 @@ public final class MessageMenu: NSMenu {
     action: Action?,
     isDisabled: Bool = false
   ) -> NSMenuItem {
-    let item = NSMenuItem(
-      title: title,
-      action: #selector(self.itemTapped(_:)),
-      keyEquivalent: action?.tag.keyEquivalent ?? ""
-    )
+    let item = NSMenuItem(title: title, action: #selector(self.itemTapped(_:)))
 
     // Set target to receive the events
     item.target = self