Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
[MM-25165] Fix search bar disappearing (#5502)
Browse files Browse the repository at this point in the history
* fix search bar disappearing

* Revert "fix search bar disappearing"

This reverts commit 114cd70.

* Fix search bar not showing

* update snapshots

* Fix searching

* Fix padding

* fix snapshots
  • Loading branch information
hahmadia committed May 20, 2020
1 parent a021e31 commit da32c0f
Show file tree
Hide file tree
Showing 7 changed files with 540 additions and 508 deletions.
14 changes: 13 additions & 1 deletion components/admin_console/team_channel_settings/abstract_list.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import {FormattedMessage} from 'react-intl';
import classNames from 'classnames';

import NextIcon from 'components/widgets/icons/fa_next_icon';
import PreviousIcon from 'components/widgets/icons/fa_previous_icon';
Expand All @@ -23,10 +24,12 @@ export default class AbstractList extends React.PureComponent {
getData: PropTypes.func.isRequired,
removeGroup: PropTypes.func,
}).isRequired,
noPadding: PropTypes.bool,
};

static defaultProps = {
data: [],
noPadding: false,
};

constructor(props) {
Expand Down Expand Up @@ -111,10 +114,19 @@ export default class AbstractList extends React.PureComponent {

render = () => {
const {startCount, endCount, total} = this.getPaging();
const {noPadding} = this.props;
const lastPage = endCount === total;
const firstPage = this.state.page === 0;
return (
<div className='groups-list groups-list-no-padding'>
<div
className={classNames(
'groups-list',
'groups-list-no-padding',
{
'groups-list-less-padding': noPadding,
}
)}
>
{this.renderHeader()}
<div
id='groups-list--body'
Expand Down
Loading

0 comments on commit da32c0f

Please sign in to comment.