diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx index b9b0e6b4c0852c15ef5d3290de4635c7bafef858..435f2d544b1ff937892ee0f86ce9ba54b3f2f5fb 100644 --- a/src/components/common/messaging/attachments/MessageReply.tsx +++ b/src/components/common/messaging/attachments/MessageReply.tsx @@ -45,10 +45,13 @@ export const ReplyBase = styled.div<{ .content { gap: 4px; display: flex; + cursor: pointer; align-items: center; flex-direction: row; - cursor: pointer; + > * { + pointer-events: none; + } } > svg:first-child { diff --git a/src/lib/renderer/Singleton.ts b/src/lib/renderer/Singleton.ts index 83bb2efe0f90feed338ebf204f113abefa11e377..be9829d1228a45abd4f6ab02c34a5bc6d7fd46c7 100644 --- a/src/lib/renderer/Singleton.ts +++ b/src/lib/renderer/Singleton.ts @@ -73,6 +73,16 @@ export class SingletonRenderer extends EventEmitter3 { } async init(id: string, message_id?: string) { + if (message_id) { + if (this.state.type === 'RENDER') { + let message = this.state.messages.find(x => x._id === message_id); + if (message) { + this.emit("scroll", { type: "ScrollToView", id: message_id }); + return; + } + } + } + this.channel = id; this.stale = false; this.setStateUnguarded({ type: "LOADING" }); diff --git a/src/pages/channels/ChannelHeader.tsx b/src/pages/channels/ChannelHeader.tsx index 31cb705efc50e169282017f32328961b32e7f786..95b964b049555be24773b15162fe49f7521b8448 100644 --- a/src/pages/channels/ChannelHeader.tsx +++ b/src/pages/channels/ChannelHeader.tsx @@ -58,6 +58,10 @@ const Info = styled.div` font-size: 0.8em; font-weight: 400; color: var(--secondary-foreground); + + > * { + pointer-events: none; + } } `;