Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
70f1d640ed | ||
|
|
e57af60466 | ||
|
|
1f10866b60 | ||
|
|
d9c797f3f5 |
@@ -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>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ import { createUploadAtom, UploadSuccess } from '../../../state/upload';
|
|||||||
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
import { CompactUploadCardRenderer } from '../../../components/upload-card';
|
||||||
import { useCapabilities } from '../../../hooks/useCapabilities';
|
import { useCapabilities } from '../../../hooks/useCapabilities';
|
||||||
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
import { Presence, useUserPresence } from '../../../hooks/useUserPresence';
|
||||||
import { noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
import { DND_STATUS_SENTINEL, noteLocalStatusWrite } from '../../../utils/ownStatusSync';
|
||||||
import { ProfileDecoration } from './ProfileDecoration';
|
import { ProfileDecoration } from './ProfileDecoration';
|
||||||
import { EmojiBoard } from '../../../components/emoji-board';
|
import { EmojiBoard } from '../../../components/emoji-board';
|
||||||
import { useStatusPresets } from '../../../hooks/useStatusPresets';
|
import { useStatusPresets } from '../../../hooks/useStatusPresets';
|
||||||
@@ -396,7 +396,8 @@ function ProfileStatus() {
|
|||||||
const [presenceStatus] = useSetting(settingsAtom, 'presenceStatus');
|
const [presenceStatus] = useSetting(settingsAtom, 'presenceStatus');
|
||||||
const [hidePresence] = useSetting(settingsAtom, 'hidePresence');
|
const [hidePresence] = useSetting(settingsAtom, 'hidePresence');
|
||||||
|
|
||||||
const initialStatus = presence?.status ?? localStorage.getItem(STATUS_MSG_KEY(userId)) ?? '';
|
const serverStatus = presence?.status === DND_STATUS_SENTINEL ? undefined : presence?.status;
|
||||||
|
const initialStatus = serverStatus ?? localStorage.getItem(STATUS_MSG_KEY(userId)) ?? '';
|
||||||
const [statusMsg, setStatusMsg] = useState<string>(initialStatus);
|
const [statusMsg, setStatusMsg] = useState<string>(initialStatus);
|
||||||
// True while the user has unsaved local edits — prevents a server presence
|
// True while the user has unsaved local edits — prevents a server presence
|
||||||
// echo from overwriting what the user is currently typing/inserting.
|
// echo from overwriting what the user is currently typing/inserting.
|
||||||
@@ -442,6 +443,9 @@ function ProfileStatus() {
|
|||||||
pendingAppliedRef.current = null; // window elapsed — accept external changes
|
pendingAppliedRef.current = null; // window elapsed — accept external changes
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// [Gitea #283] "dnd" is the Do Not Disturb sentinel, not something the user
|
||||||
|
// typed: don't show it in the status field or keep it as their status.
|
||||||
|
if (remoteStatus === DND_STATUS_SENTINEL) return;
|
||||||
if (remoteStatus) {
|
if (remoteStatus) {
|
||||||
setStatusMsg(remoteStatus);
|
setStatusMsg(remoteStatus);
|
||||||
localStorage.setItem(STATUS_MSG_KEY(userId), remoteStatus);
|
localStorage.setItem(STATUS_MSG_KEY(userId), remoteStatus);
|
||||||
|
|||||||
@@ -48,3 +48,34 @@ test("a fresh local save wins over a server read that hasn't caught up", () => {
|
|||||||
'previous',
|
'previous',
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('pickHeartbeatStatus: the "dnd" sentinel is never adopted as the user status (#283)', () => {
|
||||||
|
const base = { lastLocalWriteAt: 0, now: 100_000 };
|
||||||
|
// leaving DND: the server still says "dnd" → restore the real local status
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: '🎮 Gaming',
|
||||||
|
server: { presence: 'unavailable', status_msg: 'dnd' },
|
||||||
|
}),
|
||||||
|
'🎮 Gaming',
|
||||||
|
);
|
||||||
|
// a local copy that had absorbed the sentinel becomes empty, not "dnd"
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: 'dnd',
|
||||||
|
server: { presence: 'online', status_msg: 'dnd' },
|
||||||
|
}),
|
||||||
|
'',
|
||||||
|
);
|
||||||
|
// ordinary statuses are unaffected
|
||||||
|
assert.equal(
|
||||||
|
pickHeartbeatStatus({
|
||||||
|
...base,
|
||||||
|
local: 'old',
|
||||||
|
server: { presence: 'online', status_msg: 'new' },
|
||||||
|
}),
|
||||||
|
'new',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
@@ -9,6 +9,9 @@
|
|||||||
* overridden by a server read that hasn't caught up yet.
|
* overridden by a server read that hasn't caught up yet.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/** The status_msg Lotus sends for Do Not Disturb (see usePresenceUpdater). */
|
||||||
|
export const DND_STATUS_SENTINEL = 'dnd';
|
||||||
|
|
||||||
/** Trust this device's own copy for this long after it saved or cleared it. */
|
/** Trust this device's own copy for this long after it saved or cleared it. */
|
||||||
export const LOCAL_WRITE_GRACE_MS = 15_000;
|
export const LOCAL_WRITE_GRACE_MS = 15_000;
|
||||||
|
|
||||||
@@ -37,7 +40,12 @@ export const pickHeartbeatStatus = ({
|
|||||||
lastLocalWriteAt: number;
|
lastLocalWriteAt: number;
|
||||||
now: number;
|
now: number;
|
||||||
}): string => {
|
}): string => {
|
||||||
if (!server || server.presence === 'offline') return local;
|
// [Gitea #283] Lotus encodes Do Not Disturb as status_msg "dnd", so a device
|
||||||
if (now - writtenAt < LOCAL_WRITE_GRACE_MS) return local;
|
// leaving DND must not adopt that sentinel as the user's status — keep (and
|
||||||
|
// so restore) the real one it holds locally.
|
||||||
|
const mine = local === DND_STATUS_SENTINEL ? '' : local;
|
||||||
|
if (!server || server.presence === 'offline') return mine;
|
||||||
|
if (now - writtenAt < LOCAL_WRITE_GRACE_MS) return mine;
|
||||||
|
if (server.status_msg === DND_STATUS_SENTINEL) return mine;
|
||||||
return server.status_msg ?? '';
|
return server.status_msg ?? '';
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user