From 674189dd668189fc68336312b471eefaef2b4b87 Mon Sep 17 00:00:00 2001 From: Nikolay Tverdokhlebov Date: Wed, 2 Oct 2024 13:59:21 +0300 Subject: [PATCH 1/9] feat: next From 45b7b82d1b2dd451e06f18394c4eae6ecf7e14fb Mon Sep 17 00:00:00 2001 From: Nikolay Tverdokhlebov Date: Wed, 2 Oct 2024 13:57:19 +0300 Subject: [PATCH 2/9] feat: replace HTML with YFMWrapper --- package-lock.json | 13 +++++++------ package.json | 4 ++-- src/blocks/YFM/YFM.tsx | 2 +- src/components/PostCard/PostCard.scss | 12 ++++++++---- src/components/PostCard/PostCard.tsx | 24 ++++++++++++++---------- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3141bbfb..aa26c56d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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..c9783848 100644 --- a/package.json +++ b/package.json @@ -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/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..0ddd8b03 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 && ( Date: Tue, 14 Jan 2025 15:18:03 +0500 Subject: [PATCH 3/9] feat: update transformer --- src/components/PostCard/PostCard.tsx | 2 +- src/data/transformPost.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PostCard/PostCard.tsx b/src/components/PostCard/PostCard.tsx index 0ddd8b03..82ee458e 100644 --- a/src/components/PostCard/PostCard.tsx +++ b/src/components/PostCard/PostCard.tsx @@ -100,7 +100,7 @@ export const PostCard = ({ blogCard: true, }} id={titleId} - variant={titleHeadingLevel} + tagName={titleHeadingLevel} /> )} {description && ( diff --git a/src/data/transformPost.ts b/src/data/transformPost.ts index 278d1f47..12669d31 100644 --- a/src/data/transformPost.ts +++ b/src/data/transformPost.ts @@ -30,7 +30,7 @@ export const transformPost = ({postData, lang, options: {plugins} = {}}: Transfo return { ...post, - title, + title: yfmTransformer(lang, title as string, {plugins}), tags, textTitle: typografToText(title, lang), htmlTitle: typografToHTML(title, lang), From cc7574d035dd67de1e5e9eb6b79998377cfad8dc Mon Sep 17 00:00:00 2001 From: Nikolay Tverdokhlebov Date: Tue, 14 Jan 2025 17:34:15 +0500 Subject: [PATCH 4/9] fixup! feat: update transformer --- src/blocks/Suggest/Suggest.tsx | 1 - 1 file changed, 1 deletion(-) 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) => ( From d82601dd2329b12a31ef78dcc3583eec45449b19 Mon Sep 17 00:00:00 2001 From: gravity-ui-bot <111915794+gravity-ui-bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:45:14 +0000 Subject: [PATCH 5/9] 7.0.0-alpha.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa26c56d..18d4193e 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.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gravity-ui/blog-constructor", - "version": "6.5.0", + "version": "7.0.0-alpha.0", "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", diff --git a/package.json b/package.json index c9783848..cf7448ee 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.0", "description": "Gravity UI Blog Constructor", "license": "MIT", "repository": { From efe3d66c5db17b6d5f24a286932958f61accf51a Mon Sep 17 00:00:00 2001 From: Nikolay Tverdokhlebov Date: Thu, 16 Jan 2025 15:25:02 +0500 Subject: [PATCH 6/9] fixup! fixup! feat: update transformer --- styles/yfm.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/styles/yfm.scss b/styles/yfm.scss index 66819222..c1b445c9 100644 --- a/styles/yfm.scss +++ b/styles/yfm.scss @@ -130,6 +130,15 @@ .yfm-clipboard { margin: $indentM 0; } + + .yfm_reset_paddings > h1, + .yfm_reset_paddings > h2, + .yfm_reset_paddings > h3, + .yfm_reset_paddings > h4, + .yfm_reset_paddings > h5, + .yfm_reset_paddings > h6 { + margin-top: 0; + } } .yfm_blog_card { From ff762899faee04a878253126c558351407a9e7d4 Mon Sep 17 00:00:00 2001 From: gravity-ui-bot <111915794+gravity-ui-bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 10:35:39 +0000 Subject: [PATCH 7/9] 7.0.0-alpha.1 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18d4193e..d5a4fc2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.0", + "version": "7.0.0-alpha.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.0", + "version": "7.0.0-alpha.1", "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", diff --git a/package.json b/package.json index cf7448ee..6eeca88e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.0", + "version": "7.0.0-alpha.1", "description": "Gravity UI Blog Constructor", "license": "MIT", "repository": { From 055ea6098310957d5d501d2759b1ee81e91516b4 Mon Sep 17 00:00:00 2001 From: Nikolay Tverdokhlebov Date: Thu, 16 Jan 2025 16:32:12 +0500 Subject: [PATCH 8/9] fixup! fixup! fixup! feat: update transformer --- styles/yfm.scss | 51 ++++++++++++++++++++----------------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/styles/yfm.scss b/styles/yfm.scss index c1b445c9..60e5aaa4 100644 --- a/styles/yfm.scss +++ b/styles/yfm.scss @@ -7,27 +7,6 @@ @include text-size(body-3); color: var(--g-color-text-primary); - h1:first-child, - h2:first-child, - h3:first-child, - h4:first-child { - padding: 0; - margin-top: 0; - padding-top: 0; - } - - h2 { - @include text-size(display-2); - } - - h3 { - @include text-size(header-2); - } - - h4 { - @include text-size(header-1); - } - @include add-specificity(&) { h1, h2, @@ -40,6 +19,27 @@ padding-top: 0; font-weight: var(--g-text-header-font-weight); } + + h1:first-child, + h2:first-child, + h3:first-child, + h4:first-child { + padding: 0; + margin-top: 0; + padding-top: 0; + } + + h2 { + @include text-size(display-2); + } + + h3 { + @include text-size(header-2); + } + + h4 { + @include text-size(header-1); + } } blockquote, @@ -130,15 +130,6 @@ .yfm-clipboard { margin: $indentM 0; } - - .yfm_reset_paddings > h1, - .yfm_reset_paddings > h2, - .yfm_reset_paddings > h3, - .yfm_reset_paddings > h4, - .yfm_reset_paddings > h5, - .yfm_reset_paddings > h6 { - margin-top: 0; - } } .yfm_blog_card { From 1d5a47d41eba9e46a8e2be41d8aff35ed1821f49 Mon Sep 17 00:00:00 2001 From: gravity-ui-bot <111915794+gravity-ui-bot@users.noreply.github.com> Date: Thu, 16 Jan 2025 11:43:21 +0000 Subject: [PATCH 9/9] 7.0.0-alpha.2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index d5a4fc2d..0c1c2330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.1", + "version": "7.0.0-alpha.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.1", + "version": "7.0.0-alpha.2", "license": "MIT", "dependencies": { "@bem-react/classname": "^1.6.0", diff --git a/package.json b/package.json index 6eeca88e..f47baadd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gravity-ui/blog-constructor", - "version": "7.0.0-alpha.1", + "version": "7.0.0-alpha.2", "description": "Gravity UI Blog Constructor", "license": "MIT", "repository": {