Skip to content

Commit

Permalink
Make columns-area unscrollable when modal opened (mastodon#6241)
Browse files Browse the repository at this point in the history
* Add aria-autocomplete='list' in Textaria

ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete

* Make detect empty string brefore assign upload description

* Change code elements in keyboard-shortcuts component to kbd

* Add validation for onMuteNotifications

* Make columns-area unscrollable when modal opend

* Make columns-area unscrollable when modal opened
  • Loading branch information
neetshin authored and Gargron committed Jan 15, 2018
1 parent 1d63368 commit 687b470
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
static propTypes = {
intl: PropTypes.object.isRequired,
columns: ImmutablePropTypes.list.isRequired,
isModalOpen: PropTypes.bool.isRequired,
singleColumn: PropTypes.bool,
children: PropTypes.node,
};
Expand Down Expand Up @@ -144,7 +145,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
}

render () {
const { columns, children, singleColumn } = this.props;
const { columns, children, singleColumn, isModalOpen } = this.props;
const { shouldAnimate } = this.state;

const columnIndex = getIndex(this.context.router.history.location.pathname);
Expand All @@ -159,7 +160,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
}

return (
<div className='columns-area' ref={this.setRef}>
<div className={`columns-area ${ isModalOpen ? 'unscrollable' : '' }`} ref={this.setRef}>
{columns.map(column => {
const params = column.get('params', null) === null ? null : column.get('params').toJS();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ColumnsArea from '../components/columns_area';

const mapStateToProps = state => ({
columns: state.getIn(['settings', 'columns']),
isModalOpen: !!state.get('modal').modalType,
});

export default connect(mapStateToProps, null, null, { withRef: true })(ColumnsArea);
4 changes: 4 additions & 0 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,10 @@
justify-content: flex-start;
overflow-x: auto;
position: relative;

&.unscrollable {
overflow-x: hidden;
}
}

@media screen and (min-width: 360px) {
Expand Down

0 comments on commit 687b470

Please sign in to comment.