bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Columns cleanup

Browse source
This commit is contained in:
Alex Gleason 2021-01-01 13:18:06 -06:00
parent 39436bc07c
commit acf0619790
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/soapbox/features/ui/components/column.js
View file

@ -1,7 +1,6 @@
import React from 'react';
import ColumnHeader from './column_header';
import PropTypes from 'prop-types';
import { isMobile } from '../../../is_mobile';
import ColumnBackButton from '../../../components/column_back_button';
import ColumnBackButtonSlim from '../../../components/column_back_button_slim';
@ -12,25 +11,17 @@ export default class Column extends React.PureComponent {
icon: PropTypes.string,
children: PropTypes.node,
active: PropTypes.bool,
hideHeadingOnMobile: PropTypes.bool,
backBtnSlim: PropTypes.bool,
};
render() {
const { heading, icon, children, active, hideHeadingOnMobile, backBtnSlim } = this.props;
const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth)));
const columnHeaderId = showHeading && heading.replace(/ /g, '-');
const header = showHeading && (
<ColumnHeader icon={icon} active={active} type={heading} columnHeaderId={columnHeaderId} />
);
const { heading, icon, children, active, backBtnSlim } = this.props;
const columnHeaderId = heading.replace(/ /g, '-');
const backBtn = backBtnSlim ? (<ColumnBackButtonSlim />) : (<ColumnBackButton />);
return (
<div role='region' aria-labelledby={columnHeaderId} className='column'>
{header}
<ColumnHeader icon={icon} active={active} type={heading} columnHeaderId={columnHeaderId} />
{backBtn}
{children}
</div>

7
app/soapbox/features/ui/components/column_header.js
View file

@ -19,16 +19,11 @@ export default class ColumnHeader extends React.PureComponent {
render() {
const { icon, type, active, columnHeaderId } = this.props;
let iconElement = '';
if (icon) {
iconElement = <Icon id={icon} fixedWidth className='column-header__icon' />;
}
return (
<h1 className={classNames('column-header', { active })} id={columnHeaderId || null}>
<button onClick={this.handleClick}>
{iconElement}
{icon && <Icon id={icon} fixedWidth className='column-header__icon' />}
{type}
</button>
</h1>