@gravity-ui/dynamic-forms 1.4.1 → 1.6.0

package/build/esm/lib/kit/components/Views/OneOfCardView.js

@@ -24,5 +24,5 @@ export const OneOfCardView = (props) => {
     if (!value || !Object.keys(value).length) {
         return null;
     }
-    return (React.createElement(AccordeonCard, { className: "df-accordeon-card-layout", header: wrappedValue, open: open, onToggle: onToggle, ignoreHeaderToggle: true }, specProperties[valueKey] ? (React.createElement(ViewController, { spec: specProperties[valueKey], name: `${name}.${valueKey}`, key: `${name}.${valueKey}` })) : null));
+    return (React.createElement(AccordeonCard, { className: "df-accordeon-card-layout", name: name, header: wrappedValue, open: open, onToggle: onToggle, ignoreHeaderToggle: true }, specProperties[valueKey] ? (React.createElement(ViewController, { spec: specProperties[valueKey], name: `${name}.${valueKey}`, key: `${name}.${valueKey}` })) : null));
 };

package/build/esm/lib/kit/components/Views/TextLinkView/TextLinkView.js

@@ -1,12 +1,27 @@
+import { __rest } from "tslib";
 import React from 'react';
-import { ViewController } from '../../../../core';
+import _ from 'lodash';
+import { ViewController, isStringSpec } from '../../../../core';
 const TEXT_LINK_PROPERTY_NAME = 'text';
