Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70f1d640ed |
@@ -1,4 +1,4 @@
|
|||||||
import React, { CSSProperties, ReactNode, useEffect, useRef, useState } from 'react';
|
import React, { CSSProperties, ReactNode, useEffect, useId, useRef, useState } from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Box, Button, config, Icon, Icons, Text, color, toRem } from 'folds';
|
import { Box, Button, config, Icon, Icons, Text, color, toRem } from 'folds';
|
||||||
import { IContent, MatrixEvent } from 'matrix-js-sdk';
|
import { IContent, MatrixEvent } from 'matrix-js-sdk';
|
||||||
@@ -41,7 +41,10 @@ import { formatAccuracy } from '../../utils/geoShare';
|
|||||||
import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
|
import { Attachment, AttachmentBox, AttachmentContent, AttachmentHeader } from './attachment';
|
||||||
import { FileHeader, FileDownloadButton } from './FileHeader';
|
import { FileHeader, FileDownloadButton } from './FileHeader';
|
||||||
|
|
||||||
const COLLAPSE_MAX_HEIGHT = 320; // px ≈ 20 lines
|
// ≈ 20 lines; in rem so a larger font setting doesn't show fewer lines (Gitea #343).
|
||||||
|
const COLLAPSE_MAX_HEIGHT_REM = 20;
|
||||||
|
const collapseMaxHeightPx = (): number =>
|
||||||
|
COLLAPSE_MAX_HEIGHT_REM * (parseFloat(getComputedStyle(document.documentElement).fontSize) || 16);
|
||||||
|
|
||||||
type CollapsibleBodyProps = {
|
type CollapsibleBodyProps = {
|
||||||
eventId?: string;
|
eventId?: string;
|
||||||
@@ -79,7 +82,7 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
|||||||
const el = bodyRef.current;
|
const el = bodyRef.current;
|
||||||
if (!el) return undefined;
|
if (!el) return undefined;
|
||||||
const observer = new ResizeObserver(() => {
|
const observer = new ResizeObserver(() => {
|
||||||
setNeedsCollapse(el.scrollHeight > COLLAPSE_MAX_HEIGHT);
|
setNeedsCollapse(el.scrollHeight > collapseMaxHeightPx());
|
||||||
});
|
});
|
||||||
observer.observe(el);
|
observer.observe(el);
|
||||||
return () => observer.disconnect();
|
return () => observer.disconnect();
|
||||||
@@ -89,16 +92,36 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
|||||||
// (Gitea #85); useReducedMotion subscribes to the change event instead.
|
// (Gitea #85); useReducedMotion subscribes to the change event instead.
|
||||||
const prefersReducedMotion = useReducedMotion();
|
const prefersReducedMotion = useReducedMotion();
|
||||||
|
|
||||||
|
const bodyId = useId();
|
||||||
|
const isClipped = needsCollapse && collapsed;
|
||||||
|
// [Gitea #343] The clipped part stays in the DOM, so Tab can reach a link in
|
||||||
|
// it; the browser would then scroll the overflow:hidden box itself (top cut
|
||||||
|
// off, and it stayed that way). Expand instead when focus lands inside.
|
||||||
|
const handleFocus = () => {
|
||||||
|
if (isClipped) setCollapsed(false);
|
||||||
|
};
|
||||||
|
useEffect(() => {
|
||||||
|
if (isClipped && bodyRef.current) bodyRef.current.scrollTop = 0;
|
||||||
|
}, [isClipped]);
|
||||||
|
|
||||||
|
// Fade the content itself rather than painting a fixed-colour gradient over
|
||||||
|
// it, so it blends on any background (bubbles, highlights, chat backgrounds).
|
||||||
|
const fadeMask = 'linear-gradient(#000 calc(100% - 3rem), transparent)';
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
ref={bodyRef}
|
ref={bodyRef}
|
||||||
|
id={bodyId}
|
||||||
|
onFocus={handleFocus}
|
||||||
style={{
|
style={{
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
...(needsCollapse && collapsed
|
...(isClipped
|
||||||
? {
|
? {
|
||||||
maxHeight: `${COLLAPSE_MAX_HEIGHT}px`,
|
maxHeight: `${COLLAPSE_MAX_HEIGHT_REM}rem`,
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
|
maskImage: fadeMask,
|
||||||
|
WebkitMaskImage: fadeMask,
|
||||||
transition: prefersReducedMotion ? undefined : 'max-height 0.2s ease',
|
transition: prefersReducedMotion ? undefined : 'max-height 0.2s ease',
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
@@ -107,23 +130,12 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
{needsCollapse && collapsed && (
|
|
||||||
<div
|
|
||||||
style={{
|
|
||||||
position: 'absolute',
|
|
||||||
bottom: 0,
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
height: '3rem',
|
|
||||||
background: `linear-gradient(transparent, ${color.Surface.Container})`,
|
|
||||||
pointerEvents: 'none',
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
{needsCollapse && (
|
{needsCollapse && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
aria-expanded={!collapsed}
|
||||||
|
aria-controls={bodyId}
|
||||||
onClick={() => setCollapsed((c) => !c)}
|
onClick={() => setCollapsed((c) => !c)}
|
||||||
style={{
|
style={{
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
@@ -134,7 +146,8 @@ function CollapsibleBody({ eventId, children }: CollapsibleBodyProps) {
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Text as="span" size="T200" style={{ color: color.Primary.Main }}>
|
<Text as="span" size="T200" style={{ color: color.Primary.Main }}>
|
||||||
{collapsed ? 'Read more ↓' : 'Show less ↑'}
|
{collapsed ? 'Read more' : 'Show less'}
|
||||||
|
<span aria-hidden="true">{collapsed ? ' ↓' : ' ↑'}</span>
|
||||||
</Text>
|
</Text>
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user