@gravity-ui/page-constructor 5.0.0 → 5.1.0

package/build/cjs/sub-blocks/BackgroundCard/BackgroundCard.css

@@ -37,6 +37,12 @@ unpredictable css rules order in build */
   object-fit: cover;
   object-position: left;
 }
+.pc-background-card__footer {
+  margin-top: 0px;
+}
+.pc-background-card__links, .pc-background-card__buttons {
+  margin-top: 16px;
+}
 
 a.pc-background-card_theme_light {
   background-color: var(--pc-color-base-silver);

package/build/cjs/sub-blocks/BackgroundCard/BackgroundCard.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const components_1 = require("../../components/");
 const theme_1 = require("../../context/theme");
 const utils_1 = require("../../utils");
-const renderContentControls_1 = tslib_1.__importDefault(require("../../utils/renderContentControls/renderContentControls"));
 const Content_1 = tslib_1.__importDefault(require("../Content/Content"));
-const renderCardFooterControlsContainer_1 = tslib_1.__importDefault(require("../renderCardFooterControlsContainer/renderCardFooterControlsContainer"));
 const b = (0, utils_1.block)('background-card');
 const BackgroundCard = (props) => {
     const { url, title, text, border, background, paddingBottom, backgroundColor, additionalInfo, theme: cardTheme = 'default', links, buttons, analyticsEvents, urlTitle, controlPosition = 'content', } = props;
@@ -17,16 +15,12 @@ const BackgroundCard = (props) => {
     const hasBackgroundColor = backgroundColor || cardTheme !== 'default';
     const borderType = hasBackgroundColor ? 'none' : border;
     const areControlsInFooter = !paddingBottom && controlPosition === 'footer';
-    const footerControls = (0, react_1.useMemo)(() => (0, renderContentControls_1.default)({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }, renderCardFooterControlsContainer_1.default), [areControlsInFooter, links, buttons, titleId]);
     return (react_1.default.createElement(components_1.CardBase, { className: b({ padding: paddingBottom, theme: cardTheme }), url: url, border: borderType, analyticsEvents: analyticsEvents, urlTitle: urlTitle },
         react_1.default.createElement(components_1.CardBase.Content, null,
             react_1.default.createElement(components_1.BackgroundImage, Object.assign({ className: b('image') }, (0, utils_1.getThemedValue)(background, theme), { style: { backgroundColor } })),
             react_1.default.createElement(Content_1.default, { titleId: titleId, title: title, text: text, additionalInfo: additionalInfo, size: "s", theme: cardTheme, links: areControlsInFooter ? undefined : links, buttons: areControlsInFooter ? undefined : buttons, colSizes: { all: 12, md: 12 } })),
-        footerControls));
+        areControlsInFooter && (links || buttons) && (react_1.default.createElement(components_1.CardBase.Footer, null,
+            react_1.default.createElement(components_1.Links, { className: b('links'), size: "s", links: links, titleId: titleId }),
+            react_1.default.createElement(components_1.Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId })))));
 };
 exports.default = BackgroundCard;

package/build/cjs/sub-blocks/BasicCard/BasicCard.css

@@ -2,4 +2,11 @@
 unpredictable css rules order in build */
 .pc-basic-card.pc-basic-card {
   min-height: auto;
+}
+
+.pc-basic-card__footer {
+  margin-top: 0px;
+}
+.pc-basic-card__links, .pc-basic-card__buttons {
+  margin-top: 16px;
 }

package/build/cjs/sub-blocks/BasicCard/BasicCard.js

@@ -1,30 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const components_1 = require("../../components");
 const sub_blocks_1 = require("../../models/constructor-items/sub-blocks");
 const utils_1 = require("../../utils");
-const renderContentControls_1 = tslib_1.__importDefault(require("../../utils/renderContentControls/renderContentControls"));
 const Content_1 = tslib_1.__importDefault(require("../Content/Content"));
