@gravity-ui/dynamic-forms 4.3.0 → 4.5.0

package/build/cjs/lib/core/components/Form/DynamicField.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicField = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
+const get_1 = tslib_1.__importDefault(require("lodash/get"));
 const isFunction_1 = tslib_1.__importDefault(require("lodash/isFunction"));
 const isString_1 = tslib_1.__importDefault(require("lodash/isString"));
-const get_1 = tslib_1.__importDefault(require("lodash/get"));
 const react_is_1 = require("react-is");
 const helpers_1 = require("../../helpers");
 const Controller_1 = require("./Controller");
 const hooks_1 = require("./hooks");
 const utils_1 = require("./utils");
-const DynamicField = ({ name, spec, config, Monaco, generateRandomValue, search, withoutInsertFFDebounce, mutators: externalMutators, __mirror, }) => {
+const DynamicField = ({ name, spec, config, Monaco, generateRandomValue, search, withoutInsertFFDebounce, destroyOnUnregister = true, mutators: externalMutators, __mirror, }) => {
     const DynamicFormsCtx = (0, hooks_1.useCreateContext)();
     const SearchContext = (0, hooks_1.useCreateSearchContext)();
     const { tools, store } = (0, hooks_1.useStore)(name);
-    const watcher = (0, hooks_1.useIntegrationFF)(store, withoutInsertFFDebounce);
+    const watcher = (0, hooks_1.useIntegrationFF)(store, withoutInsertFFDebounce, destroyOnUnregister);
     const { mutatorsStore, mutateDFState } = (0, hooks_1.useMutators)(externalMutators);
     const { store: searchStore, setField, removeField, isHiddenField } = (0, hooks_1.useSearchStore)();
     const context = react_1.default.useMemo(() => ({

package/build/cjs/lib/core/components/Form/hooks/useIntegrationFF.js

@@ -5,11 +5,12 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const get_1 = tslib_1.__importDefault(require("lodash/get"));
+const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const isFunction_1 = tslib_1.__importDefault(require("lodash/isFunction"));
 const values_1 = tslib_1.__importDefault(require("lodash/values"));
 const react_final_form_1 = require("react-final-form");
 const utils_1 = require("../utils");
-const useIntegrationFF = (store, withoutDebounce) => {
+const useIntegrationFF = (store, withoutDebounce, destroyOnUnregister) => {
     const form = (0, react_final_form_1.useForm)();
     const watcher = react_1.default.useMemo(() => {
         const props = {
@@ -34,6 +35,7 @@ const useIntegrationFF = (store, withoutDebounce) => {
                 }
                 return error;
             },
+            isEqual: isEqual_1.default,
         };
         return react_1.default.createElement(react_final_form_1.Field, Object.assign({}, props));
     }, [store.name, store.errors]);
@@ -53,7 +55,7 @@ const useIntegrationFF = (store, withoutDebounce) => {
     }, [store.values]);
     react_1.default.useEffect(() => {
         return () => {
-            if (store.name) {
+            if (store.name && destroyOnUnregister) {
                 form.change(store.name, undefined);
             }
         };

package/build/esm/lib/core/components/Form/DynamicField.d.ts

@@ -10,6 +10,7 @@ export interface DynamicFieldProps {
     search?: string | ((spec: Spec, input: FieldValue, name: string) => boolean);
     generateRandomValue?: (spec: StringSpec) => string;
     withoutInsertFFDebounce?: boolean;
+    destroyOnUnregister?: boolean;
     mutators?: DynamicFormMutators;
     __mirror?: WonderMirror;
 }

package/build/esm/lib/core/components/Form/DynamicField.js

@@ -1,17 +1,17 @@
 import React from 'react';
+import get from 'lodash/get';
 import isFunction from 'lodash/isFunction';
 import isString from 'lodash/isString';
-import get from 'lodash/get';
 import { isValidElementType } from 'react-is';
 import { isCorrectSpec } from '../../helpers';
 import { Controller } from './Controller';
 import { useCreateContext, useCreateSearchContext, useDynamicFieldMirror, useIntegrationFF, useMutators, useSearchStore, useStore, } from './hooks';
 import { getDefaultSearchFunction, isCorrectConfig } from './utils';
-export const DynamicField = ({ name, spec, config, Monaco, generateRandomValue, search, withoutInsertFFDebounce, mutators: externalMutators, __mirror, }) => {
+export const DynamicField = ({ name, spec, config, Monaco, generateRandomValue, search, withoutInsertFFDebounce, destroyOnUnregister = true, mutators: externalMutators, __mirror, }) => {
     const DynamicFormsCtx = useCreateContext();
     const SearchContext = useCreateSearchContext();
     const { tools, store } = useStore(name);
-    const watcher = useIntegrationFF(store, withoutInsertFFDebounce);
+    const watcher = useIntegrationFF(store, withoutInsertFFDebounce, destroyOnUnregister);
     const { mutatorsStore, mutateDFState } = useMutators(externalMutators);
     const { store: searchStore, setField, removeField, isHiddenField } = useSearchStore();
     const context = React.useMemo(() => ({

package/build/esm/lib/core/components/Form/hooks/useIntegrationFF.d.ts

@@ -1,2 +1,2 @@
 import { DynamicFieldStore } from '../types';
-export declare const useIntegrationFF: (store: DynamicFieldStore, withoutDebounce?: boolean) => JSX.Element;
+export declare const useIntegrationFF: (store: DynamicFieldStore, withoutDebounce?: boolean, destroyOnUnregister?: boolean) => JSX.Element;

package/build/esm/lib/core/components/Form/hooks/useIntegrationFF.js

@@ -1,11 +1,12 @@
 import React from 'react';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
 import isFunction from 'lodash/isFunction';
 import values from 'lodash/values';
 import { Field as FinalFormField, useForm } from 'react-final-form';
 import { transformArrOut } from '../utils';
-export const useIntegrationFF = (store, withoutDebounce) => {
+export const useIntegrationFF = (store, withoutDebounce, destroyOnUnregister) => {
     const form = useForm();
     const watcher = React.useMemo(() => {
         const props = {
@@ -30,6 +31,7 @@ export const useIntegrationFF = (store, withoutDebounce) => {
                 }
                 return error;
             },
+            isEqual,
         };
         return React.createElement(FinalFormField, Object.assign({}, props));
     }, [store.name, store.errors]);
@@ -49,7 +51,7 @@ export const useIntegrationFF = (store, withoutDebounce) => {
     }, [store.values]);
     React.useEffect(() => {
         return () => {
-            if (store.name) {
+            if (store.name && destroyOnUnregister) {
                 form.change(store.name, undefined);
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dynamic-forms",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "",
   "license": "MIT",
   "main": "build/cjs/index.js",
@@ -65,6 +65,8 @@
     "@storybook/preset-scss": "^1.0.3",
     "@storybook/react": "^7.0.27",
     "@storybook/react-webpack5": "^7.0.27",
+    "@swc/core": "^1.5.0",
+    "@swc/jest": "^0.2.36",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.4.3",
@@ -84,7 +86,7 @@
     "gulp-replace": "^1.1.4",
     "gulp-typescript": "^6.0.0-alpha.1",
     "husky": "^7.0.4",
-    "jest": "^29.5.0",
+    "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.5.0",
     "jest-transform-css": "^6.0.1",
     "monaco-editor": "^0.30.1",