Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fix_video_player.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fix video player sometimes not working
2 changes: 1 addition & 1 deletion src/app/components/DeviceVerification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type WaitingMessageProps = {
function WaitingMessage({ message }: WaitingMessageProps) {
return (
<Box alignItems="Center" gap="200">
<Spinner variant="Secondary" size="200" />
<Spinner variant="Secondary" size="200" style={{ backgroundColor: 'transparent' }} />
<Text size="T300">{message}</Text>
</Box>
);
Expand Down
1 change: 1 addition & 0 deletions src/app/components/media/media.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const ImagePixelated = style({
export const Video = style([
DefaultReset,
{
position: 'relative',
objectFit: 'contain',
width: '100%',
height: '100%',
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/message/modals/MessageDelete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export function MessageDeleteInternal({ room, mEvent, onClose }: MessageDeleteIn
variant="Critical"
before={
deleteState.status === AsyncStatus.Loading ? (
<Spinner fill="Solid" variant="Critical" size="200" />
<Spinner variant="Secondary" size="200" style={{ backgroundColor: 'transparent' }} />
) : undefined
}
aria-disabled={deleteState.status === AsyncStatus.Loading}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/message/modals/MessageReport.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export function MessageReportInternal({ room, mEvent, onClose }: MessageReportIn
variant="Critical"
before={
reportState.status === AsyncStatus.Loading ? (
<Spinner fill="Solid" variant="Critical" size="200" />
<Spinner variant="Secondary" size="200" style={{ backgroundColor: 'transparent' }} />
) : undefined
}
aria-disabled={
Expand Down
11 changes: 10 additions & 1 deletion src/app/components/room-card/RoomCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,16 @@ export const RoomCard = as<'div', RoomCardProps>(
variant="Secondary"
size="300"
disabled={joining}
before={joining && <Spinner size="50" variant="Secondary" fill="Soft" />}
before={
joining && (
<Spinner
size="50"
variant="Secondary"
fill="Soft"
style={{ background: 'transparent' }}
/>
)
}
>
<Text size="B300" truncate>
{joining ? 'Joining' : 'Join'}
Expand Down
7 changes: 6 additions & 1 deletion src/app/components/room-intro/RoomIntro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,12 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) =>
disabled={prevRoomState.status === AsyncStatus.Loading}
after={
prevRoomState.status === AsyncStatus.Loading ? (
<Spinner size="50" variant="Secondary" fill="Soft" />
<Spinner
size="50"
variant="Secondary"
fill="Soft"
style={{ background: 'transparent' }}
/>
) : undefined
}
>
Expand Down
1 change: 1 addition & 0 deletions src/app/features/room/RoomInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1814,6 +1814,7 @@ export const RoomInput = forwardRef<HTMLDivElement, RoomInputProps>(
variant="SurfaceVariant"
size="300"
radii="300"
style={{ backgroundColor: 'transparent' }}
>
{composerIcon(GifIcon, {
weight: emojiBoardTab === EmojiBoardTab.Gif ? 'fill' : 'regular',
Expand Down
4 changes: 2 additions & 2 deletions src/app/features/room/RoomTimeline.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1001,13 +1001,13 @@ export function RoomTimeline({

{showBackPaginationSpinner && (
<TimelineFloat position="Top" style={timelineTopFloatLift}>
<Spinner variant="Secondary" size="400" />
<Spinner variant="Secondary" size="400" style={{ backgroundColor: 'transparent' }} />
</TimelineFloat>
)}

{showFrontPaginationSpinner && (
<TimelineFloat position="Bottom" style={timelineBottomFloatLift}>
<Spinner variant="Secondary" size="400" />
<Spinner variant="Secondary" size="400" style={{ backgroundColor: 'transparent' }} />
</TimelineFloat>
)}

Expand Down
Loading