Merge branch 'search-results-virtuoso' into 'develop'
SearchResults: use padding, not margins See merge request soapbox-pub/soapbox-fe!1383
This commit is contained in:
commit
f33ee6e1c8
1 changed files with 16 additions and 19 deletions
|
@ -6,7 +6,6 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import { defineMessages, injectIntl } from 'react-intl';
|
import { defineMessages, injectIntl } from 'react-intl';
|
||||||
|
|
||||||
import Pullable from 'soapbox/components/pullable';
|
|
||||||
import ScrollableList from 'soapbox/components/scrollable_list';
|
import ScrollableList from 'soapbox/components/scrollable_list';
|
||||||
import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder_account';
|
import PlaceholderAccount from 'soapbox/features/placeholder/components/placeholder_account';
|
||||||
import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder_hashtag';
|
import PlaceholderHashtag from 'soapbox/features/placeholder/components/placeholder_hashtag';
|
||||||
|
@ -151,7 +150,6 @@ class SearchResults extends ImmutablePureComponent {
|
||||||
{this.renderFilterBar()}
|
{this.renderFilterBar()}
|
||||||
|
|
||||||
{noResultsMessage || (
|
{noResultsMessage || (
|
||||||
<Pullable>
|
|
||||||
<ScrollableList
|
<ScrollableList
|
||||||
key={selectedFilter}
|
key={selectedFilter}
|
||||||
scrollKey={`${selectedFilter}:${value}`}
|
scrollKey={`${selectedFilter}:${value}`}
|
||||||
|
@ -163,12 +161,11 @@ class SearchResults extends ImmutablePureComponent {
|
||||||
placeholderCount={20}
|
placeholderCount={20}
|
||||||
className={classNames({
|
className={classNames({
|
||||||
'divide-gray-200 dark:divide-slate-700 divide-solid divide-y': selectedFilter === 'statuses',
|
'divide-gray-200 dark:divide-slate-700 divide-solid divide-y': selectedFilter === 'statuses',
|
||||||
'space-y-4': selectedFilter === 'accounts',
|
|
||||||
})}
|
})}
|
||||||
|
itemClassName={classNames({ 'pb-4': selectedFilter === 'accounts' })}
|
||||||
>
|
>
|
||||||
{searchResults}
|
{searchResults}
|
||||||
</ScrollableList>
|
</ScrollableList>
|
||||||
</Pullable>
|
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue