bf3cb42da7
Cherry-picked d2528b26b6
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream changed stuff, we had extra attributes.
Applied upstream changes while keeping our extra attributes.
- `app/serializers/rest/instance_serializer.rb`:
Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`,
so updated that file by keeping our extra attributes, and took upstream's
version of `app/serializers/rest/instance_serializer.rb`.
- `spec/views/about/show.html.haml_spec.rb`:
Took upstream's version.
56 lines
1.5 KiB
JavaScript
56 lines
1.5 KiB
JavaScript
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import PropTypes from 'prop-types';
|
|
import SearchContainer from 'mastodon/features/compose/containers/search_container';
|
|
import ComposeFormContainer from 'mastodon/features/compose/containers/compose_form_container';
|
|
import NavigationContainer from 'mastodon/features/compose/containers/navigation_container';
|
|
import LinkFooter from './link_footer';
|
|
import ServerBanner from 'mastodon/components/server_banner';
|
|
import { changeComposing } from 'mastodon/actions/compose';
|
|
|
|
export default @connect()
|
|
class ComposePanel extends React.PureComponent {
|
|
|
|
static contextTypes = {
|
|
identity: PropTypes.object.isRequired,
|
|
};
|
|
|
|
static propTypes = {
|
|
dispatch: PropTypes.func.isRequired,
|
|
};
|
|
|
|
onFocus = () => {
|
|
this.props.dispatch(changeComposing(true));
|
|
}
|
|
|
|
onBlur = () => {
|
|
this.props.dispatch(changeComposing(false));
|
|
}
|
|
|
|
render() {
|
|
const { signedIn } = this.context.identity;
|
|
|
|
return (
|
|
<div className='compose-panel' onFocus={this.onFocus}>
|
|
<SearchContainer openInRoute />
|
|
|
|
{!signedIn && (
|
|
<React.Fragment>
|
|
<ServerBanner />
|
|
<div className='flex-spacer' />
|
|
</React.Fragment>
|
|
)}
|
|
|
|
{signedIn && (
|
|
<React.Fragment>
|
|
<NavigationContainer onClose={this.onBlur} />
|
|
<ComposeFormContainer singleColumn />
|
|
</React.Fragment>
|
|
)}
|
|
|
|
<LinkFooter withHotkeys />
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|