-export const TextLinkView = ({ value, spec, name }) => {
-    const specProperties = spec.properties;
-    const preparedSpec = React.useMemo(() => {
+export const TextLinkView = (_a) => {
+    var { value, spec, name, Layout } = _a, restProps = __rest(_a, ["value", "spec", "name", "Layout"]);
+    const childSpec = React.useMemo(() => {
         var _a;
-        return specProperties && specProperties[TEXT_LINK_PROPERTY_NAME]
-            ? Object.assign(Object.assign({}, specProperties[TEXT_LINK_PROPERTY_NAME]), { viewSpec: Object.assign(Object.assign({}, (_a = specProperties[TEXT_LINK_PROPERTY_NAME]) === null || _a === void 0 ? void 0 : _a.viewSpec), { link: value === null || value === void 0 ? void 0 : value.link }) }) : undefined;
-    }, [specProperties, value === null || value === void 0 ? void 0 : value.link]);
-    return preparedSpec ? (React.createElement(ViewController, { spec: preparedSpec, name: `${name}.${TEXT_LINK_PROPERTY_NAME}` })) : null;
+        if (((_a = spec.properties) === null || _a === void 0 ? void 0 : _a[TEXT_LINK_PROPERTY_NAME]) &&
+            isStringSpec(spec.properties[TEXT_LINK_PROPERTY_NAME])) {
+            const childSpec = _.cloneDeep(spec.properties[TEXT_LINK_PROPERTY_NAME]);
+            childSpec.viewSpec.layout = '';
+            childSpec.viewSpec.link = value === null || value === void 0 ? void 0 : value.link;
+            return childSpec;
+        }
+        return undefined;
+    }, [spec.properties, value === null || value === void 0 ? void 0 : value.link]);
+    if (!childSpec || !(value === null || value === void 0 ? void 0 : value.text)) {
+        return null;
+    }
+    const content = React.createElement(ViewController, { spec: childSpec, name: `${name}.${TEXT_LINK_PROPERTY_NAME}` });
+    if (Layout) {
+        return (React.createElement(Layout, Object.assign({ spec: spec, name: name, value: value }, restProps), content));
+    }
+    return React.createElement(React.Fragment, null, content);
 };

package/build/esm/lib/kit/components/Views/index.d.ts

@@ -6,6 +6,7 @@ export * from './MonacoInputView';
 export * from './MultiSelectView';
 export * from './NumberWithScaleView';
 export * from './ObjectBaseView';
+export * from './ObjectValueInputView';
 export * from './OneOfCardView';
 export * from './OneOfView';
 export * from './TableArrayView';

package/build/esm/lib/kit/components/Views/index.js

@@ -6,6 +6,7 @@ export * from './MonacoInputView';
 export * from './MultiSelectView';
 export * from './NumberWithScaleView';
 export * from './ObjectBaseView';
+export * from './ObjectValueInputView';
 export * from './OneOfCardView';
 export * from './OneOfView';
 export * from './TableArrayView';

package/build/esm/lib/kit/constants/config.js

@@ -1,4 +1,4 @@
-import { Accordeon, AccordeonCardLayout, ArrayBase, ArrayBaseView, BaseView, CardAccordeon, CardOneOf, CardOneOfView, CardSection, Checkbox, FileInput, FileInputView, Group, Group2, MonacoInput, MonacoInputCard, MonacoView, MonacoViewCard, MultiSelect, MultiSelectView, NumberWithScale, NumberWithScaleView, ObjectBase, ObjectBaseView, OneOf, OneOfCard, OneOfCardView, OneOfView, Row, Row2, RowVerbose, Secret, Section, Section2, SectionCard, SectionCard2, SectionWithSubtitle, SectionWithSubtitle2, Select, TableArrayInput, TableArrayView, TableCell, Text, TextArea, TextAreaView, TextContent, TextLink, TextLinkView, Transparent, ViewAccordeon, ViewAccordeonCard, ViewCardAccordeon, ViewCardSection, ViewGroup, ViewGroup2, ViewRow, ViewRow2, ViewSection, ViewSection2, ViewSectionCard, ViewSectionCard2, ViewTableCell, ViewTransparent, } from '../components';
+import { Accordeon, AccordeonCardLayout, ArrayBase, ArrayBaseView, BaseView, CardAccordeon, CardOneOf, CardOneOfView, CardSection, Checkbox, FileInput, FileInputView, Group, Group2, MonacoInput, MonacoInputCard, MonacoView, MonacoViewCard, MultiSelect, MultiSelectView, NumberWithScale, NumberWithScaleView, ObjectBase, ObjectBaseView, ObjectValueInput, ObjectValueInputView, OneOf, OneOfCard, OneOfCardView, OneOfView, Row, Row2, RowVerbose, Secret, Section, Section2, SectionCard, SectionCard2, SectionWithSubtitle, SectionWithSubtitle2, Select, TableArrayInput, TableArrayView, TableCell, Text, TextArea, TextAreaView, TextContent, TextLink, TextLinkView, Transparent, ViewAccordeon, ViewAccordeonCard, ViewCardAccordeon, ViewCardSection, ViewGroup, ViewGroup2, ViewRow, ViewRow2, ViewSection, ViewSection2, ViewSectionCard, ViewSectionCard2, ViewTableCell, ViewTransparent, } from '../components';
 import { getArrayValidator, getBooleanValidator, getNumberValidator, getObjectValidator, getStringValidator, } from '../validators';
 export const dynamicConfig = {
     array: {
@@ -58,6 +58,7 @@ export const dynamicConfig = {
             secret: { Component: Secret, independent: true },
             base: { Component: ObjectBase, independent: true },
             text_link: { Component: TextLink, independent: true },
+            object_value: { Component: ObjectValueInput, independent: true },
         },
         layouts: {
             row: Row,
@@ -155,6 +156,7 @@ export const dynamicCardConfig = {
             secret: { Component: Secret, independent: true },
             base: { Component: ObjectBase, independent: true },
             text_link: { Component: TextLink, independent: true },
+            object_value: { Component: ObjectValueInput, independent: true },
         },
         layouts: {
             row: Row2,
@@ -241,6 +243,7 @@ export const dynamicViewConfig = {
             secret: undefined,
             base: { Component: ObjectBaseView, independent: true },
             text_link: { Component: TextLinkView, independent: true },
+            object_value: { Component: ObjectValueInputView, independent: true },
         },
         layouts: {
             row: ViewRow,
@@ -320,6 +323,7 @@ export const dynamicViewCardConfig = {
             secret: undefined,
             base: { Component: ObjectBaseView, independent: true },
             text_link: { Component: TextLinkView, independent: true },
+            object_value: { Component: ObjectValueInputView, independent: true },
         },
         layouts: {
             row: ViewRow2,

package/build/esm/lib/kit/hooks/useOneOf.js

@@ -3,7 +3,7 @@ import { RadioButton, Select } from '@gravity-ui/uikit';
 import _ from 'lodash';
 const MAX_TAB_TITLE_LENGTH = 20;
 export const useOneOf = ({ props, onTogglerChange }) => {
-    const { input, spec, Layout } = props;
+    const { name, input, spec, Layout } = props;
     const specProperties = React.useMemo(() => (_.isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
     const [oneOfValue, setOneOfValue] = React.useState(() => {
         let valueKeys;
@@ -37,10 +37,10 @@ export const useOneOf = ({ props, onTogglerChange }) => {
     const togglerInput = React.useMemo(() => {
         if (options.length > 3 ||
             _.some(options, ({ title }) => title.length > MAX_TAB_TITLE_LENGTH)) {
-            return (React.createElement(Select, { width: "max", value: [oneOfValue], onUpdate: onOneOfChange, options: options, disabled: spec.viewSpec.disabled, filterable: options.length > 7 }));
+            return (React.createElement(Select, { width: "max", value: [oneOfValue], onUpdate: onOneOfChange, options: options, disabled: spec.viewSpec.disabled, filterable: options.length > 7, qa: name }));
         }
-        return (React.createElement(RadioButton, { value: oneOfValue, onChange: (event) => onOneOfChange([event.target.value]), disabled: spec.viewSpec.disabled }, options.map((option) => (React.createElement(RadioButton.Option, { key: option.value, value: option.value }, option.title)))));
-    }, [options, oneOfValue, onOneOfChange]);
+        return (React.createElement(RadioButton, { value: oneOfValue, onChange: (event) => onOneOfChange([event.target.value]), disabled: spec.viewSpec.disabled, qa: name }, options.map((option) => (React.createElement(RadioButton.Option, { key: option.value, value: option.value }, option.title)))));
+    }, [options, oneOfValue, onOneOfChange, name]);
     const toggler = React.useMemo(() => {
         if (Layout) {
             return React.createElement(Layout, Object.assign({}, props), togglerInput);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/dynamic-forms",
-  "version": "1.4.1",
+  "version": "1.6.0",
   "description": "",
   "license": "MIT",
   "main": "build/cjs/index.js",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@gravity-ui/i18n": "^1.0.0",
-    "@gravity-ui/icons": "^1.1.0",
+    "@gravity-ui/icons": "^2.1.0",
     "bem-cn-lite": "^4.0.0",
     "lodash": "^4.17.20"
   },
@@ -51,7 +51,7 @@
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^2.0.0",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^4.1.0",
+    "@gravity-ui/uikit": "^4.10.0",
     "@storybook/addon-essentials": "^6.5.16",
     "@storybook/preset-scss": "^1.0.3",
     "@storybook/react": "^6.5.16",
@@ -94,7 +94,7 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@gravity-ui/uikit": "^3.0.0 || ^4.0.0",
+    "@gravity-ui/uikit": "^4.0.0",
     "final-form": "^4.20.2",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0",