fix autoscroll and clean new message form

This commit is contained in:
Guillaume Dorce 2022-11-12 22:50:58 +01:00
parent b1a1590c1e
commit 6d1072cc43
2 changed files with 39 additions and 18 deletions

View File

@ -1,5 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query'; import { useMutation, useQueryClient } from '@tanstack/react-query';
import { useState } from 'react'; import { useRef, useState } from 'react';
import { FaPlus, FaTimes } from 'react-icons/fa'; import { FaPlus, FaTimes } from 'react-icons/fa';
import { newMessage } from '@controllers/MessageController'; import { newMessage } from '@controllers/MessageController';
@ -8,6 +8,7 @@ const NewMessage = () => {
const [image, setImage] = useState(''); const [image, setImage] = useState('');
const queryClient = useQueryClient(); const queryClient = useQueryClient();
const [preview, setPreview] = useState(''); const [preview, setPreview] = useState('');
const imageRef = useRef<HTMLInputElement>(null);
const handleImageSelect = (e: any) => { const handleImageSelect = (e: any) => {
setImage(e.target.value); setImage(e.target.value);
@ -37,6 +38,9 @@ const NewMessage = () => {
setMessage(''); setMessage('');
setImage(''); setImage('');
setPreview(''); setPreview('');
if (imageRef.current) {
imageRef.current.value = '';
}
}; };
const handleRemoveImage = () => { const handleRemoveImage = () => {
@ -74,6 +78,7 @@ const NewMessage = () => {
className="hidden" className="hidden"
{...(image !== '' && { value: image })} {...(image !== '' && { value: image })}
onChange={handleImageSelect} onChange={handleImageSelect}
ref={imageRef}
/> />
</div> </div>

View File

@ -1,4 +1,4 @@
import { ReactNode, useCallback, useEffect, useState } from 'react'; import { ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
import { FaChevronDown } from 'react-icons/fa'; import { FaChevronDown } from 'react-icons/fa';
const ScrollToBottom = ({ children, className = '' }: { children: ReactNode; className?: string }) => { const ScrollToBottom = ({ children, className = '' }: { children: ReactNode; className?: string }) => {
@ -12,21 +12,37 @@ const ScrollToBottom = ({ children, className = '' }: { children: ReactNode; cla
} }
}, []); }, []);
useEffect(() => { useMemo(() => {
if (node) {
const container = document.querySelector('main > div'); const container = document.querySelector('main > div');
container?.addEventListener('scroll', () => {
if (node?.getBoundingClientRect() && node.getBoundingClientRect().y >= window.innerHeight) {
setShow(true);
} else {
setShow(false);
}
});
container?.addEventListener('DOMNodeInserted', (e) => { container?.addEventListener('DOMNodeInserted', (e) => {
if (!(e.target as Element).classList.contains('message')) return; if (!(e.target as Element).classList.contains('message')) return;
if (node?.getBoundingClientRect() && node.getBoundingClientRect().y >= window.innerHeight) { if (node?.getBoundingClientRect() && node.getBoundingClientRect().y >= window.innerHeight) {
node?.scrollIntoView({ behavior: 'smooth' }); node?.scrollIntoView({ behavior: 'smooth' });
} }
}); });
container?.querySelectorAll('.message > div > img').forEach((img) => {
img.addEventListener('load', () => {
if (node?.getBoundingClientRect() && node.getBoundingClientRect().y >= window.innerHeight) {
node?.scrollIntoView({ behavior: 'smooth' });
}
});
});
const observer = new IntersectionObserver(
([entry]) => {
if (entry.isIntersecting) {
setShow(false);
} else {
setShow(true);
}
},
{ threshold: 1 }
);
observer.observe(node);
return () => observer.disconnect();
}
}, [node]); }, [node]);
return ( return (
@ -43,7 +59,7 @@ const ScrollToBottom = ({ children, className = '' }: { children: ReactNode; cla
<span className="popup-btn block cursor-pointer rounded-full shadow-lg shadow-slate-900 bg-grey-dark hover:bg-grey-light transition-all"> <span className="popup-btn block cursor-pointer rounded-full shadow-lg shadow-slate-900 bg-grey-dark hover:bg-grey-light transition-all">
<FaChevronDown className="fill-grey-light hover:fill-grey-dark transition-all text-xl w-10 h-10 p-2.5" /> <FaChevronDown className="fill-grey-light hover:fill-grey-dark transition-all text-xl w-10 h-10 p-2.5" />
</span> </span>
<span className='sr-only'>Descendre en bas de la page</span> <span className="sr-only">Descendre en bas de la page</span>
</button> </button>
</> </>
); );