@gravity-ui/page-constructor 2.22.0 → 2.22.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.22.2](https://github.com/gravity-ui/page-constructor/compare/v2.22.1...v2.22.2) (2023-06-01)
+
+
+### Bug Fixes
+
+* **MediaBlock:** add border property into schema ([#371](https://github.com/gravity-ui/page-constructor/issues/371)) ([5365791](https://github.com/gravity-ui/page-constructor/commit/5365791550bdb2ed8258d9582605e620ab0e1b11))
+
+## [2.22.1](https://github.com/gravity-ui/page-constructor/compare/v2.22.0...v2.22.1) (2023-06-01)
+
+
+### Bug Fixes
+
+* filter block nesting ([#364](https://github.com/gravity-ui/page-constructor/issues/364)) ([5b62522](https://github.com/gravity-ui/page-constructor/commit/5b62522e5e34eeacbb2fb9ec6de957bba69cd758))
+
 ## [2.22.0](https://github.com/gravity-ui/page-constructor/compare/v2.21.0...v2.22.0) (2023-05-31)
 
 

package/build/cjs/blocks/CardLayout/CardLayout.js

@@ -12,6 +12,6 @@ const DEFAULT_SIZES = {
 };
 const b = (0, utils_1.block)('card-layout-block');
 const CardLayout = ({ title, description, animated, colSizes = DEFAULT_SIZES, children, }) => (react_1.default.createElement(components_1.AnimateBlock, { className: b(), animate: animated },
-    react_1.default.createElement(components_1.BlockHeader, { title: title, description: description }),
+    (title || description) && react_1.default.createElement(components_1.BlockHeader, { title: title, description: description }),
     react_1.default.createElement(grid_1.Row, null, react_1.default.Children.map(children, (child, index) => (react_1.default.createElement(grid_1.Col, { key: index, sizes: colSizes, className: b('item') }, child))))));
 exports.default = CardLayout;

package/build/cjs/blocks/CardLayout/schema.d.ts

@@ -1,6 +1,6 @@
 export declare const CardLayoutProps: {
     additionalProperties: boolean;
-    required: string[];
+    required: never[];
     properties: {
         colSizes: {
             type: string;
@@ -76,7 +76,7 @@ export declare const CardLayoutProps: {
 export declare const CardLayoutBlock: {
     'card-layout-block': {
         additionalProperties: boolean;
-        required: string[];
+        required: never[];
         properties: {
             colSizes: {
                 type: string;

package/build/cjs/blocks/CardLayout/schema.js

@@ -4,7 +4,7 @@ exports.CardLayoutBlock = exports.CardLayoutProps = void 0;
 const common_1 = require("../../schema/validators/common");
 exports.CardLayoutProps = {
     additionalProperties: false,
-    required: ['title'],
+    required: [],
     properties: Object.assign(Object.assign(Object.assign(Object.assign({}, common_1.BlockBaseProps), common_1.AnimatableProps), common_1.BlockHeaderProps), { colSizes: common_1.containerSizesObject, children: common_1.ChildrenCardsProps }),
 };
 exports.CardLayoutBlock = {

package/build/cjs/blocks/FilterBlock/FilterBlock.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
+const __1 = require("..");
 const components_1 = require("../../components");
 const ButtonTabs_1 = tslib_1.__importDefault(require("../../components/ButtonTabs/ButtonTabs"));
-const ConstructorBlocks_1 = require("../../containers/PageConstructor/components/ConstructorBlocks");
+const ConstructorItem_1 = require("../../containers/PageConstructor/components/ConstructorItem");
 const grid_1 = require("../../grid");
-const models_1 = require("../../models");
 const utils_1 = require("../../utils");
 const i18n_1 = tslib_1.__importDefault(require("./i18n"));
 const b = (0, utils_1.block)('filter-block');
@@ -24,25 +24,21 @@ const FilterBlock = ({ title, description, tags, tagButtonSize, allTag, items, c
             ? tabButtons[0].id
             : selectedTag;
     }, [tabButtons, selectedTag]);
-    const container = (0, react_1.useMemo)(() => {
+    const cards = (0, react_1.useMemo)(() => {
         const itemsToShow = actualTag
             ? items.filter((item) => item.tags.includes(actualTag))
             : items;
-        return [
-            {
-                type: models_1.BlockType.CardLayoutBlock,
-                title: '',
-                colSizes: colSizes,
-                children: itemsToShow.map((item) => item.card),
-            },
-        ];
-    }, [actualTag, items, colSizes]);
+        return itemsToShow.map((item) => item.card);
+    }, [actualTag, items]);
     return (react_1.default.createElement(components_1.AnimateBlock, { className: b(), animate: animated },
         title && (react_1.default.createElement(components_1.BlockHeader, { className: b('title', { centered: centered }), title: title, description: description })),
         tabButtons.length && (react_1.default.createElement(grid_1.Row, null,
             react_1.default.createElement(grid_1.Col, null,
                 react_1.default.createElement(ButtonTabs_1.default, { className: b('tabs', { centered: centered }), items: tabButtons, activeTab: selectedTag, onSelectTab: setSelectedTag, tabSize: tagButtonSize })))),
         react_1.default.createElement(grid_1.Row, { className: b('block-container') },
-            react_1.default.createElement(ConstructorBlocks_1.ConstructorBlocks, { items: container }))));
+            react_1.default.createElement(__1.CardLayoutBlock, { title: "", colSizes: colSizes }, cards.map((card, index) => {
+                const key = (0, utils_1.getBlockKey)(card, index);
+                return react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: card, blockKey: key, key: key });
+            })))));
 };
 exports.default = FilterBlock;

package/build/cjs/models/constructor-items/blocks.d.ts

@@ -246,7 +246,7 @@ export interface LinkTableBlockProps extends BlockHeaderProps {
     linkTheme?: LinkTheme;
 }
 export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChildren {
-    title: TitleProps | string;
+    title?: TitleProps | string;
     description?: string;
     colSizes?: GridColumnSizesType;
 }

package/build/cjs/sub-blocks/MediaCard/schema.d.ts

@@ -140,6 +140,10 @@ export declare const MediaCardBlock: {
             fullscreen: {
                 type: string;
             };
+            border: {
+                type: string;
+                enum: string[];
+            };
             type: {};
             when: {};
         };

package/build/cjs/sub-blocks/MediaCard/schema.js

@@ -6,6 +6,6 @@ exports.MediaCardBlock = {
     'media-card': {
         additionalProperties: false,
         required: [],
-        properties: Object.assign(Object.assign(Object.assign({}, common_1.BaseProps), common_1.MediaProps), common_1.AnimatableProps),
+        properties: Object.assign(Object.assign(Object.assign(Object.assign({}, common_1.BaseProps), common_1.CardBase), common_1.MediaProps), common_1.AnimatableProps),
     },
 };

package/build/esm/blocks/CardLayout/CardLayout.js

@@ -10,6 +10,6 @@ const DEFAULT_SIZES = {
 };
 const b = block('card-layout-block');
 const CardLayout = ({ title, description, animated, colSizes = DEFAULT_SIZES, children, }) => (React.createElement(AnimateBlock, { className: b(), animate: animated },
-    React.createElement(BlockHeader, { title: title, description: description }),
+    (title || description) && React.createElement(BlockHeader, { title: title, description: description }),
     React.createElement(Row, null, React.Children.map(children, (child, index) => (React.createElement(Col, { key: index, sizes: colSizes, className: b('item') }, child))))));
 export default CardLayout;

package/build/esm/blocks/CardLayout/schema.d.ts

@@ -1,6 +1,6 @@
 export declare const CardLayoutProps: {
     additionalProperties: boolean;
-    required: string[];
+    required: never[];
     properties: {
         colSizes: {
             type: string;
@@ -76,7 +76,7 @@ export declare const CardLayoutProps: {
 export declare const CardLayoutBlock: {
     'card-layout-block': {
         additionalProperties: boolean;
-        required: string[];
+        required: never[];
         properties: {
             colSizes: {
                 type: string;

package/build/esm/blocks/CardLayout/schema.js

@@ -1,7 +1,7 @@
 import { AnimatableProps, BlockBaseProps, BlockHeaderProps, ChildrenCardsProps, containerSizesObject, } from '../../schema/validators/common';
 export const CardLayoutProps = {
     additionalProperties: false,
-    required: ['title'],
+    required: [],
     properties: Object.assign(Object.assign(Object.assign(Object.assign({}, BlockBaseProps), AnimatableProps), BlockHeaderProps), { colSizes: containerSizesObject, children: ChildrenCardsProps }),
 };
 export const CardLayoutBlock = {

package/build/esm/blocks/FilterBlock/FilterBlock.js

@@ -1,10 +1,10 @@
 import React, { useMemo, useState } from 'react';
+import { CardLayoutBlock } from '..';
 import { AnimateBlock, BlockHeader } from '../../components';
 import ButtonTabs from '../../components/ButtonTabs/ButtonTabs';
-import { ConstructorBlocks } from '../../containers/PageConstructor/components/ConstructorBlocks';
+import { ConstructorItem } from '../../containers/PageConstructor/components/ConstructorItem';
 import { Col, Row } from '../../grid';
-import { BlockType } from '../../models';
-import { block } from '../../utils';
+import { block, getBlockKey } from '../../utils';
 import i18n from './i18n';
 import './FilterBlock.css';
 const b = block('filter-block');
@@ -22,25 +22,21 @@ const FilterBlock = ({ title, description, tags, tagButtonSize, allTag, items, c
             ? tabButtons[0].id
             : selectedTag;
     }, [tabButtons, selectedTag]);
-    const container = useMemo(() => {
+    const cards = useMemo(() => {
         const itemsToShow = actualTag
             ? items.filter((item) => item.tags.includes(actualTag))
             : items;
-        return [
-            {
-                type: BlockType.CardLayoutBlock,
-                title: '',
-                colSizes: colSizes,
-                children: itemsToShow.map((item) => item.card),
-            },
-        ];
-    }, [actualTag, items, colSizes]);
+        return itemsToShow.map((item) => item.card);
+    }, [actualTag, items]);
     return (React.createElement(AnimateBlock, { className: b(), animate: animated },
         title && (React.createElement(BlockHeader, { className: b('title', { centered: centered }), title: title, description: description })),
         tabButtons.length && (React.createElement(Row, null,
             React.createElement(Col, null,
                 React.createElement(ButtonTabs, { className: b('tabs', { centered: centered }), items: tabButtons, activeTab: selectedTag, onSelectTab: setSelectedTag, tabSize: tagButtonSize })))),
         React.createElement(Row, { className: b('block-container') },
-            React.createElement(ConstructorBlocks, { items: container }))));
+            React.createElement(CardLayoutBlock, { title: "", colSizes: colSizes }, cards.map((card, index) => {
+                const key = getBlockKey(card, index);
+                return React.createElement(ConstructorItem, { data: card, blockKey: key, key: key });
+            })))));
 };
 export default FilterBlock;

package/build/esm/models/constructor-items/blocks.d.ts

@@ -246,7 +246,7 @@ export interface LinkTableBlockProps extends BlockHeaderProps {
     linkTheme?: LinkTheme;
 }
 export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChildren {
-    title: TitleProps | string;
+    title?: TitleProps | string;
     description?: string;
     colSizes?: GridColumnSizesType;
 }

package/build/esm/sub-blocks/MediaCard/schema.d.ts

@@ -140,6 +140,10 @@ export declare const MediaCardBlock: {
             fullscreen: {
                 type: string;
             };
+            border: {
+                type: string;
+                enum: string[];
+            };
             type: {};
             when: {};
         };

package/build/esm/sub-blocks/MediaCard/schema.js

@@ -1,8 +1,8 @@
-import { AnimatableProps, BaseProps, MediaProps } from '../../schema/validators/common';
+import { AnimatableProps, BaseProps, CardBase, MediaProps } from '../../schema/validators/common';
 export const MediaCardBlock = {
     'media-card': {
         additionalProperties: false,
         required: [],
-        properties: Object.assign(Object.assign(Object.assign({}, BaseProps), MediaProps), AnimatableProps),
+        properties: Object.assign(Object.assign(Object.assign(Object.assign({}, BaseProps), CardBase), MediaProps), AnimatableProps),
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "2.22.0",
+  "version": "2.22.2",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

package/server/models/constructor-items/blocks.d.ts

@@ -246,7 +246,7 @@ export interface LinkTableBlockProps extends BlockHeaderProps {
     linkTheme?: LinkTheme;
 }
 export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChildren {
-    title: TitleProps | string;
+    title?: TitleProps | string;
     description?: string;
     colSizes?: GridColumnSizesType;
 }