Fix tapback keyboard covering target message

Move the hidden emoji TextField from per-message-row (MessageText) to
the list level (ChannelMessageList / UserMessageList). This ensures only
a single TextField exists in the view hierarchy and lets the list's
ScrollViewReader scroll the target message into view when the emoji
keyboard opens.

Changes:
- MessageText: Remove tapbackText state, FocusState, hidden TextField,
  and processTapback(). Accept an onTapback closure instead.
- MessageContextMenuItems: Replace isShowingTapbackInput binding with
  an onTapback closure.
- ChannelMessageRow / UserMessageRow: Accept and forward onTapback
  closure to MessageText.
- ChannelMessageList / UserMessageList: Own the tapback state, hidden
  TextField, processTapback(), and scroll-to-target logic via
  onChange(of: tapbackFocused). Restore Mac Catalyst character palette
  support.

Author: garthvh

Meshtastic/Views/Messages/ChannelMessageList.swift

@@ -24,6 +24,9 @@ struct ChannelMessageList: View {
 	@State private var messageToHighlight: Int64 = 0
 	@State private var needsReadSync: Bool = false
 	@State private var messageLimit: Int = 50
+	@State private var tapbackTargetMessage: MessageEntity?
+	@State private var tapbackText = ""
+	@FocusState var tapbackFocused: Bool
 	@Query private var allPrivateMessages: [MessageEntity]
 
 	init(myInfo: MyInfoEntity, channel: ChannelEntity) {
@@ -62,6 +65,30 @@ struct ChannelMessageList: View {
 		return scenePhase == .active
 	}
 
+	private func processTapback() {
+		guard !tapbackText.isEmpty, let target = tapbackTargetMessage else { return }
+		let emojiToSend = tapbackText
+		let destination = MessageDestination.channel(channel)
+
+		Task {
+			do {
+				try await accessoryManager.sendMessage(
+					message: emojiToSend,
+					toUserNum: destination.userNum,
+					channel: destination.channelNum,
+					isEmoji: true,
+					replyID: target.messageId
+				)
+			} catch {
+				Logger.services.warning("Failed to send tapback.")
+			}
+		}
+
+		tapbackText = ""
+		tapbackFocused = false
+		tapbackTargetMessage = nil
+	}
+
 	var body: some View {
 		// Show only the most recent N messages to limit memory usage
 		let messages = allPrivateMessages.suffix(messageLimit)
@@ -101,7 +128,21 @@ struct ChannelMessageList: View {
 							  messageFieldFocused: $messageFieldFocused,
 							  messageToHighlight: $messageToHighlight,
 							  scrollView: scrollView,
-							  onInteractionComplete: handleInteractionComplete
+							  onInteractionComplete: handleInteractionComplete,
+							  onTapback: { message in
+								  tapbackTargetMessage = message
+								  tapbackFocused = true
+								  #if targetEnvironment(macCatalyst)
+								  DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+									  if let nsApp = NSClassFromString("NSApplication")?.value(forKeyPath: "sharedApplication") as? NSObject {
+										  let selector = NSSelectorFromString("orderFrontCharacterPalette:")
+										  if nsApp.responds(to: selector) {
+											  nsApp.perform(selector, with: nil)
+										  }
+									  }
+								  }
+								  #endif
+							  }
 						  )
 						  .onAppear {
 							  if !message.read && UIApplication.shared.applicationState == .active {
@@ -135,6 +176,26 @@ struct ChannelMessageList: View {
 					}
 				}
 			}
+			.onChange(of: tapbackFocused) {
+				if tapbackFocused, let target = tapbackTargetMessage {
+					DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+						withAnimation {
+							scrollView.scrollTo(target.messageId, anchor: .center)
+						}
+					}
+				}
+			}
+			.background {
+				TextField("", text: $tapbackText)
+					.keyboardType(.emoji)
+					.focused($tapbackFocused)
+					.frame(width: 1, height: 1)
+					.opacity(0.01)
+					.allowsHitTesting(false)
+					.onChange(of: tapbackText) {
+						processTapback()
+					}
+			}
 			TextMessageField(
 				destination: .channel(channel),
 				replyMessageId: $replyMessageId,

Meshtastic/Views/Messages/ChannelMessageRow.swift

@@ -18,6 +18,7 @@ struct ChannelMessageRow: View {
 	@Binding var messageToHighlight: Int64
 	let scrollView: ScrollViewProxy
 	let onInteractionComplete: () -> Void
+	let onTapback: (MessageEntity) -> Void
 
 	private var isCurrentUser: Bool {
 		Int64(preferredPeripheralNum) == message.fromUser?.num
@@ -32,7 +33,8 @@ struct ChannelMessageRow: View {
 	     messageFieldFocused: FocusState<Bool>.Binding,
 	     messageToHighlight: Binding<Int64>,
 	     scrollView: ScrollViewProxy,
-	     onInteractionComplete: @escaping () -> Void) {
+	     onInteractionComplete: @escaping () -> Void,
+	     onTapback: @escaping (MessageEntity) -> Void) {
 		// Initialize ObservedObject with the concrete instance
 		self.message = message
 		self.allMessages = allMessages
@@ -44,6 +46,7 @@ struct ChannelMessageRow: View {
 		self._messageToHighlight = messageToHighlight
 		self.scrollView = scrollView
 		self.onInteractionComplete = onInteractionComplete
+		self.onTapback = onTapback
 	}
 
 	var body: some View {
@@ -122,6 +125,8 @@ struct ChannelMessageRow: View {
 						) {
 							self.replyMessageId = message.messageId
 							self.messageFieldFocused = true
+						} onTapback: {
+							onTapback(message)
 						}
 
 						if isCurrentUser && message.canRetry {

Meshtastic/Views/Messages/MessageContextMenuItems.swift

@@ -10,7 +10,7 @@ struct MessageContextMenuItems: View {
 	let tapBackDestination: MessageDestination
 	let isCurrentUser: Bool
 	@Binding var isShowingDeleteConfirmation: Bool
-	@Binding var isShowingTapbackInput: Bool
+	let onTapback: () -> Void
 	let onReply: () -> Void
 	let canTranslate: Bool
 	let hasTranslatedText: Bool
@@ -39,19 +39,7 @@ struct MessageContextMenuItems: View {
 		Button("Tapback") {
 			// The context menu needs a moment to dismiss before the focus state can be changed.
 			DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-				isShowingTapbackInput = true
-				#if targetEnvironment(macCatalyst)
-				// On Mac Catalyst, open the system Character Palette (emoji picker)
-				// by calling orderFrontCharacterPalette: directly on NSApplication.
-				DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-					if let nsApp = NSClassFromString("NSApplication")?.value(forKeyPath: "sharedApplication") as? NSObject {
-						let selector = NSSelectorFromString("orderFrontCharacterPalette:")
-						if nsApp.responds(to: selector) {
-							nsApp.perform(selector, with: nil)
-						}
-					}
-				}
-				#endif
+				onTapback()
 			}
 		}
 

Meshtastic/Views/Messages/MessageText.swift

@@ -15,12 +15,11 @@ struct MessageText: View {
 	let tapBackDestination: MessageDestination
 	let isCurrentUser: Bool
 	let onReply: () -> Void
+	let onTapback: () -> Void
 	// State for handling channel URL sheet
 	@State private var saveChannelLink: SaveChannelLinkData?
 	@State private var isShowingDeleteConfirmation = false
 	@State private var isShowingTranslationPresentation = false
-	@State private var tapbackText = ""
-	@FocusState private var isTapbackInputFocused: Bool
 
 	var body: some View {
 		SessionReplayPrivacyView(textAndInputPrivacy: .maskAll) {
@@ -104,29 +103,14 @@ struct MessageText: View {
 			.foregroundColor(isCurrentUser ? .white : Color("Colors/MeshtasticBubbleText"))
 			.background(isCurrentUser ? .accentColor : Color("Colors/MeshtasticBubble"))
 			.cornerRadius(15)
-			.background {
-				TextField("", text: $tapbackText)
-					.keyboardType(.emoji)
-					.scrollDismissesKeyboard(.immediately)
-					.focused($isTapbackInputFocused)
-					.frame(width: 1, height: 1)
-					.opacity(0.01)
-					.allowsHitTesting(false)
-					.onChange(of: tapbackText) {
-						processTapback()
-					}
-			}
 			.overlay(messageOverlays)
 			.contextMenu {
 				MessageContextMenuItems(
 					message: message,
 					tapBackDestination: tapBackDestination,
 					isCurrentUser: isCurrentUser,
 					isShowingDeleteConfirmation: $isShowingDeleteConfirmation,
-					isShowingTapbackInput: Binding(
-						get: { isTapbackInputFocused },
-						set: { isTapbackInputFocused = $0 }
-					),
+					onTapback: onTapback,
 					onReply: onReply,
 					canTranslate: canTranslate,
 						hasTranslatedText: hasTranslatedText,
@@ -257,36 +241,6 @@ struct MessageText: View {
 			Logger.data.error("Failed to clear translated message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
 		}
 	}
-	
-	private func processTapback() {
-		guard !tapbackText.isEmpty else { return }
-		let emojiToSend = tapbackText
-		
-		Task {
-			do {
-				try await accessoryManager.sendMessage(
-					message: emojiToSend,
-					toUserNum: tapBackDestination.userNum,
-					channel: tapBackDestination.channelNum,
-					isEmoji: true,
-					replyID: message.messageId
-				)
-				await MainActor.run {
-					switch tapBackDestination {
-					case .channel:
-						break
-					case .user:
-						break
-					}
-				}
-			} catch {
-				Logger.services.warning("Failed to send tapback.")
-			}
-		}
-		
-		tapbackText = ""
-		isTapbackInputFocused = false
-	}
 }
 
 private extension MessageDestination {

Meshtastic/Views/Messages/UserMessageList.swift

@@ -21,6 +21,9 @@ struct UserMessageList: View {
 	@State private var messageToHighlight: Int64 = 0
 	@State private var redrawTapbacksTrigger = UUID()
 	@AppStorage("preferredPeripheralNum") private var preferredPeripheralNum = -1
+	@State private var tapbackTargetMessage: MessageEntity?
+	@State private var tapbackText = ""
+	@FocusState var tapbackFocused: Bool
 	private var allPrivateMessages: [MessageEntity] {
 		let sent = user.sentMessages ?? []
 		let received = user.receivedMessages ?? []
@@ -57,6 +60,30 @@ struct UserMessageList: View {
 		return scenePhase == .active
 	}
 
+	private func processTapback() {
+		guard !tapbackText.isEmpty, let target = tapbackTargetMessage else { return }
+		let emojiToSend = tapbackText
+		let destination = MessageDestination.user(user)
+
+		Task {
+			do {
+				try await accessoryManager.sendMessage(
+					message: emojiToSend,
+					toUserNum: destination.userNum,
+					channel: destination.channelNum,
+					isEmoji: true,
+					replyID: target.messageId
+				)
+			} catch {
+				Logger.services.warning("Failed to send tapback.")
+			}
+		}
+
+		tapbackText = ""
+		tapbackFocused = false
+		tapbackTargetMessage = nil
+	}
+
 	var body: some View {
 		// Cast user.messageList to an array for easier indexing and ForEach.
 		let messages: [MessageEntity] = Array(allPrivateMessages)
@@ -86,7 +113,21 @@ struct UserMessageList: View {
 								messageFieldFocused: $messageFieldFocused,
 								messageToHighlight: $messageToHighlight,
 								scrollView: scrollView,
-								onInteractionComplete: handleInteractionComplete
+								onInteractionComplete: handleInteractionComplete,
+								onTapback: { message in
+									tapbackTargetMessage = message
+									tapbackFocused = true
+									#if targetEnvironment(macCatalyst)
+									DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+										if let nsApp = NSClassFromString("NSApplication")?.value(forKeyPath: "sharedApplication") as? NSObject {
+											let selector = NSSelectorFromString("orderFrontCharacterPalette:")
+											if nsApp.responds(to: selector) {
+												nsApp.perform(selector, with: nil)
+											}
+										}
+									}
+									#endif
+								}
 							)
 							.onAppear {
 								// Only mark as read if the app is in the foreground
@@ -119,6 +160,26 @@ struct UserMessageList: View {
 						}
 					}
 				}
+				.onChange(of: tapbackFocused) {
+					if tapbackFocused, let target = tapbackTargetMessage {
+						DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+							withAnimation {
+								scrollView.scrollTo(target.messageId, anchor: .center)
+							}
+						}
+					}
+				}
+				.background {
+					TextField("", text: $tapbackText)
+						.keyboardType(.emoji)
+						.focused($tapbackFocused)
+						.frame(width: 1, height: 1)
+						.opacity(0.01)
+						.allowsHitTesting(false)
+						.onChange(of: tapbackText) {
+							processTapback()
+						}
+				}
 			}
 			TextMessageField(
 				destination: .user(user),

Meshtastic/Views/Messages/UserMessageRow.swift

@@ -22,6 +22,7 @@ struct UserMessageRow: View {
 	@Binding var messageToHighlight: Int64
 	let scrollView: ScrollViewProxy
 	let onInteractionComplete: () -> Void
+	let onTapback: (MessageEntity) -> Void
 
 	private var isCurrentUser: Bool {
 		Int64(preferredPeripheralNum) == message.fromUser?.num
@@ -36,7 +37,8 @@ struct UserMessageRow: View {
 	     messageFieldFocused: FocusState<Bool>.Binding,
 	     messageToHighlight: Binding<Int64>,
 	     scrollView: ScrollViewProxy,
-	     onInteractionComplete: @escaping () -> Void) {
+	     onInteractionComplete: @escaping () -> Void,
+	     onTapback: @escaping (MessageEntity) -> Void) {
 		// Initialize ObservedObject with the concrete instance
 		self.message = message
 		self.allMessages = allMessages
@@ -48,6 +50,7 @@ struct UserMessageRow: View {
 		self._messageToHighlight = messageToHighlight
 		self.scrollView = scrollView
 		self.onInteractionComplete = onInteractionComplete
+		self.onTapback = onTapback
 	}
 
 	var body: some View {
@@ -127,8 +130,8 @@ struct UserMessageRow: View {
 							isCurrentUser: isCurrentUser
 						) {
 							self.replyMessageId = message.messageId
-							self.messageFieldFocused = true
-						}
+							self.messageFieldFocused = true						} onTapback: {
+							onTapback(message)						}
 
 						if isCurrentUser && message.canRetry || (isCurrentUser && message.receivedACK && !message.realACK) {
 							RetryButton(message: message, destination: .user(user))