Merge branch 'emoji-button-fixes' into 'develop'

Emoji button fixes

See merge request soapbox-pub/soapbox-fe!1289
edit-profile-fix
Alex Gleason 2 years ago
commit 1308c1ce69

@ -1,5 +1,5 @@
import classNames from 'classnames'; import classNames from 'classnames';
import React, { useState } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { usePopper } from 'react-popper'; import { usePopper } from 'react-popper';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
@ -22,6 +22,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
const status = useAppSelector(state => state.statuses.get(statusId)); const status = useAppSelector(state => state.statuses.get(statusId));
const soapboxConfig = useSoapboxConfig(); const soapboxConfig = useSoapboxConfig();
const timeout = useRef<NodeJS.Timeout>();
const [visible, setVisible] = useState(false); const [visible, setVisible] = useState(false);
// const [focused, setFocused] = useState(false); // const [focused, setFocused] = useState(false);
@ -42,16 +43,40 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
], ],
}); });
useEffect(() => {
return () => {
if (timeout.current) {
clearTimeout(timeout.current);
}
};
}, []);
if (!status) return null; if (!status) return null;
const handleMouseEnter = () => { const handleMouseEnter = () => {
if (timeout.current) {
clearTimeout(timeout.current);
}
if (!isUserTouching()) { if (!isUserTouching()) {
setVisible(true); setVisible(true);
} }
}; };
const handleMouseLeave = () => { const handleMouseLeave = () => {
if (timeout.current) {
clearTimeout(timeout.current);
}
// Unless the user is touching, delay closing the emoji selector briefly
// so the user can move the mouse diagonally to make a selection.
if (isUserTouching()) {
setVisible(false); setVisible(false);
} else {
timeout.current = setTimeout(() => {
setVisible(false);
}, 500);
}
}; };
const handleReact = (emoji: string): void => { const handleReact = (emoji: string): void => {
@ -107,7 +132,7 @@ const EmojiButtonWrapper: React.FC<IEmojiButtonWrapper> = ({ statusId, children
); );
return ( return (
<div onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}> <div className='relative' onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
{React.cloneElement(children, { {React.cloneElement(children, {
onClick: handleClick, onClick: handleClick,
ref: setReferenceElement, ref: setReferenceElement,

Loading…
Cancel
Save