mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix message input emoji focus close (#4727)

Browse source
This commit is contained in:
007 2021-02-04 22:37:47 +00:00 • committed by GitHub
parent 2501584db6
commit 062a1f7dd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/components/emoji/EmojiPicker.tsx
View file

@ -20,7 +20,6 @@ import {
} from 'lodash';
import { Emoji } from './Emoji';
import { dataByCategory, search } from './lib';
import { useRestoreFocus } from '../../util/hooks';
import { LocalizerType } from '../../types/Util';
export type EmojiPickDataType = {
@ -75,7 +74,6 @@ export const EmojiPicker = React.memo(
}: Props,
ref
) => {
const focusRef = React.useRef<HTMLButtonElement>(null);
const [firstRecent] = React.useState(recentEmojis);
const [selectedCategory, setSelectedCategory] = React.useState(
categories[0]
@ -188,9 +186,6 @@ export const EmojiPicker = React.memo(
};
}, [onClose, searchMode]);
// Focus after initial render, restore focus on teardown
useRestoreFocus(focusRef);
const [, ...renderableCategories] = categories;
const emojiGrid = React.useMemo(() => {
@ -307,7 +302,6 @@ export const EmojiPicker = React.memo(
<header className="module-emoji-picker__header">
<button
type="button"
ref={focusRef}
onClick={handleToggleSearch}
title={i18n('EmojiPicker--search-placeholder')}
className={classNames(