luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix WebUI crashing when SVG support is disabled (#15809)

Browse source 
Fixes #14910
This commit is contained in:
Claire 2021-02-28 01:01:34 +01:00 committed by GitHub
parent 73264e0716
commit 0635c8760d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
app/javascript/mastodon/components/hashtag.js
View file

@ -2,10 +2,35 @@
import React from 'react'; import React from 'react';
import { Sparklines, SparklinesCurve } from 'react-sparklines'; import { Sparklines, SparklinesCurve } from 'react-sparklines';
import { FormattedMessage } from 'react-intl'; import { FormattedMessage } from 'react-intl';
import PropTypes from 'prop-types';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import Permalink from './permalink'; import Permalink from './permalink';
import ShortNumber from 'mastodon/components/short_number'; import ShortNumber from 'mastodon/components/short_number';
class SilentErrorBoundary extends React.Component {
static propTypes = {
children: PropTypes.node,
};
state = {
error: false,
};
componentDidCatch () {
this.setState({ error: true });
}
render () {
if (this.state.error) {
return null;
}
return this.props.children;
}
}
/** /**
* Used to render counter of how much people are talking about hashtag * Used to render counter of how much people are talking about hashtag
* *
@ -51,17 +76,19 @@ const Hashtag = ({ hashtag }) => (
</div> </div>
<div className='trends__item__sparkline'> <div className='trends__item__sparkline'>
<Sparklines <SilentErrorBoundary>
width={50} <Sparklines
height={28} width={50}
data={hashtag height={28}
.get('history') data={hashtag
.reverse() .get('history')
.map((day) => day.get('uses')) .reverse()
.toArray()} .map((day) => day.get('uses'))
> .toArray()}
<SparklinesCurve style={{ fill: 'none' }} /> >
</Sparklines> <SparklinesCurve style={{ fill: 'none' }} />
</Sparklines>
</SilentErrorBoundary>
</div> </div>
</div> </div>
); );