Skip to content
Snippets Groups Projects
Unverified Commit 5513b9d8 authored by Marlo Longley's avatar Marlo Longley Committed by GitHub
Browse files

Merge pull request #3859 from ProjectMirador/mui5-span-tags

Update annotation tags to avoid improperly nested HTML tags
parents 36730ab9 40c9adc4
No related branches found
No related tags found
2 merge requests!19Draft: Merge video support into mui5,!18Only nudge over badge content for the WindowListButton; it needs special...
...@@ -95,14 +95,17 @@ export class CanvasAnnotations extends Component { ...@@ -95,14 +95,17 @@ export class CanvasAnnotations extends Component {
onMouseEnter={() => this.handleAnnotationHover(annotation)} onMouseEnter={() => this.handleAnnotationHover(annotation)}
onMouseLeave={this.handleAnnotationBlur} onMouseLeave={this.handleAnnotationBlur}
> >
<ListItemText primaryTypographyProps={{ variant: 'body2' }}> <ListItemText
primaryTypographyProps={{ variant: 'body2' }}
primary={
<SanitizedHtml ruleSet={htmlSanitizationRuleSet} htmlString={annotation.content} /> <SanitizedHtml ruleSet={htmlSanitizationRuleSet} htmlString={annotation.content} />
<div> }
{annotation.tags.map((tag) => ( secondary={
<Chip size="small" variant="outlined" label={tag} id={tag} key={tag.toString()} /> annotation.tags.map((tag) => (
))} <Chip component="span" size="small" variant="outlined" label={tag} id={tag} key={tag.toString()} />
</div> ))
</ListItemText> }
/>
</MenuItem> </MenuItem>
</ScrollTo> </ScrollTo>
))} ))}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment