Skip to content

fix: reintroduce View to avoid list being cropped #695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
housseindjirdeh merged 1 commit into from
Jan 16, 2018
Merged

fix: reintroduce View to avoid list being cropped #695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 41 additions & 39 deletions src/user/screens/repository-list.screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { Component } from 'react';
import styled from 'styled-components/native';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import { FlatList, Dimensions } from 'react-native';
import { View, FlatList, Dimensions } from 'react-native';

import {
ViewContainer,
Expand Down Expand Up @@ -129,46 +129,48 @@ class RepositoryList extends Component {

return (
<ViewContainer>
<Header>
<SearchBarWrapper>
<SearchContainer>
<SearchBar
textColor={colors.primaryDark}
textFieldBackgroundColor={colors.greyLight}
showsCancelButton={searchFocus}
onFocus={() => this.setState({ searchFocus: true })}
onCancelButtonPress={() =>
this.setState({ searchStart: false, query: '' })}
onSearchButtonPress={query => {
this.search(query);
}}
hideBackground
<View>
<Header>
<SearchBarWrapper>
<SearchContainer>
<SearchBar
textColor={colors.primaryDark}
textFieldBackgroundColor={colors.greyLight}
showsCancelButton={searchFocus}
onFocus={() => this.setState({ searchFocus: true })}
onCancelButtonPress={() =>
this.setState({ searchStart: false, query: '' })}
onSearchButtonPress={query => {
this.search(query);
}}
hideBackground
/>
</SearchContainer>
</SearchBarWrapper>
</Header>

{loading &&
[...Array(searchStart ? repoCount : 10)].map(
(item, index) => <LoadingRepositoryListItem key={index} /> // eslint-disable-line react/no-array-index-key
)}

{!loading && (
<ListContainer>
<FlatList
removeClippedSubviews={false}
data={this.getList()}
keyExtractor={this.keyExtractor}
renderItem={({ item }) => (
<RepositoryListItem
repository={item}
showFullName={authUser.login !== item.owner.login}
navigation={navigation}
/>
)}
/>
</SearchContainer>
</SearchBarWrapper>
</Header>

{loading &&
[...Array(searchStart ? repoCount : 10)].map(
(item, index) => <LoadingRepositoryListItem key={index} /> // eslint-disable-line react/no-array-index-key
</ListContainer>
)}

{!loading && (
<ListContainer>
<FlatList
removeClippedSubviews={false}
data={this.getList()}
keyExtractor={this.keyExtractor}
renderItem={({ item }) => (
<RepositoryListItem
repository={item}
showFullName={authUser.login !== item.owner.login}
navigation={navigation}
/>
)}
/>
</ListContainer>
)}
</View>
</ViewContainer>
);
}
Expand Down