🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Handling long playlist comments (#2973)
Tim8f9ed1b99466
diff --git a/ui/src/album/AlbumDetails.js b/ui/src/album/AlbumDetails.jsindex e5fcb5eb7..dccecd4dc 100644--- a/ui/src/album/AlbumDetails.js+++ b/ui/src/album/AlbumDetails.js@@ -1,4 +1,4 @@-import React, { useMemo, useCallback, useState, useEffect } from 'react'+import { useState, useEffect, useCallback } from 'react'import {Card,CardContent,@@ -17,7 +17,6 @@ import {ChipField,Link,} from 'react-admin'-import clsx from 'clsx'import Lightbox from 'react-image-lightbox'import 'react-image-lightbox/style.css'import subsonic from '../subsonic'@@ -29,11 +28,11 @@ import {LoveButton,RatingField,useAlbumsPerPage,+ CollapsibleComment,} from '../common'import config from '../config'import { formatFullDate, intersperse } from '../utils'import AlbumExternalLinks from './AlbumExternalLinks'-import AnchorMe from '../common/Linkify'const useStyles = makeStyles((theme) => ({@@ -85,12 +84,6 @@ const useStyles = makeStyles(top: theme.spacing(-0.2),left: theme.spacing(0.5),},- commentBlock: {- display: 'inline-block',- marginTop: '1em',- float: 'left',- wordBreak: 'break-word',- },notes: {display: 'inline-block',marginTop: '1em',@@ -98,9 +91,6 @@ const useStyles = makeStyles(wordBreak: 'break-word',cursor: 'pointer',},- pointerCursor: {- cursor: 'pointer',- },recordName: {},recordArtist: {},recordMeta: {},@@ -116,41 +106,6 @@ const useStyles = makeStyles(},)-const AlbumComment = ({ record }) => {- const classes = useStyles()- const [expanded, setExpanded] = React.useState(false)-- const lines = record.comment.split('\n')- const formatted = useMemo(() => {- return lines.map((line, idx) => (- <span key={record.id + '-comment-' + idx}>- <AnchorMe text={line} />- <br />- </span>- ))- }, [lines, record.id])-- const handleExpandClick = useCallback(() => {- setExpanded(!expanded)- }, [expanded, setExpanded])-- return (- <Collapse- collapsedHeight={'1.5em'}- in={expanded}- timeout={'auto'}- className={clsx(- classes.commentBlock,- lines.length > 1 && classes.pointerCursor,- )}- >- <Typography variant={'body1'} onClick={handleExpandClick}>- {formatted}- </Typography>- </Collapse>- )-}-export const useGetHandleGenreClick = (width) => {const [perPage] = useAlbumsPerPage(width)@@ -268,7 +223,7 @@ const AlbumDetails = (props) => {const isXsmall = useMediaQuery((theme) => theme.breakpoints.down('xs'))const isDesktop = useMediaQuery((theme) => theme.breakpoints.up('lg'))const classes = useStyles()- const [isLightboxOpen, setLightboxOpen] = React.useState(false)+ const [isLightboxOpen, setLightboxOpen] = useState(false)const [expanded, setExpanded] = useState(false)const [albumInfo, setAlbumInfo] = useState()@@ -296,11 +251,8 @@ const AlbumDetails = (props) => {const imageUrl = subsonic.getCoverArtUrl(record, 300)const fullImageUrl = subsonic.getCoverArtUrl(record)- const handleOpenLightbox = React.useCallback(() => setLightboxOpen(true), [])- const handleCloseLightbox = React.useCallback(- () => setLightboxOpen(false),- [],- )+ const handleOpenLightbox = useCallback(() => setLightboxOpen(true), [])+ const handleCloseLightbox = useCallback(() => setLightboxOpen(false), [])return (<Card className={classes.root}><div className={classes.cardContents}>@@ -373,11 +325,15 @@ const AlbumDetails = (props) => {</Typography></Collapse>)}- {isDesktop && record['comment'] && <AlbumComment record={record} />}+ {isDesktop && record['comment'] && (+ <CollapsibleComment record={record} />+ )}</CardContent></div></div>- {!isDesktop && record['comment'] && <AlbumComment record={record} />}+ {!isDesktop && record['comment'] && (+ <CollapsibleComment record={record} />+ )}{!isDesktop && (<div className={classes.notes}><Collapse collapsedHeight={'1.5em'} in={expanded} timeout={'auto'}>diff --git a/ui/src/common/CollapsibleComment.js b/ui/src/common/CollapsibleComment.jsnew file mode 100644index 000000000..f0485b2e8--- /dev/null+++ b/ui/src/common/CollapsibleComment.js@@ -0,0 +1,57 @@+import { useCallback, useMemo, useState } from 'react'+import { Typography, Collapse } from '@material-ui/core'+import { makeStyles } from '@material-ui/core/styles'+import AnchorMe from './Linkify'+import clsx from 'clsx'++const useStyles = makeStyles(+ (theme) => ({+ commentBlock: {+ display: 'inline-block',+ marginTop: '1em',+ float: 'left',+ wordBreak: 'break-word',+ },+ pointerCursor: {+ cursor: 'pointer',+ },+ }),+ {+ name: 'NDCollapsibleComment',+ },+)++export const CollapsibleComment = ({ record }) => {+ const classes = useStyles()+ const [expanded, setExpanded] = useState(false)++ const lines = record.comment.split('\n')+ const formatted = useMemo(() => {+ return lines.map((line, idx) => (+ <span key={record.id + '-comment-' + idx}>+ <AnchorMe text={line} />+ <br />+ </span>+ ))+ }, [lines, record.id])++ const handleExpandClick = useCallback(() => {+ setExpanded(!expanded)+ }, [expanded, setExpanded])++ return (+ <Collapse+ collapsedHeight={'2em'}+ in={expanded}+ timeout={'auto'}+ className={clsx(+ classes.commentBlock,+ lines.length > 1 && classes.pointerCursor,+ )}+ >+ <Typography variant={'h6'} onClick={handleExpandClick}>+ {formatted}+ </Typography>+ </Collapse>+ )+}diff --git a/ui/src/common/index.js b/ui/src/common/index.jsindex c9d139ef5..e4bed7004 100644--- a/ui/src/common/index.js+++ b/ui/src/common/index.js@@ -2,6 +2,7 @@ export * from './AddToPlaylistButton'export * from './ArtistLinkField'export * from './BatchPlayButton'export * from './BitrateField'+export * from './CollapsibleComment'export * from './ContextMenus'export * from './DateField'export * from './DocLink'diff --git a/ui/src/playlist/PlaylistDetails.js b/ui/src/playlist/PlaylistDetails.jsindex 4e80b666f..80ac07c35 100644--- a/ui/src/playlist/PlaylistDetails.js+++ b/ui/src/playlist/PlaylistDetails.js@@ -1,9 +1,7 @@-import React from 'react'import { Card, CardContent, Typography } from '@material-ui/core'import { makeStyles } from '@material-ui/core/styles'import { useTranslate } from 'react-admin'-import { DurationField, SizeField } from '../common'-import Linkify from '../common/Linkify'+import { CollapsibleComment, DurationField, SizeField } from '../common'const useStyles = makeStyles((theme) => ({@@ -52,9 +50,7 @@ const PlaylistDetails = (props) => {<Typography variant="h5" className={classes.title}>{record.name || translate('ra.page.loading')}</Typography>- <Typography component="h6">- <Linkify text={record.comment} />- </Typography>+ <CollapsibleComment record={record} /><Typography component="p">{record.songCount ? (<span>diff --git a/ui/src/themes/ligera.js b/ui/src/themes/ligera.jsindex 1c1a90746..824cf7e67 100644--- a/ui/src/themes/ligera.js+++ b/ui/src/themes/ligera.js@@ -300,6 +300,8 @@ export default {fontSize: '.875rem',color: 'rgb(113 113 113 / 80%)',},+ },+ NDCollapsibleComment: {commentBlock: {fontSize: '.875rem',color: 'rgb(113 113 113 / 80%)',diff --git a/ui/src/themes/nord.js b/ui/src/themes/nord.jsindex 492de9c06..e1f064bb0 100644--- a/ui/src/themes/nord.js+++ b/ui/src/themes/nord.js@@ -289,6 +289,8 @@ export default {fontSize: '.875rem',color: 'rgba(255,255,255, 0.8)',},+ },+ NDCollapsibleComment: {commentBlock: {fontSize: '.875rem',color: 'rgba(255,255,255, 0.8)',diff --git a/ui/src/themes/spotify.js b/ui/src/themes/spotify.jsindex 7813291ad..703d8159e 100644--- a/ui/src/themes/spotify.js+++ b/ui/src/themes/spotify.js@@ -230,6 +230,8 @@ export default {fontSize: '.875rem',color: 'rgba(255,255,255, 0.8)',},+ },+ NDCollapsibleComment: {commentBlock: {fontSize: '.875rem',color: 'rgba(255,255,255, 0.8)',