Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Implement reply to feature

Hakan Shehuef8a487047b7
diff --git a/desktop/src/renderer/components/messages/conversation.tsx b/desktop/src/renderer/components/messages/conversation.tsx
index 8a220b9b..88424b49 100644
--- a/desktop/src/renderer/components/messages/conversation.tsx
+++ b/desktop/src/renderer/components/messages/conversation.tsx
@@ -1,6 +1,9 @@
import React from 'react';
import { MessageList } from '@/renderer/components/messages/message-list';
-import { MessageCreate } from '@/renderer/components/messages/message-create';
+import {
+ MessageCreate,
+ MessageCreateRefProps,
+} from '@/renderer/components/messages/message-create';
import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { InView } from 'react-intersection-observer';
@@ -12,13 +15,14 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
const viewportRef = React.useRef<HTMLDivElement>(null);
const containerRef = React.useRef<HTMLDivElement>(null);
const observerRef = React.useRef<ResizeObserver | null>(null);
- const scrollPosition = React.useRef<number>(0);
+ const scrollPositionRef = React.useRef<number>(0);
const bottomRef = React.useRef<HTMLDivElement>(null);
const bottomVisibleRef = React.useRef<boolean>(false);
- const shouldScrollToBottom = React.useRef<boolean>(true);
+ const shouldScrollToBottomRef = React.useRef<boolean>(true);
+ const messageCreateRef = React.useRef<MessageCreateRefProps>(null);
React.useEffect(() => {
- if (bottomRef.current && scrollPosition.current == 0) {
+ if (bottomRef.current && scrollPositionRef.current == 0) {
bottomRef.current.scrollIntoView();
}
@@ -29,11 +33,11 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
return;
}
- if (shouldScrollToBottom.current) {
+ if (shouldScrollToBottomRef.current) {
bottomRef.current?.scrollIntoView();
} else {
viewportRef.current.scrollTop =
- viewportRef.current.scrollHeight - scrollPosition.current;
+ viewportRef.current.scrollHeight - scrollPositionRef.current;
}
});
@@ -49,10 +53,10 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
const handleScroll = () => {
if (viewportRef.current) {
- scrollPosition.current =
+ scrollPositionRef.current =
viewportRef.current.scrollHeight - viewportRef.current.scrollTop;
- shouldScrollToBottom.current = bottomVisibleRef.current;
+ shouldScrollToBottomRef.current = bottomVisibleRef.current;
}
};
@@ -67,10 +71,15 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
<MessageList
conversationId={conversationId}
onLastMessageIdChange={() => {
- if (shouldScrollToBottom.current && bottomRef.current) {
+ if (shouldScrollToBottomRef.current && bottomRef.current) {
bottomRef.current.scrollIntoView();
}
}}
+ onReply={(message) => {
+ if (messageCreateRef.current) {
+ messageCreateRef.current.setReplyTo(message);
+ }
+ }}
/>
</div>
<InView
@@ -83,7 +92,7 @@ export const Conversation = ({ conversationId }: ConversationProps) => {
<div ref={bottomRef} className="h-4"></div>
</InView>
</ScrollArea>
- <MessageCreate conversationId={conversationId} />
+ <MessageCreate ref={messageCreateRef} conversationId={conversationId} />
</React.Fragment>
);
};
diff --git a/desktop/src/renderer/components/messages/message-create.tsx b/desktop/src/renderer/components/messages/message-create.tsx
index 3b3b9e53..84bde795 100644
--- a/desktop/src/renderer/components/messages/message-create.tsx
+++ b/desktop/src/renderer/components/messages/message-create.tsx
@@ -1,29 +1,87 @@
import React from 'react';
-import { MessageEditor } from '@/renderer/components/messages/message-editor';
+import {
+ MessageEditor,
+ MessageEditorRefProps,
+} from '@/renderer/components/messages/message-editor';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
+import { MessageNode } from '@/types/messages';
+import { Icon } from '@/renderer/components/ui/icon';
interface MessageCreateProps {
conversationId: string;
}
-export const MessageCreate = ({ conversationId }: MessageCreateProps) => {
+export interface MessageCreateRefProps {
+ setReplyTo: (replyTo: MessageNode | null) => void;
+}
+
+export const MessageCreate = React.forwardRef<
+ MessageCreateRefProps,
+ MessageCreateProps
+>(({ conversationId }, ref) => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
+ const messageEditorRef = React.useRef<MessageEditorRefProps>(null);
+ const [replyTo, setReplyTo] = React.useState<MessageNode | null>(null);
+
+ React.useImperativeHandle(ref, () => ({
+ setReplyTo: (replyTo) => {
+ setReplyTo(replyTo);
+ if (messageEditorRef.current) {
+ messageEditorRef.current.focus();
+ }
+ },
+ }));
+
return (
<div className="container mt-1 px-10">
<div className="flex flex-col">
+ {replyTo && (
+ <div className="flex flex-row items-center justify-between rounded-t-lg border-b-2 bg-gray-100 p-2 text-foreground">
+ <p className="text-sm">
+ Replying to{' '}
+ <span className="font-semibold">{replyTo.author.name}</span>
+ </p>
+ <button
+ className="cursor-pointer"
+ onClick={() => {
+ setReplyTo(null);
+ }}
+ >
+ <Icon name="close-circle-line" />
+ </button>
+ </div>
+ )}
<MessageEditor
+ ref={messageEditorRef}
conversationId={conversationId}
onSubmit={(content) => {
+ const messageContent = content;
+ if (replyTo) {
+ messageContent.content.unshift({
+ type: 'messageReference',
+ attrs: {
+ id: replyTo.id,
+ name: replyTo.author.name,
+ },
+ content: replyTo.content,
+ });
+ }
mutate({
input: {
type: 'message_create',
conversationId: conversationId,
- content: content,
+ content: messageContent,
userId: workspace.userId,
},
+ onSuccess: () => {
+ setReplyTo(null);
+ if (messageEditorRef.current) {
+ messageEditorRef.current.focus();
+ }
+ },
});
}}
loading={isPending}
@@ -34,4 +92,4 @@ export const MessageCreate = ({ conversationId }: MessageCreateProps) => {
<div className="flex h-8 min-h-8 items-center text-xs text-muted-foreground"></div>
</div>
);
-};
+});
diff --git a/desktop/src/renderer/components/messages/message-editor.tsx b/desktop/src/renderer/components/messages/message-editor.tsx
index e16691d9..cb26430a 100644
--- a/desktop/src/renderer/components/messages/message-editor.tsx
+++ b/desktop/src/renderer/components/messages/message-editor.tsx
@@ -42,7 +42,15 @@ interface MessageEditorProps {
onSubmit: (content: JSONContent) => void;
}
-export const MessageEditor = (props: MessageEditorProps) => {
+export interface MessageEditorRefProps {
+ focus: () => void;
+ clear: () => void;
+}
+
+export const MessageEditor = React.forwardRef<
+ MessageEditorRefProps,
+ MessageEditorProps
+>((props, ref) => {
const editor = useEditor(
{
extensions: [
@@ -94,6 +102,20 @@ export const MessageEditor = (props: MessageEditorProps) => {
editor.chain().clearContent(true).focus().run();
}, [editor, props]);
+ React.useImperativeHandle(ref, () => ({
+ focus: () => {
+ if (editor == null) {
+ return;
+ }
+
+ editor.chain().focus('end').run();
+ editor?.view?.focus();
+ },
+ clear: () => {
+ editor?.chain().clearContent(true).focus().run();
+ },
+ }));
+
return (
<div className="flex min-h-0 flex-row items-center rounded bg-gray-100 p-2 pl-0">
<div className="flex w-10 items-center justify-center">
@@ -175,4 +197,4 @@ export const MessageEditor = (props: MessageEditorProps) => {
</div>
</div>
);
-};
+});
diff --git a/desktop/src/renderer/components/messages/message-list.tsx b/desktop/src/renderer/components/messages/message-list.tsx
index b7017839..caa29ba5 100644
--- a/desktop/src/renderer/components/messages/message-list.tsx
+++ b/desktop/src/renderer/components/messages/message-list.tsx
@@ -4,10 +4,12 @@ import { Message } from '@/renderer/components/messages/message';
import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { compareString } from '@/lib/utils';
+import { MessageNode } from '@/types/messages';
interface MessageListProps {
conversationId: string;
onLastMessageIdChange: (id: string) => void;
+ onReply: (replyTo: MessageNode | null) => void;
}
const MESSAGES_PER_PAGE = 50;
@@ -15,6 +17,7 @@ const MESSAGES_PER_PAGE = 50;
export const MessageList = ({
conversationId,
onLastMessageIdChange,
+ onReply,
}: MessageListProps) => {
const workspace = useWorkspace();
const lastMessageId = React.useRef<string | null>(null);
@@ -98,7 +101,11 @@ export const MessageList = ({
<div className="flex-grow border-t border-gray-100" />
</div>
)}
- <Message message={message} previousMessage={previousMessage} />
+ <Message
+ message={message}
+ previousMessage={previousMessage}
+ onReply={onReply}
+ />
</React.Fragment>
);
})}
diff --git a/desktop/src/renderer/components/messages/message.tsx b/desktop/src/renderer/components/messages/message.tsx
index 4d5db711..a2ea86ed 100644
--- a/desktop/src/renderer/components/messages/message.tsx
+++ b/desktop/src/renderer/components/messages/message.tsx
@@ -19,6 +19,7 @@ import { useWorkspace } from '@/renderer/contexts/workspace';
interface MessageProps {
message: MessageNode;
previousMessage?: MessageNode;
+ onReply: (replyTo: MessageNode | null) => void;
}
const shouldDisplayUserInfo = (
@@ -39,7 +40,11 @@ const shouldDisplayUserInfo = (
return previousMessage.author.id !== message.author.id;
};
-export const Message = ({ message, previousMessage }: MessageProps) => {
+export const Message = ({
+ message,
+ previousMessage,
+ onReply,
+}: MessageProps) => {
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
@@ -120,7 +125,13 @@ export const Message = ({ message, previousMessage }: MessageProps) => {
/>
</li>
<li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">
- <Icon name="reply-line" className="cursor-pointer" />
+ <Icon
+ name="reply-line"
+ className="cursor-pointer"
+ onClick={() => {
+ onReply(message);
+ }}
+ />
</li>
{canDelete && (
<li className="flex h-8 w-7 cursor-pointer items-center justify-center hover:bg-gray-200">
diff --git a/desktop/src/renderer/editor/extensions/message-reference.tsx b/desktop/src/renderer/editor/extensions/message-reference.tsx
new file mode 100644
index 00000000..66c42c87
--- /dev/null
+++ b/desktop/src/renderer/editor/extensions/message-reference.tsx
@@ -0,0 +1,30 @@
+import { mergeAttributes, Node } from '@tiptap/core';
+import { ReactNodeViewRenderer } from '@tiptap/react';
+import { MessageReferenceNodeView } from '@/renderer/editor/views/message-reference';
+
+export const MessageReferenceNode = Node.create({
+ name: 'messageReference',
+ topNode: true,
+ content: 'block+',
+ addAttributes() {
+ return {
+ id: {
+ default: null,
+ },
+ messageId: {
+ default: null,
+ },
+ name: {
+ default: null,
+ },
+ };
+ },
+ renderHTML({ HTMLAttributes }) {
+ return ['messageReference', mergeAttributes(HTMLAttributes)];
+ },
+ addNodeView() {
+ return ReactNodeViewRenderer(MessageReferenceNodeView, {
+ as: 'messageReference',
+ });
+ },
+});
diff --git a/desktop/src/renderer/editor/renderers/blockquote.tsx b/desktop/src/renderer/editor/renderers/blockquote.tsx
index 1ee5a627..69a37f36 100644
--- a/desktop/src/renderer/editor/renderers/blockquote.tsx
+++ b/desktop/src/renderer/editor/renderers/blockquote.tsx
@@ -8,12 +8,13 @@ interface BlockquoteRendererProps {
keyPrefix: string | null;
}
-const BlockquoteRenderer = ({ node, keyPrefix }: BlockquoteRendererProps) => {
+export const BlockquoteRenderer = ({
+ node,
+ keyPrefix,
+}: BlockquoteRendererProps) => {
return (
<blockquote className={defaultClasses.blockquote}>
<NodeChildrenRenderer node={node} keyPrefix={keyPrefix} />
</blockquote>
);
};
-
-export { BlockquoteRenderer };
diff --git a/desktop/src/renderer/editor/renderers/message-reference.tsx b/desktop/src/renderer/editor/renderers/message-reference.tsx
new file mode 100644
index 00000000..48e7cec1
--- /dev/null
+++ b/desktop/src/renderer/editor/renderers/message-reference.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
+import { JSONContent } from '@tiptap/core';
+
+interface MessageReferenceRendererProps {
+ node: JSONContent;
+ keyPrefix: string | null;
+}
+
+export const MessageReferenceRenderer = ({
+ node,
+ keyPrefix,
+}: MessageReferenceRendererProps) => {
+ return (
+ <div className="items-top flex flex-col gap-2 border-l-4 p-2 text-sm text-foreground">
+ <p className="font-medium">{node.attrs.name}</p>
+ <NodeChildrenRenderer node={node} keyPrefix={keyPrefix} />
+ </div>
+ );
+};
diff --git a/desktop/src/renderer/editor/renderers/node.tsx b/desktop/src/renderer/editor/renderers/node.tsx
index 9cbfa199..93e1b8a6 100644
--- a/desktop/src/renderer/editor/renderers/node.tsx
+++ b/desktop/src/renderer/editor/renderers/node.tsx
@@ -13,6 +13,7 @@ import { ParagraphRenderer } from '@/renderer/editor/renderers/paragraph';
import { TaskItemRenderer } from '@/renderer/editor/renderers/task-item';
import { TaskListRenderer } from '@/renderer/editor/renderers/task-list';
import { TextRenderer } from '@/renderer/editor/renderers/text';
+import { MessageReferenceRenderer } from '@/renderer/editor/renderers/message-reference';
import { match } from 'ts-pattern';
import { JSONContent } from '@tiptap/core';
import { MarkRenderer } from '@/renderer/editor/renderers/mark';
@@ -69,6 +70,9 @@ export const NodeRenderer = ({
.with('codeBlock', () => (
<CodeBlockRenderer node={node} keyPrefix={keyPrefix} />
))
+ .with('messageReference', () => (
+ <MessageReferenceRenderer node={node} keyPrefix={keyPrefix} />
+ ))
.otherwise(null)}
</MarkRenderer>
);
diff --git a/desktop/src/renderer/editor/views/code-block.tsx b/desktop/src/renderer/editor/views/code-block.tsx
index cbb9b65a..9bc4404b 100644
--- a/desktop/src/renderer/editor/views/code-block.tsx
+++ b/desktop/src/renderer/editor/views/code-block.tsx
@@ -34,7 +34,7 @@ export const CodeBlockNodeView = ({
return (
<NodeViewWrapper
- data-block-id={node.attrs.blockId}
+ data-id={node.attrs.id}
as="pre"
className={defaultClasses.codeBlock}
>
diff --git a/desktop/src/renderer/editor/views/message-reference.tsx b/desktop/src/renderer/editor/views/message-reference.tsx
new file mode 100644
index 00000000..96a5d9b6
--- /dev/null
+++ b/desktop/src/renderer/editor/views/message-reference.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { type NodeViewProps } from '@tiptap/core';
+import { NodeViewContent, NodeViewWrapper } from '@tiptap/react';
+
+export const MessageReferenceNodeView = ({ node }: NodeViewProps) => {
+ const name = node.attrs.name ?? 'Unnamed';
+
+ if (!name) {
+ return null;
+ }
+
+ return (
+ <NodeViewWrapper
+ data-id={node.attrs.id}
+ className="items-top flex flex-col gap-2 border-l-4 p-2 text-sm text-foreground"
+ >
+ <p className="font-medium">{name}</p>
+ <NodeViewContent />
+ </NodeViewWrapper>
+ );
+};
diff --git a/desktop/src/renderer/editor/views/page.tsx b/desktop/src/renderer/editor/views/page.tsx
index 00b57f61..5d081450 100644
--- a/desktop/src/renderer/editor/views/page.tsx
+++ b/desktop/src/renderer/editor/views/page.tsx
@@ -8,7 +8,7 @@ import { useQuery } from '@/renderer/hooks/use-query';
export const PageNodeView = ({ node }: NodeViewProps) => {
const workspace = useWorkspace();
const id = node.attrs.id;
- const { data, isPending } = useQuery({
+ const { data } = useQuery({
type: 'node_get',
nodeId: id,
userId: workspace.userId,
@@ -23,7 +23,7 @@ export const PageNodeView = ({ node }: NodeViewProps) => {
return (
<NodeViewWrapper
- data-block-id={node.attrs.blockId}
+ data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
workspace.navigateToNode(id);