Improved display of reactions overlay on large messages

martinmitrevski · martinmitrevski · commit 8b0299211f9b · 2022-04-21T15:10:44.000+02:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Reactions/ReactionsOverlayView.swift
@@ -73,7 +73,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                 )
                 .offset(
                     x: paddingValue / 2,
-                    y: originY + messageDisplayInfo.frame.height - paddingValue + 2
+                    y: originY + messageContainerHeight - paddingValue + 2
                 )
             }
             
@@ -105,7 +105,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
                             .animation(popInAnimation, value: popIn)
                             .offset(
                                 x: messageDisplayInfo.frame.origin.x - diffWidth,
-                                y: popIn ? -24 : -messageDisplayInfo.frame.height / 2
+                                y: popIn ? -24 : -messageContainerHeight / 2
                             )
                             : nil
                     )
@@ -194,7 +194,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {
         var originY = messageDisplayInfo.frame.origin.y
         let screenHeight = UIScreen.main.bounds.size.height
         let minOrigin: CGFloat = 100
-        let maxOrigin: CGFloat = screenHeight - messageDisplayInfo.frame.height - bottomPopupOffset - minOrigin
+        let maxOrigin: CGFloat = screenHeight - messageContainerHeight - bottomPopupOffset - minOrigin
         if originY < minOrigin {
             originY = minOrigin
         } else if originY > maxOrigin {

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {`
`73`	`73`	`)`
`74`	`74`	`.offset(`
`75`	`75`	`x: paddingValue / 2,`
`76`		`- y: originY + messageDisplayInfo.frame.height - paddingValue + 2`
	`76`	`+ y: originY + messageContainerHeight - paddingValue + 2`
`77`	`77`	`)`
`78`	`78`	`}`
`79`	`79`
`@@ -105,7 +105,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {`
`105`	`105`	`.animation(popInAnimation, value: popIn)`
`106`	`106`	`.offset(`
`107`	`107`	`x: messageDisplayInfo.frame.origin.x - diffWidth,`
`108`		`- y: popIn ? -24 : -messageDisplayInfo.frame.height / 2`
	`108`	`+ y: popIn ? -24 : -messageContainerHeight / 2`
`109`	`109`	`)`
`110`	`110`	`: nil`
`111`	`111`	`)`
`@@ -194,7 +194,7 @@ public struct ReactionsOverlayView<Factory: ViewFactory>: View {`
`194`	`194`	`var originY = messageDisplayInfo.frame.origin.y`
`195`	`195`	`let screenHeight = UIScreen.main.bounds.size.height`
`196`	`196`	`let minOrigin: CGFloat = 100`
`197`		`- let maxOrigin: CGFloat = screenHeight - messageDisplayInfo.frame.height - bottomPopupOffset - minOrigin`
	`197`	`+ let maxOrigin: CGFloat = screenHeight - messageContainerHeight - bottomPopupOffset - minOrigin`
`198`	`198`	`if originY < minOrigin {`
`199`	`199`	`originY = minOrigin`
`200`	`200`	`} else if originY > maxOrigin {`