|
|
|
@ -23,7 +23,7 @@ const messages = defineMessages({ |
|
|
|
|
|
|
|
|
|
const mapStateToProps = (state, ownProps) => ({ |
|
|
|
|
elefriend: state.getIn(['compose', 'elefriend']), |
|
|
|
|
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : ownProps.isSearchPage, |
|
|
|
|
showSearch: ownProps.multiColumn ? state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']) : false, |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
const mapDispatchToProps = (dispatch, { intl }) => ({ |
|
|
|
@ -46,7 +46,6 @@ class Compose extends React.PureComponent { |
|
|
|
|
static propTypes = { |
|
|
|
|
multiColumn: PropTypes.bool, |
|
|
|
|
showSearch: PropTypes.bool, |
|
|
|
|
isSearchPage: PropTypes.bool, |
|
|
|
|
elefriend: PropTypes.number, |
|
|
|
|
onClickElefriend: PropTypes.func, |
|
|
|
|
onMount: PropTypes.func, |
|
|
|
@ -55,19 +54,11 @@ class Compose extends React.PureComponent { |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
componentDidMount () { |
|
|
|
|
const { isSearchPage } = this.props; |
|
|
|
|
|
|
|
|
|
if (!isSearchPage) { |
|
|
|
|
this.props.onMount(); |
|
|
|
|
} |
|
|
|
|
this.props.onMount(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
componentWillUnmount () { |
|
|
|
|
const { isSearchPage } = this.props; |
|
|
|
|
|
|
|
|
|
if (!isSearchPage) { |
|
|
|
|
this.props.onUnmount(); |
|
|
|
|
} |
|
|
|
|
this.props.onUnmount(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
render () { |
|
|
|
@ -76,7 +67,6 @@ class Compose extends React.PureComponent { |
|
|
|
|
intl, |
|
|
|
|
multiColumn, |
|
|
|
|
onClickElefriend, |
|
|
|
|
isSearchPage, |
|
|
|
|
showSearch, |
|
|
|
|
} = this.props; |
|
|
|
|
const computedClass = classNames('drawer', `mbstobon-${elefriend}`); |
|
|
|
@ -86,10 +76,10 @@ class Compose extends React.PureComponent { |
|
|
|
|
<div className={computedClass} role='region' aria-label={intl.formatMessage(messages.compose)}> |
|
|
|
|
<HeaderContainer /> |
|
|
|
|
|
|
|
|
|
{(multiColumn || isSearchPage) && <SearchContainer />} |
|
|
|
|
{multiColumn && <SearchContainer />} |
|
|
|
|
|
|
|
|
|
<div className='drawer__pager'> |
|
|
|
|
{!isSearchPage && <div className='drawer__inner'> |
|
|
|
|
<div className='drawer__inner'> |
|
|
|
|
<NavigationContainer /> |
|
|
|
|
|
|
|
|
|
<ComposeFormContainer /> |
|
|
|
@ -97,9 +87,9 @@ class Compose extends React.PureComponent { |
|
|
|
|
<div className='drawer__inner__mastodon'> |
|
|
|
|
{mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />} |
|
|
|
|
</div> |
|
|
|
|
</div>} |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<Motion defaultStyle={{ x: isSearchPage ? 0 : -100 }} style={{ x: spring(showSearch || isSearchPage ? 0 : -100, { stiffness: 210, damping: 20 }) }}> |
|
|
|
|
<Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}> |
|
|
|
|
{({ x }) => ( |
|
|
|
|
<div className='drawer__inner darker' style={{ transform: `translateX(${x}%)`, visibility: x === -100 ? 'hidden' : 'visible' }}> |
|
|
|
|
<SearchResultsContainer /> |
|
|
|
|