treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix style of legacy column headers (#6342) 

* Fix regression from #6199: Style of legacy column headers

* Fix tests

* Clean up variables
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Eugen Rochko 2018-01-24 04:03:51 +01:00 committed by GitHub
parent b1daa71da5
commit daefbd66a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/ui/components/__tests__/column-test.js
View File

@ -21,13 +21,13 @@ describe('<Column />', () => {
<div className='scrollable' /> <div className='scrollable' />
</Column> </Column>
); );
wrapper.find(ColumnHeader).simulate('click'); wrapper.find(ColumnHeader).find('button').simulate('click');
expect(global.requestAnimationFrame.mock.calls.length).toEqual(1); expect(global.requestAnimationFrame.mock.calls.length).toEqual(1);
}); });
it('does not try to scroll if there is no scrollable content', () => { it('does not try to scroll if there is no scrollable content', () => {
const wrapper = mount(<Column heading='notifications' />); const wrapper = mount(<Column heading='notifications' />);
wrapper.find(ColumnHeader).simulate('click'); wrapper.find(ColumnHeader).find('button').simulate('click');
expect(global.requestAnimationFrame.mock.calls.length).toEqual(0); expect(global.requestAnimationFrame.mock.calls.length).toEqual(0);
}); });
}); });

20
app/javascript/mastodon/features/ui/components/column_header.js
View File

@ -1,5 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classNames from 'classnames';
export default class ColumnHeader extends React.PureComponent { export default class ColumnHeader extends React.PureComponent {
@ -16,19 +17,20 @@ export default class ColumnHeader extends React.PureComponent {
} }
render () { render () {
const { type, active, columnHeaderId } = this.props; const { icon, type, active, columnHeaderId } = this.props;
let iconElement = '';
let icon = ''; if (icon) {
iconElement = <i className={`fa fa-fw fa-${icon} column-header__icon`} />;
if (this.props.icon) {
icon = <i className={`fa fa-fw fa-${this.props.icon} column-header__icon`} />;
} }
return ( return (
<div role='button heading' tabIndex='0' className={`column-header ${active ? 'active' : ''}`} onClick={this.handleClick} id={columnHeaderId || null}> <h1 className={classNames('column-header', { active })} id={columnHeaderId || null}>
{icon} <button onClick={this.handleClick}>
{type} {iconElement}
</div> {type}
</button>
</h1>
); );
} }