jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Message: Only focus if focus is not inside container already

This commit is contained in:
Scott Nonnenberg 2019-11-14 15:54:50 -08:00
parent 8b239b76ef
commit 79b9408f1f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ts/components/conversation/InlineNotificationWrapper.tsx
View File

@ -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();
}
};

6
ts/components/conversation/Message.tsx
View File

@ -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();
}
};