Skip to content
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

Jump to bottom

HorizontalCell: updated paddings and now they're applied to content #1316

Merged
merged 2 commits into from
Jan 21, 2021
Merged

HorizontalCell: updated paddings and now they're applied to content #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6088d89
HorizontalCell: updated paddings and now they're applied to content
gbowsky Jan 21, 2021
ccaf479
HorizontalCell: fixed indentation, updated example, also design-revie…
gbowsky Jan 21, 2021
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
14 changes: 7 additions & 7 deletions src/components/HorizontalCell/HorizontalCell.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.HorizontalCell {
padding-bottom: 6px;
display: flex;
}

Expand All @@ -10,6 +9,7 @@

.HorizontalCell__content {
word-break: break-all;
text-overflow: ellipsis;
}

.HorizontalCell__subtitle {
Expand All @@ -18,15 +18,15 @@
}

.HorizontalCell--s {
width: 72px;
max-width: 80px;
}

.HorizontalCell--s .HorizontalCell__image {
padding: 4px 8px;
}

.HorizontalCell--s .HorizontalCell__content {
padding: 2px 4px;
padding: 2px 4px 8px 4px;
text-align: center;
}

Expand All @@ -45,20 +45,20 @@

.HorizontalCell--m .HorizontalCell__content,
.HorizontalCell--l .HorizontalCell__content {
padding: 2px 6px;
padding: 2px 6px 8px 6px;
text-align: left;
}

/* iOS */
.HorizontalCell--ios:first-child::before,
.HorizontalCell--ios:last-child::after {
content: "";
width: 4px;
min-width: 4px;
}

.HorizontalCell--ios.HorizontalCell--s:first-child,
.HorizontalCell--ios.HorizontalCell--s:last-child {
width: 78px;
max-width: 88px;
}

.HorizontalCell--ios.HorizontalCell--m:first-child,
Expand All @@ -79,7 +79,7 @@
.HorizontalCell--android.HorizontalCell--s:last-child,
.HorizontalCell--vkcom.HorizontalCell--s:first-child,
.HorizontalCell--vkcom.HorizontalCell--s:last-child {
width: 80px;
max-width: 88px;
}

.HorizontalCell--android.HorizontalCell--m:first-child,
Expand Down
24 changes: 13 additions & 11 deletions src/components/HorizontalCell/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
HorizontalCell автоматически ставит отступы по бокам в зависимости от платформы, поэтому его лучше использовать в HorizontalScroll.
* При `size='s'` рекомендуется `<Avatar size={56}/>` или же любой компонент шириной 56 пикс.
* При `size='m'` рекомендуется `<Avatar size={88} mode='app'/>` или же любой компонент шириной 96 пикс.
* При `size='l'` рекомендуется `<Avatar size={128} mode='image/>` или же любой компонент.
* При `size='s'` **для iOS** рекомендуется `<Avatar size={64}/>`, а для остальных платформ `<Avatar size={56}/>` или же любой компонент шириной до 64 пикс.
* При `size='m'` рекомендуется `<Avatar size={88} mode='app'/>` или же любой компонент шириной до 96 пикс.
* При `size='l'` рекомендуется `<Avatar size={128} mode='image/>` или же любой компонент произвольной ширины.

```jsx
class HorizontalCellExample extends React.Component {
const HorizontalCellExample = withPlatform(class HorizontalCellExample extends React.Component {
constructor(props) {
super(props);
this.state = {
Expand All @@ -17,6 +17,8 @@ class HorizontalCellExample extends React.Component {
}

componentDidMount() {
const { platform } = this.props;

const largeImageStyles = {
width: 220,
height: 124,
Expand All @@ -30,27 +32,27 @@ class HorizontalCellExample extends React.Component {
users.forEach((user) => {
generatedUserItems.push(
<HorizontalCell size='s' header={user.first_name}>
<Avatar size={56} src={user.photo_100}/>
<Avatar size={platform === 'ios' ? 64 : 56} src={user.photo_100}/>
</HorizontalCell>
)
})
this.setState({userItems: generatedUserItems});

let exampleMiniApps = [
<HorizontalCell size='s' header='Промокот'>
<Avatar size={56} mode='app'
<Avatar size={platform === 'ios' ? 64 : 56} mode='app'
src='https://sun9-54.userapi.com/c850536/v850536134/15096d/6806J7q6YwM.jpg'/>
</HorizontalCell>,
<HorizontalCell size='s' header='Разделите счёт'>
<Avatar size={56} mode='app'
<Avatar size={platform === 'ios' ? 64 : 56} mode='app'
src='https://sun9-20.userapi.com/c857416/v857416681/fc6d0/06XQvs4SyiE.jpg'/>
</HorizontalCell>,
<HorizontalCell size='s' header='Рассылки'>
<Avatar size={56} mode='app'
<Avatar size={platform === 'ios' ? 64 : 56} mode='app'
src='https://sun9-50.userapi.com/c850536/v850536397/129313/qdVJ7A7xd70.jpg'/>
</HorizontalCell>,
<HorizontalCell size='s' header='Тексты песен'>
<Avatar size={56} mode='app'
<Avatar size={platform === 'ios' ? 64 : 56} mode='app'
src='https://sun9-41.userapi.com/Zf2HluZJZDYjTbxhnSfeYnHtttBYsYbdjJ3QJQ/aDcJQrVVnbQ.jpg'/>
</HorizontalCell>];
let generatedMiniAppsItems = [];
Expand Down Expand Up @@ -117,7 +119,7 @@ class HorizontalCellExample extends React.Component {
this.setState({albumItems: generatedAlbums})
}

render() {
render() {
return (
<View activePanel="horizontalCell">
<Panel id="horizontalCell">
Expand Down Expand Up @@ -163,7 +165,7 @@ class HorizontalCellExample extends React.Component {
</View>
)
}
}
});

<HorizontalCellExample/>
```