From 6af2d295820899161655638718bab841f17e20e3 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Thu, 19 May 2022 17:15:36 +1000 Subject: [PATCH] ui: add to do for expand button --- .../Message Cells/Content Views/ReactionContainerView.swift | 5 ++++- Session/Conversations/Message Cells/VisibleMessageCell.swift | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift b/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift index 1c9bda6de..4d5d91d45 100644 --- a/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift +++ b/Session/Conversations/Message Cells/Content Views/ReactionContainerView.swift @@ -11,6 +11,7 @@ final class ReactionContainerView : UIView { private var showingAllReactions = false var reactionViews: [ReactionView] = [] + var expandButton: ExpandingReactionButton? // MARK: Lifecycle init() { @@ -56,8 +57,10 @@ final class ReactionContainerView : UIView { reactionViews.append(reactionView) } if expandButtonReactions.count > 0 { - let expandButton = ExpandingReactionButton(emojis: expandButtonReactions) + expandButton = ExpandingReactionButton(emojis: expandButtonReactions) stackView.addArrangedSubview(expandButton) + } else { + expandButton = nil } containerView.addArrangedSubview(stackView) } diff --git a/Session/Conversations/Message Cells/VisibleMessageCell.swift b/Session/Conversations/Message Cells/VisibleMessageCell.swift index 8c75ac9fa..55cf89058 100644 --- a/Session/Conversations/Message Cells/VisibleMessageCell.swift +++ b/Session/Conversations/Message Cells/VisibleMessageCell.swift @@ -557,9 +557,12 @@ final class VisibleMessageCell : MessageCell, LinkPreviewViewDelegate { } else { delegate?.quickReact(viewItem, with: reactionView.emoji) } - break + return } } + if let expandButton = reactionContainerView.expandButton, expandButton.frame.contains(convertedLocation) { + // TODO: show all emojis + } } else { delegate?.handleViewItemTapped(viewItem, gestureRecognizer: gestureRecognizer) }