From 4c33acddf0df10c1f332a4c46e8ba929855c234d Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 4 Mar 2022 16:21:16 +0300
Subject: [PATCH] Message Context Menu: Fix width jumps, fix not copying text
 (#1747)

---
 src/components/middle/message/MessageContextMenu.scss | 8 ++++++--
 src/components/middle/message/MessageContextMenu.tsx  | 1 +
 src/util/getMessageIdsForSelectedText.ts              | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/middle/message/MessageContextMenu.scss b/src/components/middle/message/MessageContextMenu.scss
index bdb27fb49..edfc5ec7b 100644
--- a/src/components/middle/message/MessageContextMenu.scss
+++ b/src/components/middle/message/MessageContextMenu.scss
@@ -28,11 +28,15 @@
     touch-action: none;
   }
 
+  &--seen-by {
+    min-width: 14rem;
+  }
+
   .avatars {
     display: flex;
     align-self: center;
-    margin-left: auto;
-    padding-left: 1rem;
+    margin-inline-start: auto;
+    padding-inline-start: 1rem;
 
     .Avatar {
       border: 0.0625rem solid var(--color-background);
diff --git a/src/components/middle/message/MessageContextMenu.tsx b/src/components/middle/message/MessageContextMenu.tsx
index 6311a1cf9..24c21a3c7 100644
--- a/src/components/middle/message/MessageContextMenu.tsx
+++ b/src/components/middle/message/MessageContextMenu.tsx
@@ -249,6 +249,7 @@ const MessageContextMenu: FC<OwnProps> = ({
         {canReport && <MenuItem icon="flag" onClick={onReport}>{lang('lng_context_report_msg')}</MenuItem>}
         {(canShowSeenBy || canShowReactionsCount) && (
           <MenuItem
+            className="MessageContextMenu--seen-by"
             icon={canShowReactionsCount ? 'reactions' : 'group'}
             onClick={canShowReactionsCount ? onShowReactors : onShowSeenBy}
             disabled={!canShowReactionsCount && !message.seenByUserIds?.length}
diff --git a/src/util/getMessageIdsForSelectedText.ts b/src/util/getMessageIdsForSelectedText.ts
index ae716e523..3322decfb 100644
--- a/src/util/getMessageIdsForSelectedText.ts
+++ b/src/util/getMessageIdsForSelectedText.ts
@@ -1,7 +1,8 @@
 const ELEMENT_NODE = 1;
 
 export default function getMessageIdsForSelectedText() {
-  let selectedFragments = window.getSelection()?.getRangeAt(0).cloneContents();
+  const selection = window.getSelection();
+  let selectedFragments = selection && selection.rangeCount ? selection.getRangeAt(0).cloneContents() : undefined;
   if (!selectedFragments || selectedFragments.childElementCount === 0) {
     return;
   }