-const renderCardFooterControlsContainer_1 = tslib_1.__importDefault(require("../renderCardFooterControlsContainer/renderCardFooterControlsContainer"));
 const b = (0, utils_1.block)('basic-card');
 const BasicCard = (props) => {
     const { title, text, icon, additionalInfo, links, list, buttons, iconPosition = sub_blocks_1.IconPosition.Top, controlPosition = 'content' } = props, cardParams = tslib_1.__rest(props, ["title", "text", "icon", "additionalInfo", "links", "list", "buttons", "iconPosition", "controlPosition"]);
     const titleId = (0, uikit_1.useUniqId)();
     const descriptionId = (0, uikit_1.useUniqId)();
     const areControlsInFooter = controlPosition === 'footer';
-    const footerControls = (0, react_1.useMemo)(() => (0, renderContentControls_1.default)({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }, renderCardFooterControlsContainer_1.default), [areControlsInFooter, links, buttons, titleId]);
     return (react_1.default.createElement(components_1.CardBase, Object.assign({ className: b() }, cardParams, { extraProps: { 'aria-describedby': descriptionId, 'aria-labelledby': titleId } }),
         react_1.default.createElement(components_1.CardBase.Content, null,
             react_1.default.createElement(components_1.IconWrapper, { icon: icon ? { value: icon, position: iconPosition } : undefined },
                 react_1.default.createElement(Content_1.default, { title: title, titleId: titleId, text: text, textId: descriptionId, additionalInfo: additionalInfo, links: areControlsInFooter ? undefined : links, list: list, buttons: areControlsInFooter ? undefined : buttons, size: "s", colSizes: { all: 12, md: 12 } }))),
-        footerControls));
+        areControlsInFooter && (buttons || links) && (react_1.default.createElement(components_1.CardBase.Footer, { className: b('footer') },
+            react_1.default.createElement(components_1.Links, { className: b('links'), size: "s", links: links, titleId: titleId }),
+            react_1.default.createElement(components_1.Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId })))));
 };
 exports.default = BasicCard;

package/build/cjs/sub-blocks/Content/Content.css

@@ -57,7 +57,9 @@ unpredictable css rules order in build */
 .pc-content_size_s .pc-content__text_without-title {
   margin-top: 0;
 }
-.pc-content_size_s .pc-content__list {
+.pc-content_size_s .pc-content__list,
+.pc-content_size_s .pc-content__links,
+.pc-content_size_s .pc-content__buttons {
   margin-top: 16px;
 }
 .pc-content_size_l .pc-content__text,
@@ -72,7 +74,9 @@ unpredictable css rules order in build */
   font-size: var(--g-text-body-3-font-size);
   line-height: var(--g-text-body-3-line-height);
 }
-.pc-content_size_l .pc-content__list {
+.pc-content_size_l .pc-content__list,
+.pc-content_size_l .pc-content__links,
+.pc-content_size_l .pc-content__buttons {
   margin-top: 24px;
 }
 .pc-content_theme_dark {

package/build/cjs/sub-blocks/Content/Content.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
+const react_1 = tslib_1.__importDefault(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const components_1 = require("../../components");
 const grid_1 = require("../../grid");
 const utils_1 = require("../../utils");
 const blocks_1 = require("../../utils/blocks");
-const renderContentControls_1 = tslib_1.__importDefault(require("../../utils/renderContentControls/renderContentControls"));
 const b = (0, utils_1.block)('content');
 function getTextSize(size) {
     switch (size) {
@@ -27,13 +26,6 @@ const Content = (props) => {
     const hasTitle = Boolean(title);
     const defaultTitleId = (0, uikit_1.useUniqId)();
     const titleId = titleIdFromProps || defaultTitleId;
-    const controls = (0, react_1.useMemo)(() => (0, renderContentControls_1.default)({
-        size,
-        links,
-        buttons,
-        titleId,
-        qa: qaAttributes,
-    }), [size, links, buttons, titleId, qaAttributes]);
     return (react_1.default.createElement(grid_1.Col, { className: b({ size, centered, theme }, className), reset: true, sizes: colSizes, qa: qaAttributes.container },
         title && (react_1.default.createElement(components_1.Title, { className: b('title'), title: titleProps, colSizes: { all: 12 }, id: titleId })),
         text && (react_1.default.createElement("div", { className: b('text', { ['without-title']: !hasTitle }) },
@@ -46,6 +38,7 @@ const Content = (props) => {
                     'constructor-notice': true,
                     [`constructor-size-${size}`]: true,
                 } }))),
-        controls));
+        links && (react_1.default.createElement(components_1.Links, { className: b('links', { size }), size: size, links: links, titleId: titleId, qa: qaAttributes.links, linkQa: qaAttributes.link })),
+        buttons && (react_1.default.createElement(components_1.Buttons, { className: b('buttons', { size }), size: size, buttons: buttons, titleId: titleId, qa: qaAttributes.buttons, buttonQa: qaAttributes.button }))));
 };
 exports.default = Content;

package/build/cjs/sub-blocks/LayoutItem/LayoutItem.css

@@ -22,4 +22,7 @@ unpredictable css rules order in build */
 }
 .pc-layout-item__content_no-media {
   margin: 0;
+}
+.pc-layout-item__links, .pc-layout-item__buttons {
+  margin-top: 16px;
 }

