Исправлена отчистка сообщений после нажатия ESC
This commit is contained in:
@@ -60,6 +60,7 @@ export function DialogInput() {
|
|||||||
useHotkeys([
|
useHotkeys([
|
||||||
['Esc', () => {
|
['Esc', () => {
|
||||||
setAttachments([]);
|
setAttachments([]);
|
||||||
|
deselectAllMessages();
|
||||||
}]
|
}]
|
||||||
], [], true);
|
], [], true);
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ export function MessageAttachments(props: MessageAttachmentsProps) {
|
|||||||
text: props.text,
|
text: props.text,
|
||||||
parent: props.parent,
|
parent: props.parent,
|
||||||
}
|
}
|
||||||
console.info("Rendering attachment", attachProps);
|
|
||||||
switch (att.type) {
|
switch (att.type) {
|
||||||
case AttachmentType.MESSAGES:
|
case AttachmentType.MESSAGES:
|
||||||
return <MessageReplyMessages {...attachProps} key={index}></MessageReplyMessages>
|
return <MessageReplyMessages {...attachProps} key={index}></MessageReplyMessages>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useRosettaColors } from "@/app/hooks/useRosettaColors";
|
import { useRosettaColors } from "@/app/hooks/useRosettaColors";
|
||||||
import { useReplyMessages } from "@/app/providers/DialogProvider/useReplyMessages";
|
import { useReplyMessages } from "@/app/providers/DialogProvider/useReplyMessages";
|
||||||
import { Button, Flex, Modal, Text } from "@mantine/core";
|
import { Button, Flex, Modal, Text } from "@mantine/core";
|
||||||
import { useDisclosure, useHotkeys } from "@mantine/hooks";
|
import { useDisclosure } from "@mantine/hooks";
|
||||||
import { IconCornerUpLeft, IconCornerUpRightDouble, IconTrash, IconX } from "@tabler/icons-react";
|
import { IconCornerUpLeft, IconCornerUpRightDouble, IconTrash, IconX } from "@tabler/icons-react";
|
||||||
import classes from "./ReplyHeader.module.css";
|
import classes from "./ReplyHeader.module.css";
|
||||||
import { DialogsList } from "../DialogsList/DialogsList";
|
import { DialogsList } from "../DialogsList/DialogsList";
|
||||||
@@ -19,10 +19,6 @@ export function ReplyHeader() {
|
|||||||
const [opened, { open, close }] = useDisclosure(false);
|
const [opened, { open, close }] = useDisclosure(false);
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
const {deleteSelectedMessages} = useDialog();
|
const {deleteSelectedMessages} = useDialog();
|
||||||
|
|
||||||
useHotkeys([
|
|
||||||
['Esc', deselectAllMessages]
|
|
||||||
], [], true);
|
|
||||||
|
|
||||||
const onClickForward = () => {
|
const onClickForward = () => {
|
||||||
open();
|
open();
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ export function useReplyMessages() {
|
|||||||
const {dialog} = context;
|
const {dialog} = context;
|
||||||
|
|
||||||
const selectMessage = (message : MessageReply) => {
|
const selectMessage = (message : MessageReply) => {
|
||||||
|
console.info("-> ", replyMessages);
|
||||||
console.info(message);
|
console.info(message);
|
||||||
if(replyMessages.publicKey != dialog){
|
if(replyMessages.publicKey != dialog){
|
||||||
/**
|
/**
|
||||||
@@ -70,6 +71,7 @@ export function useReplyMessages() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const deselectAllMessages = () => {
|
const deselectAllMessages = () => {
|
||||||
|
console.info("Deselecting all messages");
|
||||||
setReplyMessages({
|
setReplyMessages({
|
||||||
publicKey: "",
|
publicKey: "",
|
||||||
messages: []
|
messages: []
|
||||||
|
|||||||
Reference in New Issue
Block a user