@gravity-ui/dynamic-forms 5.24.0 → 5.26.0

package/build/esm/lib/unstable/kit/layouts/Accordeon/Accordeon.js

@@ -12,34 +12,36 @@ export const Accordeon = ({ children, headName, input, meta, mode, schema, props
     const { titleProps, togglerProps, withIndent = false, withDefaultSummary = false } = props, restLayoutProps = __rest(props, ["titleProps", "togglerProps", "withIndent", "withDefaultSummary"]);
     const { copy, required, hidden, open } = ((_a = schema.nodeParameters) === null || _a === void 0 ? void 0 : _a.flags) || {};
     const overviewFlag = mode === SchemaRendererMode.Overview;
-    const summary = React.useMemo(() => {
-        const stopPropagation = (event) => {
-            event.stopPropagation();
-        };
-        return (React.createElement(Flex, { alignItems: "center", gap: 2 },
-            withDefaultSummary ? (React.createElement(Text, Object.assign({}, titleProps, { className: b('title', { required: required && !overviewFlag }, titleProps === null || titleProps === void 0 ? void 0 : titleProps.className) }), schema.title)) : (React.createElement(Disclosure.Summary, null, (props) => (React.createElement(Button, Object.assign({}, togglerProps, { className: b('toggler', togglerProps === null || togglerProps === void 0 ? void 0 : togglerProps.className) }),
-                React.createElement(Flex, { alignItems: "center", gap: 2, height: "100%" },
-                    React.createElement(Icon, { data: props.expanded ? ChevronUp : ChevronDown }),
-                    React.createElement(Text, Object.assign({}, titleProps, { className: b('title', { required: required && !overviewFlag }, titleProps === null || titleProps === void 0 ? void 0 : titleProps.className) }), schema.title)))))),
-            schema.description ? (React.createElement(HelpMark, { onClick: stopPropagation },
-                React.createElement(HTMLContent, { content: schema.description, headName: headName }))) : null,
-            overviewFlag ? (React.createElement(CopyButton, { className: b('copy-button'), copy: copy, value: input.value })) : null,
-            overviewFlag ? null : (React.createElement(ArrayRemoveButton, { name: input.name, headName: headName, onClick: stopPropagation }))));
-    }, [
-        copy,
-        headName,
-        input.name,
-        input.value,
-        overviewFlag,
-        required,
-        schema.title,
-        schema.description,
-        titleProps,
-        togglerProps,
-        withDefaultSummary,
-    ]);
+    const summary = React.useMemo(() => (React.createElement(Text, Object.assign({}, titleProps, { className: b('title', { required: required && !overviewFlag }, titleProps === null || titleProps === void 0 ? void 0 : titleProps.className) }), schema.title)), [overviewFlag, required, schema.title, titleProps]);
+    const helpMark = React.useMemo(() => {
+        if (schema.description) {
+            return (React.createElement(HelpMark, null,
+                React.createElement(HTMLContent, { content: schema.description, headName: headName })));
+        }
+        return null;
+    }, [schema.description, headName]);
+    const copyButton = React.useMemo(() => {
+        if (overviewFlag) {
+            return React.createElement(CopyButton, { className: b('copy-button'), copy: copy, value: input.value });
+        }
+        return null;
+    }, [overviewFlag, copy, input.value]);
+    const removeButton = React.useMemo(() => {
+        if (overviewFlag) {
+            return null;
+        }
+        return React.createElement(ArrayRemoveButton, { name: input.name, headName: headName });
+    }, [overviewFlag, input.name, headName]);
     return (React.createElement(LayoutContainer, { className: b({ 'without-default-summary': !withDefaultSummary }), hideEmpty: overviewFlag, hidden: hidden },
-        React.createElement(Disclosure, Object.assign({ summary: summary, defaultExpanded: open }, restLayoutProps),
+        React.createElement(Disclosure, Object.assign({ defaultExpanded: open, summary: summary }, restLayoutProps),
+            React.createElement(Disclosure.Summary, null, ({ expanded, onClick }, defaultSummary) => (React.createElement(Flex, { minHeight: "28px", alignItems: "center", gap: 2 },
+                withDefaultSummary ? (defaultSummary) : (React.createElement(Button, Object.assign({}, togglerProps, { onClick: onClick, className: b('toggler', togglerProps === null || togglerProps === void 0 ? void 0 : togglerProps.className) }),
+                    React.createElement(Flex, { alignItems: "center", gap: 2, height: "100%" },
+                        React.createElement(Icon, { data: expanded ? ChevronUp : ChevronDown }),
+                        summary))),
+                helpMark,
+                copyButton,
+                removeButton))),
             React.createElement(Flex, { direction: "column", gap: 0.5, grow: 1 },
                 React.createElement("div", { className: b('content', { 'with-indent': withIndent }) }, children),
                 overviewFlag ? null : (React.createElement(EntityError, { errorMessage: meta.error, validationState: getValidationState(meta) }))))));

package/build/esm/lib/unstable/kit/utils/transformer.d.ts

@@ -1,11 +1,11 @@
 import { type Spec } from '../../../core';
-import { type JsonSchema } from '../../core';
+import { type ErrorMessages, type JsonSchema } from '../../core';
 type Rules = Record<string, (spec: Spec, mutableSchema: JsonSchema, rules: {
     specRules: Rules;
     viewSpecRules: Rules;
-}) => void>;
+}, errorMessages: ErrorMessages) => void>;
 export declare function specToJsonSchema(spec: Spec, mutableSchema?: JsonSchema, rules?: {
     specRules: Rules;
     viewSpecRules: Rules;
-}): JsonSchema;
+}, errorMessages?: ErrorMessages): JsonSchema;
 export {};

