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

feat: refactor column detection #62

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: refactor column detection #62

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d95002
feat: refactor column detection
niktverd Jun 7, 2023
1ddfcbc
feat: refactor with hoc
niktverd Jun 7, 2023
1874d0e
fixup! feat: refactor with hoc
niktverd Jun 7, 2023
67b054f
fixup! fixup! feat: refactor with hoc
niktverd Jun 13, 2023
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: 2 additions & 0 deletions .storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const config = {
use: [{loader: 'markdown-loader'}],
});

storybookBaseConfig.module.rules[0].exclude = [/node_modules/, /\.test.(tsx?|jsx?)$/];

// to turn fileName in context.parameters into path form number in production bundle
storybookBaseConfig.optimization.moduleIds = 'named';

Expand Down
2 changes: 2 additions & 0 deletions src/blocks/Author/Author.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ export const Author: React.FC<AuthorProps> = (props) => {
</Wrapper>
);
};

export default Author;
6 changes: 3 additions & 3 deletions src/blocks/Author/__stories__/Author.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import customBlocks from '../../../constructor/blocksMap';
import {PostPageContext} from '../../../contexts/PostPageContext';
import {BLOCKS} from '../../../demo/constants';
import {AuthorProps} from '../../../models/blocks';
import {BlockType, PostData} from '../../../models/common';
import {BlockInColumnsType, PostData} from '../../../models/common';
import {Author} from '../Author';

import post from '../../../../.mocks/post.json';
Expand All @@ -22,7 +22,7 @@ export default {
} as Meta;

type AuthorModel = {
type: BlockType.Author;
type: BlockInColumnsType.Author;
} & AuthorProps;

