Skip to content

Commit f4cc4d5

Browse files
committed
fix: delete and report button colors & missing modal backgrounds
1 parent 2a65518 commit f4cc4d5

4 files changed

Lines changed: 29 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Sable Client Changelog
22

3+
## 1.1.7
4+
5+
- Fix delete and report button colors.
6+
- Fix modal backgrounds missing in some menus.
7+
38
## 1.1.6
49

510
- Fix crash if too many emojis present [cinnyapp#2570](https://github.com/cinnyapp/cinny/issues/2570)

src/app/components/message/modals/GlobalModalManager.tsx

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { useAtom } from 'jotai';
3-
import { Overlay, OverlayBackdrop, OverlayCenter, Box } from 'folds';
3+
import { Overlay, OverlayBackdrop, OverlayCenter, Box, Modal } from 'folds';
44
import FocusTrap from 'focus-trap-react';
55
import { MessageReportInternal } from './MessageReport';
66
import { MessageDeleteInternal } from './MessageDelete';
@@ -28,23 +28,37 @@ export function GlobalModalManager() {
2828
escapeDeactivates: stopPropagation,
2929
}}
3030
>
31-
<Box>
31+
<div>
3232
{modal.type === ModalType.Report && (
33-
<MessageReportInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
33+
<Box>
34+
<MessageReportInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
35+
</Box>
3436
)}
37+
3538
{modal.type === ModalType.Delete && (
36-
<MessageDeleteInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
39+
<Box>
40+
<MessageDeleteInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
41+
</Box>
3742
)}
43+
3844
{modal.type === ModalType.Source && (
39-
<MessageSourceInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
45+
<Modal variant="Surface" size="300">
46+
<MessageSourceInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
47+
</Modal>
4048
)}
49+
4150
{modal.type === ModalType.Reactions && (
42-
<MessageAllReactionInternal room={modal.room} relations={modal.relations} onClose={close} />
51+
<Modal variant="Surface" size="300">
52+
<MessageAllReactionInternal room={modal.room} relations={modal.relations} onClose={close} />
53+
</Modal>
4354
)}
55+
4456
{modal.type === ModalType.ReadReceipts && (
45-
<MessageReadReceiptInternal room={modal.room} eventId={modal.eventId} onClose={close} />
57+
<Modal variant="Surface" size="300">
58+
<MessageReadReceiptInternal room={modal.room} eventId={modal.eventId} onClose={close} />
59+
</Modal>
4660
)}
47-
</Box>
61+
</div>
4862
</FocusTrap>
4963
</OverlayCenter>
5064
</Overlay>

src/app/components/message/modals/MessageDelete.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export function MessageDeleteItem({ room, mEvent }: { room: Room; mEvent: Matrix
1818
size="300"
1919
after={<Icon size="100" src={Icons.Delete} />}
2020
radii="300"
21+
fill="None"
2122
variant="Critical"
2223
onClick={(e: React.MouseEvent) => {
2324
e.preventDefault();

src/app/components/message/modals/MessageReport.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ export function MessageReportItem({ room, mEvent }: { room: Room; mEvent: Matrix
1717
<MenuItem
1818
size="300"
1919
variant="Critical"
20+
fill="None"
2021
after={<Icon size="100" src={Icons.Warning} />}
2122
radii="300"
2223
onClick={(e: React.MouseEvent) => {

0 commit comments

Comments
 (0)