package/build/cjs/sub-blocks/LayoutItem/LayoutItem.js

@@ -5,7 +5,6 @@ const react_1 = tslib_1.__importStar(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const components_1 = require("../../components");
 const utils_1 = require("../../utils");
-const renderContentControls_1 = tslib_1.__importDefault(require("../../utils/renderContentControls/renderContentControls"));
 const Content_1 = tslib_1.__importDefault(require("../Content/Content"));
 const utils_2 = require("./utils");
 const b = (0, utils_1.block)('layout-item');
@@ -15,12 +14,6 @@ const LayoutItem = (_a) => {
     const areControlsInFooter = controlPosition === 'footer';
     const contentProps = Object.assign(Object.assign(Object.assign({}, content), (areControlsInFooter ? {} : { links: normalizedLinks, buttons })), { size: 's', colSizes: { all: 12, md: 12 } });
     const titleId = (0, uikit_1.useUniqId)();
-    const footerControls = (0, react_1.useMemo)(() => (0, renderContentControls_1.default)({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }), [areControlsInFooter, links, buttons, titleId]);
     const renderMedia = () => {
         if (!media) {
             return null;
@@ -36,6 +29,7 @@ const LayoutItem = (_a) => {
         react_1.default.createElement("div", { className: b('content', { 'no-media': !media }) },
             react_1.default.createElement(components_1.IconWrapper, { icon: icon },
                 react_1.default.createElement(Content_1.default, Object.assign({}, contentProps, { titleId: titleId })))),
-        footerControls));
+        areControlsInFooter && links && (react_1.default.createElement(components_1.Links, { className: b('links'), size: "s", links: links, titleId: titleId })),
+        areControlsInFooter && buttons && (react_1.default.createElement(components_1.Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId }))));
 };
 exports.default = LayoutItem;

package/build/esm/sub-blocks/BackgroundCard/BackgroundCard.css

@@ -37,6 +37,12 @@ unpredictable css rules order in build */
   object-fit: cover;
   object-position: left;
 }
+.pc-background-card__footer {
+  margin-top: 0px;
+}
+.pc-background-card__links, .pc-background-card__buttons {
+  margin-top: 16px;
+}
 
 a.pc-background-card_theme_light {
   background-color: var(--pc-color-base-silver);

package/build/esm/sub-blocks/BackgroundCard/BackgroundCard.js

@@ -1,11 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useUniqId } from '@gravity-ui/uikit';
-import { BackgroundImage, CardBase } from '../../components/';
+import { BackgroundImage, Buttons, CardBase, Links } from '../../components/';
 import { useTheme } from '../../context/theme';
 import { block, getThemedValue } from '../../utils';
-import renderContentControls from '../../utils/renderContentControls/renderContentControls';
 import Content from '../Content/Content';
-import renderCardFooterControlsContainer from '../renderCardFooterControlsContainer/renderCardFooterControlsContainer';
 import './BackgroundCard.css';
 const b = block('background-card');
 const BackgroundCard = (props) => {
@@ -15,16 +13,12 @@ const BackgroundCard = (props) => {
     const hasBackgroundColor = backgroundColor || cardTheme !== 'default';
     const borderType = hasBackgroundColor ? 'none' : border;
     const areControlsInFooter = !paddingBottom && controlPosition === 'footer';
-    const footerControls = useMemo(() => renderContentControls({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }, renderCardFooterControlsContainer), [areControlsInFooter, links, buttons, titleId]);
     return (React.createElement(CardBase, { className: b({ padding: paddingBottom, theme: cardTheme }), url: url, border: borderType, analyticsEvents: analyticsEvents, urlTitle: urlTitle },
         React.createElement(CardBase.Content, null,
             React.createElement(BackgroundImage, Object.assign({ className: b('image') }, getThemedValue(background, theme), { style: { backgroundColor } })),
             React.createElement(Content, { titleId: titleId, title: title, text: text, additionalInfo: additionalInfo, size: "s", theme: cardTheme, links: areControlsInFooter ? undefined : links, buttons: areControlsInFooter ? undefined : buttons, colSizes: { all: 12, md: 12 } })),
-        footerControls));
+        areControlsInFooter && (links || buttons) && (React.createElement(CardBase.Footer, null,
+            React.createElement(Links, { className: b('links'), size: "s", links: links, titleId: titleId }),
+            React.createElement(Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId })))));
 };
 export default BackgroundCard;

