@gravity-ui/dynamic-forms 5.25.0 → 5.27.0

package/build/esm/lib/unstable/core/useSchemaRendererState/useSchemaRendererState.js

@@ -2,14 +2,24 @@ import React from 'react';
 import { useForm } from 'react-final-form';
 import { SchemaRendererEventType } from '../constants';
 import { SCHEMA_RENDERER_SERVICE_FIELD } from '../useSchemaRenderer';
-import { getSchemaByPointer, getServiceFieldName } from '../utils';
+import { getSchemaByPointer, getServiceFieldName, getStrictModeChecker } from '../utils';
 export const useSchemaRendererState = ({ headName, name, schemaPath, subscriptions = Object.values(SchemaRendererEventType), }) => {
     const form = useForm();
+    const strictCheckerRef = React.useRef(getStrictModeChecker());
     const uuidRef = React.useRef(null);
     const [tick, setTick] = React.useState(0);
     const srName = React.useMemo(() => getServiceFieldName(SCHEMA_RENDERER_SERVICE_FIELD, headName), [headName]);
     React.useMemo(() => {
         var _a;
+        if (!strictCheckerRef.current.checkDiff({
+            form,
+            headName,
+            name,
+            schemaPath,
+            subscriptions: subscriptions.join(','),
+        })) {
+            return;
+        }
         const srField = form.getFieldState(srName);
         const srState = (_a = srField === null || srField === void 0 ? void 0 : srField.data) === null || _a === void 0 ? void 0 : _a.state;
         if (srState) {
@@ -44,8 +54,12 @@ export const useSchemaRendererState = ({ headName, name, schemaPath, subscriptio
         return undefined;
     }, [form, srName, tick]);
     React.useEffect(() => {
+        const strictChecker = strictCheckerRef.current;
         return () => {
             var _a;
+            if (strictChecker.isStrict()) {
+                return;
+            }
             const srField = form.getFieldState(srName);
             const srState = (_a = srField === null || srField === void 0 ? void 0 : srField.data) === null || _a === void 0 ? void 0 : _a.state;
             if (srState && uuidRef.current) {

package/build/esm/lib/unstable/core/utils/common.d.ts

@@ -58,3 +58,6 @@ export declare const arrayPathToDotBracket: (arrayPath: string[]) => string;
 export declare const getSchemaByPointer: (schema: JsonSchema, pointer: string | string[]) => JsonSchema | undefined;
 export declare const getValuePaths: (value: unknown, path?: string[]) => string[][];
 export declare const getServiceFieldName: (serviceFieldName: string, headName: string) => string;
+export declare const isStringInt: (v: unknown) => v is string;
+export declare const isStringFloat: (v: unknown) => v is string;
+export declare const isStringNumber: (v: unknown) => v is string;

package/build/esm/lib/unstable/core/utils/common.js

@@ -106,3 +106,6 @@ export const getValuePaths = (value, path = []) => {
     return result;
 };
 export const getServiceFieldName = (serviceFieldName, headName) => headName ? `${serviceFieldName}.${headName}` : serviceFieldName;
+export const isStringInt = (v) => /^-?(0|[1-9][0-9]*)$/.test(`${v}`);
+export const isStringFloat = (v) => /^-?(0|[1-9][0-9]*)(\.[0-9]+)?$/.test(`${v}`);
+export const isStringNumber = (v) => isStringInt(v) || isStringFloat(v);

package/build/esm/lib/unstable/core/utils/index.d.ts

@@ -1,2 +1,3 @@
 export * from './common';
 export * from './definers';
+export * from './strict-mode';

package/build/esm/lib/unstable/core/utils/index.js

@@ -1,2 +1,3 @@
 export * from './common';
 export * from './definers';
+export * from './strict-mode';

package/build/esm/lib/unstable/core/utils/strict-mode.d.ts

@@ -0,0 +1,6 @@
+export declare const getStrictModeChecker: () => {
+    cachedValues: Record<string, unknown> | undefined;
+    hasDiff: boolean | undefined;
+    checkDiff: (currentValues: Record<string, unknown>) => boolean;
+    isStrict: () => boolean | undefined;
+};

package/build/esm/lib/unstable/core/utils/strict-mode.js

@@ -0,0 +1,26 @@
+export const getStrictModeChecker = () => {
+    const checker = {
+        cachedValues: undefined,
+        hasDiff: undefined,
+        checkDiff: (currentValues) => {
+            const cachedValues = checker.cachedValues;
+            if (!cachedValues ||
+                [...Object.keys(cachedValues), ...Object.keys(currentValues)].some((key) => cachedValues[key] !== currentValues[key])) {
+                checker.cachedValues = Object.assign({}, currentValues);
+                checker.hasDiff = true;
+                return true;
+            }
+            checker.hasDiff = false;
+            return false;
+        },
+        isStrict: () => {
+            if (checker.hasDiff === undefined) {
+                return undefined;
+            }
+            const hasDiff = checker.hasDiff;
+            checker.hasDiff = undefined;
+            return !hasDiff;
+        },
+    };
+    return checker;
+};

package/build/esm/lib/unstable/kit/components/EntityError/EntityError.js

@@ -5,7 +5,7 @@ import './EntityError.css';
 const b = block('entity-error');
 export const EntityError = ({ errorMessage, validationState }) => {
     if (validationState === 'invalid' && errorMessage) {
-        return (React.createElement(Text, { className: b(), color: "danger" }, errorMessage));
+        return (React.createElement(Text, { className: b(), color: "danger", wordBreak: "break-word", "data-sr-error": "true" }, errorMessage));
     }
     return null;
 };

package/build/esm/lib/unstable/kit/entities/Alert/Alert.js

@@ -27,17 +27,17 @@ export const Alert = ({ headName, props, schema }) => {
     const msg = React.useMemo(() => {
         if (message) {
             if (typeof message === 'string') {
-                return (React.createElement("div", { className: b('message', { expanded }) },
+                return (React.createElement("div", { className: b('message', { expanded: expanded || !title }) },
                     React.createElement(HTMLContent, { content: message, headName: headName })));
             }
             return message;
         }
         if (schema.description) {
-            return (React.createElement("div", { className: b('message', { expanded }) },
+            return (React.createElement("div", { className: b('message', { expanded: expanded || !title }) },
                 React.createElement(HTMLContent, { content: schema.description, headName: headName })));
         }
         return undefined;
-    }, [expanded, headName, message, schema.description]);
+    }, [expanded, headName, message, schema.description, title]);
     return (React.createElement(EntityContainer, { className: b({ expanded }), stretch: "fit", fill: "populated" },
         React.createElement(UIKitAlert, Object.assign({ icon: icon, message: msg, title: title }, entityRestProps))));
 };

package/build/esm/lib/unstable/kit/entities/FewOfNested/FewOfNested.js

@@ -28,7 +28,12 @@ export const FewOfNested = ({ Layout, headName, input, layoutProps, meta, mode,
         const { Entity, Layout, entityProps, independent, layoutProps } = renderKit[mode];
         const togglerInput = Object.assign(Object.assign({}, input), { name: togglerArrayRemoveButton ? name : `${name}._____toggler`, value: togglerValues, onChange: (value) => {
                 if (Array.isArray(value)) {
-                    setTogglerValues(value.filter(isString));
+                    const nextTogglerValues = value.filter(isString);
+                    setTogglerValues(nextTogglerValues);
+                    input.onChange(nextTogglerValues.reduce((acc, togglerValue) => {
+                        var _a;
+                        return (Object.assign(Object.assign({}, acc), { [togglerValue]: (_a = input.value) === null || _a === void 0 ? void 0 : _a[togglerValue] }));
+                    }, {}));
                 }
             } });
         const togglerMeta = Object.assign(Object.assign({}, meta), { error: undefined });

package/build/esm/lib/unstable/kit/entities/OneOfNested/OneOfNested.js

@@ -12,7 +12,15 @@ export const OneOfNested = ({ Layout, headName, input, layoutProps, meta, mode,
         headName,
         subscriptions: [SchemaRendererEventType.Config],
     });
-    const [togglerValue, setTogglerValue] = React.useState(Object.keys(value || (overviewFlag ? undefined : schema.properties) || {})[0]);
+    const [togglerValue, setTogglerValue] = React.useState(() => {
+        if (value && Object.keys(value).length) {
+            return Object.keys(value)[0];
+        }
+        if (!overviewFlag && schema.properties) {
+            return Object.keys(schema.properties)[0];
+        }
+        return undefined;
+    });
     const toggler = React.useMemo(() => {
         var _a;
         let result = null;
@@ -24,7 +32,9 @@ export const OneOfNested = ({ Layout, headName, input, layoutProps, meta, mode,
                 ? booleanToKey.true === togglerValue
                 : togglerValue, onChange: (value) => {
                 const nextValue = `${value}`;
-                setTogglerValue((booleanToKey === null || booleanToKey === void 0 ? void 0 : booleanToKey[nextValue]) || nextValue);
+                const nextTogglerValue = (booleanToKey === null || booleanToKey === void 0 ? void 0 : booleanToKey[nextValue]) || nextValue;
+                setTogglerValue(nextTogglerValue);
+                input.onChange({ [nextTogglerValue]: undefined });
             } });
         const togglerMeta = Object.assign(Object.assign({}, meta), { error: undefined });
         if (Entity) {

package/build/esm/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.d.ts

@@ -1,5 +1,5 @@
 import { type TextInputProps } from '@gravity-ui/uikit';
-import type { JsonSchemaString, NodeEntity } from '../../../core';
+import { type JsonSchemaString, type NodeEntity } from '../../../core';
 import './StringNumberWithScaleInput.css';
 export interface StringNumberWithScaleInputProps extends Omit<TextInputProps, 'defaultValue' | 'value' | 'onFocus' | 'onBlur' | 'onChange' | 'onUpdate' | 'errorMessage' | 'validationState' | 'qa'> {
     defaultType?: string;

package/build/esm/lib/unstable/kit/form-entities/StringNumberWithScaleInput/StringNumberWithScaleInput.js

@@ -2,8 +2,9 @@ import { __rest } from "tslib";
 import React from 'react';
 import { Select, TextInput } from '@gravity-ui/uikit';
 import Decimal from 'decimal.js';
+import { isStringNumber } from '../../../core';
 import { EntityContainer } from '../../components';
-import { block, getBooleanValidationState, getValidationState, isStringNumber } from '../../utils';
+import { block, getBooleanValidationState, getValidationState } from '../../utils';
 import './StringNumberWithScaleInput.css';
 const b = block('string-number-with-scale-input');
 export const StringNumberWithScaleInput = ({ input, meta, props, schema }) => {

package/build/esm/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.d.ts

@@ -1,4 +1,4 @@
-import type { JsonSchemaString, NodeEntity } from '../../../core';
+import { type JsonSchemaString, type NodeEntity } from '../../../core';
 import { type LongValueProps } from '../../components';
 export interface StringNumberWithScaleValueProps extends Omit<LongValueProps, 'qa' | 'value'> {
     scale?: Record<string, {

package/build/esm/lib/unstable/kit/overview-entities/StringNumberWithScaleValue/StringNumberWithScaleValue.js

@@ -3,8 +3,8 @@ import React from 'react';
 import { Text } from '@gravity-ui/uikit';
 import Decimal from 'decimal.js';
 import get from 'lodash/get';
+import { isStringNumber } from '../../../core';
 import { EmptyEntityValue, EntityContainer, LongValue } from '../../components';
-import { isStringNumber } from '../../utils';
 export const StringNumberWithScaleValue = ({ input, props }) => {
     const { scale, viewType } = props, restProps = __rest(props, ["scale", "viewType"]);
     const level = React.useMemo(() => {

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

@@ -6,6 +6,3 @@ export declare const getArrayItemParentName: (name: string) => string;
 export declare const getArrayItemIndex: (name: string) => string;
 export declare const isArrayItem: (name: string) => boolean;
 export declare const isTupleItem: (name: string, headName: string, form: FormApi) => boolean | undefined;
-export declare const isStringInt: (v: unknown) => v is string;
-export declare const isStringFloat: (v: unknown) => v is string;
-export declare const isStringNumber: (v: unknown) => v is string;

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

@@ -28,6 +28,3 @@ export const isTupleItem = (name, headName, form) => {
     const parentSchema = getSchemaByPointer(srState.schema, parentState.schemaPath);
     return parentSchema && 'items' in parentSchema && Array.isArray(parentSchema.items);
 };
-export const isStringInt = (v) => /^-?(0|[1-9][0-9]*)$/.test(`${v}`);
-export const isStringFloat = (v) => /^-?(0|[1-9][0-9]*)(\.[0-9]+)?$/.test(`${v}`);
-export const isStringNumber = (v) => isStringInt(v) || isStringFloat(v);

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

@@ -1,4 +1,4 @@
 export { block } from './cn';
-export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isStringInt, isStringFloat, isStringNumber, isTupleItem, } from './common';
+export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isTupleItem, } from './common';
 export { parseDate } from './date';
 export { specToJsonSchema } from './transformer';

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

@@ -1,4 +1,4 @@
 export { block } from './cn';
-export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isStringInt, isStringFloat, isStringNumber, isTupleItem, } from './common';
+export { getArrayItemIndex, getArrayItemParentName, getBooleanValidationState, getValidationState, isArrayItem, isTupleItem, } from './common';
 export { parseDate } from './date';
 export { specToJsonSchema } from './transformer';

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

@@ -3,7 +3,6 @@ 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) {
@@ -660,6 +659,15 @@ const specRules = {
             Object.entries(spec.properties).forEach(([key, childSpec]) => {
                 const childSchema = specToJsonSchema(childSpec, Object.assign({}, (get(mutableSchema, ['properties', key]) || {})), rules, errorMessages);
                 set(mutableSchema, ['properties', key], childSchema);
+                if (childSpec.required &&
+                    !(spec.viewSpec.type === 'oneof' ||
+                        spec.viewSpec.type === 'oneof_flat' ||
+                        spec.viewSpec.type === 'card_oneof' ||
+                        spec.viewSpec.type === 'multi_oneof' ||
+                        spec.viewSpec.type === 'multi_oneof_flat')) {
+                    set(mutableSchema, ['required'], [...(get(mutableSchema, 'required') || []), key]);
+                    set(mutableSchema, 'nodeParameters.errorMessages.required', errorMessages.required);
+                }
             });
         }
     },
@@ -677,7 +685,7 @@ const specRules = {
         Object.values(rules.viewSpecRules).forEach((rule) => rule(spec, mutableSchema, rules, errorMessages));
     },
 };
-export function specToJsonSchema(spec, mutableSchema = {}, rules, errorMessages = defaultErrorMessages) {
+export function specToJsonSchema(spec, mutableSchema = {}, rules, errorMessages = {}) {
     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 }, errorMessages));

package/package.json

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