Fix add reaction (#25222)

RocketChat · Apr 19, 2022 · cf0b627 · cf0b627
1 parent f6cac21
commit cf0b627
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/apps/meteor/app/emoji/client/lib/EmojiPicker.js b/apps/meteor/app/emoji/client/lib/EmojiPicker.js
@@ -70,8 +70,12 @@ export const EmojiPicker = {
 		const windowHeight = window.innerHeight;
 		const windowWidth = window.innerWidth;
 		const windowBorder = 10;
-		const sourcePos = $(this.source).offset();
-		const { left, top } = sourcePos;
+
+		// get the position of the source element
+		let { left, top } = this.source.getBoundingClientRect();
+		left += window.scrollX;
+		top += window.scrollY;
+
 		const cssProperties = { top, left };
 		const isLargerThanWindow = this.width + windowBorder > windowWidth;
 

diff --git a/apps/meteor/app/ui-utils/client/lib/popover.js b/apps/meteor/app/ui-utils/client/lib/popover.js
@@ -157,6 +157,7 @@ Template.popover.onDestroyed(function () {
 
 Template.popover.events({
 	'click .js-action'(e, instance) {
+		e.stopPropagation();
 		!this.action || this.action.call(this, e, instance.data.data);
 		popover.close();
 	},