package/build/esm/sub-blocks/BasicCard/BasicCard.css

@@ -2,4 +2,11 @@
 unpredictable css rules order in build */
 .pc-basic-card.pc-basic-card {
   min-height: auto;
+}
+
+.pc-basic-card__footer {
+  margin-top: 0px;
+}
+.pc-basic-card__links, .pc-basic-card__buttons {
+  margin-top: 16px;
 }

package/build/esm/sub-blocks/BasicCard/BasicCard.js

@@ -1,12 +1,10 @@
 import { __rest } from "tslib";
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useUniqId } from '@gravity-ui/uikit';
-import { CardBase, IconWrapper } from '../../components';
+import { Buttons, CardBase, IconWrapper, Links } from '../../components';
 import { IconPosition } from '../../models/constructor-items/sub-blocks';
 import { block } from '../../utils';
-import renderContentControls from '../../utils/renderContentControls/renderContentControls';
 import Content from '../Content/Content';
-import renderCardFooterControlsContainer from '../renderCardFooterControlsContainer/renderCardFooterControlsContainer';
 import './BasicCard.css';
 const b = block('basic-card');
 const BasicCard = (props) => {
@@ -14,16 +12,12 @@ const BasicCard = (props) => {
     const titleId = useUniqId();
     const descriptionId = useUniqId();
     const areControlsInFooter = controlPosition === 'footer';
-    const footerControls = useMemo(() => renderContentControls({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }, renderCardFooterControlsContainer), [areControlsInFooter, links, buttons, titleId]);
     return (React.createElement(CardBase, Object.assign({ className: b() }, cardParams, { extraProps: { 'aria-describedby': descriptionId, 'aria-labelledby': titleId } }),
         React.createElement(CardBase.Content, null,
             React.createElement(IconWrapper, { icon: icon ? { value: icon, position: iconPosition } : undefined },
                 React.createElement(Content, { title: title, titleId: titleId, text: text, textId: descriptionId, additionalInfo: additionalInfo, links: areControlsInFooter ? undefined : links, list: list, buttons: areControlsInFooter ? undefined : buttons, size: "s", colSizes: { all: 12, md: 12 } }))),
-        footerControls));
+        areControlsInFooter && (buttons || links) && (React.createElement(CardBase.Footer, { className: b('footer') },
+            React.createElement(Links, { className: b('links'), size: "s", links: links, titleId: titleId }),
+            React.createElement(Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId })))));
 };
 export default BasicCard;

package/build/esm/sub-blocks/Content/Content.css

@@ -57,7 +57,9 @@ unpredictable css rules order in build */
 .pc-content_size_s .pc-content__text_without-title {
   margin-top: 0;
 }
-.pc-content_size_s .pc-content__list {
+.pc-content_size_s .pc-content__list,
+.pc-content_size_s .pc-content__links,
+.pc-content_size_s .pc-content__buttons {
   margin-top: 16px;
 }
 .pc-content_size_l .pc-content__text,
@@ -72,7 +74,9 @@ unpredictable css rules order in build */
   font-size: var(--g-text-body-3-font-size);
   line-height: var(--g-text-body-3-line-height);
 }
-.pc-content_size_l .pc-content__list {
+.pc-content_size_l .pc-content__list,
+.pc-content_size_l .pc-content__links,
+.pc-content_size_l .pc-content__buttons {
   margin-top: 24px;
 }
 .pc-content_theme_dark {

package/build/esm/sub-blocks/Content/Content.js

@@ -1,10 +1,9 @@
-import React, { useMemo } from 'react';
+import React from 'react';
 import { useUniqId } from '@gravity-ui/uikit';
-import { ContentList, Title, YFMWrapper } from '../../components';
+import { Buttons, ContentList, Links, Title, YFMWrapper } from '../../components';
 import { Col } from '../../grid';
 import { block } from '../../utils';
 import { getQaAttrubutes } from '../../utils/blocks';
-import renderContentControls from '../../utils/renderContentControls/renderContentControls';
 import './Content.css';
 const b = block('content');
 function getTextSize(size) {
@@ -25,13 +24,6 @@ const Content = (props) => {
     const hasTitle = Boolean(title);
     const defaultTitleId = useUniqId();
     const titleId = titleIdFromProps || defaultTitleId;
-    const controls = useMemo(() => renderContentControls({
-        size,
-        links,
-        buttons,
-        titleId,
-        qa: qaAttributes,
-    }), [size, links, buttons, titleId, qaAttributes]);
     return (React.createElement(Col, { className: b({ size, centered, theme }, className), reset: true, sizes: colSizes, qa: qaAttributes.container },
         title && (React.createElement(Title, { className: b('title'), title: titleProps, colSizes: { all: 12 }, id: titleId })),
         text && (React.createElement("div", { className: b('text', { ['without-title']: !hasTitle }) },
@@ -44,6 +36,7 @@ const Content = (props) => {
                     'constructor-notice': true,
                     [`constructor-size-${size}`]: true,
                 } }))),
-        controls));
+        links && (React.createElement(Links, { className: b('links', { size }), size: size, links: links, titleId: titleId, qa: qaAttributes.links, linkQa: qaAttributes.link })),
+        buttons && (React.createElement(Buttons, { className: b('buttons', { size }), size: size, buttons: buttons, titleId: titleId, qa: qaAttributes.buttons, buttonQa: qaAttributes.button }))));
 };
 export default Content;

