@gravity-ui/page-constructor 3.0.0-alpha.4 → 3.0.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (130) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/build/cjs/components/BackgroundImage/BackgroundImage.js +2 -2
  3. package/build/cjs/components/BlockBase/BlockBase.d.ts +3 -2
  4. package/build/cjs/components/BlockBase/BlockBase.js +4 -2
  5. package/build/cjs/components/Button/Button.css +3 -0
  6. package/build/cjs/components/Button/Button.js +5 -4
  7. package/build/cjs/components/Image/Image.d.ts +1 -0
  8. package/build/cjs/components/Image/Image.js +2 -2
  9. package/build/cjs/containers/Loadable/Loadable.d.ts +2 -2
  10. package/build/cjs/containers/PageConstructor/PageConstructor.js +5 -3
  11. package/build/cjs/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.js +3 -2
  12. package/build/cjs/containers/PageConstructor/components/ConstructorItem/ConstructorItem.d.ts +1 -1
  13. package/build/cjs/containers/PageConstructor/components/ConstructorItem/ConstructorItem.js +5 -5
  14. package/build/cjs/context/innerContext/InnerContext.d.ts +2 -1
  15. package/build/cjs/customization/BlockDecoration.d.ts +3 -0
  16. package/build/cjs/customization/BlockDecoration.js +22 -0
  17. package/build/cjs/editor/Components/AddBlock/AddBlock.css +82 -0
  18. package/build/cjs/editor/Components/AddBlock/AddBlock.d.ts +7 -0
  19. package/build/cjs/editor/Components/AddBlock/AddBlock.js +43 -0
  20. package/build/cjs/editor/Components/EditBlock/EditBlock.css +47 -0
  21. package/build/cjs/editor/Components/EditBlock/EditBlock.d.ts +4 -0
  22. package/build/cjs/editor/Components/EditBlock/EditBlock.js +32 -0
  23. package/build/cjs/editor/Containers/Editor.d.ts +2 -0
  24. package/build/cjs/editor/Containers/Editor.js +24 -0
  25. package/build/cjs/editor/data/index.d.ts +13 -0
  26. package/build/cjs/editor/data/index.js +27 -0
  27. package/build/cjs/editor/data/previews/default-preview.d.ts +3 -0
  28. package/build/cjs/editor/data/previews/default-preview.js +18 -0
  29. package/build/cjs/editor/data/previews/header-block.d.ts +3 -0
  30. package/build/cjs/editor/data/previews/header-block.js +19 -0
  31. package/build/cjs/editor/index.d.ts +2 -0
  32. package/build/cjs/editor/index.js +7 -0
  33. package/build/cjs/editor/store/index.d.ts +15 -0
  34. package/build/cjs/editor/store/index.js +32 -0
  35. package/build/cjs/editor/store/reducer.d.ts +41 -0
  36. package/build/cjs/editor/store/reducer.js +59 -0
  37. package/build/cjs/editor/store/utils.d.ts +12 -0
  38. package/build/cjs/editor/store/utils.js +34 -0
  39. package/build/cjs/editor/styles/mixins.css +0 -0
  40. package/build/cjs/editor/styles/variables.css +0 -0
  41. package/build/cjs/editor/types/index.d.ts +17 -0
  42. package/build/cjs/editor/types/index.js +2 -0
  43. package/build/cjs/editor/utils/index.d.ts +11 -0
  44. package/build/cjs/editor/utils/index.js +12 -0
  45. package/build/cjs/hooks/useMetrika.js +0 -7
  46. package/build/cjs/models/constructor-items/blocks.d.ts +1 -11
  47. package/build/cjs/models/constructor-items/blocks.js +0 -2
  48. package/build/cjs/models/constructor-items/common.d.ts +3 -3
  49. package/build/cjs/models/constructor.d.ts +4 -1
  50. package/build/cjs/models/customization.d.ts +9 -0
  51. package/build/cjs/models/customization.js +2 -0
  52. package/build/cjs/models/index.d.ts +1 -0
  53. package/build/cjs/models/index.js +1 -0
  54. package/build/cjs/schema/index.js +0 -1
  55. package/build/cjs/sub-blocks/Content/Content.js +2 -2
  56. package/build/cjs/text-transform/transformers.js +2 -4
  57. package/build/cjs/utils/blocks.d.ts +4 -1
  58. package/build/cjs/utils/blocks.js +11 -1
  59. package/build/esm/components/BackgroundImage/BackgroundImage.js +2 -2
  60. package/build/esm/components/BlockBase/BlockBase.d.ts +3 -2
  61. package/build/esm/components/BlockBase/BlockBase.js +4 -2
  62. package/build/esm/components/Button/Button.css +3 -0
  63. package/build/esm/components/Button/Button.js +5 -4
  64. package/build/esm/components/Image/Image.d.ts +1 -0
  65. package/build/esm/components/Image/Image.js +2 -2
  66. package/build/esm/containers/Loadable/Loadable.d.ts +2 -2
  67. package/build/esm/containers/PageConstructor/PageConstructor.js +6 -4
  68. package/build/esm/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.js +3 -2
  69. package/build/esm/containers/PageConstructor/components/ConstructorItem/ConstructorItem.d.ts +1 -1
  70. package/build/esm/containers/PageConstructor/components/ConstructorItem/ConstructorItem.js +5 -5
  71. package/build/esm/context/innerContext/InnerContext.d.ts +2 -1
  72. package/build/esm/customization/BlockDecoration.d.ts +3 -0
  73. package/build/esm/customization/BlockDecoration.js +17 -0
  74. package/build/esm/editor/Components/AddBlock/AddBlock.css +82 -0
  75. package/build/esm/editor/Components/AddBlock/AddBlock.d.ts +8 -0
  76. package/build/esm/editor/Components/AddBlock/AddBlock.js +41 -0
  77. package/build/esm/editor/Components/EditBlock/EditBlock.css +47 -0
  78. package/build/esm/editor/Components/EditBlock/EditBlock.d.ts +5 -0
  79. package/build/esm/editor/Components/EditBlock/EditBlock.js +30 -0
  80. package/build/esm/editor/Containers/Editor.d.ts +2 -0
  81. package/build/esm/editor/Containers/Editor.js +20 -0
  82. package/build/esm/editor/data/index.d.ts +13 -0
  83. package/build/esm/editor/data/index.js +24 -0
  84. package/build/esm/editor/data/previews/default-preview.d.ts +3 -0
  85. package/build/esm/editor/data/previews/default-preview.js +15 -0
  86. package/build/esm/editor/data/previews/header-block.d.ts +3 -0
  87. package/build/esm/editor/data/previews/header-block.js +16 -0
  88. package/build/esm/editor/index.d.ts +2 -0
  89. package/build/esm/editor/index.js +2 -0
  90. package/build/esm/editor/store/index.d.ts +15 -0
  91. package/build/esm/editor/store/index.js +28 -0
  92. package/build/esm/editor/store/reducer.d.ts +41 -0
  93. package/build/esm/editor/store/reducer.js +55 -0
  94. package/build/esm/editor/store/utils.d.ts +12 -0
  95. package/build/esm/editor/store/utils.js +26 -0
  96. package/build/esm/editor/styles/mixins.css +0 -0
  97. package/build/esm/editor/styles/variables.css +0 -0
  98. package/build/esm/editor/types/index.d.ts +17 -0
  99. package/build/esm/editor/types/index.js +1 -0
  100. package/build/esm/editor/utils/index.d.ts +11 -0
  101. package/build/esm/editor/utils/index.js +6 -0
  102. package/build/esm/hooks/useMetrika.js +0 -7
  103. package/build/esm/models/constructor-items/blocks.d.ts +1 -11
  104. package/build/esm/models/constructor-items/blocks.js +0 -2
  105. package/build/esm/models/constructor-items/common.d.ts +3 -3
  106. package/build/esm/models/constructor.d.ts +4 -1
  107. package/build/esm/models/customization.d.ts +9 -0
  108. package/build/esm/models/customization.js +1 -0
  109. package/build/esm/models/index.d.ts +1 -0
  110. package/build/esm/models/index.js +1 -0
  111. package/build/esm/schema/index.js +0 -1
  112. package/build/esm/sub-blocks/Content/Content.js +2 -3
  113. package/build/esm/text-transform/transformers.js +2 -4
  114. package/build/esm/utils/blocks.d.ts +4 -1
  115. package/build/esm/utils/blocks.js +7 -0
  116. package/package.json +4 -3
  117. package/server/models/constructor-items/blocks.d.ts +1 -11
  118. package/server/models/constructor-items/blocks.js +0 -2
  119. package/server/models/constructor-items/common.d.ts +3 -3
  120. package/server/models/constructor.d.ts +4 -1
  121. package/server/models/customization.d.ts +9 -0
  122. package/server/models/customization.js +2 -0
  123. package/server/models/index.d.ts +1 -0
  124. package/server/models/index.js +1 -0
  125. package/server/text-transform/transformers.js +2 -4
  126. package/server/utils/blocks.d.ts +4 -1
  127. package/server/utils/blocks.js +11 -1
  128. package/styles/styles.css +0 -196
  129. package/styles/styles.scss +0 -1
  130. package/styles/fonts.scss +0 -223
