mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-24 01:52:41 +00:00
cc396f085d
So far, glitch-soc used history.length to decide whether to call `goBack()` or go to / in order to not leave the webUI. This made clicking the “Back” button go to the “Getting started” column instead of going back in the browser's history when such an action would leave the web UI, but also when: - The WebUI is refreshed (F5) - A tab is restored - The history length reaches its maximum (e.g., 50 in Firefox) This commit fixes these shortcomings by checking `window.history.state`. Indeed, we only want to go back in the browser's history when the current location has been reached from within the WebUI, which only happens via `pushState` as far as I know. Since browser store the serialized state in the browser history, this also survives page reload and session restoration.
218 lines
7.4 KiB
JavaScript
218 lines
7.4 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import classNames from 'classnames';
|
|
import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
|
|
import NotificationPurgeButtonsContainer from 'flavours/glitch/containers/notification_purge_buttons_container';
|
|
|
|
const messages = defineMessages({
|
|
show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
|
|
hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
|
|
moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
|
|
moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
|
|
enterNotifCleaning : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },
|
|
});
|
|
|
|
@injectIntl
|
|
export default class ColumnHeader extends React.PureComponent {
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object,
|
|
};
|
|
|
|
static propTypes = {
|
|
intl: PropTypes.object.isRequired,
|
|
title: PropTypes.node,
|
|
icon: PropTypes.string,
|
|
active: PropTypes.bool,
|
|
localSettings : ImmutablePropTypes.map,
|
|
multiColumn: PropTypes.bool,
|
|
extraButton: PropTypes.node,
|
|
showBackButton: PropTypes.bool,
|
|
notifCleaning: PropTypes.bool, // true only for the notification column
|
|
notifCleaningActive: PropTypes.bool,
|
|
onEnterCleaningMode: PropTypes.func,
|
|
children: PropTypes.node,
|
|
pinned: PropTypes.bool,
|
|
onPin: PropTypes.func,
|
|
onMove: PropTypes.func,
|
|
onClick: PropTypes.func,
|
|
intl: PropTypes.object.isRequired,
|
|
};
|
|
|
|
state = {
|
|
collapsed: true,
|
|
animating: false,
|
|
animatingNCD: false,
|
|
};
|
|
|
|
handleToggleClick = (e) => {
|
|
e.stopPropagation();
|
|
this.setState({ collapsed: !this.state.collapsed, animating: true });
|
|
}
|
|
|
|
handleTitleClick = () => {
|
|
this.props.onClick();
|
|
}
|
|
|
|
handleMoveLeft = () => {
|
|
this.props.onMove(-1);
|
|
}
|
|
|
|
handleMoveRight = () => {
|
|
this.props.onMove(1);
|
|
}
|
|
|
|
handleBackClick = () => {
|
|
// if history is exhausted, or we would leave mastodon, just go to root.
|
|
if (window.history.state) {
|
|
this.context.router.history.goBack();
|
|
} else {
|
|
this.context.router.history.push('/');
|
|
}
|
|
}
|
|
|
|
handleTransitionEnd = () => {
|
|
this.setState({ animating: false });
|
|
}
|
|
|
|
handleTransitionEndNCD = () => {
|
|
this.setState({ animatingNCD: false });
|
|
}
|
|
|
|
onEnterCleaningMode = () => {
|
|
this.setState({ animatingNCD: true });
|
|
this.props.onEnterCleaningMode(!this.props.notifCleaningActive);
|
|
}
|
|
|
|
render () {
|
|
const { intl, icon, active, children, pinned, onPin, multiColumn, extraButton, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props;
|
|
const { collapsed, animating, animatingNCD } = this.state;
|
|
|
|
let title = this.props.title;
|
|
|
|
const wrapperClassName = classNames('column-header__wrapper', {
|
|
'active': active,
|
|
});
|
|
|
|
const buttonClassName = classNames('column-header', {
|
|
'active': active,
|
|
});
|
|
|
|
const collapsibleClassName = classNames('column-header__collapsible', {
|
|
'collapsed': collapsed,
|
|
'animating': animating,
|
|
});
|
|
|
|
const collapsibleButtonClassName = classNames('column-header__button', {
|
|
'active': !collapsed,
|
|
});
|
|
|
|
const notifCleaningButtonClassName = classNames('column-header__button', {
|
|
'active': notifCleaningActive,
|
|
});
|
|
|
|
const notifCleaningDrawerClassName = classNames('ncd column-header__collapsible', {
|
|
'collapsed': !notifCleaningActive,
|
|
'animating': animatingNCD,
|
|
});
|
|
|
|
let extraContent, pinButton, moveButtons, backButton, collapseButton;
|
|
|
|
//*glitch
|
|
const msgEnterNotifCleaning = intl.formatMessage(messages.enterNotifCleaning);
|
|
|
|
if (children) {
|
|
extraContent = (
|
|
<div key='extra-content' className='column-header__collapsible__extra'>
|
|
{children}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
if (multiColumn && pinned) {
|
|
pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
|
|
|
|
moveButtons = (
|
|
<div key='move-buttons' className='column-header__setting-arrows'>
|
|
<button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='text-btn column-header__setting-btn' onClick={this.handleMoveLeft}><i className='fa fa-chevron-left' /></button>
|
|
<button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='text-btn column-header__setting-btn' onClick={this.handleMoveRight}><i className='fa fa-chevron-right' /></button>
|
|
</div>
|
|
);
|
|
} else if (multiColumn) {
|
|
pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
|
|
}
|
|
|
|
if (!pinned && (multiColumn || showBackButton)) {
|
|
backButton = (
|
|
<button onClick={this.handleBackClick} className='column-header__back-button'>
|
|
<i className='fa fa-fw fa-chevron-left column-back-button__icon' />
|
|
<FormattedMessage id='column_back_button.label' defaultMessage='Back' />
|
|
</button>
|
|
);
|
|
}
|
|
|
|
const collapsedContent = [
|
|
extraContent,
|
|
];
|
|
|
|
if (multiColumn) {
|
|
collapsedContent.push(moveButtons);
|
|
collapsedContent.push(pinButton);
|
|
}
|
|
|
|
if (children || multiColumn) {
|
|
collapseButton = <button className={collapsibleButtonClassName} title={formatMessage(collapsed ? messages.show : messages.hide)} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
|
|
}
|
|
|
|
const hasTitle = icon && title;
|
|
|
|
return (
|
|
<div className={wrapperClassName}>
|
|
<h1 className={buttonClassName}>
|
|
{hasTitle && (
|
|
<button onClick={this.handleTitleClick}>
|
|
<i className={`fa fa-fw fa-${icon} column-header__icon`} />
|
|
{title}
|
|
</button>
|
|
)}
|
|
|
|
{!hasTitle && backButton}
|
|
|
|
<div className='column-header__buttons'>
|
|
{hasTitle && backButton}
|
|
{extraButton}
|
|
{ notifCleaning ? (
|
|
<button
|
|
aria-label={msgEnterNotifCleaning}
|
|
title={msgEnterNotifCleaning}
|
|
onClick={this.onEnterCleaningMode}
|
|
className={notifCleaningButtonClassName}
|
|
>
|
|
<i className='fa fa-eraser' />
|
|
</button>
|
|
) : null}
|
|
{collapseButton}
|
|
</div>
|
|
</h1>
|
|
|
|
{ notifCleaning ? (
|
|
<div className={notifCleaningDrawerClassName} onTransitionEnd={this.handleTransitionEndNCD}>
|
|
<div className='column-header__collapsible-inner nopad-drawer'>
|
|
{(notifCleaningActive || animatingNCD) ? (<NotificationPurgeButtonsContainer />) : null }
|
|
</div>
|
|
</div>
|
|
) : null}
|
|
|
|
<div className={collapsibleClassName} tabIndex={collapsed ? -1 : null} onTransitionEnd={this.handleTransitionEnd}>
|
|
<div className='column-header__collapsible-inner'>
|
|
{(!collapsed || animating) && collapsedContent}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|