@@ -9,37 +9,38 @@ import { Edit as EditIcon, Delete as DeleteIcon } from '@material-ui/icons/'
9
9
10
10
const UsersListTableItems = ( { users, rowsPerPage = 10 , rowsExpected = 10 } ) => {
11
11
const classes = useStyles ( )
12
- const UsersListTableItems = ( { users, rowsPerPage = 10 } ) => {
13
12
// Count how many empty rows needs to be filled
14
- const usersLoading = users . length
15
- ? [ ]
16
- : Array . from ( { length : rowsPerPage } ) . map ( ( item , index ) => index )
17
- const emptyRows = users . length ? rowsPerPage - users . length : [ ]
13
+ const usersVisible = users . length || rowsExpected
14
+ const usersArrayExpected = Array . from ( { length : usersVisible } ) . map (
15
+ ( item , index ) => index ,
16
+ )
17
+ const emptyRows = rowsPerPage - usersVisible
18
18
19
19
return (
20
20
< >
21
- { usersLoading . map ( item => (
22
- < TableRow key = { item } >
23
- < TableCell >
24
- < Skeleton variant = "circle" width = { 40 } height = { 40 } />
25
- </ TableCell >
26
- < TableCell >
27
- < Skeleton variant = "text" />
28
- </ TableCell >
29
- < TableCell >
30
- < Skeleton variant = "text" />
31
- </ TableCell >
32
- < TableCell >
33
- < Skeleton variant = "text" />
34
- </ TableCell >
35
- < TableCell >
36
- < Skeleton variant = "text" />
37
- </ TableCell >
38
- < TableCell >
39
- < Skeleton variant = "text" />
40
- </ TableCell >
41
- </ TableRow >
42
- ) ) }
21
+ { ! users . length &&
22
+ usersArrayExpected . map ( item => (
23
+ < TableRow key = { item } >
24
+ < TableCell >
25
+ < Skeleton variant = "circle" width = { 40 } height = { 40 } />
26
+ </ TableCell >
27
+ < TableCell >
28
+ < Skeleton variant = "text" />
29
+ </ TableCell >
30
+ < TableCell >
31
+ < Skeleton variant = "text" />
32
+ </ TableCell >
33
+ < TableCell >
34
+ < Skeleton variant = "text" />
35
+ </ TableCell >
36
+ < TableCell >
37
+ < Skeleton variant = "text" />
38
+ </ TableCell >
39
+ < TableCell >
40
+ < Skeleton variant = "text" />
41
+ </ TableCell >
42
+ </ TableRow >
43
+ ) ) }
43
44
{ users . map ( row => (
44
45
< TableRow key = { row . id } >
45
46
< TableCell >
@@ -79,12 +80,8 @@ const UsersListTableItems = ({ users, rowsPerPage = 10, rowsExpected = 10 }) =>
79
80
UsersListTableItems . propTypes = { }
80
81
81
82
const useStyles = makeStyles ( theme => ( {
82
- root : {
83
- flexShrink : 0 ,
84
- marginLeft : theme . spacing ( 2.5 ) ,
85
- } ,
86
83
link : {
87
- color : ' inherit'
84
+ color : " inherit"
88
85
}
89
86
} ) )
90
87
0 commit comments