@gravity-ui/dynamic-forms 4.16.1 → 4.17.0

package/build/cjs/lib/kit/components/Inputs/TextContent/TextContent.js

@@ -25,7 +25,7 @@ const TextContentComponent = ({ spec, value, Layout, }) => {
             : undefined;
         content = (react_1.default.createElement(uikit_1.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 === null || textContentParams === void 0 ? void 0 : textContentParams.themeAlert }));
+            title: titleAlert, theme: textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.themeAlert, view: textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.viewAlert }));
     }
     else if (textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.themeLabel) {
         content = (react_1.default.createElement(uikit_1.Label, { size: "m", theme: textContentParams.themeLabel, className: b(), value: value, icon: iconLib }, content));

package/build/cjs/lib/kit/components/Layouts/Accordeon/Accordeon.js

@@ -10,6 +10,7 @@ const RemoveButton_1 = require("../../RemoveButton");
 const SimpleVerticalAccordeon_1 = require("../../SimpleVerticalAccordeon");
 const Accordeon = ({ name, spec, input, meta, children, }) => {
     var _a;
+    const { variantTitle } = spec.viewSpec.layoutProps || {};
     const [open, setOpen] = react_1.default.useState(Boolean((_a = spec.viewSpec) === null || _a === void 0 ? void 0 : _a.layoutOpen));
     const onDrop = react_1.default.useCallback(() => {
         setOpen(false);
@@ -22,7 +23,7 @@ const Accordeon = ({ name, spec, input, meta, children, }) => {
         return react_1.default.createElement(RemoveButton_1.RemoveButton, { name: name, onDrop: onDrop });
     }, [spec.required, input.value, onDrop, name]);
     (0, hooks_1.useErrorChecker)({ name, meta, open, setOpen });
-    return (react_1.default.createElement(SimpleVerticalAccordeon_1.SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: spec.viewSpec.layoutDescription || '', open: open, onOpenChange: setOpen, headerActionsTemplate: removeButton, hideInsteadOfDestroy: true, withBranchView: true },
+    return (react_1.default.createElement(SimpleVerticalAccordeon_1.SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: spec.viewSpec.layoutDescription || '', open: open, onOpenChange: setOpen, headerActionsTemplate: removeButton, hideInsteadOfDestroy: true, withBranchView: true, variantTitle: variantTitle },
         react_1.default.createElement(components_1.ErrorWrapper, { name: name, meta: meta, withoutChildErrorStyles: true }, children)));
 };
 exports.Accordeon = Accordeon;

package/build/cjs/lib/kit/components/Layouts/Section/Section.js

@@ -19,6 +19,25 @@ const SectionBase = (_a) => {
     const arrOrObjFlag = (0, core_1.isArraySpec)(spec) || (0, core_1.isObjectSpec)(spec);
     const titleRef = react_1.default.useRef(null);
     let content = children;
+    const { variantTitle: variantTitleProp } = spec.viewSpec.layoutProps || {};
+    const { sizeTitle, variantTitle } = react_1.default.useMemo(() => {
+        if (variantTitleProp) {
+            return {
+                sizeTitle: undefined,
+                variantTitle: variantTitleProp,
+            };
+        }
+        if (titleSize === 'm') {
+            return {
+                sizeTitle: titleSize,
+                variantTitle: 'body-2',
+            };
+        }
+        return {
+            sizeTitle: titleSize,
+            variantTitle: 'body-1',
+        };
+    }, [variantTitleProp, titleSize]);
     const removeButton = react_1.default.useMemo(() => {
         if ((input === null || input === void 0 ? void 0 : input.value) && (input === null || input === void 0 ? void 0 : input.onDrop) && (0, core_1.isArrayItem)(name)) {
             return (react_1.default.createElement(RemoveButton_1.RemoveButton, { name: name, onDrop: input.onDrop, switcherClassName: b('remove-button') }));
@@ -48,10 +67,10 @@ const SectionBase = (_a) => {
     return (react_1.default.createElement("section", { className: b() },
         layoutTitle ? (react_1.default.createElement("div", { className: b('header', {
                 'with-popover': !descriptionAsSubtitle,
-                size: titleSize,
+                size: sizeTitle,
             }) },
             react_1.default.createElement(uikit_1.Popover, { className: b('title-popover'), content: layoutTitle, placement: __2.COMMON_POPOVER_PLACEMENT, disabled: layoutTitlePopoverDisabled },
-                react_1.default.createElement(uikit_1.Text, { className: b('title'), variant: titleSize === 'm' ? 'body-2' : 'body-1', ref: titleRef, ellipsis: true }, layoutTitle)),
+                react_1.default.createElement(uikit_1.Text, { className: b('title'), variant: variantTitle, ref: titleRef, ellipsis: true }, layoutTitle)),
             description,
             removeButton)) : null,
         react_1.default.createElement("div", { className: b('content') }, content)));

package/build/cjs/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.js

@@ -52,7 +52,7 @@ class SimpleVerticalAccordeon extends react_1.default.Component {
     }
     render() {
         var _a;
-        const { children, headerActionsTemplate, className, contentClassName, buttonClassName, hideInsteadOfDestroy, withBranchView, viewLayout, name, } = this.props;
+        const { children, headerActionsTemplate, className, contentClassName, buttonClassName, hideInsteadOfDestroy, withBranchView, viewLayout, name, variantTitle, } = this.props;
         const { open, hidden, isFirstRender } = this.state;
         const content = hideInsteadOfDestroy ? (react_1.default.createElement("div", { ref: this.componentRef, className: b('body', { hidden: !open }) }, children)) : (open && (react_1.default.createElement("div", { ref: this.componentRef, className: b('body', contentClassName) }, children)));
         if (viewLayout && !isFirstRender && hidden) {
@@ -60,7 +60,7 @@ class SimpleVerticalAccordeon extends react_1.default.Component {
         }
         const title = this.getTitle();
         const titlePopoverDisabled = (((_a = this.titleRef.current) === null || _a === void 0 ? void 0 : _a.offsetWidth) || 0) <= TITLE_TEXT_MAX_WIDTH;
-        const currentTitleVariant = this.getCurrentTitleVariant();
+        const currentTitleVariant = variantTitle || this.getCurrentTitleVariant();
         return (Boolean(react_1.default.Children.count(children)) && (react_1.default.createElement("div", { className: b({ branch: withBranchView, view: viewLayout }, className) },
             react_1.default.createElement("div", { className: b('header') },
                 react_1.default.createElement(uikit_1.Popover, { content: title, disabled: titlePopoverDisabled, placement: common_1.COMMON_POPOVER_PLACEMENT },

package/build/cjs/lib/kit/components/ViewLayouts/ViewAccordeon/ViewAccordeon.js

@@ -10,11 +10,12 @@ const SimpleVerticalAccordeon_1 = require("../../SimpleVerticalAccordeon");
 const ViewAccordeon = ({ name, value, spec, children, }) => {
     const { showLayoutDescription } = (0, core_1.useDynamicFormsCtx)();
     const [open, setOpen] = react_1.default.useState((0, isBoolean_1.default)(spec.viewSpec.layoutOpen) ? spec.viewSpec.layoutOpen : true);
+    const { variantTitle } = spec.viewSpec.layoutProps || {};
     if (!(0, utils_1.isNotEmptyValue)(value, spec)) {
         return null;
     }
     return (react_1.default.createElement(SimpleVerticalAccordeon_1.SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: showLayoutDescription && spec.viewSpec.layoutDescription
             ? spec.viewSpec.layoutDescription
-            : undefined, open: open, onOpenChange: setOpen, hideInsteadOfDestroy: true, withBranchView: true, viewLayout: true }, children));
+            : undefined, open: open, onOpenChange: setOpen, hideInsteadOfDestroy: true, withBranchView: true, viewLayout: true, variantTitle: variantTitle }, children));
 };
 exports.ViewAccordeon = ViewAccordeon;

package/build/cjs/lib/kit/utils/common.js

@@ -42,7 +42,7 @@ const isNotEmptyValue = (value, spec) => {
 };
 exports.isNotEmptyValue = isNotEmptyValue;
 const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if ((0, isObjectLike_1.default)(spec)) {
         const result = (0, cloneDeep_1.default)(spec);
         if ((0, isString_1.default)(result.type)) {
@@ -54,7 +54,7 @@ const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) => {
                 try {
                     _defaultValue = JSON.parse(result.defaultValue);
                 }
-                catch (_k) {
+                catch (_m) {
                     _defaultValue = undefined;
                 }
             }
@@ -86,6 +86,10 @@ const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) => {
             result.viewSpec.textContentParams.themeAlert =
                 result.viewSpec.textContentParams.themeAlert.toLowerCase();
         }
+        if ((0, isString_1.default)((_l = (_k = result.viewSpec) === null || _k === void 0 ? void 0 : _k.textContentParams) === null || _l === void 0 ? void 0 : _l.viewAlert)) {
+            result.viewSpec.textContentParams.viewAlert =
+                result.viewSpec.textContentParams.viewAlert.toLowerCase();
+        }
         if ((0, isString_1.default)(result.validator)) {
             result.validator = result.validator.toLowerCase();
         }

package/build/esm/lib/core/components/View/types/layout.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormValue, Spec } from '../../../';
 import { ViewProps } from './';
-export type ViewLayoutProps<Value extends FormValue, SpecType extends Spec> = {
+export type ViewLayoutProps<Value extends FormValue, SpecType extends Spec<undefined, undefined, Record<string, any> | undefined> = Spec> = {
     children: React.ReactElement;
 } & ViewProps<Value, SpecType>;
 export type ViewLayoutType<Value extends FormValue, SpecType extends Spec> = (props: ViewLayoutProps<Value, SpecType>) => React.ReactElement | null;

package/build/esm/lib/core/components/View/types/views.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormValue, Spec } from '../../../';
 import { ViewLayoutType } from './';
-export type ViewProps<Value extends FormValue, SpecType extends Spec> = {
+export type ViewProps<Value extends FormValue, SpecType extends Spec<undefined, undefined, Record<string, any> | undefined> = Spec> = {
     spec: SpecType;
     name: string;
     value?: Value;

package/build/esm/lib/core/types/specs.d.ts

@@ -1,4 +1,4 @@
-import { AlertProps, LabelProps } from '@gravity-ui/uikit';
+import type { AlertProps, LabelProps } from '@gravity-ui/uikit';
 import { ColorTextBaseProps } from '@gravity-ui/uikit/build/esm/components/Text/colorText/colorText';
 import { ReadAsMethod, SpecTypes } from '../constants';
 import { ArrayValue, ObjectValue } from './';
@@ -151,6 +151,7 @@ export interface StringSpec<LinkType = any, InputComponentProps extends Record<s
             iconColor?: ColorTextBaseProps['color'];
             titleAlert?: string;
             themeAlert?: AlertProps['theme'];
+            viewAlert?: AlertProps['view'];
         };
         fileInput?: {
             accept?: string;

package/build/esm/lib/kit/components/Inputs/TextContent/TextContent.js

@@ -22,7 +22,7 @@ export const TextContentComponent = ({ spec, value, Layout, }) => {
             : undefined;
         content = (React.createElement(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 === null || textContentParams === void 0 ? void 0 : textContentParams.themeAlert }));
+            title: titleAlert, theme: textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.themeAlert, view: textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.viewAlert }));
     }
     else if (textContentParams === null || textContentParams === void 0 ? void 0 : textContentParams.themeLabel) {
         content = (React.createElement(Label, { size: "m", theme: textContentParams.themeLabel, className: b(), value: value, icon: iconLib }, content));

package/build/esm/lib/kit/components/Layouts/Accordeon/Accordeon.d.ts

@@ -1,2 +1,7 @@
+import { TextProps } from '@gravity-ui/uikit';
 import { ArrayLayoutProps, ObjectLayoutProps } from '../../../../core';
-export declare const Accordeon: <T extends ArrayLayoutProps<undefined, undefined> | ObjectLayoutProps<undefined, undefined>>({ name, spec, input, meta, children, }: T) => JSX.Element;
+interface AccordeonLayoutProps {
+    variantTitle?: TextProps['variant'];
+}
+export declare const Accordeon: <T extends ArrayLayoutProps<Record<string, any> | undefined, AccordeonLayoutProps | undefined> | ObjectLayoutProps<Record<string, any> | undefined, AccordeonLayoutProps | undefined>>({ name, spec, input, meta, children, }: T) => JSX.Element;
+export {};

package/build/esm/lib/kit/components/Layouts/Accordeon/Accordeon.js

@@ -6,6 +6,7 @@ import { RemoveButton } from '../../RemoveButton';
 import { SimpleVerticalAccordeon } from '../../SimpleVerticalAccordeon';
 export const Accordeon = ({ name, spec, input, meta, children, }) => {
     var _a;
+    const { variantTitle } = spec.viewSpec.layoutProps || {};
     const [open, setOpen] = React.useState(Boolean((_a = spec.viewSpec) === null || _a === void 0 ? void 0 : _a.layoutOpen));
     const onDrop = React.useCallback(() => {
         setOpen(false);
@@ -18,6 +19,6 @@ export const Accordeon = ({ name, spec, input, meta, children, }) => {
         return React.createElement(RemoveButton, { name: name, onDrop: onDrop });
     }, [spec.required, input.value, onDrop, name]);
     useErrorChecker({ name, meta, open, setOpen });
-    return (React.createElement(SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: spec.viewSpec.layoutDescription || '', open: open, onOpenChange: setOpen, headerActionsTemplate: removeButton, hideInsteadOfDestroy: true, withBranchView: true },
+    return (React.createElement(SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: spec.viewSpec.layoutDescription || '', open: open, onOpenChange: setOpen, headerActionsTemplate: removeButton, hideInsteadOfDestroy: true, withBranchView: true, variantTitle: variantTitle },
         React.createElement(ErrorWrapper, { name: name, meta: meta, withoutChildErrorStyles: true }, children)));
 };

package/build/esm/lib/kit/components/Layouts/Section/Section.js

@@ -17,6 +17,25 @@ const SectionBase = (_a) => {
     const arrOrObjFlag = isArraySpec(spec) || isObjectSpec(spec);
     const titleRef = React.useRef(null);
     let content = children;
+    const { variantTitle: variantTitleProp } = spec.viewSpec.layoutProps || {};
+    const { sizeTitle, variantTitle } = React.useMemo(() => {
+        if (variantTitleProp) {
+            return {
+                sizeTitle: undefined,
+                variantTitle: variantTitleProp,
+            };
+        }
+        if (titleSize === 'm') {
+            return {
+                sizeTitle: titleSize,
+                variantTitle: 'body-2',
+            };
+        }
+        return {
+            sizeTitle: titleSize,
+            variantTitle: 'body-1',
+        };
+    }, [variantTitleProp, titleSize]);
     const removeButton = React.useMemo(() => {
         if ((input === null || input === void 0 ? void 0 : input.value) && (input === null || input === void 0 ? void 0 : input.onDrop) && isArrayItem(name)) {
             return (React.createElement(RemoveButton, { name: name, onDrop: input.onDrop, switcherClassName: b('remove-button') }));
@@ -46,10 +65,10 @@ const SectionBase = (_a) => {
     return (React.createElement("section", { className: b() },
         layoutTitle ? (React.createElement("div", { className: b('header', {
                 'with-popover': !descriptionAsSubtitle,
-                size: titleSize,
+                size: sizeTitle,
             }) },
             React.createElement(Popover, { className: b('title-popover'), content: layoutTitle, placement: COMMON_POPOVER_PLACEMENT, disabled: layoutTitlePopoverDisabled },
-                React.createElement(Text, { className: b('title'), variant: titleSize === 'm' ? 'body-2' : 'body-1', ref: titleRef, ellipsis: true }, layoutTitle)),
+                React.createElement(Text, { className: b('title'), variant: variantTitle, ref: titleRef, ellipsis: true }, layoutTitle)),
             description,
             removeButton)) : null,
         React.createElement("div", { className: b('content') }, content)));

package/build/esm/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { TextProps } from '@gravity-ui/uikit';
 import './SimpleVerticalAccordeon.css';
 interface SimpleVerticalAccordeonProps {
     children: React.ReactNode;
@@ -16,6 +17,7 @@ interface SimpleVerticalAccordeonProps {
     hideInsteadOfDestroy?: boolean;
     withBranchView?: boolean;
     viewLayout?: boolean;
+    variantTitle?: TextProps['variant'];
 }
 interface SimpleVerticalAccordeonState {
     open: boolean;

package/build/esm/lib/kit/components/SimpleVerticalAccordeon/SimpleVerticalAccordeon.js

@@ -49,7 +49,7 @@ export class SimpleVerticalAccordeon extends React.Component {
     }
     render() {
         var _a;
-        const { children, headerActionsTemplate, className, contentClassName, buttonClassName, hideInsteadOfDestroy, withBranchView, viewLayout, name, } = this.props;
+        const { children, headerActionsTemplate, className, contentClassName, buttonClassName, hideInsteadOfDestroy, withBranchView, viewLayout, name, variantTitle, } = this.props;
         const { open, hidden, isFirstRender } = this.state;
         const content = hideInsteadOfDestroy ? (React.createElement("div", { ref: this.componentRef, className: b('body', { hidden: !open }) }, children)) : (open && (React.createElement("div", { ref: this.componentRef, className: b('body', contentClassName) }, children)));
         if (viewLayout && !isFirstRender && hidden) {
@@ -57,7 +57,7 @@ export class SimpleVerticalAccordeon extends React.Component {
         }
         const title = this.getTitle();
         const titlePopoverDisabled = (((_a = this.titleRef.current) === null || _a === void 0 ? void 0 : _a.offsetWidth) || 0) <= TITLE_TEXT_MAX_WIDTH;
-        const currentTitleVariant = this.getCurrentTitleVariant();
+        const currentTitleVariant = variantTitle || this.getCurrentTitleVariant();
         return (Boolean(React.Children.count(children)) && (React.createElement("div", { className: b({ branch: withBranchView, view: viewLayout }, className) },
             React.createElement("div", { className: b('header') },
                 React.createElement(Popover, { content: title, disabled: titlePopoverDisabled, placement: COMMON_POPOVER_PLACEMENT },

package/build/esm/lib/kit/components/ViewLayouts/ViewAccordeon/ViewAccordeon.d.ts

@@ -1,2 +1,7 @@
-import { ArrayViewLayoutProps, ObjectViewLayoutProps } from '../../../../core';
-export declare const ViewAccordeon: <T extends ArrayViewLayoutProps | ObjectViewLayoutProps>({ name, value, spec, children, }: T) => JSX.Element | null;
+import { TextProps } from '@gravity-ui/uikit';
+import { ArrayValue, ObjectValue, Spec, ViewLayoutProps } from '../../../../core';
+interface ViewAccordeonLayoutProps {
+    variantTitle?: TextProps['variant'];
+}
+export declare const ViewAccordeon: <T extends ViewLayoutProps<ArrayValue | ObjectValue, Spec<any, any, ViewAccordeonLayoutProps>>>({ name, value, spec, children, }: T) => JSX.Element | null;
+export {};

package/build/esm/lib/kit/components/ViewLayouts/ViewAccordeon/ViewAccordeon.js

@@ -6,10 +6,11 @@ import { SimpleVerticalAccordeon } from '../../SimpleVerticalAccordeon';
 export const ViewAccordeon = ({ name, value, spec, children, }) => {
     const { showLayoutDescription } = useDynamicFormsCtx();
     const [open, setOpen] = React.useState(isBoolean(spec.viewSpec.layoutOpen) ? spec.viewSpec.layoutOpen : true);
+    const { variantTitle } = spec.viewSpec.layoutProps || {};
     if (!isNotEmptyValue(value, spec)) {
         return null;
     }
     return (React.createElement(SimpleVerticalAccordeon, { name: name, title: spec.viewSpec.layoutTitle || '', note: showLayoutDescription && spec.viewSpec.layoutDescription
             ? spec.viewSpec.layoutDescription
-            : undefined, open: open, onOpenChange: setOpen, hideInsteadOfDestroy: true, withBranchView: true, viewLayout: true }, children));
+            : undefined, open: open, onOpenChange: setOpen, hideInsteadOfDestroy: true, withBranchView: true, viewLayout: true, variantTitle: variantTitle }, children));
 };

package/build/esm/lib/kit/utils/common.js

@@ -37,7 +37,7 @@ export const isNotEmptyValue = (value, spec) => {
     return true;
 };
 export const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     if (isObjectLike(spec)) {
         const result = cloneDeep(spec);
         if (isString(result.type)) {
@@ -49,7 +49,7 @@ export const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) =
                 try {
                     _defaultValue = JSON.parse(result.defaultValue);
                 }
-                catch (_k) {
+                catch (_m) {
                     _defaultValue = undefined;
                 }
             }
@@ -81,6 +81,10 @@ export const prepareSpec = (spec, parseJsonDefaultValue, overridePatternError) =
             result.viewSpec.textContentParams.themeAlert =
                 result.viewSpec.textContentParams.themeAlert.toLowerCase();
         }
+        if (isString((_l = (_k = result.viewSpec) === null || _k === void 0 ? void 0 : _k.textContentParams) === null || _l === void 0 ? void 0 : _l.viewAlert)) {
+            result.viewSpec.textContentParams.viewAlert =
+                result.viewSpec.textContentParams.viewAlert.toLowerCase();
+        }
         if (isString(result.validator)) {
             result.validator = result.validator.toLowerCase();
         }

package/package.json

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