Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: prevent text wrap in department/school card #1055

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+42 −90
Open

feat: prevent text wrap in department/school card #1055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc00d4
feat: prevent text wrap in department/school card
KevinWu098 Nov 23, 2024
0eb6f29
chore: remove old comment
KevinWu098 Nov 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/antalmanac/src/components/RightPane/CoursePane/CourseRenderPane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import RightPaneStore from '../RightPaneStore';
import GeDataFetchProvider from '../SectionTable/GEDataFetchProvider';
import SectionTableLazyWrapper from '../SectionTable/SectionTableLazyWrapper';

import SchoolDeptCard from './SchoolDeptCard';
import { SchoolDeptCard } from './SchoolDeptCard';
import darkModeLoadingGif from './SearchForm/Gifs/dark-loading.gif';
import loadingGif from './SearchForm/Gifs/loading.gif';
import darkNoNothing from './static/dark-no_results.png';
Expand Down
130 changes: 41 additions & 89 deletions apps/antalmanac/src/components/RightPane/CoursePane/SchoolDeptCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,98 +1,50 @@
import {
Accordion,
AccordionDetails,
AccordionSummary,
Box,
Grid,
Paper,
Theme,
Typography,
withStyles,
} from '@material-ui/core';
import { ClassNameMap, Styles } from '@material-ui/core/styles/withStyles';
import { ExpandMore } from '@material-ui/icons';
import { PureComponent } from 'react';

const styles: Styles<Theme, object> = (theme) => ({
school: {
display: 'flex',
flexWrap: 'wrap',
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
[theme.breakpoints.up('sm')]: {
paddingLeft: theme.spacing(3),
paddingRight: theme.spacing(3),
},
paddingTop: theme.spacing(),
paddingBottom: theme.spacing(),
},
dept: {
display: 'flex',
flexWrap: 'wrap',
paddingLeft: theme.spacing(2),
paddingRight: theme.spacing(2),
[theme.breakpoints.up('sm')]: {
paddingLeft: theme.spacing(3),
paddingRight: theme.spacing(3),
},
paddingTop: theme.spacing(),
paddingBottom: theme.spacing(),
},
text: {
flexBasis: '50%',
flexGrow: 1,
display: 'inline',
cursor: 'pointer',
},
icon: {
cursor: 'pointer',
},
collapse: {
flexBasis: '100%',
},
comments: {
fontFamily: 'Roboto',
fontSize: 12,
},
});
import { ExpandMore } from '@mui/icons-material';
import { Accordion, AccordionDetails, AccordionSummary, Box, Grid, Paper, Typography } from '@mui/material';

interface SchoolDeptCardProps {
classes: ClassNameMap;
comment: string;
name: string;
type: string;
}

class SchoolDeptCard extends PureComponent<SchoolDeptCardProps> {
state = { commentsOpen: false };
export function SchoolDeptCard({ name, type, comment }: SchoolDeptCardProps) {
const html = { __html: comment };

render() {
const html = { __html: this.props.comment };
return (
<Grid item xs={12}>
<Paper elevation={1} square style={{ overflow: 'hidden' }}>
<Accordion>
<AccordionSummary expandIcon={<ExpandMore />}>
<Typography variant={this.props.type === 'school' ? 'h6' : 'subtitle1'}>
{this.props.name}
</Typography>
</AccordionSummary>
<AccordionDetails>
<Typography variant="body2" component={'span'}>
{/*The default component for the body2 typography seems to be <p> which is giving warnings with DOMnesting */}
<Typography>{this.props.comment === '' ? 'No comments found' : 'Comments:'}</Typography>
<Box
dangerouslySetInnerHTML={html}
className={this.props.classes.comments}
component="p"
/>
</Typography>
</AccordionDetails>
</Accordion>
</Paper>
</Grid>
);
}
}
return (
<Grid item xs={12}>
<Paper elevation={1} square style={{ overflow: 'hidden' }}>
<Accordion disableGutters>
<AccordionSummary
expandIcon={<ExpandMore />}
sx={{
paddingX: 1,
paddingY: 0,

export default withStyles(styles)(SchoolDeptCard);
/**
* AccordionSummary contains a child "content" which is the actual parent of the Typography below
* Styling to prevent wrap must be applied to the aforementioned parent
*/
'& .MuiAccordionSummary-content': {
overflow: 'hidden',
whiteSpace: 'nowrap',
},
}}
>
<Typography
variant={type === 'school' ? 'h6' : 'subtitle1'}
sx={{ textOverflow: 'ellipsis', overflow: 'hidden' }}
>
{name}
</Typography>
</AccordionSummary>
<AccordionDetails sx={{ paddingX: 1, paddingY: 0 }}>
<Box sx={{ fontSize: 12 }}>
<Typography>{comment === '' ? 'No comments found' : 'Comments:'}</Typography>
<Box dangerouslySetInnerHTML={html} component="p" />
</Box>
</AccordionDetails>
</Accordion>
</Paper>
</Grid>
);
}
Loading