diff --git a/package-lock.json b/package-lock.json index 3141bbfb..0c1c2330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gravity-ui/blog-constructor", - "version": "6.5.0", + "version": "7.0.0-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gravity-ui/blog-constructor", - "version": "6.5.0", + "version": "7.0.0-alpha.2", "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", @@ -26,7 +26,7 @@ "@commitlint/config-conventional": "^17.4.3", "@diplodoc/transform": "^4.10.8", "@gravity-ui/eslint-config": "^3.1.1", - "@gravity-ui/page-constructor": "^5.27.0", + "@gravity-ui/page-constructor": "^6.0.0-alpha.2", "@gravity-ui/prettier-config": "^1.1.0", "@gravity-ui/stylelint-config": "^4.0.1", "@gravity-ui/tsconfig": "^1.0.0", @@ -85,7 +85,7 @@ }, "peerDependencies": { "@diplodoc/transform": "^4.10.7", - "@gravity-ui/page-constructor": "^5.0.0", + "@gravity-ui/page-constructor": "^6.0.0-alpha.2", "@gravity-ui/uikit": "^6.26.0", "react": "^16.0.0 || ^17.0.0 || ^18.0.0" } @@ -3100,10 +3100,11 @@ } }, "node_modules/@gravity-ui/page-constructor": { - "version": "5.27.0", - "resolved": "https://registry.npmjs.org/@gravity-ui/page-constructor/-/page-constructor-5.27.0.tgz", - "integrity": "sha512-LYkxXHEpKihWAYm1WwgxxlyjhiaCrbl1o5HBMLd+fzeXLAcBN6ZpjVWyq+QRuY6duc1RWMJ68A3szxlr/LBy7Q==", + "version": "6.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/@gravity-ui/page-constructor/-/page-constructor-6.0.0-alpha.2.tgz", + "integrity": "sha512-yn0SFpIhWtkP64M0Z2BE/zxnBQb2v99gDNDpsgD+lAlKB0pJzNA6oEDRAWvbs7pJlgeL2wyiTzZugo7a55CgpA==", "dev": true, + "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", "@gravity-ui/components": "^3.8.0", @@ -3131,7 +3132,7 @@ "uuid": "^9.0.0" }, "peerDependencies": { - "@diplodoc/transform": "^4.10.4", + "@diplodoc/transform": "^4.28.2", "@gravity-ui/uikit": "^6.0.0", "react": "^16.0.0 || ^17.0.0 || ^18.0.0" } diff --git a/package.json b/package.json index f35bb5a7..f47baadd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gravity-ui/blog-constructor", - "version": "6.5.0", + "version": "7.0.0-alpha.2", "description": "Gravity UI Blog Constructor", "license": "MIT", "repository": { @@ -78,7 +78,7 @@ }, "peerDependencies": { "@diplodoc/transform": "^4.10.7", - "@gravity-ui/page-constructor": "^5.0.0", + "@gravity-ui/page-constructor": "^6.0.0-alpha.2", "@gravity-ui/uikit": "^6.26.0", "react": "^16.0.0 || ^17.0.0 || ^18.0.0" }, @@ -89,7 +89,7 @@ "@commitlint/config-conventional": "^17.4.3", "@diplodoc/transform": "^4.10.8", "@gravity-ui/eslint-config": "^3.1.1", - "@gravity-ui/page-constructor": "^5.27.0", + "@gravity-ui/page-constructor": "^6.0.0-alpha.2", "@gravity-ui/prettier-config": "^1.1.0", "@gravity-ui/stylelint-config": "^4.0.1", "@gravity-ui/tsconfig": "^1.0.0", diff --git a/src/blocks/Suggest/Suggest.tsx b/src/blocks/Suggest/Suggest.tsx index 016a8f24..b5110493 100644 --- a/src/blocks/Suggest/Suggest.tsx +++ b/src/blocks/Suggest/Suggest.tsx @@ -43,7 +43,6 @@ export const Suggest = ({paddingTop = 'l', paddingBottom = 'l'}: SuggestProps) = {suggestedPosts.map((post) => ( diff --git a/src/blocks/YFM/YFM.tsx b/src/blocks/YFM/YFM.tsx index 22693cfa..ebb26047 100644 --- a/src/blocks/YFM/YFM.tsx +++ b/src/blocks/YFM/YFM.tsx @@ -28,7 +28,7 @@ export const YFM = (props: YFMProps) => { blog: true, resetPaddings: true, }} - className={b({'no-list-reset': true})} + contentClassName={b({'no-list-reset': true})} /> ); diff --git a/src/components/PostCard/PostCard.scss b/src/components/PostCard/PostCard.scss index 30991723..9465eeba 100644 --- a/src/components/PostCard/PostCard.scss +++ b/src/components/PostCard/PostCard.scss @@ -36,14 +36,18 @@ $block: '.#{$namespace}post-card'; } &__title { - margin-bottom: $indentXXXS; - &_size_s { - @include heading4(); + @include add-specificity(&) { + @include heading4(); + margin-bottom: $indentXXXS; + } } &_size_m { - @include heading2(); + @include add-specificity(&) { + @include heading2(); + margin-bottom: $indentXXXS; + } } } diff --git a/src/components/PostCard/PostCard.tsx b/src/components/PostCard/PostCard.tsx index c59420c5..82ee458e 100644 --- a/src/components/PostCard/PostCard.tsx +++ b/src/components/PostCard/PostCard.tsx @@ -1,5 +1,5 @@ import React, {useContext, useMemo} from 'react'; -import {AnalyticsEventsProp, CardBase, HTML, YFMWrapper} from '@gravity-ui/page-constructor'; +import {AnalyticsEventsProp, CardBase, YFMWrapper} from '@gravity-ui/page-constructor'; import {useUniqId} from '@gravity-ui/uikit'; import {LikesContext} from '../../contexts/LikesContext'; @@ -91,17 +91,21 @@ export const PostCard = ({ {tags[0].name} )} - {title && - React.createElement( - titleHeadingLevel, - {className: b('title', {size})}, - - {title} - , - )} + {title && ( + + )} {description && (