aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vnext/src/ui/Thread.js19
-rw-r--r--vnext/src/ui/UserInfo.js56
2 files changed, 41 insertions, 34 deletions
diff --git a/vnext/src/ui/Thread.js b/vnext/src/ui/Thread.js
index cbd40c4c..2e07cd0e 100644
--- a/vnext/src/ui/Thread.js
+++ b/vnext/src/ui/Thread.js
@@ -46,17 +46,20 @@ function Comment({ msg, draft, visitor, active, setActive, onStartEditing, postC
}, []);
useEffect(() => {
isMounted = true;
- if (author.uri) {
- fetchUserUri(author.uri).then(response => {
- if (isMounted) {
- setAuthor(response.data);
- }
- });
- }
+ setAuthor(previous => {
+ if (previous.uri) {
+ fetchUserUri(previous.uri).then(response => {
+ if (isMounted) {
+ return response.data;
+ }
+ });
+ }
+ return previous;
+ });
return () => {
isMounted = false;
};
- }, [author.uri]);
+ }, []);
return (
<div style={chatItemStyle(visitor, msg)}>
<div className="msg-header">
diff --git a/vnext/src/ui/UserInfo.js b/vnext/src/ui/UserInfo.js
index ccdd5c04..6310b8b7 100644
--- a/vnext/src/ui/UserInfo.js
+++ b/vnext/src/ui/UserInfo.js
@@ -12,34 +12,35 @@ import './UserInfo.css';
let isMounted;
/**
- * Wrapper for dumb VSCode
- * @param {import('../api').User} user
- */
-function useUserState(user) {
- return useState(user);
-}
-
-/**
* User info component
* @param {{user: string, onUpdate?: function, children?: Element}} props
*/
export default function UserInfo(props) {
- const [user, setUser] = useUserState({ uname: props.user, uid: 0 });
+ /** @type {import('../api').User} user */
+ const currentUser = {
+ uname: props.user,
+ uid: 0
+ };
+ const [user, setUser] = useState(currentUser);
const { onUpdate } = props;
useEffect(() => {
isMounted = true;
- if (!user.avatar) {
- info(user.uname).then(response => {
- if (isMounted) {
- setUser(response.data);
- onUpdate && onUpdate(response.data);
- }
- });
- }
+ setUser(previous => {
+ if (!previous.avatar) {
+ info(previous.uname).then(response => {
+ if (isMounted) {
+ onUpdate && onUpdate(response.data);
+ return response.data;
+ }
+ });
+ }
+ return previous;
+ });
+
return () => {
isMounted = false;
};
- }, [onUpdate, user, user.avatar, setUser]);
+ }, [onUpdate]);
return (
<>
<div className="userinfo">
@@ -104,17 +105,20 @@ export function UserLink(props) {
const [user, setUser] = useState(props.user);
useEffect(() => {
isMounted = true;
- if (user.uri) {
- fetchUserUri(user.uri).then(response => {
- if (isMounted) {
- setUser(response.data);
- }
- });
- }
+ setUser(previous => {
+ if (previous.uri) {
+ fetchUserUri(previous.uri).then(response => {
+ if (isMounted) {
+ return response.data;
+ }
+ });
+ }
+ return previous;
+ });
return () => {
isMounted = false;
};
- }, [user.uid, user.uri, setUser]);
+ }, []);
return (
user.uid ?
<Link key={user.uid} to={`/${user.uname}/`} className="info-avatar"><img src={user.avatar} />{user.uname}</Link>