Parcourir la source

Merge pull request #166 from crowi/fix-seen-users-count

Fix seen users count
Sotaro KARASAWA il y a 9 ans
Parent
commit
fdf1974ef5

+ 3 - 2
resource/js/components/SeenUserList.js

@@ -15,6 +15,7 @@ export default class SeenUserList extends React.Component {
 
   componentDidMount() {
     const seenUserIds = this.getSeenUserIds();
+
     if (seenUserIds.length > 0) {
       // FIXME: user data cache
       this.crowi.apiGet('/users.list', {user_ids: seenUserIds.join(',')})
@@ -41,12 +42,12 @@ export default class SeenUserList extends React.Component {
 
   render() {
     return (
-      <p className="seen-user-list">
+      <div className="seen-user-list">
         <p className="seen-user-count">
           {this.state.seenUsers.length}
         </p>
         <UserList users={this.state.seenUsers} />
-      </p>
+      </div>
     );
   }
 }

+ 13 - 0
resource/js/components/SeenUserList/UserList.js

@@ -3,7 +3,20 @@ import UserPicture from '../User/UserPicture';
 
 export default class UserList extends React.Component {
 
+  isSeenUserListShown() {
+    const userCount = this.props.users.length;
+    if (0 < userCount && userCount <= 10) {
+      return true;
+    }
+
+    return false;
+  }
+
   render() {
+    if (!this.isSeenUserListShown()) {
+      return null;
+    }
+
     const users = this.props.users.map((user) => {
       return (
         <a key={user._id} data-user-id={user._id} href={'/user/' + user.username} title={user.name}>