@gravity-ui/dynamic-forms 4.14.0 → 4.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/build/cjs/lib/kit/components/Inputs/DateInput/DateInput.js +7 -3
  2. package/build/cjs/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js +3 -2
  3. package/build/cjs/lib/kit/components/Inputs/ObjectBase/ObjectBase.js +4 -1
  4. package/build/cjs/lib/kit/components/Views/DateView/DateView.js +10 -8
  5. package/build/cjs/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js +4 -1
  6. package/build/cjs/lib/kit/hooks/useOneOf/useOneOf.js +9 -3
  7. package/build/esm/lib/core/types/specs.d.ts +1 -0
  8. package/build/esm/lib/kit/components/Inputs/DateInput/DateInput.d.ts +1 -1
  9. package/build/esm/lib/kit/components/Inputs/DateInput/DateInput.js +8 -4
  10. package/build/esm/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js +3 -2
  11. package/build/esm/lib/kit/components/Inputs/ObjectBase/ObjectBase.js +4 -1
  12. package/build/esm/lib/kit/components/Views/DateView/DateView.js +10 -8
  13. package/build/esm/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js +4 -1
  14. package/build/esm/lib/kit/hooks/useOneOf/useOneOf.js +9 -3
  15. package/package.json +3 -3
package/build/cjs/lib/kit/components/Inputs/DateInput/DateInput.js CHANGED
@@ -6,11 +6,12 @@ const react_1 = tslib_1.__importStar(require("react"));
6
6
  const date_components_1 = require("@gravity-ui/date-components");
7
7
  const date_utils_1 = require("@gravity-ui/date-utils");
8
8
  const utils_1 = require("../../../utils");
9
- exports.DEFAULT_DATE_FORMAT = 'DD-MM-YYYY';
9
+ exports.DEFAULT_DATE_FORMAT = 'DD.MM.YYYY HH:mm';
10
10
  const b = (0, utils_1.block)('date-input');
11
11
  const DateInput = ({ name, input, spec, inputProps, }) => {
12
12
  const { value, onChange, onBlur, onFocus } = input;
13
13
  const dateInput = spec.viewSpec.dateInput;
14
+ const timeZone = (dateInput === null || dateInput === void 0 ? void 0 : dateInput.timeZone) && (0, date_utils_1.isValidTimeZone)(dateInput.timeZone) ? dateInput.timeZone : undefined;
14
15
  const outputFormat = dateInput === null || dateInput === void 0 ? void 0 : dateInput.outputFormat;
15
16
  const onUpdate = (0, react_1.useCallback)((date) => {
16
17
  if (!date) {
@@ -42,8 +43,11 @@ const DateInput = ({ name, input, spec, inputProps, }) => {
42
43
  }
43
44
  }, [outputFormat]);
44
45
  const props = Object.assign(Object.assign({ hasClear: true, format: (dateInput === null || dateInput === void 0 ? void 0 : dateInput.printFormat) || exports.DEFAULT_DATE_FORMAT }, inputProps), { onBlur: onBlur, onFocus: onFocus, value: value
45
- ? (0, date_utils_1.dateTimeParse)(value.seconds ? value.seconds * 1000 : value) || null
46
- : null, onUpdate, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder });
46
+ ? (0, date_utils_1.dateTimeParse)(value.seconds ? value.seconds * 1000 : value, {
47
+ format: dateInput === null || dateInput === void 0 ? void 0 : dateInput.outputFormat,
48
+ timeZone,
49
+ }) || null
50
+ : null, onUpdate, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder, timeZone });
47
51
  return react_1.default.createElement(date_components_1.DatePicker, Object.assign({ className: b(), "data-qa": name }, props));
48
52
  };
49
53
  exports.DateInput = DateInput;
