mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
fix: delete and report button colors & missing modal backgrounds
This commit is contained in:
1 parent
2a65518ce3
commit
f4cc4d51de
4 files changed
+29
-8
No files matched your search
@@ -1,5 +1,10 @@
|
||||
# Sable Client Changelog
|
||||
|
||||
## 1.1.7
|
||||
|
||||
- Fix delete and report button colors.
|
||||
- Fix modal backgrounds missing in some menus.
|
||||
|
||||
## 1.1.6
|
||||
|
||||
- Fix crash if too many emojis present [cinnyapp#2570](https://github.com/cinnyapp/cinny/issues/2570)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import React from 'react';
|
||||
import { useAtom } from 'jotai';
|
||||
import { Overlay, OverlayBackdrop, OverlayCenter, Box } from 'folds';
|
||||
import { Overlay, OverlayBackdrop, OverlayCenter, Box, Modal } from 'folds';
|
||||
import FocusTrap from 'focus-trap-react';
|
||||
import { MessageReportInternal } from './MessageReport';
|
||||
import { MessageDeleteInternal } from './MessageDelete';
|
||||
@@ -28,23 +28,37 @@ export function GlobalModalManager() {
|
||||
escapeDeactivates: stopPropagation,
|
||||
}}
|
||||
>
|
||||
<Box>
|
||||
<div>
|
||||
{modal.type === ModalType.Report && (
|
||||
<MessageReportInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
<Box>
|
||||
<MessageReportInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{modal.type === ModalType.Delete && (
|
||||
<MessageDeleteInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
<Box>
|
||||
<MessageDeleteInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{modal.type === ModalType.Source && (
|
||||
<MessageSourceInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
<Modal variant="Surface" size="300">
|
||||
<MessageSourceInternal room={modal.room} mEvent={modal.mEvent} onClose={close} />
|
||||
</Modal>
|
||||
)}
|
||||
|
||||
{modal.type === ModalType.Reactions && (
|
||||
<MessageAllReactionInternal room={modal.room} relations={modal.relations} onClose={close} />
|
||||
<Modal variant="Surface" size="300">
|
||||
<MessageAllReactionInternal room={modal.room} relations={modal.relations} onClose={close} />
|
||||
</Modal>
|
||||
)}
|
||||
|
||||
{modal.type === ModalType.ReadReceipts && (
|
||||
<MessageReadReceiptInternal room={modal.room} eventId={modal.eventId} onClose={close} />
|
||||
<Modal variant="Surface" size="300">
|
||||
<MessageReadReceiptInternal room={modal.room} eventId={modal.eventId} onClose={close} />
|
||||
</Modal>
|
||||
)}
|
||||
</Box>
|
||||
</div>
|
||||
</FocusTrap>
|
||||
</OverlayCenter>
|
||||
</Overlay>
|
||||
|
||||
@@ -18,6 +18,7 @@ export function MessageDeleteItem({ room, mEvent }: { room: Room; mEvent: Matrix
|
||||
size="300"
|
||||
after={<Icon size="100" src={Icons.Delete} />}
|
||||
radii="300"
|
||||
fill="None"
|
||||
variant="Critical"
|
||||
onClick={(e: React.MouseEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -17,6 +17,7 @@ export function MessageReportItem({ room, mEvent }: { room: Room; mEvent: Matrix
|
||||
<MenuItem
|
||||
size="300"
|
||||
variant="Critical"
|
||||
fill="None"
|
||||
after={<Icon size="100" src={Icons.Warning} />}
|
||||
radii="300"
|
||||
onClick={(e: React.MouseEvent) => {
|
||||
|
||||
Reference in new issue
Block a user