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

4
ts/components/Tooltip.tsx
View file

@ -6,7 +6,7 @@ import classNames from 'classnames';
import { noop } from 'lodash';
import { Manager, Reference, Popper } from 'react-popper';
import { Theme, themeClassName } from '../util/theme';
import { multiRef } from '../util/multiRef';
import { refMerger } from '../util/refMerger';
import { offsetDistanceModifier } from '../util/popperUtil';
type EventWrapperPropsType = {
@ -52,7 +52,7 @@ const TooltipEventWrapper = React.forwardRef<
<span
onFocus={on}
onBlur={off}
ref={multiRef<HTMLSpanElement>(ref, wrapperRef)}
ref={refMerger<HTMLSpanElement>(ref, wrapperRef)}
>
{children}
</span>