Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f9172cc339 |
@@ -55,6 +55,52 @@ test.describe('local homeserver regression', () => {
|
|||||||
expect(console_.unexpected()).toEqual([]);
|
expect(console_.unexpected()).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('you can vote on a poll you just created, without reloading (#284)', async ({ page }) => {
|
||||||
|
const console_ = collectConsole(page);
|
||||||
|
const room = await createRoom(alice, 'Poll Room');
|
||||||
|
await loginUI(page, alice);
|
||||||
|
await openRoom(page, room);
|
||||||
|
const question = uniq('Lunch? ');
|
||||||
|
await page.getByRole('button', { name: 'Create poll' }).first().click();
|
||||||
|
await page.getByPlaceholder('Ask a question…').fill(question);
|
||||||
|
await page.getByLabel('Option 1', { exact: true }).fill('Pizza');
|
||||||
|
await page.getByLabel('Option 2', { exact: true }).fill('Tacos');
|
||||||
|
await page.getByRole('button', { name: 'Create Poll' }).last().click();
|
||||||
|
const poll = page.locator('[data-message-id]', { hasText: question }).last();
|
||||||
|
await expect(poll).toBeVisible();
|
||||||
|
type Ev = {
|
||||||
|
type: string;
|
||||||
|
event_id: string;
|
||||||
|
content: { 'm.relates_to'?: { event_id?: string } };
|
||||||
|
};
|
||||||
|
const events = async () =>
|
||||||
|
(
|
||||||
|
await api<{ chunk: Ev[] }>(
|
||||||
|
'GET',
|
||||||
|
`/_matrix/client/v3/rooms/${enc(room)}/messages?dir=b&limit=10`,
|
||||||
|
alice.token,
|
||||||
|
)
|
||||||
|
).chunk;
|
||||||
|
// Vote once the poll has reached the server (its row may still carry the local id).
|
||||||
|
await expect
|
||||||
|
.poll(async () => (await events()).some((e) => /poll\.start/.test(e.type)))
|
||||||
|
.toBe(true);
|
||||||
|
await poll.getByText('Tacos', { exact: true }).first().click();
|
||||||
|
await expect
|
||||||
|
.poll(async () => {
|
||||||
|
const chunk = await events();
|
||||||
|
const start = chunk.find((e) => /poll\.start/.test(e.type));
|
||||||
|
return chunk.some(
|
||||||
|
(e) =>
|
||||||
|
/poll\.response/.test(e.type) &&
|
||||||
|
e.content['m.relates_to']?.event_id === start?.event_id &&
|
||||||
|
start?.event_id.startsWith('$'),
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.toBe(true);
|
||||||
|
expect(console_.unexpected()).toEqual([]);
|
||||||
|
});
|
||||||
|
|
||||||
test('your own message scrolls into view even after scrolling up (#212)', async ({ page }) => {
|
test('your own message scrolls into view even after scrolling up (#212)', async ({ page }) => {
|
||||||
const room = await createRoom(alice, 'Scroll Room');
|
const room = await createRoom(alice, 'Scroll Room');
|
||||||
await Array.from({ length: 40 }).reduce<Promise<unknown>>(
|
await Array.from({ length: 40 }).reduce<Promise<unknown>>(
|
||||||
|
|||||||
Generated
+4
-4
@@ -81,7 +81,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.23",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
@@ -2695,9 +2695,9 @@
|
|||||||
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
"integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA=="
|
||||||
},
|
},
|
||||||
"node_modules/@lotusguild/element-call-embedded": {
|
"node_modules/@lotusguild/element-call-embedded": {
|
||||||
"version": "0.25.0-lotus.23",
|
"version": "0.25.0-lotus.22",
|
||||||
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.23/element-call-embedded-0.25.0-lotus.23.tgz",
|
"resolved": "https://code.lotusguild.org/api/packages/LotusGuild/npm/%40lotusguild%2Felement-call-embedded/-/0.25.0-lotus.22/element-call-embedded-0.25.0-lotus.22.tgz",
|
||||||
"integrity": "sha512-vRmcWeJcU0Accyl2x3mqNEzrIe8djE5BekyYbYOSCsMflC98rZgD1mO7KOe7bA1cX7gparRf6sAt1fotHoU+bA==",
|
"integrity": "sha512-AimDKZA4xUKEEyl2XUFUSUDl03tBKFv88T/3igKyH2VqNSPMGnqcQJC5HXIkHLTWrOmg8kLcJ//FFbqlUZiLcA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
"node_modules/@matrix-org/matrix-sdk-crypto-wasm": {
|
||||||
|
|||||||
+1
-1
@@ -108,7 +108,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@axe-core/playwright": "4.13.0",
|
"@axe-core/playwright": "4.13.0",
|
||||||
"@lotusguild/element-call-embedded": "0.25.0-lotus.23",
|
"@lotusguild/element-call-embedded": "0.25.0-lotus.22",
|
||||||
"@playwright/test": "1.63.0",
|
"@playwright/test": "1.63.0",
|
||||||
"@rollup/plugin-inject": "5.0.5",
|
"@rollup/plugin-inject": "5.0.5",
|
||||||
"@rollup/plugin-wasm": "6.2.2",
|
"@rollup/plugin-wasm": "6.2.2",
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ export function AccountDataEditor({
|
|||||||
</Chip>
|
</Chip>
|
||||||
</Box>
|
</Box>
|
||||||
<Box shrink="No">
|
<Box shrink="No">
|
||||||
<IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
|
<IconButton onClick={requestClose} variant="Surface" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ export const DeviceVerificationSetup = forwardRef<HTMLDivElement, DeviceVerifica
|
|||||||
Setup Device Verification
|
Setup Device Verification
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
<IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
@@ -361,7 +361,7 @@ export const DeviceVerificationReset = forwardRef<HTMLDivElement, DeviceVerifica
|
|||||||
Reset Device Verification
|
Reset Device Verification
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
<IconButton size="300" radii="300" onClick={onCancel} aria-label="Cancel">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -139,11 +139,8 @@ export const createRoom = async (mx: MatrixClient, data: CreateRoomData): Promis
|
|||||||
data.allowFederation,
|
data.allowFederation,
|
||||||
data.additionalCreators,
|
data.additionalCreators,
|
||||||
),
|
),
|
||||||
// [Gitea #328] Every non-space room gets call.member at user level, not just
|
power_level_content_override:
|
||||||
// voice rooms: the call button is shown in private group rooms too, and with
|
data.type === RoomType.Call ? createVoiceRoomPowerLevelsOverride() : undefined,
|
||||||
// Synapse's state_default (50) only admins could start or join a call there
|
|
||||||
// ("You don't have permission to join!").
|
|
||||||
power_level_content_override: createVoiceRoomPowerLevelsOverride(),
|
|
||||||
initial_state: initialState,
|
initial_state: initialState,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import React, { KeyboardEvent, useCallback, useEffect, useMemo, useState } from 'react';
|
import React, { KeyboardEvent, useCallback, useEffect, useMemo, useState } from 'react';
|
||||||
import { Box, Chip, color, config, Icon, Icons, Text, toRem } from 'folds';
|
import { Box, Chip, color, config, Icon, Icons, Text, toRem } from 'folds';
|
||||||
import { RelationsEvent } from 'matrix-js-sdk/lib/models/relations';
|
import { RelationsEvent } from 'matrix-js-sdk/lib/models/relations';
|
||||||
import { MatrixEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
|
import { MatrixEvent, MatrixEventEvent, Room, RoomEvent, PollEvent } from 'matrix-js-sdk';
|
||||||
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
import { useMatrixClient } from '../../../hooks/useMatrixClient';
|
||||||
import { getMemberName, sendRoomEvent } from '../../../utils/room';
|
import { getMemberName, sendRoomEvent } from '../../../utils/room';
|
||||||
import {
|
import {
|
||||||
@@ -99,7 +99,21 @@ export function PollContent({
|
|||||||
}) {
|
}) {
|
||||||
const mx = useMatrixClient();
|
const mx = useMatrixClient();
|
||||||
const roomId = room.roomId;
|
const roomId = room.roomId;
|
||||||
const eventId = mEvent.getId();
|
// [Gitea #284] A poll you just created starts with its local-echo id
|
||||||
|
// (`~!room:txn`); the SDK swaps in the real `$event` id once it's sent but
|
||||||
|
// doesn't re-render us. Track the id so votes and the tally use the real one.
|
||||||
|
const [eventId, setEventId] = useState(() => mEvent.getId());
|
||||||
|
useEffect(() => {
|
||||||
|
const sync = () => setEventId(mEvent.getId());
|
||||||
|
sync();
|
||||||
|
mEvent.on(MatrixEventEvent.LocalEventIdReplaced, sync);
|
||||||
|
mEvent.on(MatrixEventEvent.Status, sync);
|
||||||
|
return () => {
|
||||||
|
mEvent.off(MatrixEventEvent.LocalEventIdReplaced, sync);
|
||||||
|
mEvent.off(MatrixEventEvent.Status, sync);
|
||||||
|
};
|
||||||
|
}, [mEvent]);
|
||||||
|
const isLocalEcho = !!eventId?.startsWith('~');
|
||||||
const senderId = mEvent.getSender();
|
const senderId = mEvent.getSender();
|
||||||
|
|
||||||
const parsed = useMemo(() => parsePollStart(mEvent.getContent()), [mEvent]);
|
const parsed = useMemo(() => parsePollStart(mEvent.getContent()), [mEvent]);
|
||||||
@@ -192,8 +206,9 @@ export function PollContent({
|
|||||||
const isMultiple = maxSelections > 1;
|
const isMultiple = maxSelections > 1;
|
||||||
|
|
||||||
const showResults = resultsVisible(isUndisclosed, isEnded);
|
const showResults = resultsVisible(isUndisclosed, isEnded);
|
||||||
const canVote = !!roomId && !!eventId && !isEnded;
|
const canVote = !!roomId && !!eventId && !isLocalEcho && !isEnded;
|
||||||
const canEnd = !!eventId && !isEnded && (senderId === mx.getUserId() || canRedact);
|
const canEnd =
|
||||||
|
!!eventId && !isLocalEcho && !isEnded && (senderId === mx.getUserId() || canRedact);
|
||||||
|
|
||||||
const myVotes = pending ?? tally.myVotes;
|
const myVotes = pending ?? tally.myVotes;
|
||||||
const { counts, total, voters } = tally;
|
const { counts, total, voters } = tally;
|
||||||
@@ -219,25 +234,34 @@ export function PollContent({
|
|||||||
setPending(next);
|
setPending(next);
|
||||||
// Send the STABLE m.poll.response (matches Lotus's stable m.poll.start; the reader
|
// Send the STABLE m.poll.response (matches Lotus's stable m.poll.start; the reader
|
||||||
// accepts both namespaces).
|
// accepts both namespaces).
|
||||||
sendRoomEvent(mx, roomId, null, 'm.poll.response', {
|
// The SDK can throw synchronously (e.g. a relation to a pending event).
|
||||||
'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
|
try {
|
||||||
'm.selections': Array.from(next),
|
sendRoomEvent(mx, roomId, null, 'm.poll.response', {
|
||||||
}).catch(() => setPending(null));
|
'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
|
||||||
|
'm.selections': Array.from(next),
|
||||||
|
}).catch(() => setPending(null));
|
||||||
|
} catch {
|
||||||
|
setPending(null);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleEndPoll = () => {
|
const handleEndPoll = () => {
|
||||||
if (!roomId || !eventId || ending) return;
|
if (!roomId || !eventId || ending) return;
|
||||||
setEnding(true);
|
setEnding(true);
|
||||||
sendRoomEvent(mx, roomId, null, 'm.poll.end', {
|
try {
|
||||||
'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
|
sendRoomEvent(mx, roomId, null, 'm.poll.end', {
|
||||||
'm.poll.end': {},
|
'm.relates_to': { rel_type: 'm.reference', event_id: eventId },
|
||||||
'm.text': 'The poll has ended.',
|
'm.poll.end': {},
|
||||||
})
|
'm.text': 'The poll has ended.',
|
||||||
.then(() => {
|
|
||||||
setConfirmEnd(false);
|
|
||||||
setEnding(false);
|
|
||||||
})
|
})
|
||||||
.catch(() => setEnding(false));
|
.then(() => {
|
||||||
|
setConfirmEnd(false);
|
||||||
|
setEnding(false);
|
||||||
|
})
|
||||||
|
.catch(() => setEnding(false));
|
||||||
|
} catch {
|
||||||
|
setEnding(false);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Radiogroup keyboard model (single-choice only): arrows move focus + selection.
|
// Radiogroup keyboard model (single-choice only): arrows move focus + selection.
|
||||||
|
|||||||
@@ -43,9 +43,7 @@ export function SettingTile({ title, description, before, after, children }: Set
|
|||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
{description && (
|
{description && (
|
||||||
// [Gitea #291] A <div>, not a <p>: many tiles pass blocks (badges,
|
<Text className={BreakWord} size="T200" priority="300">
|
||||||
// <Box>, <Text>) as the description, which is invalid inside a <p>.
|
|
||||||
<Text as="div" className={BreakWord} size="T200" priority="300">
|
|
||||||
{description}
|
{description}
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
|
|||||||
@@ -310,13 +310,9 @@ export function UploadCardRenderer({
|
|||||||
const { file } = upload;
|
const { file } = upload;
|
||||||
const fileSizeExceeded = file.size >= allowSize;
|
const fileSizeExceeded = file.size >= allowSize;
|
||||||
|
|
||||||
// [Gitea #291] Start in an effect, not during render: the desktop taskbar
|
if (upload.status === UploadStatus.Idle && !fileSizeExceeded) {
|
||||||
// progress hook subscribes to the upload atoms, so a render-time start
|
startUpload();
|
||||||
// updated another component mid-render (React warning on every image send).
|
}
|
||||||
const idle = upload.status === UploadStatus.Idle;
|
|
||||||
useEffect(() => {
|
|
||||||
if (idle && !fileSizeExceeded) startUpload();
|
|
||||||
}, [idle, fileSizeExceeded, startUpload]);
|
|
||||||
|
|
||||||
const handleSpoiler = (marked: boolean) => {
|
const handleSpoiler = (marked: boolean) => {
|
||||||
setMetadata(fileItem, { ...metadata, markedAsSpoiler: marked });
|
setMetadata(fileItem, { ...metadata, markedAsSpoiler: marked });
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ export function StateEventEditor({ type, stateKey, requestClose }: StateEventEdi
|
|||||||
</Chip>
|
</Chip>
|
||||||
</Box>
|
</Box>
|
||||||
<Box shrink="No">
|
<Box shrink="No">
|
||||||
<IconButton type="button" onClick={requestClose} variant="Surface" aria-label="Close">
|
<IconButton onClick={requestClose} variant="Surface" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -143,7 +143,7 @@ export function PollCreator({ roomId, threadRootId, onClose }: PollCreatorProps)
|
|||||||
Create Poll
|
Create Poll
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
|
<IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export function ReportRoomModal({ roomId, onClose }: ReportRoomModalProps) {
|
|||||||
Report Room
|
Report Room
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
|
<IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ export function ReportUserModal({ userId, onClose }: ReportUserModalProps) {
|
|||||||
Report User
|
Report User
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" onClick={onClose} radii="300" aria-label="Close">
|
<IconButton size="300" onClick={onClose} radii="300" aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -202,7 +202,7 @@ export function ScheduleMessageModal({
|
|||||||
{title}
|
{title}
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton type="button" size="300" radii="300" onClick={onClose} aria-label="Close">
|
<IconButton size="300" radii="300" onClick={onClose} aria-label="Close">
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -725,13 +725,7 @@ export const MessageDeleteItem = as<
|
|||||||
Delete Message
|
Delete Message
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton
|
<IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
|
||||||
type="button"
|
|
||||||
size="300"
|
|
||||||
onClick={handleClose}
|
|
||||||
radii="300"
|
|
||||||
aria-label="Close"
|
|
||||||
>
|
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
@@ -871,13 +865,7 @@ export const MessageReportItem = as<
|
|||||||
Report Message
|
Report Message
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
<IconButton
|
<IconButton size="300" onClick={handleClose} radii="300" aria-label="Close">
|
||||||
type="button"
|
|
||||||
size="300"
|
|
||||||
onClick={handleClose}
|
|
||||||
radii="300"
|
|
||||||
aria-label="Close"
|
|
||||||
>
|
|
||||||
<Icon src={Icons.Cross} />
|
<Icon src={Icons.Cross} />
|
||||||
</IconButton>
|
</IconButton>
|
||||||
</Header>
|
</Header>
|
||||||
|
|||||||
@@ -69,15 +69,8 @@ export const Reactions = as<'div', ReactionsProps>(
|
|||||||
const measure = useCallback(() => {
|
const measure = useCallback(() => {
|
||||||
const container = containerRef.current;
|
const container = containerRef.current;
|
||||||
if (!container) return;
|
if (!container) return;
|
||||||
// [Gitea #305] The width the chips actually get (content box). The border
|
const rowWidth = container.getBoundingClientRect().width;
|
||||||
// box grows by 4 px while collapsed (margin -2 / padding 2), and measuring
|
const gap = parseFloat(getComputedStyle(container).columnGap) || 8;
|
||||||
// it made a row within 4 px of fitting flip collapsed↔expanded every frame.
|
|
||||||
const cs = getComputedStyle(container);
|
|
||||||
const rowWidth =
|
|
||||||
container.clientWidth -
|
|
||||||
(parseFloat(cs.paddingLeft) || 0) -
|
|
||||||
(parseFloat(cs.paddingRight) || 0);
|
|
||||||
const gap = parseFloat(cs.columnGap) || 8;
|
|
||||||
const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
|
const chips = keys ? keys.split('\u0000').map((k) => chipRefs.current.get(k)) : [];
|
||||||
const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
|
const widths = chips.map((el) => el?.getBoundingClientRect().width ?? 0);
|
||||||
const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
|
const moreWidth = moreRef.current?.getBoundingClientRect().width ?? 48;
|
||||||
@@ -117,21 +110,8 @@ export const Reactions = as<'div', ReactionsProps>(
|
|||||||
style={{
|
style={{
|
||||||
...props.style,
|
...props.style,
|
||||||
...(collapsed && rowHeight
|
...(collapsed && rowHeight
|
||||||
? // 2px breathing room so row-1 focus outlines are not clipped. Longhand
|
? // 2px breathing room so row-1 focus outlines are not clipped.
|
||||||
// margins so the timeline's marginTop survives (Gitea #305: the
|
{ maxHeight: rowHeight + 4, overflow: 'hidden', padding: 2, margin: -2 }
|
||||||
// `margin` shorthand overrode it and, once removed, cleared it).
|
|
||||||
{
|
|
||||||
maxHeight: rowHeight + 4,
|
|
||||||
overflow: 'hidden',
|
|
||||||
padding: 2,
|
|
||||||
marginLeft: -2,
|
|
||||||
marginRight: -2,
|
|
||||||
marginBottom: -2,
|
|
||||||
marginTop:
|
|
||||||
props.style?.marginTop !== undefined
|
|
||||||
? `calc(${typeof props.style.marginTop === 'number' ? `${props.style.marginTop}px` : props.style.marginTop} - 2px)`
|
|
||||||
: -2,
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
}}
|
}}
|
||||||
ref={(el) => {
|
ref={(el) => {
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ import { verifyDenoiseAssets } from './denoiseSmokeCheck';
|
|||||||
import { canDelegateCapability } from './utils';
|
import { canDelegateCapability } from './utils';
|
||||||
import { getCallPageUrl } from './callPageUrl';
|
import { getCallPageUrl } from './callPageUrl';
|
||||||
import { restrictWidgetMessages } from '../widgetTransport';
|
import { restrictWidgetMessages } from '../widgetTransport';
|
||||||
import { isRingableRoom } from '../../utils/callRing';
|
|
||||||
|
|
||||||
// Maximum time to wait for the embedded Element Call iframe to progress from
|
// Maximum time to wait for the embedded Element Call iframe to progress from
|
||||||
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
// initial load to a ready/joined state. If it hasn't by then, we assume the
|
||||||
@@ -252,18 +251,8 @@ export class CallEmbed {
|
|||||||
verifyDenoiseAssets(denoiseModel).catch(() => undefined);
|
verifyDenoiseAssets(denoiseModel).catch(() => undefined);
|
||||||
}
|
}
|
||||||
|
|
||||||
// [Gitea #295] Only ask Element Call to notify where a call can ring at all
|
|
||||||
// (DMs, invite-only groups outside a space). In a voice channel or space
|
|
||||||
// room the notification carries an @room mention, so every member got a
|
|
||||||
// highlighted ping (and phone push) whenever a moderator hopped in, and
|
|
||||||
// other clients showed it as a missed call.
|
|
||||||
// `none` needs element-call-embedded ≥ 0.25.0-lotus.23 (older builds ignore it).
|
|
||||||
if (CallEmbed.startingCall(intent)) {
|
if (CallEmbed.startingCall(intent)) {
|
||||||
let notify = 'none';
|
params.append('sendNotificationType', CallEmbed.dmCall(intent) ? 'ring' : 'notification');
|
||||||
if (isRingableRoom(room, CallEmbed.dmCall(intent))) {
|
|
||||||
notify = CallEmbed.dmCall(intent) ? 'ring' : 'notification';
|
|
||||||
}
|
|
||||||
params.append('sendNotificationType', notify);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// [Gitea #43] On its own origin when config.json sets elementCallUrl.
|
// [Gitea #43] On its own origin when config.json sets elementCallUrl.
|
||||||
|
|||||||
Reference in New Issue
Block a user