Message: Only focus if focus is not inside container already

iswanj · Nov 15, 2019 · 79b9408 · 79b9408
1 parent 8b239b7
commit 79b9408
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ts/components/conversation/InlineNotificationWrapper.tsx b/ts/components/conversation/InlineNotificationWrapper.tsx
@@ -11,8 +11,10 @@ export class InlineNotificationWrapper extends React.Component<PropsType> {
   public focusRef: React.RefObject<HTMLDivElement> = React.createRef();
 
   public setFocus = () => {
-    if (this.focusRef.current) {
-      this.focusRef.current.focus();
+    const container = this.focusRef.current;
+
+    if (container && !container.contains(document.activeElement)) {
+      container.focus();
     }
   };
 

diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
@@ -187,8 +187,10 @@ export class Message extends React.PureComponent<Props, State> {
   };
 
   public setFocus = () => {
-    if (this.focusRef.current) {
-      this.focusRef.current.focus();
+    const container = this.focusRef.current;
+
+    if (container && !container.contains(document.activeElement)) {
+      container.focus();
     }
   };