supnas/cinny
2
1
Fork 0
Code Issues 3 Pull requests Activity

fix: auto scroll to bottom properly

Browse source
This commit is contained in:
sup39 2024-01-18 07:58:58 +09:00
parent bb4763e509
commit 658185a39f
Signed by: sup39
GPG key ID: 111C00916C1641E5
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/app/organisms/room/RoomTimeline.tsx
View file

@ -666,13 +666,13 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
// Stay at bottom when room editor resize // Stay at bottom when room editor resize
useResizeObserver( useResizeObserver(
useMemo(() => { useMemo(() => {
let mounted = false; // let mounted = false;
return (entries) => { return (entries) => {
if (!mounted) { // if (!mounted) {
// skip initial mounting call // // skip initial mounting call
mounted = true; // mounted = true;
return; // return;
} // }
if (!roomInputRef.current) return; if (!roomInputRef.current) return;
const editorBaseEntry = getResizeObserverEntry(roomInputRef.current, entries); const editorBaseEntry = getResizeObserverEntry(roomInputRef.current, entries);
const scrollElement = getScrollElement(); const scrollElement = getScrollElement();
@ -1100,13 +1100,17 @@ export function RoomTimeline({ room, eventId, roomInputRef, editor }: RoomTimeli
if (typeof mxcUrl !== 'string') { if (typeof mxcUrl !== 'string') {
return null; return null;
} }
// const height = scaleYDimension(imgInfo?.w || 400, 400, imgInfo?.h || 400); // FIXME
const imgW = imgInfo?.w ?? 400;
const imgH = imgInfo?.h ?? 400;
const maxW = scrollRef.current?.querySelector(`[data-message-id]>div>div:nth-child(2)`)?.clientWidth ?? 400;
const height = imgW <= maxW ? imgH : scaleYDimension(imgW, maxW, imgH);
return ( return (
<Attachment> <Attachment>
<AttachmentBox <AttachmentBox
style={{ style={{
// height: toRem(height < 48 ? 48 : height), height: toRem(Math.max(48, Math.min(480, height))),
}} }}
> >
<ImageContent <ImageContent