Renaming activeSingleInterviewId and better modal handling

This commit is contained in:
Sharyn 2018-07-06 14:03:08 +02:00
parent 2255591e6c
commit 240a194297
3 changed files with 11 additions and 11 deletions

View File

@ -16,7 +16,7 @@ class Search extends React.Component {
term: '',
isSingleInterviewModalOpen: false,
isInterviewsListModalOpen: false,
activeSingleInterview: 1,
activeSingleInterviewId: 1,
isSearchActive: false,
};
this.onInputChange = this.onInputChange.bind(this);
@ -44,22 +44,22 @@ class Search extends React.Component {
}
toggleSingleInterview(event) {
const { isSingleInterviewModalOpen } = this.state;
const { isSingleInterviewModalOpen, isInterviewsListModalOpen } = this.state;
this.setState({
isInterviewsListModalOpen: !isInterviewsListModalOpen,
isSingleInterviewModalOpen: !isSingleInterviewModalOpen,
isInterviewsListModalOpen: false,
activeSingleInterview: Number(event.target.id),
activeSingleInterviewId: Number(event.target.id),
});
}
getSelectedInterview() {
const { activeSingleInterview } = this.state;
const selectedInterview = Data.find( item => item.id === activeSingleInterview);
const { activeSingleInterviewId } = this.state;
const selectedInterview = Data.find( item => item.id === activeSingleInterviewId);
return selectedInterview;
}
render() {
const { isSingleInterviewModalOpen, isInterviewsListModalOpen, isSearchActive, activeSingleInterview } = this.state;
const { isSingleInterviewModalOpen, isInterviewsListModalOpen, isSearchActive, activeSingleInterviewId } = this.state;
return (
<div className="browse-wrap">
@ -97,7 +97,7 @@ class Search extends React.Component {
</div>
{isSingleInterviewModalOpen &&
(<SingleInterview
activeSingleInterview={activeSingleInterview}
activeSingleInterviewId={activeSingleInterviewId}
selectedInterview={this.getSelectedInterview()}
toggleSingleInterview={this.toggleSingleInterview}
/>)

View File

@ -29,4 +29,4 @@
text-decoration: underline;
}
}
}
}

View File

@ -10,14 +10,14 @@ const SingleInterview = props => (
closeModal={props.toggleSingleInterview}
>
<div className="single-interview">
<span className="number">{ props.activeSingleInterview }</span>
<span className="number">{ props.activeSingleInterviewId }</span>
<div>{ Parser(props.selectedInterview.content) }</div>
</div>
</Modal>
);
SingleInterview.propTypes = {
activeSingleInterview: PropTypes.number.isRequired,
activeSingleInterviewId: PropTypes.number.isRequired,
selectedInterview: PropTypes.shape({}).isRequired,
toggleSingleInterview: PropTypes.func.isRequired,
};