From db480928ec2ca37533c3fbf82588259bce522291 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Thu, 18 Jul 2019 23:27:54 -0400 Subject: [PATCH] Added column back button to column component by default --- .../gabsocial/features/ui/components/column.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/javascript/gabsocial/features/ui/components/column.js b/app/javascript/gabsocial/features/ui/components/column.js index 2f38b629..a382bc96 100644 --- a/app/javascript/gabsocial/features/ui/components/column.js +++ b/app/javascript/gabsocial/features/ui/components/column.js @@ -2,6 +2,8 @@ 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'; export default class Column extends React.PureComponent { @@ -11,10 +13,11 @@ export default class Column extends React.PureComponent { children: PropTypes.node, active: PropTypes.bool, hideHeadingOnMobile: PropTypes.bool, + backBtnSlim: PropTypes.string, }; render () { - const { heading, icon, children, active, hideHeadingOnMobile } = this.props; + const { heading, icon, children, active, hideHeadingOnMobile, backBtnSlim } = this.props; const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth))); @@ -22,9 +25,13 @@ export default class Column extends React.PureComponent { const header = showHeading && ( ); + + const backBtn = backBtnSlim ? () : (); + return (
{header} + {backBtn} {children}
);