feat: disallow replying while uploading image/file

This commit is contained in:
zerosoul
2022-05-23 11:54:46 +08:00
parent f093221805
commit c1c0107512
7 changed files with 46 additions and 30 deletions
+3 -2
View File
@@ -4,12 +4,12 @@ import styled from "styled-components";
import Tippy from "@tippyjs/react";
import { hideAll } from "tippy.js";
import { updateSelectMessages } from "../../../app/slices/ui";
import { addReplyingMessage } from "../../../app/slices/message";
// import StyledMenu from "../styled/Menu";
import ContextMenu from "../ContextMenu";
import Tooltip from "../../component/Tooltip";
import useFavMessage from "../../hook/useFavMessage";
import useSendMessage from "../../hook/useSendMessage";
import ReactionPicker from "./ReactionPicker";
import replyIcon from "../../../assets/icons/reply.svg?url";
import reactIcon from "../../../assets/icons/reaction.svg?url";
@@ -82,6 +82,7 @@ export default function Commands({
DeleteModal,
ForwardModal,
} = useMessageOperation({ mid, context, contextId });
const { setReplying } = useSendMessage({ context, to: contextId });
const { addFavorite, isFavorited } = useFavMessage({
cid: context == "channel" ? contextId : null,
});
@@ -90,7 +91,7 @@ export default function Commands({
const cmdsRef = useRef(null);
const handleReply = (fromMenu) => {
if (contextId) {
dispatch(addReplyingMessage({ id: contextId, mid }));
setReplying(mid);
}
if (fromMenu) {
hideAll();
+3 -3
View File
@@ -10,8 +10,7 @@ import IconPin from "../../../assets/icons/pin.svg";
import IconCopy from "../../../assets/icons/copy.svg";
import IconSelect from "../../../assets/icons/select.svg";
import { updateSelectMessages } from "../../../app/slices/ui";
import { addReplyingMessage } from "../../../app/slices/message";
import useSendMessage from "../../hook/useSendMessage";
import useMessageOperation from "./useMessageOperation";
export default function MessageContextMenu({
@@ -40,6 +39,7 @@ export default function MessageContextMenu({
DeleteModal,
} = useMessageOperation({ mid, contextId, context });
const dispatch = useDispatch();
const { setReplying } = useSendMessage({ context, to: contextId });
const handleSelect = () => {
dispatch(updateSelectMessages({ context, id: contextId, data: mid }));
// hideAll();
@@ -47,7 +47,7 @@ export default function MessageContextMenu({
const handleReply = () => {
// console.log("dddd", contextId, mid);
if (contextId) {
dispatch(addReplyingMessage({ id: contextId, mid }));
setReplying(mid);
}
};
return (