Skip to content

feat(ExtendedFeatures): add content #51

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
merged 6 commits into from
Nov 10, 2022
Merged

feat(ExtendedFeatures): add content #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b709bd4
feat(ExtendedFeatures): add content
Nov 8, 2022
cf21625
fix: imports order
Nov 9, 2022
7402c49
Merge branch 'main' of github.com:gravity-ui/page-constructor into yu…
Nov 9, 2022
5160309
fix(ExtendedFeatures): add transform
Nov 9, 2022
3c7b489
fix: paddig-right features-item
Nov 9, 2022
08e8dba
fix: remove comments
Nov 10, 2022
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
2 changes: 1 addition & 1 deletion src/blocks/CardLayout/__stories__/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"title": "Lorem ipsum",
"description": "Dolor sit amet"
},
"description": "Four cards in a row on the desktop, three cards in a row on a tablet, two card in a row on a mobile phone.",
"description": "Four cards in a row on the desktop, three cards in a row on a tablet, two cards in a row on a mobile phone.",
"colSizes": {
"all": 6,
"sm": 4,
Expand Down
13 changes: 11 additions & 2 deletions src/blocks/ExtendedFeatures/ExtendedFeatures.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ $block: '.#{$ns}ExtendedFeaturesBlock';

&__item {
margin-top: $indentM;
padding-right: $indentM;

&.col {
padding-right: $indentM;
}

&-title {
@include heading4();
Expand Down Expand Up @@ -66,13 +69,19 @@ $block: '.#{$ns}ExtendedFeaturesBlock';
@include icon();

display: block;
margin-bottom: $indentXXXS;
margin-bottom: $indentXXS;
}

@media (max-width: map-get($gridBreakpoints, 'sm')) {
&__item {
margin-top: $indentM;
}

&__item {
&.col {
padding-right: $indentXXXS;
}
}
}

@include animate-slides(#{$class}__item);
Expand Down
81 changes: 52 additions & 29 deletions src/blocks/ExtendedFeatures/ExtendedFeatures.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import React from 'react';
import React, {useContext} from 'react';

import {block} from '../../utils';
import {block, getThemedValue} from '../../utils';
import {ExtendedFeaturesProps} from '../../models';
import {Row, Col} from '../../grid';
import {Link, HTML, AnimateBlock, BlockHeader} from '../../components/';
import {AnimateBlock, BlockHeader, HTML} from '../../components/';
import {Content} from '../../sub-blocks';
import Image from '../../components/Image/Image';
import {ThemeValueContext} from '../../context/theme/ThemeValueContext';
import {getMediaImage} from '../../components/Media/Image/utils';

import './ExtendedFeatures.scss';

Expand All @@ -21,31 +25,50 @@ export const ExtendedFeaturesBlock = ({
items,
colSizes = DEFAULT_SIZES,
animated,
}: ExtendedFeaturesProps) => (
<AnimateBlock className={b()} animate={animated}>
<BlockHeader title={title} description={description} className={b('header')} />
<div className={b('items')}>
<Row>
{items.map(({title: itemTitle, text, link, label, icon}) => (
<Col className={b('item')} key={text || itemTitle} sizes={colSizes}>
{icon && <img src={icon} className={b('icon')} />}
{itemTitle && (
<h5 className={b('item-title', {'has-label': Boolean(label)})}>
<HTML>{itemTitle}</HTML>
{label && <div className={b('item-label')}>{label}</div>}
</h5>
)}
{text && (
<div className={b('item-text')}>
<HTML>{text}</HTML>
</div>
)}
{link && <Link className={b('item-link')} {...link} />}
</Col>
))}
</Row>
</div>
</AnimateBlock>
);
}: ExtendedFeaturesProps) => {
const {themeValue: theme} = useContext(ThemeValueContext);

return (
<AnimateBlock className={b()} animate={animated}>
<BlockHeader title={title} description={description} className={b('header')} />
<div className={b('items')}>
<Row>
{items.map(({title: itemTitle, text, link, links, label, icon}) => {
const itemLinks = links || [];

const iconThemed = icon && getThemedValue(icon, theme);
const iconData = iconThemed && getMediaImage(iconThemed);

if (link) {
itemLinks.push(link);
}

return (
<Col className={b('item')} key={text || itemTitle} sizes={colSizes}>
{iconData && <Image {...iconData} className={b('icon')} />}
<div className={b('container')}>
{itemTitle && (
<h5 className={b('item-title')}>
<HTML>{itemTitle}</HTML>
{label && (
<div className={b('item-label')}>{label}</div>
)}
</h5>
)}
<Content
text={text}
links={itemLinks}
size="s"
colSizes={{all: 12, md: 12}}
/>
</div>
</Col>
);
})}
</Row>
</div>
</AnimateBlock>
);
};

export default ExtendedFeaturesBlock;
8 changes: 5 additions & 3 deletions src/blocks/ExtendedFeatures/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ Extended Features block

`items: FeatureItem[]` — Feature description

- `title?: string` — Title
- `text?: string` — Text
- `link?: Link` — Link below the text
- `title?: string` — Item's title
- `text?: string` — Item's text (with YFM support)
- `additionalInfo?: string` — Gray text (with YFM support)
- `links?: Link[]` — An array with link objects (see [Content blocks](?path=/story/information--common-types&viewMode=docs))
- `buttons?: Button[]` — An array with button objects (see [Content blocks](?path=/story/information--common-types&viewMode=docs))
- `label?: New | Preview` — Label

`colSizes?: Object` — Sizes of a single card in columns for different screen sizes, the value ranges from 1 to 12 columns. If 12 columns, a single card takes up the entire width of the screen.
Expand Down
55 changes: 52 additions & 3 deletions src/blocks/ExtendedFeatures/__stories__/ExtendedFeatures.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import React from 'react';
import {Meta, Story} from '@storybook/react/types-6-0';
import {ExtendedFeaturesBlockModel, ExtendedFeaturesProps} from '../../../models';
import {
ExtendedFeaturesBlockModel,
ExtendedFeaturesItem,
ExtendedFeaturesProps,
} from '../../../models';
import ExtendedFeatures from '../ExtendedFeatures';
import {PageConstructor} from '../../../containers/PageConstructor/PageConstructor';
import {yfmTransform} from '../../../../.storybook/utils';

import data from './data.json';

Expand All @@ -22,8 +27,52 @@ export default {
const DefaultTemplate: Story<ExtendedFeaturesBlockModel> = (args) => (
<PageConstructor content={{blocks: [args]}} />
);

const extendedFeaturesItems = (items: ExtendedFeaturesItem[]) => {
return items.map((item) => ({
...item,
text: item.text && yfmTransform(item.text),
}));
};

const ColSizesTemplate: Story<ExtendedFeaturesBlockModel> = (args) => (
<PageConstructor
content={{
blocks: [
{
...args,
...data.colSizes.four,
items: extendedFeaturesItems(
data.colSizes.four.items as ExtendedFeaturesItem[],
),
},
{
...args,
...data.colSizes.three,
},
{
...args,
...data.colSizes.two,
items: extendedFeaturesItems(data.colSizes.two.items as ExtendedFeaturesItem[]),
},
],
}}
/>
);

export const Default = DefaultTemplate.bind({});
export const WithLabel = DefaultTemplate.bind({});
export const ColSizes = ColSizesTemplate.bind({});

Default.args = data.default.content as ExtendedFeaturesProps;
WithLabel.args = data.withLabel.content as ExtendedFeaturesProps;
Default.args = {
...data.default.content,
items: extendedFeaturesItems(data.default.content.items as ExtendedFeaturesItem[]),
} as ExtendedFeaturesProps;
WithLabel.args = {
...data.withLabel.content,
items: extendedFeaturesItems(data.withLabel.content.items as ExtendedFeaturesItem[]),
} as ExtendedFeaturesProps;
ColSizes.args = {
...data.default.content,
items: extendedFeaturesItems(data.default.content.items as ExtendedFeaturesItem[]),
} as ExtendedFeaturesProps;
Loading