arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Replace classnames with clsx

Browse Source
This commit is contained in:
Deluan
2020-11-27 18:27:32 -05:00
parent 0b729e1cf9
commit 2ffb28fc2d
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/package-lock.json
Generated
+3 -3
View File
@@ -4184,9 +4184,9 @@
} }
}, },
"clsx": { "clsx": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.0.tgz", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
"integrity": "sha512-3avwM37fSK5oP6M5rQ9CNe99lwxhXDOeSWVPAOYF6OazUTgZCMb0yWlJpmdD74REy1gkEaFiub2ULv4fq9GUhA==" "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
}, },
"co": { "co": {
"version": "4.6.0", "version": "4.6.0",
ui/package.json
+1
View File
@@ -4,6 +4,7 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@material-ui/lab": "^4.0.0-alpha.56", "@material-ui/lab": "^4.0.0-alpha.56",
"clsx": "^1.1.1",
"deepmerge": "^4.2.2", "deepmerge": "^4.2.2",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
ui/src/album/AlbumSongs.js
+2 -2
View File
@@ -6,7 +6,7 @@ import {
useVersion, useVersion,
useListContext, useListContext,
} from 'react-admin' } from 'react-admin'
import classnames from 'classnames' import clsx from 'clsx'
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { Card, useMediaQuery } from '@material-ui/core' import { Card, useMediaQuery } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'
@@ -86,7 +86,7 @@ const AlbumSongs = (props) => {
/> />
<div className={classes.main}> <div className={classes.main}>
<Card <Card
className={classnames(classes.content, { className={clsx(classes.content, {
[classes.bulkActionsDisplayed]: props.selectedIds.length > 0, [classes.bulkActionsDisplayed]: props.selectedIds.length > 0,
})} })}
key={version} key={version}
ui/src/playlist/PlaylistSongs.js
+2 -2
View File
@@ -9,7 +9,7 @@ import {
useVersion, useVersion,
useListContext, useListContext,
} from 'react-admin' } from 'react-admin'
import classnames from 'classnames' import clsx from 'clsx'
import { useDispatch } from 'react-redux' import { useDispatch } from 'react-redux'
import { Card, useMediaQuery } from '@material-ui/core' import { Card, useMediaQuery } from '@material-ui/core'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'
@@ -133,7 +133,7 @@ const PlaylistSongs = ({ playlistId, readOnly, ...props }) => {
/> />
<div className={classes.main}> <div className={classes.main}>
<Card <Card
className={classnames(classes.content, { className={clsx(classes.content, {
[classes.bulkActionsDisplayed]: props.selectedIds.length > 0, [classes.bulkActionsDisplayed]: props.selectedIds.length > 0,
})} })}
key={version} key={version}
ui/src/user/DeleteUserButton.js
+2 -6
View File
@@ -2,7 +2,7 @@ import React from 'react'
import DeleteIcon from '@material-ui/icons/Delete' import DeleteIcon from '@material-ui/icons/Delete'
import { makeStyles } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/core/styles'
import { fade } from '@material-ui/core/styles/colorManipulator' import { fade } from '@material-ui/core/styles/colorManipulator'
import classnames from 'classnames' import clsx from 'clsx'
import { useDeleteWithConfirmController, Button, Confirm } from 'react-admin' import { useDeleteWithConfirmController, Button, Confirm } from 'react-admin'
const useStyles = makeStyles( const useStyles = makeStyles(
@@ -51,11 +51,7 @@ const DeleteUserButton = (props) => {
<Button <Button
onClick={handleDialogOpen} onClick={handleDialogOpen}
label="ra.action.delete" label="ra.action.delete"
className={classnames( className={clsx('ra-delete-button', classes.deleteButton, className)}
'ra-delete-button',
classes.deleteButton,
className
)}
key="button" key="button"
{...rest} {...rest}
> >