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