mirror of
https://github.com/docmost/docmost.git
synced 2026-05-07 06:23:06 +08:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ac47eb8dbe |
@@ -24,7 +24,12 @@ function CommentActions({
|
|||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Button size="compact-sm" loading={isLoading} onClick={onSave}>
|
<Button
|
||||||
|
size="compact-sm"
|
||||||
|
loading={isLoading}
|
||||||
|
onClick={onSave}
|
||||||
|
onMouseDown={(e) => e.preventDefault()}
|
||||||
|
>
|
||||||
{t("Save")}
|
{t("Save")}
|
||||||
</Button>
|
</Button>
|
||||||
</Group>
|
</Group>
|
||||||
|
|||||||
@@ -27,6 +27,9 @@ import { extractPageSlugId } from "@/lib";
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
|
import { useGetSpaceBySlugQuery } from "@/features/space/queries/space-query.ts";
|
||||||
import { IconArrowUp, IconMessageOff } from "@tabler/icons-react";
|
import { IconArrowUp, IconMessageOff } from "@tabler/icons-react";
|
||||||
|
import { useAtom } from "jotai";
|
||||||
|
import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
|
||||||
|
import { CustomAvatar } from "@/components/ui/custom-avatar.tsx";
|
||||||
|
|
||||||
function CommentListWithTabs() {
|
function CommentListWithTabs() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -345,6 +348,7 @@ const PageCommentInput = ({ onSave, isLoading }) => {
|
|||||||
const [content, setContent] = useState("");
|
const [content, setContent] = useState("");
|
||||||
const { ref, focused } = useFocusWithin();
|
const { ref, focused } = useFocusWithin();
|
||||||
const commentEditorRef = useRef(null);
|
const commentEditorRef = useRef(null);
|
||||||
|
const [currentUser] = useAtom(currentUserAtom);
|
||||||
|
|
||||||
const handleSave = useCallback(() => {
|
const handleSave = useCallback(() => {
|
||||||
onSave(null, content);
|
onSave(null, content);
|
||||||
@@ -363,19 +367,30 @@ const PageCommentInput = ({ onSave, isLoading }) => {
|
|||||||
position: "relative",
|
position: "relative",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<CommentEditor
|
<Group wrap="nowrap" align="flex-start" gap="xs">
|
||||||
ref={commentEditorRef}
|
<CustomAvatar
|
||||||
onUpdate={setContent}
|
size="sm"
|
||||||
onSave={handleSave}
|
avatarUrl={currentUser?.user?.avatarUrl}
|
||||||
editable={true}
|
name={currentUser?.user?.name}
|
||||||
placeholder={t("Add a comment...")}
|
style={{ flexShrink: 0, marginTop: 10 }}
|
||||||
/>
|
/>
|
||||||
|
<div style={{ flex: 1, minWidth: 0 }}>
|
||||||
|
<CommentEditor
|
||||||
|
ref={commentEditorRef}
|
||||||
|
onUpdate={setContent}
|
||||||
|
onSave={handleSave}
|
||||||
|
editable={true}
|
||||||
|
placeholder={t("Add a comment...")}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Group>
|
||||||
{focused && (
|
{focused && (
|
||||||
<ActionIcon
|
<ActionIcon
|
||||||
variant="filled"
|
variant="filled"
|
||||||
radius="xl"
|
radius="xl"
|
||||||
size="sm"
|
size="sm"
|
||||||
onClick={handleSave}
|
onClick={handleSave}
|
||||||
|
onMouseDown={(e) => e.preventDefault()}
|
||||||
loading={isLoading}
|
loading={isLoading}
|
||||||
style={{ position: "absolute", right: 8, bottom: 30 }}
|
style={{ position: "absolute", right: 8, bottom: 30 }}
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user