@@ -0,0 +1,55 @@
1
+ import { getHeaderBlock, getOrderedBlocks } from '../../utils';
2
+ import { addBlock, changeBlocksOrder, duplicateBlock, getNewBlockIndex } from './utils';
3
+ // actions
4
+ export const SELECT_BLOCK = 'SELECT_BLOCK';
5
+ export const DELETE_BLOCK = 'DELETE_BLOCK';
6
+ export const COPY_BLOCK = 'COPY_BLOCK';
7
+ export const ADD_BLOCK = 'ADD_BLOCK';
8
+ export const SET_REGION = 'SET_REGION';
9
+ export const ORDER_BLOCK = 'ORDER_BLOCK';
10
+ // reducer
11
+ export const getReducer = (headerBlockTypes) => (state, action) => {
12
+ const { content } = state;
13
+ const header = getHeaderBlock(content.blocks, headerBlockTypes);
14
+ const orderedBlocks = getOrderedBlocks(content.blocks, headerBlockTypes);
15
+ const withHeader = (blocks) => [header, ...blocks].filter(Boolean);
16
+ const getNewState = (blocks, activeBlockId) => (Object.assign(Object.assign({}, state), { content: Object.assign(Object.assign({}, content), { blocks }), activeBlockId, orderedBlocksCount: orderedBlocks.length }));
17
+ switch (action.type) {
18
+ case SELECT_BLOCK:
19
+ return getNewState(content.blocks, action.payload);
20
+ case DELETE_BLOCK: {
21
+ const blockId = action.payload;
22
+ return getNewState(typeof blockId === 'string'
23
+ ? content.blocks.filter(({ type }) => type !== blockId)
24
+ : withHeader(orderedBlocks.filter((_block, index) => index !== blockId)), -1);
25
+ }
26
+ case COPY_BLOCK: {
27
+ const index = action.payload;
28
+ return getNewState(withHeader(duplicateBlock(orderedBlocks, index)), index + 1);
29
+ }
30
+ case ADD_BLOCK: {
31
+ let blocks;
32
+ let activeBlockId;
33
+ const block = action.payload;
34
+ if (headerBlockTypes.includes(block.type)) {
35
+ blocks = header ? blocks : [block, ...orderedBlocks];
36
+ activeBlockId = block.type;
37
+ }
38
+ else {
39
+ const newBlockIndex = getNewBlockIndex(state.activeBlockId, orderedBlocks.length);
40
+ blocks = withHeader(addBlock(orderedBlocks, block, newBlockIndex));
41
+ activeBlockId = newBlockIndex;
42
+ }
43
+ if (blocks) {
44
+ return getNewState(blocks, activeBlockId);
45
+ }
46
+ return state;
47
+ }
48
+ case ORDER_BLOCK: {
49
+ const { oldIndex, newIndex } = action.payload;
50
+ return getNewState(withHeader(changeBlocksOrder(orderedBlocks, oldIndex, newIndex)), newIndex);
51
+ }
52
+ default:
53
+ return state;
54
+ }
55
+ };
@@ -0,0 +1,12 @@
1
+ import { Block, PageContent } from '../../models';
2
+ import { EditorBlockId } from './reducer';
3
+ export declare const changeBlocksOrder: (array: Block[], oldIndex: number, newIndex: number) => Block[];
4
+ export declare const duplicateBlock: (array: Block[], index: number) => Block[];
5
+ export declare const getNewBlockIndex: (id: EditorBlockId, orderedBlocksCount: number) => number;
6
+ export declare const addBlock: (array: Block[], block: Block, index: number) => Block[];
7
+ export declare const addEditorProps: (content: PageContent) => {
8
+ animated: boolean;
9
+ blocks: Block[];
10
+ menu?: import("../../models").Menu | undefined;
11
+ background?: import("../../models").ThemedMediaProps | undefined;
12
+ };
@@ -0,0 +1,26 @@
1
+ export const changeBlocksOrder = (array, oldIndex, newIndex) => {
2
+ const result = [...array];
3
+ const element = result.splice(oldIndex, 1)[0];
4
+ result.splice(newIndex, 0, element);
5
+ return result;
6
+ };
7
+ export const duplicateBlock = (array, index) => {
8
+ const result = [...array];
9
+ result.splice(index + 1, 0, result[index]);
10
+ return result;
11
+ };
12
+ export const getNewBlockIndex = (id, orderedBlocksCount) => {
13
+ if (id === -1) {
14
+ return orderedBlocksCount;
15
+ }
16
+ // id === 'string' - header block
17
+ return typeof id === 'string' ? 0 : id + 1;
18
+ };
19
+ export const addBlock = (array, block, index) => {
20
+ const result = [...array];
21
+ result.splice(index, 0, block);
22
+ return result;
23
+ };
24
+ export const addEditorProps = (content) => {
25
+ return Object.assign(Object.assign({}, content), { animated: false });
26
+ };
File without changes
File without changes
@@ -0,0 +1,17 @@
1
+ /// <reference types="react" />
2
+ import { PageConstructorProps } from '../../containers/PageConstructor';
3
+ import { BlockDecoratorProps, PageData } from '../../models';
4
+ export type EditorBlockId = number | string;
5
+ export interface EditorProps extends Required<Pick<PageConstructorProps, 'content'>>, Partial<Omit<PageConstructorProps, 'content'>> {
6
+ children: (props: Partial<PageConstructorProps>) => React.ReactNode;
7
+ onChange?: (data: PageData) => void;
8
+ }
9
+ export interface EditBlockEditorProps {
10
+ activeBlockId: EditorBlockId;
11
+ orderedBlocksCount: number;
12
+ onSelect: (index: EditorBlockId) => void;
13
+ onDelete: (index: EditorBlockId) => void;
14
+ onCopy: (index: number) => void;
15
+ onOrderChange: (index: number, newIndex: number) => void;
16
+ }
17
+ export type EditBlockProps = EditBlockEditorProps & BlockDecoratorProps;
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,11 @@
1
+ import { BlockDecorator, CustomConfig } from '../../models';
2
+ export declare const formatBlockName: (name: string) => string;
3
+ export declare const addCustomDecorator: (decorator: BlockDecorator, custom?: CustomConfig) => {
4
+ decorators: {
5
+ block: ((props: import("../../models").BlockDecoratorProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>)[];
6
+ };
7
+ blocks?: import("../../models").CustomItems | undefined;
8
+ subBlocks?: import("../../models").CustomItems | undefined;
9
+ headers?: import("../../models").CustomItems | undefined;
10
+ loadable?: import("../../models").LoadableConfig | undefined;
11
+ };
@@ -0,0 +1,6 @@
1
+ import _ from 'lodash';
2
+ export const formatBlockName = (name) => _.capitalize(name).replace(/(block|-)/g, ' ');
3
+ export const addCustomDecorator = (decorator, custom = {}) => {
4
+ const decorators = custom.decorators || {};
5
+ return Object.assign(Object.assign({}, custom), { decorators: Object.assign(Object.assign({}, decorators), { block: [...(decorators.block || []), decorator] }) });
6
+ };
@@ -1,6 +1,5 @@
1
1
  import { useContext } from 'react';
2
2
  import { MetrikaContext } from '../context/metrikaContext';
3
- import { PixelEventType } from '../models';
4
3
  import { isNewMetrikaFormat } from '../models/guards';
5
4
  // eslint-disable-next-line valid-jsdoc
6
5
  /**
@@ -26,12 +25,6 @@ export const useMetrika = () => {
26
25
  else {
27
26
  metrika.reachGoals(metrikaGoals);
28
27
  }
29
- if (!pixelEvents && pixel) {
30
- pixel.trackStandard(PixelEventType.SubmitApplication, {
31
- content_category: 'custom',
32
- content_ids: Array.isArray(metrikaGoals) ? metrikaGoals : [metrikaGoals],
33
- });
34
- }
35
28
  }
36
29
  if (pixel && pixelEvents) {
37
30
  if (isButtonPixel(pixelEvents)) {
@@ -8,8 +8,6 @@ export declare enum BlockType {
8
8
  PromoFeaturesBlock = "promo-features-block",
9
9
  ExtendedFeaturesBlock = "extended-features-block",
10
10
  SliderBlock = "slider-block",
11
- CalculatorBlock = "calculator-block",
12
- ServiceDemoBlock = "service-demo-block",
13
11
  QuestionsBlock = "questions-block",
14
12
  BannerBlock = "banner-block",
15
13
  CompaniesBlock = "companies-block",
@@ -48,7 +46,6 @@ export interface LoadableProps {
48
46
  export interface LoadableChildren {
49
47
  loadable?: LoadableProps;
50
48
  }
51
- export type ServiceDemoProps = Animatable;
52
49
  export declare enum SliderBreakpointNames {
53
50
  Sm = "sm",
54
51
  Md = "md",
@@ -110,7 +107,6 @@ export interface HeaderBlockProps {
110
107
  breadcrumbs?: HeaderBreadCrumbsProps;
111
108
  status?: JSX.Element;
112
109
  }
113
- export type CalculatorProps = Animatable;
114
110
  export interface ExtendedFeaturesItem extends Omit<ContentBlockProps, 'theme' | 'centered' | 'colSizes' | 'size' | 'title'> {
115
111
  title: string;
116
112
  label?: string;
@@ -283,15 +279,9 @@ export interface ShareBlockProps {
283
279
  export type HeaderBlockModel = {
284
280
  type: BlockType.HeaderBlock;
285
281
  } & HeaderBlockProps;
286
- export type CalculatorBlockModel = {
287
- type: BlockType.CalculatorBlock;
288
- } & CalculatorProps;
289
282
  export type SliderBlockModel = {
290
283
  type: BlockType.SliderBlock;
291
284
  } & SliderProps;
292
- export type ServiceDemoBlockModel = {
293
- type: BlockType.ServiceDemoBlock;
294
- } & ServiceDemoProps;
295
285
  export type ExtendedFeaturesBlockModel = {
296
286
  type: BlockType.ExtendedFeaturesBlock;
297
287
  } & ExtendedFeaturesProps;
@@ -340,6 +330,6 @@ export type ContentLayoutBlockModel = {
340
330
  export type ShareBLockModel = {
341
331
  type: BlockType.ShareBlock;
342
332
  } & ShareBlockProps;
343
- type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
333
+ type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
344
334
  export type Block = BlockModels & BlockBaseProps;
345
335
  export {};
@@ -3,8 +3,6 @@ export var BlockType;
3
3
  BlockType["PromoFeaturesBlock"] = "promo-features-block";
4
4
  BlockType["ExtendedFeaturesBlock"] = "extended-features-block";
5
5
  BlockType["SliderBlock"] = "slider-block";
6
- BlockType["CalculatorBlock"] = "calculator-block";
7
- BlockType["ServiceDemoBlock"] = "service-demo-block";
8
6
  BlockType["QuestionsBlock"] = "questions-block";
9
7
  BlockType["BannerBlock"] = "banner-block";
10
8
  BlockType["CompaniesBlock"] = "companies-block";
@@ -1,5 +1,5 @@
1
1
  import { CSSProperties, ReactNode } from 'react';
2
- import { ButtonSize, ButtonView } from '@gravity-ui/uikit';
2
+ import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
3
3
  import { ThemeSupporting } from '../../utils/theme';
4
4
  import { AnalyticsEventsBase, ClassNameProps, PixelEventType } from '../common';
5
5
  export declare enum AuthorType {
@@ -94,6 +94,7 @@ export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement>, P
94
94
  style?: CSSProperties;
95
95
  imageClassName?: string;
96
96
  hide?: boolean;
97
+ qa?: string;
97
98
  }
98
99
  export interface MediaVideoProps extends AnalyticsEventsBase {
99
100
  src: string[];
@@ -126,11 +127,10 @@ export interface FileLinkProps extends ClassNameProps {
126
127
  onClick?: () => void;
127
128
  }
128
129
  export type ButtonTheme = ButtonView | 'github' | 'app-store' | 'google-play' | 'scale' | 'monochrome';
129
- export interface ButtonProps extends AnalyticsEventsBase {
130
+ export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width'> {
130
131
  text: string;
131
132
  url: string;
132
133
  primary?: boolean;
133
- size?: ButtonSize;
134
134
  theme?: ButtonTheme;
135
135
  img?: ButtonImageProps | string;
136
136
  metrikaGoals?: MetrikaGoal;
@@ -1,5 +1,5 @@
1
1
  import React, { PropsWithChildren } from 'react';
2
- import { Animatable, Block, ConstructorItem, ThemedMediaProps, WithChildren } from './';
2
+ import { Animatable, Block, BlockDecoratorProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
3
3
  export interface PageData {
4
4
  content: PageContent;
5
5
  }
@@ -40,5 +40,8 @@ export interface CustomConfig {
40
40
  subBlocks?: CustomItems;
41
41
  headers?: CustomItems;
42
42
  loadable?: LoadableConfig;
43
+ decorators?: {
44
+ block?: ((props: BlockDecoratorProps) => React.ReactElement)[];
45
+ };
43
46
  }
44
47
  export {};
@@ -0,0 +1,9 @@
1
+ import { PropsWithChildren } from 'react';
2
+ export interface BlockDecorationProps extends PropsWithChildren {
3
+ id?: string;
4
+ }
5
+ export interface BlockDecoratorProps extends PropsWithChildren {
6
+ id: string | number;
7
+ isHeader?: boolean;
8
+ }
9
+ export type BlockDecorator = (props: BlockDecoratorProps) => React.ReactElement;
@@ -0,0 +1 @@
1
+ export {};
@@ -5,3 +5,4 @@ export * from './components';
5
5
  export * from './guards';
6
6
  export * from './react';
7
7
  export * from './navigation';
8
+ export * from './customization';
@@ -5,3 +5,4 @@ export * from './components';
5
5
  export * from './guards';
6
6
  export * from './react';
7
7
  export * from './navigation';
8
+ export * from './customization';
@@ -28,7 +28,6 @@ export function generateDefaultSchema(config) {
28
28
  'info-block',
29
29
  'table-block',
30
30
  'tabs-block',
31
- 'preview-block',
32
31
  'price-detailed',
33
32
  'header-slider-block',
34
33
  'cards-with-image-block',
@@ -1,4 +1,3 @@
1
- import { __rest } from "tslib";
2
1
  import React from 'react';
3
2
  import { Button, Title, YFMWrapper } from '../../components';
4
3
  import LinkBlock from '../../components/Link/Link';
@@ -35,9 +34,9 @@ function getButtonSize(size) {
35
34
  }
36
35
  const Content = (props) => {
37
36
  const { title, text, additionalInfo, size = 'l', links, buttons, colSizes = { all: 12, sm: 8 }, centered, theme, className, } = props;
38
- const titleProps = __rest(!title || typeof title === 'string'
37
+ const titleProps = !title || typeof title === 'string'
39
38
  ? { text: title, textSize: getTextSize(size) }
40
- : Object.assign({}, title), []);
39
+ : title;
41
40
  const hasTitle = Boolean(title);
42
41
  return (React.createElement(Col, { className: b({ size, centered, theme }, className), reset: true, sizes: colSizes },
43
42
  title && React.createElement(Title, { className: b('title'), title: titleProps, colSizes: { all: 12 } }),
@@ -1,3 +1,5 @@
1
+ /* eslint-disable no-param-reassign */
2
+ /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
1
3
  import _ from 'lodash';
2
4
  import { config } from './config';
3
5
  function transformBlocks(blocks, lang, customConfig = {}) {
@@ -9,7 +11,6 @@ function transformBlock(lang, blocksConfig, block) {
9
11
  const blockConfig = blocksConfig[block.type];
10
12
  if (block) {
11
13
  if ('randomOrder' in block && block.randomOrder && 'children' in block && block.children) {
12
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
13
14
  block.children = _.shuffle(block.children);
14
15
  }
15
16
  }
@@ -22,11 +23,9 @@ function transformBlock(lang, blocksConfig, block) {
22
23
  fields.forEach((field) => {
23
24
  if (block[field]) {
24
25
  if (parser) {
25
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
26
26
  block[field] = parser(transformer, block[field]);
27
27
  }
28
28
  else if (typeof block[field] === 'string') {
29
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
30
29
  block[field] = transformer(block[field]);
31
30
  }
32
31
  }
@@ -38,7 +37,6 @@ function transformBlock(lang, blocksConfig, block) {
38
37
  });
39
38
  }
40
39
  if ('children' in block && block.children) {
41
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
42
40
  block.children = transformBlocks(block.children, lang, blocksConfig);
43
41
  }
44
42
  return block;
@@ -1,4 +1,4 @@
1
- import { CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
1
+ import { Block, CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
2
2
  import { ConstructorBlock } from '../models/constructor';
3
3
  export declare function getHeaderTag(size: TextSize): "h1" | "h2" | "h4" | "h5";
4
4
  export declare function getBlockKey(block: ConstructorBlock, index: number): string;
@@ -8,4 +8,7 @@ export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomCon
8
8
  };
9
9
  export declare const getCustomSubBlockTypes: (customBlocks?: CustomConfig) => string[];
10
10
  export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
11
+ export declare const getOrderedBlocks: (blocks: Block[], headerBlockTypes?: string[]) => Block[];
12
+ export declare const getHeaderBlock: (blocks: Block[], headerBlockTypes?: string[]) => Block | undefined;
11
13
  export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
14
+ export declare const getBlockIndexFromId: (blockId?: string) => number;
@@ -37,6 +37,12 @@ const getShareUrlWithParams = (url, params = {}) => {
37
37
  });
38
38
  return result.toString();
39
39
  };
40
+ export const getOrderedBlocks = (blocks, headerBlockTypes = []) => {
41
+ return blocks.filter(({ type }) => !headerBlockTypes.includes(type));
42
+ };
43
+ export const getHeaderBlock = (blocks, headerBlockTypes = []) => {
44
+ return blocks.find(({ type }) => headerBlockTypes.includes(type));
45
+ };
40
46
  export const getShareLink = (url, type, title, text) => {
41
47
  // https://github.com/bradvin/social-share-urls
42
48
  switch (type) {
@@ -65,3 +71,4 @@ export const getShareLink = (url, type, title, text) => {
65
71
  return undefined;
66
72
  }
67
73
  };
74
+ export const getBlockIndexFromId = (blockId) => { var _a; return Number((_a = blockId === null || blockId === void 0 ? void 0 : blockId.split('-')) === null || _a === void 0 ? void 0 : _a.slice(-1).pop()); };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/page-constructor",
3
- "version": "3.0.0-alpha.4",
3
+ "version": "3.0.0-alpha.6",
4
4
  "description": "Gravity UI Page Constructor",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -61,15 +61,16 @@
61
61
  "uuid": "^9.0.0"
62
62
  },
63
63
  "peerDependencies": {
64
- "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
64
+ "@doc-tools/transform": "^2.6.1",
65
65
  "@gravity-ui/uikit": "^4.1.0",
66
- "@doc-tools/transform": "^2.6.1"
66
+ "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@commitlint/cli": "^17.1.2",
70
70
  "@commitlint/config-conventional": "^17.1.0",
71
71
  "@doc-tools/transform": "2.12.0",
72
72
  "@gravity-ui/eslint-config": "^2.0.0",
73
+ "@gravity-ui/icons": "^2.1.0",
73
74
  "@gravity-ui/prettier-config": "^1.0.1",
74
75
  "@gravity-ui/stylelint-config": "^1.0.0",
75
76
  "@gravity-ui/tsconfig": "^1.0.0",
@@ -8,8 +8,6 @@ export declare enum BlockType {
8
8
  PromoFeaturesBlock = "promo-features-block",
9
9
  ExtendedFeaturesBlock = "extended-features-block",
10
10
  SliderBlock = "slider-block",
11
- CalculatorBlock = "calculator-block",
12
- ServiceDemoBlock = "service-demo-block",
13
11
  QuestionsBlock = "questions-block",
14
12
  BannerBlock = "banner-block",
15
13
  CompaniesBlock = "companies-block",
@@ -48,7 +46,6 @@ export interface LoadableProps {
48
46
  export interface LoadableChildren {
49
47
  loadable?: LoadableProps;
50
48
  }
51
- export type ServiceDemoProps = Animatable;
52
49
  export declare enum SliderBreakpointNames {
53
50
  Sm = "sm",
54
51
  Md = "md",
@@ -110,7 +107,6 @@ export interface HeaderBlockProps {
110
107
  breadcrumbs?: HeaderBreadCrumbsProps;
111
108
  status?: JSX.Element;
112
109
  }
113
- export type CalculatorProps = Animatable;
114
110
  export interface ExtendedFeaturesItem extends Omit<ContentBlockProps, 'theme' | 'centered' | 'colSizes' | 'size' | 'title'> {
115
111
  title: string;
116
112
  label?: string;
@@ -283,15 +279,9 @@ export interface ShareBlockProps {
283
279
  export type HeaderBlockModel = {
284
280
  type: BlockType.HeaderBlock;
285
281
  } & HeaderBlockProps;
286
- export type CalculatorBlockModel = {
287
- type: BlockType.CalculatorBlock;
288
- } & CalculatorProps;
289
282
  export type SliderBlockModel = {
290
283
  type: BlockType.SliderBlock;
291
284
  } & SliderProps;
292
- export type ServiceDemoBlockModel = {
293
- type: BlockType.ServiceDemoBlock;
294
- } & ServiceDemoProps;
295
285
  export type ExtendedFeaturesBlockModel = {
296
286
  type: BlockType.ExtendedFeaturesBlock;
297
287
  } & ExtendedFeaturesProps;
@@ -340,6 +330,6 @@ export type ContentLayoutBlockModel = {
340
330
  export type ShareBLockModel = {
341
331
  type: BlockType.ShareBlock;
342
332
  } & ShareBlockProps;
343
- type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
333
+ type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
344
334
  export type Block = BlockModels & BlockBaseProps;
345
335
  export {};
@@ -6,8 +6,6 @@ var BlockType;
6
6
  BlockType["PromoFeaturesBlock"] = "promo-features-block";
7
7
  BlockType["ExtendedFeaturesBlock"] = "extended-features-block";
8
8
  BlockType["SliderBlock"] = "slider-block";
9
- BlockType["CalculatorBlock"] = "calculator-block";
10
- BlockType["ServiceDemoBlock"] = "service-demo-block";
11
9
  BlockType["QuestionsBlock"] = "questions-block";
12
10
  BlockType["BannerBlock"] = "banner-block";
13
11
  BlockType["CompaniesBlock"] = "companies-block";
@@ -1,5 +1,5 @@
1
1
  import { CSSProperties, ReactNode } from 'react';
2
- import { ButtonSize, ButtonView } from '@gravity-ui/uikit';
2
+ import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
3
3
  import { ThemeSupporting } from '../../utils/theme';
4
4
  import { AnalyticsEventsBase, ClassNameProps, PixelEventType } from '../common';
5
5
  export declare enum AuthorType {
@@ -94,6 +94,7 @@ export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement>, P
94
94
  style?: CSSProperties;
95
95
  imageClassName?: string;
96
96
  hide?: boolean;
97
+ qa?: string;
97
98
  }
98
99
  export interface MediaVideoProps extends AnalyticsEventsBase {
99
100
  src: string[];
@@ -126,11 +127,10 @@ export interface FileLinkProps extends ClassNameProps {
126
127
  onClick?: () => void;
127
128
  }
128
129
  export type ButtonTheme = ButtonView | 'github' | 'app-store' | 'google-play' | 'scale' | 'monochrome';
129
- export interface ButtonProps extends AnalyticsEventsBase {
130
+ export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width'> {
130
131
  text: string;
131
132
  url: string;
132
133
  primary?: boolean;
133
- size?: ButtonSize;
134
134
  theme?: ButtonTheme;
135
135
  img?: ButtonImageProps | string;
136
136
  metrikaGoals?: MetrikaGoal;
@@ -1,5 +1,5 @@
1
1
  import React, { PropsWithChildren } from 'react';
2
- import { Animatable, Block, ConstructorItem, ThemedMediaProps, WithChildren } from './';
2
+ import { Animatable, Block, BlockDecoratorProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
3
3
  export interface PageData {
4
4
  content: PageContent;
5
5
  }
@@ -40,5 +40,8 @@ export interface CustomConfig {
40
40
  subBlocks?: CustomItems;
41
41
  headers?: CustomItems;
42
42
  loadable?: LoadableConfig;
43
+ decorators?: {
44
+ block?: ((props: BlockDecoratorProps) => React.ReactElement)[];
45
+ };
43
46
  }
44
47
  export {};
@@ -0,0 +1,9 @@
1
+ import { PropsWithChildren } from 'react';
2
+ export interface BlockDecorationProps extends PropsWithChildren {
3
+ id?: string;
4
+ }
5
+ export interface BlockDecoratorProps extends PropsWithChildren {
6
+ id: string | number;
7
+ isHeader?: boolean;
8
+ }
9
+ export type BlockDecorator = (props: BlockDecoratorProps) => React.ReactElement;
@@ -0,0 +1,2 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
@@ -5,3 +5,4 @@ export * from './components';
5
5
  export * from './guards';
6
6
  export * from './react';
7
7
  export * from './navigation';
8
+ export * from './customization';
@@ -21,3 +21,4 @@ __exportStar(require("./components"), exports);
21
21
  __exportStar(require("./guards"), exports);
22
22
  __exportStar(require("./react"), exports);
23
23
  __exportStar(require("./navigation"), exports);
24
+ __exportStar(require("./customization"), exports);
@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.contentTransformer = void 0;
7
+ /* eslint-disable no-param-reassign */
8
+ /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
7
9
  const lodash_1 = __importDefault(require("lodash"));
8
10
  const config_1 = require("./config");
9
11
  function transformBlocks(blocks, lang, customConfig = {}) {
@@ -15,7 +17,6 @@ function transformBlock(lang, blocksConfig, block) {
15
17
  const blockConfig = blocksConfig[block.type];
16
18
  if (block) {
17
19
  if ('randomOrder' in block && block.randomOrder && 'children' in block && block.children) {
18
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
19
20
  block.children = lodash_1.default.shuffle(block.children);
20
21
  }
21
22
  }
@@ -28,11 +29,9 @@ function transformBlock(lang, blocksConfig, block) {
28
29
  fields.forEach((field) => {
29
30
  if (block[field]) {
30
31
  if (parser) {
31
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
32
32
  block[field] = parser(transformer, block[field]);
33
33
  }
34
34
  else if (typeof block[field] === 'string') {
35
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
36
35
  block[field] = transformer(block[field]);
37
36
  }
38
37
  }
@@ -44,7 +43,6 @@ function transformBlock(lang, blocksConfig, block) {
44
43
  });
45
44
  }
46
45
  if ('children' in block && block.children) {
47
- // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign, no-param-reassign
48
46
  block.children = transformBlocks(block.children, lang, blocksConfig);
49
47
  }
50
48
  return block;
@@ -1,4 +1,4 @@
1
- import { CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
1
+ import { Block, CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
2
2
  import { ConstructorBlock } from '../models/constructor';
3
3
  export declare function getHeaderTag(size: TextSize): "h1" | "h2" | "h4" | "h5";
4
4
  export declare function getBlockKey(block: ConstructorBlock, index: number): string;
@@ -8,4 +8,7 @@ export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomCon
8
8
  };
9
9
  export declare const getCustomSubBlockTypes: (customBlocks?: CustomConfig) => string[];
10
10
  export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
11
+ export declare const getOrderedBlocks: (blocks: Block[], headerBlockTypes?: string[]) => Block[];
12
+ export declare const getHeaderBlock: (blocks: Block[], headerBlockTypes?: string[]) => Block | undefined;
11
13
  export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
14
+ export declare const getBlockIndexFromId: (blockId?: string) => number;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
3
+ exports.getBlockIndexFromId = exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
4
4
  const models_1 = require("../models");
5
5
  function getHeaderTag(size) {
6
6
  switch (size) {
@@ -46,6 +46,14 @@ const getShareUrlWithParams = (url, params = {}) => {
46
46
  });
47
47
  return result.toString();
48
48
  };
49
+ const getOrderedBlocks = (blocks, headerBlockTypes = []) => {
50
+ return blocks.filter(({ type }) => !headerBlockTypes.includes(type));
51
+ };
52
+ exports.getOrderedBlocks = getOrderedBlocks;
53
+ const getHeaderBlock = (blocks, headerBlockTypes = []) => {
54
+ return blocks.find(({ type }) => headerBlockTypes.includes(type));
55
+ };
56
+ exports.getHeaderBlock = getHeaderBlock;
49
57
  const getShareLink = (url, type, title, text) => {
50
58
  // https://github.com/bradvin/social-share-urls
51
59
  switch (type) {
@@ -75,3 +83,5 @@ const getShareLink = (url, type, title, text) => {
75
83
  }
76
84
  };
77
85
  exports.getShareLink = getShareLink;
86
+ const getBlockIndexFromId = (blockId) => { var _a; return Number((_a = blockId === null || blockId === void 0 ? void 0 : blockId.split('-')) === null || _a === void 0 ? void 0 : _a.slice(-1).pop()); };
87
+ exports.getBlockIndexFromId = getBlockIndexFromId;