package/build/esm/sub-blocks/LayoutItem/LayoutItem.css

@@ -22,4 +22,7 @@ unpredictable css rules order in build */
 }
 .pc-layout-item__content_no-media {
   margin: 0;
+}
+.pc-layout-item__links, .pc-layout-item__buttons {
+  margin-top: 16px;
 }

package/build/esm/sub-blocks/LayoutItem/LayoutItem.js

@@ -1,9 +1,8 @@
 import { __rest } from "tslib";
 import React, { useMemo } from 'react';
 import { useUniqId } from '@gravity-ui/uikit';
-import { FullscreenMedia, IconWrapper, Media, MetaInfo } from '../../components';
+import { Buttons, FullscreenMedia, IconWrapper, Links, Media, MetaInfo } from '../../components';
 import { block } from '../../utils';
-import renderContentControls from '../../utils/renderContentControls/renderContentControls';
 import Content from '../Content/Content';
 import { getLayoutItemLinks, hasFullscreen, showFullscreenIcon } from './utils';
 import './LayoutItem.css';
@@ -14,12 +13,6 @@ const LayoutItem = (_a) => {
     const areControlsInFooter = controlPosition === 'footer';
     const contentProps = Object.assign(Object.assign(Object.assign({}, content), (areControlsInFooter ? {} : { links: normalizedLinks, buttons })), { size: 's', colSizes: { all: 12, md: 12 } });
     const titleId = useUniqId();
-    const footerControls = useMemo(() => renderContentControls({
-        links: areControlsInFooter ? links : undefined,
-        buttons: areControlsInFooter ? buttons : undefined,
-        size: 's',
-        titleId,
-    }), [areControlsInFooter, links, buttons, titleId]);
     const renderMedia = () => {
         if (!media) {
             return null;
@@ -35,6 +28,7 @@ const LayoutItem = (_a) => {
         React.createElement("div", { className: b('content', { 'no-media': !media }) },
             React.createElement(IconWrapper, { icon: icon },
                 React.createElement(Content, Object.assign({}, contentProps, { titleId: titleId })))),
-        footerControls));
+        areControlsInFooter && links && (React.createElement(Links, { className: b('links'), size: "s", links: links, titleId: titleId })),
+        areControlsInFooter && buttons && (React.createElement(Buttons, { className: b('buttons'), size: "s", buttons: buttons, titleId: titleId }))));
 };
 export default LayoutItem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "5.0.0",
+  "version": "5.1.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -83,7 +83,7 @@
     "@bem-react/classname": "^1.6.0",
     "@gravity-ui/components": "^3.0.0",
     "@gravity-ui/dynamic-forms": "^4.0.0",
-    "@gravity-ui/i18n": "^1.2.0",
+    "@gravity-ui/i18n": "^1.3.0",
     "@react-spring/web": "^9.7.3",
     "ajv": "^8.12.0",
     "ajv-keywords": "^5.1.0",
@@ -116,13 +116,13 @@
     "@babel/preset-typescript": "^7.22.5",
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@diplodoc/transform": "^4.10.4",
+    "@diplodoc/transform": "^4.10.8",
     "@gravity-ui/eslint-config": "^2.0.0",
     "@gravity-ui/icons": "^2.8.1",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^1.0.0",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^6.0.0",
+    "@gravity-ui/uikit": "^6.2.0",
     "@storybook/addon-actions": "^7.6.17",
     "@storybook/addon-essentials": "^7.6.17",
     "@storybook/addon-knobs": "^7.0.2",