package/build/cjs/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js CHANGED
@@ -26,7 +26,8 @@ const MultiOneOf = (props) => {
26
26
  onChange((currentValue) => (0, set_1.default)(Object.assign({}, currentValue), childName.split(`${name}.`).join(''), childValue), childErrors);
27
27
  }, [name, onChange]);
28
28
  const specProperties = react_1.default.useMemo(() => ((0, isObjectLike_1.default)(spec.properties) ? spec.properties : {}), [spec.properties]);
29
- const options = react_1.default.useMemo(() => (spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
29
+ const propertiesOrder = react_1.default.useMemo(() => { var _a; return (((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length) ? spec.viewSpec.order : Object.keys(specProperties)); }, [spec.viewSpec.order, specProperties]);
30
+ const options = react_1.default.useMemo(() => propertiesOrder.map((value) => {
30
31
  var _a, _b;
31
32
  const title = ((_a = spec.description) === null || _a === void 0 ? void 0 : _a[value]) ||
32
33
  ((_b = specProperties[value]) === null || _b === void 0 ? void 0 : _b.viewSpec.layoutTitle) ||
@@ -37,7 +38,7 @@ const MultiOneOf = (props) => {
37
38
  title,
38
39
  content: title,
39
40
  };
40
- }), [spec.description, spec.viewSpec.order, specProperties]);
41
+ }), [propertiesOrder, spec.description, specProperties]);
41
42
  const filterable = react_1.default.useMemo(() => (options.length || 0) > 9, [options.length]);
