Skip to content
This repository was archived by the owner on Jun 28, 2021. It is now read-only.

Fixed surah dropdown #793 #832

Merged
merged 5 commits into from
Jun 28, 2017
Merged

Fixed surah dropdown #793 #832

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb0da49
Fixed surah dropdown #793
naveed-ahmad Jun 24, 2017
d8708c9
Merge branch 'master' into switch_surah
naveed-ahmad Jun 24, 2017
7d0c884
Merge branch 'master' into switch_surah
naveed-ahmad Jun 25, 2017
89b2966
Merge branch 'master' into switch_surah
naveed-ahmad Jun 28, 2017
06a31b5
Merge branch 'master' into switch_surah
naveed-ahmad Jun 28, 2017
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
26 changes: 20 additions & 6 deletions src/components/SurahsDropdown/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,18 @@ const styles = require('./style.scss');

class SurahsDropdown extends Component {
shouldComponentUpdate(nextProps) {
return this.props.chapters !== nextProps.chapters;
return this.props.chapter.chapterNumber !== nextProps.chapter.chapterNumber;
}

renderList() {
const { chapters } = this.props;

return Object.values(chapters).map((chapter, index) => (
<LinkContainer to={`/${chapter.chapterNumber}`} activeClass="active" key={`chapter-${index}`}>
<LinkContainer
to={`/${chapter.chapterNumber}`}
activeClass="active"
key={`chapter-${index}`}
>
<MenuItem>
<div className="row">
<div className="col-xs-2 col-md-2">
Expand All @@ -27,9 +31,13 @@ class SurahsDropdown extends Component {
<div className="col-xs-7 col-md-7">
<span className="suran-name">{chapter.nameSimple}</span>
<br />
<span className="chapter-meaning">{chapter.translatedName.name}</span>
<span className="chapter-meaning">
{chapter.translatedName.name}
</span>
</div>
<div className={`col-xs-3 col-md-3 text-right ${styles.arabicName}`}>
<div
className={`col-xs-3 col-md-3 text-right ${styles.arabicName}`}
>
{chapter.nameArabic}
</div>
</div>
Expand All @@ -46,7 +54,13 @@ class SurahsDropdown extends Component {
link
className={styles.dropdown}
id="chapters-dropdown"
title={chapter.nameSimple || <LocaleFormattedMessage id="setting.chapters" defaultMessage="Surahs" />}
title={
chapter.nameSimple ||
<LocaleFormattedMessage
id="setting.chapters"
defaultMessage="Surahs"
/>
}
>
{this.renderList()}
</NavDropdown>
Expand All @@ -56,7 +70,7 @@ class SurahsDropdown extends Component {

SurahsDropdown.propTypes = {
chapters: customPropTypes.chapters.isRequired,
chapter: customPropTypes.chapters.isRequired,
chapter: customPropTypes.chapters.isRequired
};

export default SurahsDropdown;