fix: pinned message hidden sometimes

This commit is contained in:
Tristan Yang
2022-12-29 20:46:55 +08:00
parent 3e40e2f496
commit 1ef9cef69c
7 changed files with 106 additions and 37 deletions
@@ -14,8 +14,8 @@ const PreviewMessage: FC<Props> = ({ mid = 0 }) => {
return { msg: store.message[mid], usersData: store.users.byId };
});
if (!msg) return null;
const { from_uid, created_at, content_type, content, thumbnail = "", properties } = msg;
const { name, avatar } = usersData[from_uid || 0] || {};
const { from_uid = 0, created_at, content_type, content, thumbnail = "", properties } = msg;
const { name, avatar } = usersData[from_uid] ?? {};
return (
<StyledWrapper className={`preview`}>
<div className="avatar">
+49
View File
@@ -0,0 +1,49 @@
import dayjs from "dayjs";
import renderContent from "./Message/renderContent";
import Avatar from "./Avatar";
import StyledWrapper from "./Message/styled";
import { useAppSelector } from "../../app/store";
import { FC } from "react";
import { PinnedMessage } from "../../types/channel";
import { normalizeFileMessage } from "../utils";
import { MessagePayload } from "../../app/slices/message";
interface Props {
data: PinnedMessage
}
const PinnedMessageView: FC<Props> = ({ data }) => {
const { usersData } = useAppSelector((store) => {
return { usersData: store.users.byId };
});
const { created_by = 0 } = data;
const normalized = normalizeFileMessage(data as MessagePayload) || {};
console.log("nnnn", normalized);
const { created_at, content_type, content, properties, thumbnail = "" } = { ...data, ...normalized };
const { name, avatar } = usersData[created_by] ?? {};
return (
<StyledWrapper className={`preview`}>
<div className="avatar">
<Avatar width={40} height={40} src={avatar} name={name} />
</div>
<div className="details">
<div className="up">
<span className="name">{name}</span>
<i className="time">{dayjs(created_at).format("YYYY-MM-DD h:mm:ss A")}</i>
</div>
<div className={`down`}>
{renderContent({
content_type,
content,
thumbnail,
from_uid: created_by,
properties
})}
</div>
</div>
</StyledWrapper>
);
};
export default PinnedMessageView;