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

Fix render loop in <Modal>, clean up ref merger code

Browse source
This commit is contained in:
Evan Hahn 2021-10-01 18:53:00 -05:00 • committed by GitHub
parent 1366d09f11
commit 893a77a3ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/components/conversation/Message.tsx
View file

@ -62,7 +62,7 @@ import {
ConversationColorType,
CustomColorType,
} from '../../types/Colors';
import { createRefMerger } from '../_util';
import { createRefMerger } from '../../util/refMerger';
import { emojiToData } from '../emoji/lib';
import type { SmartReactionPicker } from '../../state/smart/ReactionPicker';
import { getCustomColorStyle } from '../../util/getCustomColorStyle';

4
ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
View file

@ -13,7 +13,7 @@ import Measure, { MeasuredComponentProps } from 'react-measure';
import { LocalizerType } from '../../../../types/Util';
import { assert } from '../../../../util/assert';
import { getOwn } from '../../../../util/getOwn';
import { multiRef } from '../../../../util/multiRef';
import { refMerger } from '../../../../util/refMerger';
import { useRestoreFocus } from '../../../../hooks/useRestoreFocus';
import { missingCaseError } from '../../../../util/missingCaseError';
import { filterAndSortConversationsByTitle } from '../../../../util/filterAndSortConversations';
@ -146,7 +146,7 @@ export const ChooseGroupMembersModal: FunctionComponent<PropsType> = ({
confirmAdds();
}
}}
ref={multiRef<HTMLInputElement>(inputRef, focusRef)}
ref={refMerger<HTMLInputElement>(inputRef, focusRef)}
value={searchTerm}
/>
{Boolean(selectedContacts.length) && (