Merge pull request #2564 from vector-im/riot_2538

BF: Quick reactions menu hide time and user display name

Riot/Modules/Room/CellData/RoomBubbleCellData.h

@@ -80,6 +80,10 @@ typedef NS_ENUM(NSInteger, RoomBubbleCellDataTag)
  */
 - (void)updateAdditionalContentHeightIfNeeded;
 
+/**
+ The index of the first visible component. NSNotFound by default.
+ */
+- (NSInteger)firstVisibleComponentIndex;
 
 #pragma mark - Show all reactions
 

Riot/Modules/Room/CellData/RoomBubbleCellData.m

@@ -277,6 +277,31 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
     return currentAttributedTextMsg;
 }
 
+- (NSInteger)firstVisibleComponentIndex
+{
+    __block NSInteger firstVisibleComponentIndex = NSNotFound;
+    
+    if (self.attachment && self.bubbleComponents.count)
+    {
+        firstVisibleComponentIndex = 0;
+    }
+    else
+    {
+        [self.bubbleComponents enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            
+            MXKRoomBubbleComponent *component = (MXKRoomBubbleComponent*)obj;
+            
+            if (component.attributedTextMessage)
+            {
+                firstVisibleComponentIndex = idx;
+                *stop = YES;
+            }
+        }];
+    }
+    
+    return firstVisibleComponentIndex;
+}
+
 - (void)refreshBubbleComponentsPosition
 {
     // CAUTION: This method must be called on the main thread.

Riot/Modules/Room/RoomViewController.m

@@ -5177,7 +5177,7 @@
         if (bubbleComponents.count > 0)
         {
             NSInteger selectedComponentIndex = foundComponentIndex != NSNotFound ? foundComponentIndex : 0;
-            bubbleComponentFrame = [roomBubbleTableViewCell componentFrameInTableViewForIndex:selectedComponentIndex];
+            bubbleComponentFrame = [roomBubbleTableViewCell surroundingFrameInTableViewForComponentIndex:selectedComponentIndex];
         }
         else
         {