Merge branch 'main' into hide-storybook-actions

Author: NasgulNexus

.github/workflows/pr-playwright-report.yml

@@ -16,11 +16,16 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           github-token: ${{ secrets.GRAVITY_UI_BOT_GITHUB_TOKEN }}
-          run_id: ${{ github.event.workflow_run.id }}
+          run-id: ${{ github.event.workflow_run.id }}
       - name: Extract PR Number
         id: pr
         run: echo "::set-output name=id::$(<pr/pr-id.txt)"
         shell: bash
+      - name: Install AWS CLI
+        uses: unfor19/install-aws-cli-action@v1
+        with:
+          version: 2.22.35
+          arch: amd64
       - name: Upload to S3
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.STORYBOOK_S3_KEY_ID }}

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [4.16.0](https://github.com/gravity-ui/dynamic-forms/compare/v4.15.0...v4.16.0) (2025-01-22)
+
+
+### Features
+
+* added new view text content alert ([#265](https://github.com/gravity-ui/dynamic-forms/issues/265)) ([2c19763](https://github.com/gravity-ui/dynamic-forms/commit/2c197632e6b5d718f94ddf7e652f6352bc5e9a6f))
+* css api ([#254](https://github.com/gravity-ui/dynamic-forms/issues/254)) ([c5608e7](https://github.com/gravity-ui/dynamic-forms/commit/c5608e7eee86f61348dacd79e2c13665ef054b22))
+
+
+### Bug Fixes
+
+* playwright ci ([#263](https://github.com/gravity-ui/dynamic-forms/issues/263)) ([a47ec49](https://github.com/gravity-ui/dynamic-forms/commit/a47ec49cfe982ae38b5d878bd1ab40312f4c8d56))
+* upload s3 playwright tests ([#259](https://github.com/gravity-ui/dynamic-forms/issues/259)) ([33b8173](https://github.com/gravity-ui/dynamic-forms/commit/33b8173cf38f0c72d68bfb294cbe9831c3ae7d7b))
+
 ## [4.15.0](https://github.com/gravity-ui/dynamic-forms/compare/v4.14.3...v4.15.0) (2024-12-12)
 
 

README-ru.md

@@ -0,0 +1,44 @@
+# @gravity-ui/dynamic-forms · [![npm package](https://img.shields.io/npm/v/@gravity-ui/dynamic-forms)](https://www.npmjs.com/package/@gravity-ui/dynamic-forms) [![CI](https://img.shields.io/github/actions/workflow/status/gravity-ui/dynamic-forms/.github/workflows/ci.yml?label=CI&logo=github)](https://github.com/gravity-ui/dynamic-forms/actions/workflows/ci.yml?query=branch:main) [![storybook](https://img.shields.io/badge/Storybook-deployed-ff4685)](https://preview.gravity-ui.com/dynamic-forms/)
+
+Библиотека для рендеринга форм и их значений на основе `JSON Schema`.
+
+## Установка
+
+```shell
+npm install --save-dev @gravity-ui/dynamic-forms
+```
+
+## Использование
+
+```jsx
+import {DynamicField, Spec, dynamicConfig} from '@gravity-ui/dynamic-forms';
+
+// To embed in a final-form
+<DynamicField name={name} spec={spec} config={config} />;
+
+import {DynamicView, dynamicViewConfig} from '@gravity-ui/dynamic-forms';
+
+// To get an overview of the values
+<DynamicView value={value} spec={spec} config={dynamicViewConfig} />;
+```
+
+### I18N
+
+Некоторые компоненты содержат текстовые токены, доступные на двух языках: `en` (по умолчанию) и `ru`. Для настройки языка используйте функцию `configure`:
+
+```js
+// index.js
+
+import {configure, Lang} from '@gravity-ui/dynamic-forms';
+
+configure({lang: Lang.Ru});
+```
+
+## Разработка
+
+Для запуска Storybook в режиме разработки выполните следующую команду:
+
+```shell
+npm ci
+npm run dev
+```

docs/spec.md

@@ -182,6 +182,8 @@ You can provide all props of [original component](https://preview.gravity-ui.com
 | text       | `string`                                                                                                                                                                                                                                                                                          |   yes    | Text for input                                                      |
 | icon       | `string`                                                                                                                                                                                                                                                                                          |          | Icon name from the [library](https://gravity-ui.com/icons)          |
 | iconColor  | `'primary'` `'complementary'` `'secondary'` `'hint'` `'info'` `'info-heavy'` `'positive'` `'positive-heavy'` `'warning'` `'warning-heavy'` `'danger'` `'danger-heavy'` `'utility'` `'utility-heavy'` `'misc'` `'misc-heavy'` `'brand'` `'dark-primary'` `'dark-complementary'` `'dark-secondary'` |          | The color of the icon, if it does not have the themeLabel parameter |
+| themeIcon  | `'normal'` `'info'` `'success'` `'warning'` `'danger'` `'utility'`                                                                                                                                                                                                                                |          | Alert color                                                         |
+| titleAlert | `string`                                                                                                                                                                                                                                                                                          |          | Alert title                                                         |
 
 #### SelectParams
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dynamic-forms",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "",
   "license": "MIT",
   "main": "build/cjs/index.js",

package.json

@@ -1,4 +1,4 @@
-import {LabelProps} from '@gravity-ui/uikit';
+import {AlertProps, LabelProps} from '@gravity-ui/uikit';
 import {ColorTextBaseProps} from '@gravity-ui/uikit/build/esm/components/Text/colorText/colorText';
 
 import {ReadAsMethod, SpecTypes} from '../constants';
@@ -173,6 +173,8 @@ export interface StringSpec<
             text: string;
             icon?: string;
             iconColor?: ColorTextBaseProps['color'];
+            titleAlert?: string;
+            themeAlert?: AlertProps['theme'];
         };
         fileInput?: {
             accept?: string;

src/lib/core/types/specs.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 
-import {Label, Text} from '@gravity-ui/uikit';
+import {isEmpty} from 'lodash';
+
+import {Alert, Label, Text} from '@gravity-ui/uikit';
 import cloneDeep from 'lodash/cloneDeep';
 
 import {StringIndependentInput, StringSpec} from '../../../../core';
@@ -41,7 +43,22 @@ export const TextContentComponent: React.FC<TextContentComponentProps> = ({
 
     let content = <span dangerouslySetInnerHTML={{__html: text}} />;
 
-    if (textContentParams?.themeLabel) {
+    if (textContentParams?.themeAlert) {
+        const titleAlert =
+            textContentParams?.titleAlert || !isEmpty(textContentParams?.titleAlert)
+                ? textContentParams.titleAlert
+                : undefined;
+
+        content = (
+            <Alert
+                icon={iconLib}
+                message={content}
+                // If the title is an empty line, then you need to explicitly write undefined, otherwise there will be an additional indent
+                title={titleAlert}
+                theme={textContentParams?.themeAlert}
+            />
+        );
+    } else if (textContentParams?.themeLabel) {
         content = (
             <Label
                 size="m"