const DefaultTemplate: Story<AuthorModel> = (args) => (
Expand All @@ -34,7 +34,7 @@ const DefaultTemplate: Story<AuthorModel> = (args) => (
export const Default = DefaultTemplate.bind({});

Default.args = {
type: BlockType.Author,
type: BlockInColumnsType.Author,
authorId: 290,
...getDefaultStoryArgs(),
};
4 changes: 2 additions & 2 deletions src/blocks/Author/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ const {
common: {BlockBaseProps},
} = validators;

import {BlockType} from '../../models/common';
import {BlockInColumnsType} from '../../models/common';
import {BlogBlockBase} from '../../schema/common';

export const Author = {
[BlockType.Author]: {
[BlockInColumnsType.Author]: {
type: 'object',
additionalProperties: false,
required: ['authorId'],
Expand Down
2 changes: 2 additions & 0 deletions src/blocks/Banner/Banner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,5 @@ export const Banner: React.FC<BannerProps> = ({
</Wrapper>
);
};

export default Banner;
6 changes: 3 additions & 3 deletions src/blocks/Banner/__stories__/Banner.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import customBlocks from '../../../constructor/blocksMap';
import {PostPageContext} from '../../../contexts/PostPageContext';
import {BLOCKS} from '../../../demo/constants';
import {BannerProps} from '../../../models/blocks';
import {BlockType, PostData} from '../../../models/common';
import {BlockInColumnsType, PostData} from '../../../models/common';
import {Banner} from '../Banner';

import post from '../../../../.mocks/post.json';
Expand All @@ -27,7 +27,7 @@ export default {
} as Meta;

type BannerModel = {
type: BlockType.Banner;
type: BlockInColumnsType.Banner;
} & BannerProps;

const DefaultTemplate: Story<BannerModel> = (args) => (
Expand All @@ -39,7 +39,7 @@ const DefaultTemplate: Story<BannerModel> = (args) => (
export const Default = DefaultTemplate.bind({});

Default.args = {
type: BlockType.Banner,
type: BlockInColumnsType.Banner,
color: '#7ccea0',
...getDefaultStoryArgs(),
title: 'Lorem',
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/Banner/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {validators} from '@gravity-ui/page-constructor';

import {BlockType} from '../../models/common';
import {BlockInColumnsType} from '../../models/common';
import {BlogBlockBase} from '../../schema/common';

const {
Expand All @@ -9,7 +9,7 @@ const {
} = validators;

export const Banner = {
[BlockType.Banner]: {
[BlockInColumnsType.Banner]: {
type: 'object',
additionalProperties: false,
required: ['title', 'text', 'image'],
Expand Down
2 changes: 2 additions & 0 deletions src/blocks/CTA/CTA.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ export const CTA: React.FC<CTAProps> = ({items, paddingTop, paddingBottom}) => {
</Wrapper>
);
};

export default CTA;
16 changes: 8 additions & 8 deletions src/blocks/CTA/__stories__/CTA.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import customBlocks from '../../../constructor/blocksMap';
import {PostPageContext} from '../../../contexts/PostPageContext';
import {BLOCKS} from '../../../demo/constants';
import {CTAProps} from '../../../models/blocks';
import {BlockType, PostData} from '../../../models/common';
import {BlockInColumnsType, PostData} from '../../../models/common';
import {CTA} from '../CTA';

import contentBlocks from '../../../../.mocks/contentBlocks.json';
Expand All @@ -23,7 +23,7 @@ export default {
} as Meta;

type CTAModel = {
type: BlockType.CTA;
type: BlockInColumnsType.CTA;
} & CTAProps;

const DefaultTemplate: Story<CTAModel> = (args) => (
Expand All @@ -40,37 +40,37 @@ export const FiveItems = DefaultTemplate.bind({});
export const SixItems = DefaultTemplate.bind({});

Default.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 3),
};

OneItem.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 1),
};

TwoItems.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 2),
};

FourItems.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 4),
};

FiveItems.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 5),
};

SixItems.args = {
type: BlockType.CTA,
type: BlockInColumnsType.CTA,
...getDefaultStoryArgs(),
items: contentBlocks.slice(0, 6),
};
4 changes: 2 additions & 2 deletions src/blocks/CTA/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {validators} from '@gravity-ui/page-constructor';

import {BlockType} from '../../models/common';
import {BlockInColumnsType} from '../../models/common';
import {BlogBlockBase} from '../../schema/common';

const {
Expand All @@ -9,7 +9,7 @@ const {
} = validators;

export const CTA = {
[BlockType.CTA]: {
[BlockInColumnsType.CTA]: {
type: 'object',
additionalProperties: false,
required: ['items'],
Expand Down
2 changes: 2 additions & 0 deletions src/blocks/ColoredText/ColoredText.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ export const ColoredText: React.FC<ColoredTextProps> = ({
</Wrapper>
);
};

export default ColoredText;
6 changes: 3 additions & 3 deletions src/blocks/ColoredText/__stories__/ColoredText.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import customBlocks from '../../../constructor/blocksMap';
import {PostPageContext} from '../../../contexts/PostPageContext';
import {BLOCKS} from '../../../demo/constants';
import {ColoredTextProps} from '../../../models/blocks';
import {BlockType, PostData} from '../../../models/common';
import {BlockInColumnsType, PostData} from '../../../models/common';
import {ColoredText} from '../ColoredText';

import post from '../../../../.mocks/post.json';
Expand All @@ -21,7 +21,7 @@ export default {
} as Meta;

type ColoredTextModel = {
type: BlockType.ColoredText;
type: BlockInColumnsType.ColoredText;
} & ColoredTextProps;

const DefaultTemplate: Story<ColoredTextModel> = (args) => (
Expand All @@ -33,7 +33,7 @@ const DefaultTemplate: Story<ColoredTextModel> = (args) => (
export const Default = DefaultTemplate.bind({});

Default.args = {
type: BlockType.ColoredText,
type: BlockInColumnsType.ColoredText,
background: {
color: '#000',
image: 'https://storage.yandexcloud.net/cloud-www-assets/constructor/storybook/images/img_8-12_light.png',
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/ColoredText/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {validators} from '@gravity-ui/page-constructor';

import {BlockType} from '../../models/common';
import {BlockInColumnsType} from '../../models/common';
import {BlogBlockBase} from '../../schema/common';

const {
Expand All @@ -25,7 +25,7 @@ const BackgroundProps = {
};

export const ColoredText = {
[BlockType.ColoredText]: {
[BlockInColumnsType.ColoredText]: {
type: 'object',
additionalProperties: false,
required: ['text'],
Expand Down
6 changes: 3 additions & 3 deletions src/blocks/Feed/__stories__/Feed.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {FeedContext} from '../../../contexts/FeedContext';
import {BLOCKS} from '../../../demo/constants';
import {FeedProps} from '../../../models/blocks';
import {
BlockType,
BlockStandsAloneType,
GetPostsRequest,
GetPostsType,
PostsProps,
Expand All @@ -32,7 +32,7 @@ export default {
} as Meta;

type FeedModel = {
type: BlockType.Feed;
type: BlockStandsAloneType.Feed;
} & FeedProps;

const getPosts: GetPostsType = async (query: GetPostsRequest) => {
Expand Down Expand Up @@ -84,7 +84,7 @@ const DefaultTemplate: Story<FeedModel> = (args) => (
export const Default = DefaultTemplate.bind({});

Default.args = {
type: BlockType.Feed,
type: BlockStandsAloneType.Feed,
color: '#000',
imageSize: 'm',
...getDefaultStoryArgs(),
Expand Down
4 changes: 2 additions & 2 deletions src/blocks/Feed/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ const {
common: {TitleProps, BlockBaseProps},
} = validators;

import {BlockType} from '../../models/common';
import {BlockStandsAloneType} from '../../models/common';

export const Feed = {
[BlockType.Feed]: {
[BlockStandsAloneType.Feed]: {
additionalProperties: false,
required: [],
properties: {
Expand Down
6 changes: 3 additions & 3 deletions src/blocks/Header/__stories__/Header.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import customBlocks from '../../../constructor/blocksMap';
import {PostPageContext} from '../../../contexts/PostPageContext';
import {BLOCKS} from '../../../demo/constants';
import {HeaderProps} from '../../../models/blocks';
import {BlockType, PostData} from '../../../models/common';
import {BlockStandsAloneType, PostData} from '../../../models/common';
import {Header} from '../Header';

import post from '../../../../.mocks/post.json';
Expand All @@ -22,7 +22,7 @@ export default {
} as Meta;

type HeaderModel = {
type: BlockType.Header;
type: BlockStandsAloneType.Header;
} & HeaderProps;

const DefaultTemplate: Story<HeaderModel> = (args) => (
Expand All @@ -34,6 +34,6 @@ const DefaultTemplate: Story<HeaderModel> = (args) => (
export const Default = DefaultTemplate.bind({});

Default.args = {
type: BlockType.Header,
type: BlockStandsAloneType.Header,
...getDefaultStoryArgs(),
};
4 changes: 2 additions & 2 deletions src/blocks/Header/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {validators} from '@gravity-ui/page-constructor';

import {BlockType} from '../../models/common';
import {BlockStandsAloneType} from '../../models/common';
import {BlogBlockBase} from '../../schema/common';

const {
Expand All @@ -9,7 +9,7 @@ const {
} = validators;

export const Header = {
[BlockType.Header]: {
[BlockStandsAloneType.Header]: {
type: 'object',
additionalProperties: false,
properties: {
Expand Down
Loading