yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Mention attributed incorrectly

Browse Source
This commit is contained in:
Tom Moor
2023-11-06 08:19:23 -05:00
parent 03bdc4e00d
commit 446fffd367
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/editor/components/MentionMenu.tsx
View File

@@ -10,7 +10,6 @@ import User from "~/models/User";
import Avatar from "~/components/Avatar"; import Avatar from "~/components/Avatar";
import { AvatarSize } from "~/components/Avatar/Avatar"; import { AvatarSize } from "~/components/Avatar/Avatar";
import Flex from "~/components/Flex"; import Flex from "~/components/Flex";
import useCurrentUser from "~/hooks/useCurrentUser";
import useRequest from "~/hooks/useRequest"; import useRequest from "~/hooks/useRequest";
import useStores from "~/hooks/useStores"; import useStores from "~/hooks/useStores";
import MentionMenuItem from "./MentionMenuItem"; import MentionMenuItem from "./MentionMenuItem";
@@ -40,9 +39,8 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
const [loaded, setLoaded] = React.useState(false); const [loaded, setLoaded] = React.useState(false);
const [items, setItems] = React.useState<MentionItem[]>([]); const [items, setItems] = React.useState<MentionItem[]>([]);
const { t } = useTranslation(); const { t } = useTranslation();
const { users } = useStores(); const { auth, users } = useStores();
const location = useLocation(); const location = useLocation();
const user = useCurrentUser({ rejectOnEmpty: false });
const documentId = parseDocumentSlug(location.pathname); const documentId = parseDocumentSlug(location.pathname);
const { data, loading, request } = useRequest( const { data, loading, request } = useRequest(
React.useCallback( React.useCallback(
@@ -71,7 +69,7 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
id: v4(), id: v4(),
type: MentionType.User, type: MentionType.User,
modelId: user.id, modelId: user.id,
actorId: user?.id, actorId: auth.currentUserId ?? undefined,
label: user.name, label: user.name,
}, },
})); }));
@@ -79,7 +77,7 @@ function MentionMenu({ search, isActive, ...rest }: Props) {
setItems(items); setItems(items);
setLoaded(true); setLoaded(true);
} }
}, [user?.id, loading, data]); }, [auth.currentUserId, loading, data]);
// Prevent showing the menu until we have data otherwise it will be positioned // Prevent showing the menu until we have data otherwise it will be positioned
// incorrectly due to the height being unknown. // incorrectly due to the height being unknown.