42
43
  const selectInput = react_1.default.useMemo(() => {
43
44
  const select = (react_1.default.createElement(uikit_1.Select, { width: "max", value: valueSelect, options: options, onUpdate: setValueSelect, onOpenChange: handleOpenChange, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder, filterable: filterable, multiple: true, className: b('select'), qa: name }));
package/build/cjs/lib/kit/components/Inputs/ObjectBase/ObjectBase.js CHANGED
@@ -20,6 +20,7 @@ const ObjectBase = (_a) => {
20
20
  }, [spec.defaultValue, spec.viewSpec.layoutTitle, restProps.input.onChange]);
21
21
  const parentOnChange = react_1.default.useCallback((childName, childValue, childErrors) => restProps.input.onChange((currentValue) => (0, set_1.default)(Object.assign({}, currentValue), childName.split(`${restProps.input.name}.`).join(''), childValue), childErrors), [restProps.input.onChange, restProps.input.name]);
22
22
  const content = react_1.default.useMemo(() => {
23
+ var _a;
23
24
  if (!spec.properties ||
24
25
  !(0, isObjectLike_1.default)(spec.properties) ||
25
26
  !Object.keys(spec.properties || {}).length) {
@@ -32,7 +33,9 @@ const ObjectBase = (_a) => {
32
33
  ? (0, utils_1.filterPropertiesForObjectInline)(spec.properties)
33
34
  : spec.properties;
34
35
  const delimiter = spec.viewSpec.delimiter;
35
- const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
36
+ const orderProperties = ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
37
+ ? spec.viewSpec.order
38
+ : Object.keys(specProperties);
36
39
  return (react_1.default.createElement("div", { className: b('content', { inline }) }, orderProperties.map((property) => {
37
40
  var _a;
38
41
  return specProperties[property] ? (react_1.default.createElement(react_1.default.Fragment, { key: `${name ? name + '.' : ''}${property}` },
package/build/cjs/lib/kit/components/Views/DateView/DateView.js CHANGED
@@ -7,15 +7,17 @@ const components_1 = require("../../../components");
7
7
  const date_utils_1 = require("@gravity-ui/date-utils");
8
8
  const isObject_1 = tslib_1.__importDefault(require("lodash/isObject"));
9
9
  const DateView = (_a) => {
10
- var _b, _c, _d;
11
10
  var { value, spec } = _a, restProps = tslib_1.__rest(_a, ["value", "spec"]);
12
- let formatedValue = value && (0, isObject_1.default)(value) && value.seconds
13
- ? (value === null || value === void 0 ? void 0 : value.seconds) * 1000
14
- : value;
15
- const localSpec = spec.viewSpec;
16
- const format = ((_b = localSpec.inputProps) === null || _b === void 0 ? void 0 : _b.format) || ((_c = localSpec.dateInput) === null || _c === void 0 ? void 0 : _c.printFormat) || components_1.DEFAULT_DATE_FORMAT;
17
- if (formatedValue && format) {
18
- formatedValue = ((_d = (0, date_utils_1.dateTimeParse)(formatedValue)) === null || _d === void 0 ? void 0 : _d.format(format)) || formatedValue;
11
+ const { printFormat = components_1.DEFAULT_DATE_FORMAT, outputFormat, timeZone, } = spec.viewSpec.dateInput || {};
12
+ let formatedValue = value;
13
+ if ((0, isObject_1.default)(value) && value.seconds) {
14
+ formatedValue = Number(value.seconds) * 1000;
15
+ }
16
+ if (formatedValue) {
17
+ const date = (0, date_utils_1.dateTimeParse)(formatedValue, { format: outputFormat, timeZone });
18
+ if (date) {
19
+ formatedValue = date.format(printFormat);
20
+ }
19
21
  }
20
22
  return react_1.default.createElement(components_1.BaseView, Object.assign({ spec: spec, value: String(formatedValue) }, restProps));
21
23
  };
package/build/cjs/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js CHANGED
@@ -11,6 +11,7 @@ const b = (0, utils_1.block)('object-base-view');
11
11
  const ObjectBaseView = (_a) => {
12
12
  var { inline, spec, name, Layout } = _a, restProps = tslib_1.__rest(_a, ["inline", "spec", "name", "Layout"]);
13
13
  const content = react_1.default.useMemo(() => {
14
+ var _a;
14
15
  if (!spec.properties || !(0, isObjectLike_1.default)(spec.properties)) {
15
16
  return null;
16
17
  }
@@ -18,7 +19,9 @@ const ObjectBaseView = (_a) => {
18
19
  ? (0, utils_1.filterPropertiesForObjectInline)(spec.properties)
19
20
  : spec.properties;
20
21
  const delimiter = spec.viewSpec.delimiter;
21
- const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
22
+ const orderProperties = ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
23
+ ? spec.viewSpec.order
24
+ : Object.keys(specProperties);
22
25
  return (react_1.default.createElement("div", { className: b('content', { inline }) }, orderProperties.map((property) => specProperties[property] ? (react_1.default.createElement(react_1.default.Fragment, { key: `${name ? name + '.' : ''}${property}` },
23
26
  react_1.default.createElement(core_1.ViewController, { spec: specProperties[property], name: `${name ? name + '.' : ''}${property}` }),
24
27
  delimiter && delimiter[property] ? (react_1.default.createElement(uikit_1.Text, { className: b('delimiter') }, delimiter[property])) : null)) : null)));
package/build/cjs/lib/kit/hooks/useOneOf/useOneOf.js CHANGED
@@ -16,6 +16,7 @@ const useOneOf = ({ props, onTogglerChange }) => {
16
16
  const specProperties = react_1.default.useMemo(() => ((0, isObjectLike_1.default)(spec.properties) ? spec.properties : {}), [spec.properties]);
17
17
  const specBooleanMap = react_1.default.useMemo(() => { var _a; return (_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.booleanMap; }, [(_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.booleanMap]);
18
18
  const [oneOfValue, setOneOfValue] = react_1.default.useState(() => {
19
+ var _a;
19
20
  let valueKeys;
20
21
  if ((0, isObjectLike_1.default)(input.value)) {
21
22
  const keys = Object.keys(input.value);
@@ -23,7 +24,11 @@ const useOneOf = ({ props, onTogglerChange }) => {
23
24
  valueKeys = keys;
24
25
  }
25
26
  }
26
- return (valueKeys || spec.viewSpec.order || Object.keys(specProperties))[0];
27
+ if (valueKeys)
28
+ return valueKeys[0];
29
+ if ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
30
+ return spec.viewSpec.order[0];
31
+ return Object.keys(specProperties)[0];
27
32
  });
28
33
  const onOneOfChange = react_1.default.useCallback(([newValue]) => {
29
34
  if (newValue !== oneOfValue) {
@@ -46,7 +51,8 @@ const useOneOf = ({ props, onTogglerChange }) => {
46
51
  }
47
52
  return undefined;
48
53
  }, [oneOfValue, specBooleanMap]);
49
- const options = react_1.default.useMemo(() => (spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
54
+ const propertiesOrder = react_1.default.useMemo(() => { var _a; return (((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length) ? spec.viewSpec.order : Object.keys(specProperties)); }, [spec.viewSpec.order, specProperties]);
55
+ const options = react_1.default.useMemo(() => propertiesOrder.map((value) => {
50
56
  var _a, _b;
51
57
  const title = ((_a = spec.description) === null || _a === void 0 ? void 0 : _a[value]) ||
52
58
  ((_b = specProperties[value]) === null || _b === void 0 ? void 0 : _b.viewSpec.layoutTitle) ||
@@ -57,7 +63,7 @@ const useOneOf = ({ props, onTogglerChange }) => {
57
63
  title,
58
64
  content: title,
59
65
  };
60
- }), [spec.description, spec.viewSpec.order, specProperties]);
66
+ }), [propertiesOrder, spec.description, specProperties]);
61
67
  const togglerType = react_1.default.useMemo(() => {
62
68
  var _a, _b, _c, _d;
63
69
  if (((_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.toggler) === 'card' && options.length < 4) {
package/build/esm/lib/core/types/specs.d.ts CHANGED
@@ -158,6 +158,7 @@ export interface StringSpec<LinkType = any, InputComponentProps extends Record<s
158
158
  dateInput?: {
159
159
  outputFormat?: string;
160
160
  printFormat?: string;
161
+ timeZone?: string;
161
162
  };
162
163
  copy?: boolean;
163
164
  selectParams?: {
package/build/esm/lib/kit/components/Inputs/DateInput/DateInput.d.ts CHANGED
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { DatePickerProps } from '@gravity-ui/date-components';
3
3
  import { StringInputProps } from '../../../../core';
4
4
  import './DateInput.css';
5
- export declare const DEFAULT_DATE_FORMAT = "DD-MM-YYYY";
5
+ export declare const DEFAULT_DATE_FORMAT = "DD.MM.YYYY HH:mm";
6
6
  export interface DateProps extends Omit<DatePickerProps, 'value' | 'disabled' | 'placeholder' | 'qa'> {
7
7
  }
8
8
  export declare const DateInput: React.FC<StringInputProps<DateProps>>;
package/build/esm/lib/kit/components/Inputs/DateInput/DateInput.js CHANGED
@@ -1,13 +1,14 @@
1
1
  import React, { useCallback } from 'react';
2
2
  import { DatePicker } from '@gravity-ui/date-components';
3
- import { dateTimeParse } from '@gravity-ui/date-utils';
3
+ import { dateTimeParse, isValidTimeZone } from '@gravity-ui/date-utils';
4
4
  import { block } from '../../../utils';
5
5
  import './DateInput.css';
6
- export const DEFAULT_DATE_FORMAT = 'DD-MM-YYYY';
6
+ export const DEFAULT_DATE_FORMAT = 'DD.MM.YYYY HH:mm';
7
7
  const b = block('date-input');
8
8
  export const DateInput = ({ name, input, spec, inputProps, }) => {
9
9
  const { value, onChange, onBlur, onFocus } = input;
10
10
  const dateInput = spec.viewSpec.dateInput;
11
+ const timeZone = (dateInput === null || dateInput === void 0 ? void 0 : dateInput.timeZone) && isValidTimeZone(dateInput.timeZone) ? dateInput.timeZone : undefined;
11
12
  const outputFormat = dateInput === null || dateInput === void 0 ? void 0 : dateInput.outputFormat;
12
13
  const onUpdate = useCallback((date) => {
13
14
  if (!date) {
@@ -39,8 +40,11 @@ export const DateInput = ({ name, input, spec, inputProps, }) => {
39
40
  }
40
41
  }, [outputFormat]);
41
42
  const props = Object.assign(Object.assign({ hasClear: true, format: (dateInput === null || dateInput === void 0 ? void 0 : dateInput.printFormat) || DEFAULT_DATE_FORMAT }, inputProps), { onBlur: onBlur, onFocus: onFocus, value: value
42
- ? dateTimeParse(value.seconds ? value.seconds * 1000 : value) || null
43
- : null, onUpdate, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder });
43
+ ? dateTimeParse(value.seconds ? value.seconds * 1000 : value, {
44
+ format: dateInput === null || dateInput === void 0 ? void 0 : dateInput.outputFormat,
45
+ timeZone,
46
+ }) || null
47
+ : null, onUpdate, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder, timeZone });
44
48
  return React.createElement(DatePicker, Object.assign({ className: b(), "data-qa": name }, props));
45
49
  };
46
50
  export default DateInput;
package/build/esm/lib/kit/components/Inputs/MultiOneOf/MultiOneOf.js CHANGED
@@ -23,7 +23,8 @@ export const MultiOneOf = (props) => {
23
23
  onChange((currentValue) => set(Object.assign({}, currentValue), childName.split(`${name}.`).join(''), childValue), childErrors);
24
24
  }, [name, onChange]);
25
25
  const specProperties = React.useMemo(() => (isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
26
- const options = React.useMemo(() => (spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
26
+ const propertiesOrder = React.useMemo(() => { var _a; return (((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length) ? spec.viewSpec.order : Object.keys(specProperties)); }, [spec.viewSpec.order, specProperties]);
27
+ const options = React.useMemo(() => propertiesOrder.map((value) => {
27
28
  var _a, _b;
28
29
  const title = ((_a = spec.description) === null || _a === void 0 ? void 0 : _a[value]) ||
29
30
  ((_b = specProperties[value]) === null || _b === void 0 ? void 0 : _b.viewSpec.layoutTitle) ||
@@ -34,7 +35,7 @@ export const MultiOneOf = (props) => {
34
35
  title,
35
36
  content: title,
36
37
  };
37
- }), [spec.description, spec.viewSpec.order, specProperties]);
38
+ }), [propertiesOrder, spec.description, specProperties]);
38
39
  const filterable = React.useMemo(() => (options.length || 0) > 9, [options.length]);
39
40
  const selectInput = React.useMemo(() => {
40
41
  const select = (React.createElement(Select, { width: "max", value: valueSelect, options: options, onUpdate: setValueSelect, onOpenChange: handleOpenChange, disabled: spec.viewSpec.disabled, placeholder: spec.viewSpec.placeholder, filterable: filterable, multiple: true, className: b('select'), qa: name }));
package/build/esm/lib/kit/components/Inputs/ObjectBase/ObjectBase.js CHANGED
@@ -18,6 +18,7 @@ export const ObjectBase = (_a) => {
18
18
  }, [spec.defaultValue, spec.viewSpec.layoutTitle, restProps.input.onChange]);
19
19
  const parentOnChange = React.useCallback((childName, childValue, childErrors) => restProps.input.onChange((currentValue) => set(Object.assign({}, currentValue), childName.split(`${restProps.input.name}.`).join(''), childValue), childErrors), [restProps.input.onChange, restProps.input.name]);
20
20
  const content = React.useMemo(() => {
21
+ var _a;
21
22
  if (!spec.properties ||
22
23
  !isObjectLike(spec.properties) ||
23
24
  !Object.keys(spec.properties || {}).length) {
@@ -30,7 +31,9 @@ export const ObjectBase = (_a) => {
30
31
  ? filterPropertiesForObjectInline(spec.properties)
31
32
  : spec.properties;
32
33
  const delimiter = spec.viewSpec.delimiter;
33
- const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
34
+ const orderProperties = ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
35
+ ? spec.viewSpec.order
36
+ : Object.keys(specProperties);
34
37
  return (React.createElement("div", { className: b('content', { inline }) }, orderProperties.map((property) => {
35
38
  var _a;
36
39
  return specProperties[property] ? (React.createElement(React.Fragment, { key: `${name ? name + '.' : ''}${property}` },
package/build/esm/lib/kit/components/Views/DateView/DateView.js CHANGED
@@ -4,15 +4,17 @@ import { BaseView, DEFAULT_DATE_FORMAT } from '../../../components';
4
4
  import { dateTimeParse } from '@gravity-ui/date-utils';
5
5
  import isObject from 'lodash/isObject';
6
6
  export const DateView = (_a) => {
7
- var _b, _c, _d;
8
7
  var { value, spec } = _a, restProps = __rest(_a, ["value", "spec"]);
9
- let formatedValue = value && isObject(value) && value.seconds
10
- ? (value === null || value === void 0 ? void 0 : value.seconds) * 1000
11
- : value;
12
- const localSpec = spec.viewSpec;
13
- const format = ((_b = localSpec.inputProps) === null || _b === void 0 ? void 0 : _b.format) || ((_c = localSpec.dateInput) === null || _c === void 0 ? void 0 : _c.printFormat) || DEFAULT_DATE_FORMAT;
14
- if (formatedValue && format) {
15
- formatedValue = ((_d = dateTimeParse(formatedValue)) === null || _d === void 0 ? void 0 : _d.format(format)) || formatedValue;
8
+ const { printFormat = DEFAULT_DATE_FORMAT, outputFormat, timeZone, } = spec.viewSpec.dateInput || {};
9
+ let formatedValue = value;
10
+ if (isObject(value) && value.seconds) {
11
+ formatedValue = Number(value.seconds) * 1000;
12
+ }
13
+ if (formatedValue) {
14
+ const date = dateTimeParse(formatedValue, { format: outputFormat, timeZone });
15
+ if (date) {
16
+ formatedValue = date.format(printFormat);
17
+ }
16
18
  }
17
19
  return React.createElement(BaseView, Object.assign({ spec: spec, value: String(formatedValue) }, restProps));
18
20
  };
package/build/esm/lib/kit/components/Views/ObjectBaseView/ObjectBaseView.js CHANGED
@@ -9,6 +9,7 @@ const b = block('object-base-view');
9
9
  export const ObjectBaseView = (_a) => {
10
10
  var { inline, spec, name, Layout } = _a, restProps = __rest(_a, ["inline", "spec", "name", "Layout"]);
11
11
  const content = React.useMemo(() => {
12
+ var _a;
12
13
  if (!spec.properties || !isObjectLike(spec.properties)) {
13
14
  return null;
14
15
  }
@@ -16,7 +17,9 @@ export const ObjectBaseView = (_a) => {
16
17
  ? filterPropertiesForObjectInline(spec.properties)
17
18
  : spec.properties;
18
19
  const delimiter = spec.viewSpec.delimiter;
19
- const orderProperties = spec.viewSpec.order || Object.keys(specProperties);
20
+ const orderProperties = ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
21
+ ? spec.viewSpec.order
22
+ : Object.keys(specProperties);
20
23
  return (React.createElement("div", { className: b('content', { inline }) }, orderProperties.map((property) => specProperties[property] ? (React.createElement(React.Fragment, { key: `${name ? name + '.' : ''}${property}` },
21
24
  React.createElement(ViewController, { spec: specProperties[property], name: `${name ? name + '.' : ''}${property}` }),
22
25
  delimiter && delimiter[property] ? (React.createElement(Text, { className: b('delimiter') }, delimiter[property])) : null)) : null)));
package/build/esm/lib/kit/hooks/useOneOf/useOneOf.js CHANGED
@@ -13,6 +13,7 @@ export const useOneOf = ({ props, onTogglerChange }) => {
13
13
  const specProperties = React.useMemo(() => (isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
14
14
  const specBooleanMap = React.useMemo(() => { var _a; return (_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.booleanMap; }, [(_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.booleanMap]);
15
15
  const [oneOfValue, setOneOfValue] = React.useState(() => {
16
+ var _a;
16
17
  let valueKeys;
17
18
  if (isObjectLike(input.value)) {
18
19
  const keys = Object.keys(input.value);
@@ -20,7 +21,11 @@ export const useOneOf = ({ props, onTogglerChange }) => {
20
21
  valueKeys = keys;
21
22
  }
22
23
  }
23
- return (valueKeys || spec.viewSpec.order || Object.keys(specProperties))[0];
24
+ if (valueKeys)
25
+ return valueKeys[0];
26
+ if ((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length)
27
+ return spec.viewSpec.order[0];
28
+ return Object.keys(specProperties)[0];
24
29
  });
25
30
  const onOneOfChange = React.useCallback(([newValue]) => {
26
31
  if (newValue !== oneOfValue) {
@@ -43,7 +48,8 @@ export const useOneOf = ({ props, onTogglerChange }) => {
43
48
  }
44
49
  return undefined;
45
50
  }, [oneOfValue, specBooleanMap]);
46
- const options = React.useMemo(() => (spec.viewSpec.order || Object.keys(specProperties)).map((value) => {
51
+ const propertiesOrder = React.useMemo(() => { var _a; return (((_a = spec.viewSpec.order) === null || _a === void 0 ? void 0 : _a.length) ? spec.viewSpec.order : Object.keys(specProperties)); }, [spec.viewSpec.order, specProperties]);
52
+ const options = React.useMemo(() => propertiesOrder.map((value) => {
47
53
  var _a, _b;
48
54
  const title = ((_a = spec.description) === null || _a === void 0 ? void 0 : _a[value]) ||
49
55
  ((_b = specProperties[value]) === null || _b === void 0 ? void 0 : _b.viewSpec.layoutTitle) ||
@@ -54,7 +60,7 @@ export const useOneOf = ({ props, onTogglerChange }) => {
54
60
  title,
55
61
  content: title,
56
62
  };
57
- }), [spec.description, spec.viewSpec.order, specProperties]);
63
+ }), [propertiesOrder, spec.description, specProperties]);
58
64
  const togglerType = React.useMemo(() => {
59
65
  var _a, _b, _c, _d;
60
66
  if (((_a = spec.viewSpec.oneOfParams) === null || _a === void 0 ? void 0 : _a.toggler) === 'card' && options.length < 4) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/dynamic-forms",
3
- "version": "4.14.0",
3
+ "version": "4.14.2",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "main": "build/cjs/index.js",
@@ -46,8 +46,8 @@
46
46
  "dependencies": {
47
47
  "@bem-react/classname": "^1.6.0",
48
48
  "@gravity-ui/components": "^3.0.0",
49
- "@gravity-ui/date-components": "^2.4.0",
50
- "@gravity-ui/date-utils": "^2.4.0",
49
+ "@gravity-ui/date-components": "^2.10.3",
50
+ "@gravity-ui/date-utils": "^2.5.5",
51
51
  "@gravity-ui/i18n": "^1.2.0",
52
52
  "@gravity-ui/icons": "^2.8.1",
53
53
  "lodash": "^4.17.20"