package/build/esm/lib/unstable/kit/utils/transformer.js

@@ -3,6 +3,7 @@ import isObject from 'lodash/isObject';
 import set from 'lodash/set';
 import { SpecTypes } from '../../../core';
 import { JsonSchemaType, NodeType } from '../../core';
+import { errorMessages as defaultErrorMessages } from '../constants';
 const viewSpecRules = {
     disabled: (spec, mutableSchema) => {
         if (spec.viewSpec.disabled) {
@@ -549,11 +550,16 @@ const specRules = {
             set(mutableSchema, 'nodeParameters.type', specTypeToNodeType[spec.type]);
         }
     },
-    required: (spec, mutableSchema) => {
+    required: (spec, mutableSchema, _rules, errorMessages) => {
         if (spec.required) {
             set(mutableSchema, 'allOf', [
                 ...(mutableSchema.allOf || []),
-                { not: { enum: [null, undefined, '', false] } },
+                {
+                    not: {
+                        enum: [null, undefined, '', false],
+                        nodeParameters: { errorMessages: { not: errorMessages.required } },
+                    },
+                },
             ]);
             set(mutableSchema, 'nodeParameters.flags.required', true);
         }
@@ -586,12 +592,12 @@ const specRules = {
             }
         }
     },
-    items: (spec, mutableSchema, rules) => {
+    items: (spec, mutableSchema, rules, errorMessages) => {
         if (spec.type === SpecTypes.Array && spec.items) {
             const childSchema = specToJsonSchema(spec.items, 'items' in mutableSchema &&
                 mutableSchema.items &&
                 !Array.isArray(mutableSchema.items)
-                ? Object.assign({}, mutableSchema.items) : {}, rules);
+                ? Object.assign({}, mutableSchema.items) : {}, rules, errorMessages);
             set(mutableSchema, 'items', childSchema);
         }
     },
@@ -649,10 +655,10 @@ const specRules = {
             set(mutableSchema, 'type', JsonSchemaType.Integer);
         }
     },
-    properties: (spec, mutableSchema, rules) => {
+    properties: (spec, mutableSchema, rules, errorMessages) => {
         if (spec.type === SpecTypes.Object && spec.properties) {
             Object.entries(spec.properties).forEach(([key, childSpec]) => {
-                const childSchema = specToJsonSchema(childSpec, Object.assign({}, (get(mutableSchema, ['properties', key]) || {})), rules);
+                const childSchema = specToJsonSchema(childSpec, Object.assign({}, (get(mutableSchema, ['properties', key]) || {})), rules, errorMessages);
                 set(mutableSchema, ['properties', key], childSchema);
             });
         }
@@ -667,13 +673,13 @@ const specRules = {
             set(mutableSchema, 'nodeParameters.errorMessages.pattern', spec.patternError);
         }
     },
-    viewSpec: (spec, mutableSchema, rules) => {
-        Object.values(rules.viewSpecRules).forEach((rule) => rule(spec, mutableSchema, rules));
+    viewSpec: (spec, mutableSchema, rules, errorMessages) => {
+        Object.values(rules.viewSpecRules).forEach((rule) => rule(spec, mutableSchema, rules, errorMessages));
     },
 };
-export function specToJsonSchema(spec, mutableSchema = {}, rules) {
+export function specToJsonSchema(spec, mutableSchema = {}, rules, errorMessages = defaultErrorMessages) {
     const mergedSpecRules = Object.assign(Object.assign({}, specRules), rules === null || rules === void 0 ? void 0 : rules.specRules);
     const mergedViewSpecRules = Object.assign(Object.assign({}, viewSpecRules), rules === null || rules === void 0 ? void 0 : rules.viewSpecRules);
-    Object.values(mergedSpecRules).forEach((rule) => rule(spec, mutableSchema, { specRules: mergedSpecRules, viewSpecRules: mergedViewSpecRules }));
+    Object.values(mergedSpecRules).forEach((rule) => rule(spec, mutableSchema, { specRules: mergedSpecRules, viewSpecRules: mergedViewSpecRules }, errorMessages));
     return mutableSchema;
 }

package/package.json

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