me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Glitch] Fix redirecting to /publish when compose form is visible in web UI

Browse source 
Port 5452af2188 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Eugen Rochko 2022-10-23 23:37:58 +02:00 committed by Claire
parent 80b53623e1
commit 89fdfb8fe6
2 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/javascript/flavours/glitch/features/compose/index.js
View file

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

18
app/javascript/flavours/glitch/features/ui/components/compose_panel.js
View file

@ -1,18 +1,34 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import SearchContainer from 'flavours/glitch/features/compose/containers/search_container'; import SearchContainer from 'flavours/glitch/features/compose/containers/search_container';
import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container'; import ComposeFormContainer from 'flavours/glitch/features/compose/containers/compose_form_container';
import NavigationContainer from 'flavours/glitch/features/compose/containers/navigation_container'; import NavigationContainer from 'flavours/glitch/features/compose/containers/navigation_container';
import LinkFooter from './link_footer'; import LinkFooter from './link_footer';
import ServerBanner from 'flavours/glitch/components/server_banner'; import ServerBanner from 'flavours/glitch/components/server_banner';
import { mountCompose, unmountCompose } from 'flavours/glitch/actions/compose';
export default export default @connect()
class ComposePanel extends React.PureComponent { class ComposePanel extends React.PureComponent {
static contextTypes = { static contextTypes = {
identity: PropTypes.object.isRequired, identity: PropTypes.object.isRequired,
}; };
static propTypes = {
dispatch: PropTypes.func.isRequired,
};
componentDidMount () {
const { dispatch } = this.props;
dispatch(mountCompose());
}
componentWillUnmount () {
const { dispatch } = this.props;
dispatch(unmountCompose());
}
render() { render() {
const { signedIn } = this.context.identity; const { signedIn } = this.context.identity;