From dbff18679e83e7db3e087baf4b0ee94dbb3f1492 Mon Sep 17 00:00:00 2001
From: Andrei Bitiutskii <aobityutskiy@yandex-team.ru>
Date: Wed, 31 Jan 2024 18:43:54 +0700
Subject: [PATCH 1/4] feat(spec): add generic for InputProps and LaypoutProps
 into Spec

---
 .../core/components/Form/Controller/utils.tsx | 17 ++++++--
 src/lib/core/components/Form/types/array.ts   | 29 +++++++++++---
 src/lib/core/components/Form/types/input.ts   |  1 +
 src/lib/core/components/Form/types/layout.ts  |  1 +
 src/lib/core/components/Form/types/number.ts  | 31 +++++++++++---
 src/lib/core/components/Form/types/string.ts  | 32 ++++++++++++---
 src/lib/core/types/specs.ts                   | 40 ++++++++++++++++---
 .../Inputs/MultiSelect/MultiSelect.tsx        |  5 ++-
 .../kit/components/Inputs/Select/Select.tsx   |  5 ++-
 src/lib/kit/components/Inputs/Text/Text.tsx   |  8 +++-
 .../components/Inputs/TextArea/TextArea.tsx   |  5 ++-
 11 files changed, 140 insertions(+), 34 deletions(-)

diff --git a/src/lib/core/components/Form/Controller/utils.tsx b/src/lib/core/components/Form/Controller/utils.tsx
index 87bd23d2..1ceaa245 100644
--- a/src/lib/core/components/Form/Controller/utils.tsx
+++ b/src/lib/core/components/Form/Controller/utils.tsx
@@ -135,18 +135,29 @@ export const getRender = <DirtyValue extends FieldValue, SpecType extends Spec>(
     const render = (props: FieldRenderProps<DirtyValue>) => {
         if (inputEntity && isCorrectSpec(spec) && _.isString(name)) {
             if (!spec.viewSpec.hidden) {
+                const {layoutProps, inputProps} = spec.viewSpec;
                 if (inputEntity.independent) {
                     const InputComponent = inputEntity.Component;
 
-                    return <InputComponent spec={spec} name={name} Layout={Layout} {...props} />;
+                    return (
+                        <InputComponent
+                            spec={spec}
+                            name={name}
+                            Layout={Layout}
+                            inputProps={inputProps}
+                            {...props}
+                        />
+                    );
                 }
 
                 const InputComponent = inputEntity.Component;
-                const input = <InputComponent spec={spec} name={name} {...props} />;
+                const input = (
+                    <InputComponent spec={spec} name={name} inputProps={inputProps} {...props} />
+                );
 
                 if (Layout) {
                     return (
-                        <Layout spec={spec} name={name} {...props}>
+                        <Layout spec={spec} name={name} layoutProps={layoutProps} {...props}>
                             {input}
                         </Layout>
                     );
diff --git a/src/lib/core/components/Form/types/array.ts b/src/lib/core/components/Form/types/array.ts
index 5829db25..1f90719d 100644
--- a/src/lib/core/components/Form/types/array.ts
+++ b/src/lib/core/components/Form/types/array.ts
@@ -16,13 +16,30 @@ import {
     ValidatorsMap,
 } from './';
 
-export type ArrayInputProps = InputProps<FieldArrayValue, ArraySpec>;
-export type ArrayIndependentInputProps = IndependentInputProps<FieldArrayValue, ArraySpec>;
-export type ArrayLayoutProps = LayoutProps<FieldArrayValue, ArraySpec>;
+export type ArrayInputProps<IProps extends Record<string, any> = {}> = InputProps<
+    FieldArrayValue,
+    ArraySpec<any, IProps>
+>;
+export type ArrayIndependentInputProps<IProps extends Record<string, any> = {}> =
+    IndependentInputProps<FieldArrayValue, ArraySpec<any, IProps>>;
+
+export type ArrayLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+    FieldArrayValue,
+    ArraySpec<any, any, LProps>
+>;
 
-export type ArrayInput = InputType<FieldArrayValue, ArraySpec>;
-export type ArrayIndependentInput = IndependentInputType<FieldArrayValue, ArraySpec>;
-export type ArrayLayout = LayoutType<FieldArrayValue, ArraySpec>;
+export type ArrayInput<IProps extends Record<string, any> = {}> = InputType<
+    FieldArrayValue,
+    ArraySpec<any, IProps>
+>;
+export type ArrayIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
+    FieldArrayValue,
+    ArraySpec<any, IProps>
+>;
+export type ArrayLayout<LProps extends Record<string, any> = {}> = LayoutType<
+    FieldArrayValue,
+    ArraySpec<any, any, LProps>
+>;
 
 export type ArrayInputEntity = InputEntity<FieldArrayValue, ArraySpec>;
 export type ArrayIndependentInputEntity = IndependentInputEntity<FieldArrayValue, ArraySpec>;
diff --git a/src/lib/core/components/Form/types/input.ts b/src/lib/core/components/Form/types/input.ts
index 746edc0e..c73927ed 100644
--- a/src/lib/core/components/Form/types/input.ts
+++ b/src/lib/core/components/Form/types/input.ts
@@ -7,6 +7,7 @@ import {FieldRenderProps, FieldValue, LayoutType} from './';
 export type InputProps<Value extends FieldValue, SpecType extends Spec> = {
     spec: SpecType;
     name: string;
+    inputProps?: SpecType['viewSpec']['inputProps'];
 } & FieldRenderProps<Value>;
 
 export type IndependentInputProps<Value extends FieldValue, SpecType extends Spec> = {
diff --git a/src/lib/core/components/Form/types/layout.ts b/src/lib/core/components/Form/types/layout.ts
index a359c61d..6e5ca018 100644
--- a/src/lib/core/components/Form/types/layout.ts
+++ b/src/lib/core/components/Form/types/layout.ts
@@ -6,6 +6,7 @@ import {FieldValue, InputProps} from './';
 
 export type LayoutProps<Value extends FieldValue, SpecType extends Spec> = {
     children: React.ReactElement;
+    layoutProps?: SpecType['viewSpec']['layoutProps'];
 } & InputProps<Value, SpecType>;
 
 export type LayoutType<Value extends FieldValue, SpecType extends Spec> = (
diff --git a/src/lib/core/components/Form/types/number.ts b/src/lib/core/components/Form/types/number.ts
index 48f196af..449116ce 100644
--- a/src/lib/core/components/Form/types/number.ts
+++ b/src/lib/core/components/Form/types/number.ts
@@ -15,13 +15,32 @@ import {
     ValidatorsMap,
 } from './';
 
-export type NumberInputProps = InputProps<number, NumberSpec>;
-export type NumberIndependentInputProps = IndependentInputProps<number, NumberSpec>;
-export type NumberLayoutProps = LayoutProps<number, NumberSpec>;
+export type NumberInputProps<IProps extends Record<string, any> = {}> = InputProps<
+    number,
+    NumberSpec<any, IProps>
+>;
 
-export type NumberInput = InputType<number, NumberSpec>;
-export type NumberIndependentInput = IndependentInputType<number, NumberSpec>;
-export type NumberLayout = LayoutType<number, NumberSpec>;
+export type NumberIndependentInputProps<IProps extends Record<string, any> = {}> =
+    IndependentInputProps<number, NumberSpec<any, IProps>>;
+
+export type NumberLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+    number,
+    NumberSpec<any, any, LProps>
+>;
+
+export type NumberInput<IProps extends Record<string, any> = {}> = InputType<
+    number,
+    NumberSpec<any, IProps>
+>;
+
+export type NumberIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
+    number,
+    NumberSpec<any, IProps>
+>;
+export type NumberLayout<LProps extends Record<string, any> = {}> = LayoutType<
+    number,
+    NumberSpec<any, any, LProps>
+>;
 
 export type NumberInputEntity = InputEntity<number, NumberSpec>;
 export type NumberIndependentInputEntity = IndependentInputEntity<number, NumberSpec>;
diff --git a/src/lib/core/components/Form/types/string.ts b/src/lib/core/components/Form/types/string.ts
index f0a96caf..ac930658 100644
--- a/src/lib/core/components/Form/types/string.ts
+++ b/src/lib/core/components/Form/types/string.ts
@@ -15,13 +15,33 @@ import {
     ValidatorsMap,
 } from './';
 
-export type StringInputProps = InputProps<string, StringSpec>;
-export type StringIndependentInputProps = IndependentInputProps<string, StringSpec>;
-export type StringLayoutProps = LayoutProps<string, StringSpec>;
+export type StringInputProps<IProps extends Record<string, any> = {}> = InputProps<
+    string,
+    StringSpec<any, IProps>
+>;
 
-export type StringInput = InputType<string, StringSpec>;
-export type StringIndependentInput = IndependentInputType<string, StringSpec>;
-export type StringLayout = LayoutType<string, StringSpec>;
+export type StringIndependentInputProps<IProps extends Record<string, any> = {}> =
+    IndependentInputProps<string, StringSpec<any, IProps>>;
+
+export type StringLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+    string,
+    StringSpec<any, any, LProps>
+>;
+
+export type StringInput<IProps extends Record<string, any> = {}> = InputType<
+    string,
+    StringSpec<any, IProps>
+>;
+
+export type StringIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
+    string,
+    StringSpec<any, IProps>
+>;
+
+export type StringLayout<LProps extends Record<string, any> = {}> = LayoutType<
+    string,
+    StringSpec<any, any, LProps>
+>;
 
 export type StringInputEntity = InputEntity<string, StringSpec>;
 export type StringIndependentInputEntity = IndependentInputEntity<string, StringSpec>;
diff --git a/src/lib/core/types/specs.ts b/src/lib/core/types/specs.ts
index 830336fb..c81a5a7a 100644
--- a/src/lib/core/types/specs.ts
+++ b/src/lib/core/types/specs.ts
@@ -5,7 +5,11 @@ import {ReadAsMethod, SpecTypes} from '../constants';
 
 import {ArrayValue, ObjectValue} from './';
 
-export interface ArraySpec<LinkType = any> {
+export interface ArraySpec<
+    LinkType = any,
+    InputProps extends Record<string, any> = {},
+    LayoutProps extends Record<string, any> = {},
+> {
     defaultValue?: ArrayValue;
     type: SpecTypes.Array;
     required?: boolean;
@@ -36,10 +40,16 @@ export interface ArraySpec<LinkType = any> {
             filterPlaceholder?: string;
             meta?: Record<string, string>;
         };
+        inputProps?: InputProps;
+        layoutProps?: LayoutProps;
     };
 }
 
-export interface BooleanSpec<LinkType = any> {
+export interface BooleanSpec<
+    LinkType = any,
+    InputProps extends Record<string, any> = {},
+    LayoutProps extends Record<string, any> = {},
+> {
     defaultValue?: boolean;
     type: SpecTypes.Boolean;
     required?: boolean;
@@ -53,10 +63,16 @@ export interface BooleanSpec<LinkType = any> {
         layoutOpen?: boolean;
         link?: LinkType;
         hidden?: boolean;
+        inputProps?: InputProps;
+        layoutProps?: LayoutProps;
     };
 }
 
-export interface NumberSpec<LinkType = any> {
+export interface NumberSpec<
+    LinkType = any,
+    InputProps extends Record<string, any> = {},
+    LayoutProps extends Record<string, any> = {},
+> {
     defaultValue?: number;
     type: SpecTypes.Number;
     required?: boolean;
@@ -75,10 +91,16 @@ export interface NumberSpec<LinkType = any> {
         placeholder?: string;
         copy?: boolean;
         hidden?: boolean;
+        inputProps?: InputProps;
+        layoutProps?: LayoutProps;
     };
 }
 
-export interface ObjectSpec<LinkType = any> {
+export interface ObjectSpec<
+    LinkType = any,
+    InputProps extends Record<string, any> = {},
+    LayoutProps extends Record<string, any> = {},
+> {
     defaultValue?: ObjectValue;
     type: SpecTypes.Object;
     required?: boolean;
@@ -99,10 +121,16 @@ export interface ObjectSpec<LinkType = any> {
         };
         placeholder?: string;
         hidden?: boolean;
+        layoutProps?: LayoutProps;
+        inputProps?: InputProps;
     };
 }
 
-export interface StringSpec<LinkType = any> {
+export interface StringSpec<
+    LinkType = any,
+    InputProps extends Record<string, any> = {},
+    LayoutProps extends Record<string, any> = {},
+> {
     defaultValue?: string;
     type: SpecTypes.String;
     required?: boolean;
@@ -149,6 +177,8 @@ export interface StringSpec<LinkType = any> {
             filterPlaceholder?: string;
             meta?: Record<string, string>;
         };
+        inputProps?: InputProps;
+        layoutProps?: LayoutProps;
         generateRandomValueButton?: boolean;
     };
 }
diff --git a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
index f262aad9..8550b7e9 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
+++ b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {Select, Text} from '@gravity-ui/uikit';
+import {Select, SelectProps as SelectBaseProps, Text} from '@gravity-ui/uikit';
 
 import {ArrayInput, FieldArrayValue, transformArrIn, transformArrOut} from '../../../../core';
 import {block} from '../../../utils';
@@ -9,7 +9,7 @@ import './MultiSelect.scss';
 
 const b = block('multi-select');
 
-export const MultiSelect: ArrayInput = ({name, input, spec}) => {
+export const MultiSelect: ArrayInput<SelectBaseProps> = ({name, input, spec, inputProps}) => {
     const {value, onBlur, onChange, onFocus} = input;
 
     const filterable = React.useMemo(() => (spec.enum?.length || 0) > 9, [spec.enum?.length]);
@@ -81,6 +81,7 @@ export const MultiSelect: ArrayInput = ({name, input, spec}) => {
             getOptionHeight={getOptionHeight}
             multiple
             qa={name}
+            {...inputProps}
         />
     );
 };
diff --git a/src/lib/kit/components/Inputs/Select/Select.tsx b/src/lib/kit/components/Inputs/Select/Select.tsx
index 955f882e..d28fe234 100644
--- a/src/lib/kit/components/Inputs/Select/Select.tsx
+++ b/src/lib/kit/components/Inputs/Select/Select.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {Select as SelectBase, Text} from '@gravity-ui/uikit';
+import {Select as SelectBase, SelectProps as SelectBaseProps, Text} from '@gravity-ui/uikit';
 
 import {StringInput} from '../../../../core';
 import {block} from '../../../utils';
@@ -9,7 +9,7 @@ import './Select.scss';
 
 const b = block('select');
 
-export const Select: StringInput = ({name, input, spec}) => {
+export const Select: StringInput<SelectBaseProps> = ({name, input, spec, inputProps}) => {
     const {value, onBlur, onChange, onFocus} = input;
 
     const filterable = React.useMemo(() => (spec.enum?.length || 0) > 9, [spec.enum?.length]);
@@ -75,6 +75,7 @@ export const Select: StringInput = ({name, input, spec}) => {
             getOptionHeight={getOptionHeight}
             renderOption={renderOption}
             qa={name}
+            {...inputProps}
         />
     );
 };
diff --git a/src/lib/kit/components/Inputs/Text/Text.tsx b/src/lib/kit/components/Inputs/Text/Text.tsx
index a3bcde03..0867c889 100644
--- a/src/lib/kit/components/Inputs/Text/Text.tsx
+++ b/src/lib/kit/components/Inputs/Text/Text.tsx
@@ -1,15 +1,18 @@
 import React from 'react';
 
 import {PasswordInput} from '@gravity-ui/components';
-import {TextInput} from '@gravity-ui/uikit';
+import {TextInput, TextInputProps as TextInputBaseProps} from '@gravity-ui/uikit';
 import _ from 'lodash';
 
 import {FieldRenderProps, NumberInputProps, StringInputProps} from '../../../../core';
 
-export const Text = <T extends NumberInputProps | StringInputProps>({
+export const Text = <
+    T extends NumberInputProps<TextInputBaseProps> | StringInputProps<TextInputBaseProps>,
+>({
     name,
     input: {value, onBlur, onChange, onFocus},
     spec,
+    inputProps,
 }: T) => {
     const props = {
         value: _.isNil(value) ? '' : `${value}`,
@@ -20,6 +23,7 @@ export const Text = <T extends NumberInputProps | StringInputProps>({
         disabled: spec.viewSpec.disabled,
         placeholder: spec.viewSpec.placeholder,
         qa: name,
+        ...inputProps,
     };
 
     if (spec.viewSpec.type === 'password') {
diff --git a/src/lib/kit/components/Inputs/TextArea/TextArea.tsx b/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
index 594a28af..9a15d12e 100644
--- a/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
+++ b/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 
-import {TextArea as TextAreaBase} from '@gravity-ui/uikit';
+import {TextArea as TextAreaBase, TextAreaProps as TextAreaBaseProps} from '@gravity-ui/uikit';
 
 import {StringInput} from '../../../../core';
 
-export const TextArea: StringInput = ({name, input, spec}) => {
+export const TextArea: StringInput<TextAreaBaseProps> = ({name, input, spec, inputProps}) => {
     const {value, onBlur, onChange, onFocus} = input;
 
     return (
@@ -19,6 +19,7 @@ export const TextArea: StringInput = ({name, input, spec}) => {
             disabled={spec.viewSpec.disabled}
             placeholder={spec.viewSpec.placeholder}
             qa={name}
+            {...inputProps}
         />
     );
 };

From 9d17b7e4e22d85bcc68c3ccdfabc95e8d5f34eb8 Mon Sep 17 00:00:00 2001
From: Andrei Bitiutskii <aobityutskiy@aobityutskiy-dev.vla.yp-c.yandex.net>
Date: Thu, 1 Feb 2024 14:52:17 +0300
Subject: [PATCH 2/4] fix(types): rename generic type; fix(input): strict
 inputProps type

---
 .../core/components/Form/Controller/utils.tsx |  1 +
 src/lib/core/components/Form/types/array.ts   | 33 +++++----
 src/lib/core/components/Form/types/boolean.ts | 40 +++++++++--
 src/lib/core/components/Form/types/input.ts   |  1 +
 src/lib/core/components/Form/types/number.ts  | 31 ++++----
 src/lib/core/components/Form/types/object.ts  | 39 +++++++++--
 src/lib/core/components/Form/types/string.ts  | 30 ++++----
 src/lib/core/types/specs.ts                   | 40 +++++------
 .../Inputs/MultiSelect/MultiSelect.tsx        | 69 ++++++++++++------
 .../kit/components/Inputs/Select/Select.tsx   | 70 +++++++++++++------
 src/lib/kit/components/Inputs/Text/Text.tsx   | 14 ++--
 .../components/Inputs/TextArea/TextArea.tsx   | 16 +++--
 12 files changed, 257 insertions(+), 127 deletions(-)

diff --git a/src/lib/core/components/Form/Controller/utils.tsx b/src/lib/core/components/Form/Controller/utils.tsx
index 1ceaa245..68280acf 100644
--- a/src/lib/core/components/Form/Controller/utils.tsx
+++ b/src/lib/core/components/Form/Controller/utils.tsx
@@ -145,6 +145,7 @@ export const getRender = <DirtyValue extends FieldValue, SpecType extends Spec>(
                             name={name}
                             Layout={Layout}
                             inputProps={inputProps}
+                            layoutProps={layoutProps}
                             {...props}
                         />
                     );
diff --git a/src/lib/core/components/Form/types/array.ts b/src/lib/core/components/Form/types/array.ts
index 1f90719d..a5d2645e 100644
--- a/src/lib/core/components/Form/types/array.ts
+++ b/src/lib/core/components/Form/types/array.ts
@@ -16,29 +16,38 @@ import {
     ValidatorsMap,
 } from './';
 
-export type ArrayInputProps<IProps extends Record<string, any> = {}> = InputProps<
+export type ArrayInputProps<InputComponentProps extends Record<string, any> = {}> = InputProps<
     FieldArrayValue,
-    ArraySpec<any, IProps>
+    ArraySpec<undefined, InputComponentProps>
+>;
+export type ArrayIndependentInputProps<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputProps<
+    FieldArrayValue,
+    ArraySpec<undefined, InputComponentProps, LayoutComponentProps>
 >;
-export type ArrayIndependentInputProps<IProps extends Record<string, any> = {}> =
-    IndependentInputProps<FieldArrayValue, ArraySpec<any, IProps>>;
 
-export type ArrayLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+export type ArrayLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
     FieldArrayValue,
-    ArraySpec<any, any, LProps>
+    ArraySpec<undefined, any, LayoutComponentProps>
 >;
 
-export type ArrayInput<IProps extends Record<string, any> = {}> = InputType<
+export type ArrayInput<InputComponentProps extends Record<string, any> = {}> = InputType<
     FieldArrayValue,
-    ArraySpec<any, IProps>
+    ArraySpec<undefined, InputComponentProps>
 >;
-export type ArrayIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
+export type ArrayIndependentInput<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputType<
     FieldArrayValue,
-    ArraySpec<any, IProps>
+    ArraySpec<undefined, InputComponentProps, LayoutComponentProps>
 >;
-export type ArrayLayout<LProps extends Record<string, any> = {}> = LayoutType<
+
+export type ArrayLayout<LayoutComponentProps extends Record<string, any> = {}> = LayoutType<
     FieldArrayValue,
-    ArraySpec<any, any, LProps>
+    ArraySpec<undefined, any, LayoutComponentProps>
 >;
 
 export type ArrayInputEntity = InputEntity<FieldArrayValue, ArraySpec>;
diff --git a/src/lib/core/components/Form/types/boolean.ts b/src/lib/core/components/Form/types/boolean.ts
index 457d7d98..7a5e292e 100644
--- a/src/lib/core/components/Form/types/boolean.ts
+++ b/src/lib/core/components/Form/types/boolean.ts
@@ -15,13 +15,41 @@ import {
     ValidatorsMap,
 } from './';
 
-export type BooleanInputProps = InputProps<boolean, BooleanSpec>;
-export type BooleanIndependentInputProps = IndependentInputProps<boolean, BooleanSpec>;
-export type BooleanLayoutProps = LayoutProps<boolean, BooleanSpec>;
+export type BooleanInputProps<InputComponentProps extends Record<string, any> = {}> = InputProps<
+    boolean,
+    BooleanSpec<undefined, InputComponentProps>
+>;
 
-export type BooleanInput = InputType<boolean, BooleanSpec>;
-export type BooleanIndependentInput = IndependentInputType<boolean, BooleanSpec>;
-export type BooleanLayout = LayoutType<boolean, BooleanSpec>;
+export type BooleanIndependentInputProps<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputProps<
+    boolean,
+    BooleanSpec<undefined, InputComponentProps, LayoutComponentProps>
+>;
+
+export type BooleanLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
+    boolean,
+    BooleanSpec<undefined, any, LayoutComponentProps>
+>;
+
+export type BooleanInput<InputComponentProps extends Record<string, any> = {}> = InputType<
+    boolean,
+    BooleanSpec<undefined, InputComponentProps>
+>;
+
+export type BooleanIndependentInput<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputType<
+    boolean,
+    BooleanSpec<undefined, InputComponentProps, LayoutComponentProps>
+>;
+
+export type BooleanLayout<LayoutComponentProps extends Record<string, any> = {}> = LayoutType<
+    boolean,
+    BooleanSpec<undefined, any, LayoutComponentProps>
+>;
 
 export type BooleanInputEntity = InputEntity<boolean, BooleanSpec>;
 export type BooleanIndependentInputEntity = IndependentInputEntity<boolean, BooleanSpec>;
diff --git a/src/lib/core/components/Form/types/input.ts b/src/lib/core/components/Form/types/input.ts
index c73927ed..613fee8e 100644
--- a/src/lib/core/components/Form/types/input.ts
+++ b/src/lib/core/components/Form/types/input.ts
@@ -12,6 +12,7 @@ export type InputProps<Value extends FieldValue, SpecType extends Spec> = {
 
 export type IndependentInputProps<Value extends FieldValue, SpecType extends Spec> = {
     Layout: LayoutType<Value, SpecType> | undefined;
+    layoutProps?: SpecType['viewSpec']['layoutProps'];
 } & InputProps<Value, SpecType>;
 
 export type InputType<Value extends FieldValue, SpecType extends Spec> = (
diff --git a/src/lib/core/components/Form/types/number.ts b/src/lib/core/components/Form/types/number.ts
index 449116ce..b488c967 100644
--- a/src/lib/core/components/Form/types/number.ts
+++ b/src/lib/core/components/Form/types/number.ts
@@ -15,31 +15,34 @@ import {
     ValidatorsMap,
 } from './';
 
-export type NumberInputProps<IProps extends Record<string, any> = {}> = InputProps<
+export type NumberInputProps<InputComponentProps extends Record<string, any> = {}> = InputProps<
     number,
-    NumberSpec<any, IProps>
+    NumberSpec<undefined, InputComponentProps>
 >;
 
-export type NumberIndependentInputProps<IProps extends Record<string, any> = {}> =
-    IndependentInputProps<number, NumberSpec<any, IProps>>;
+export type NumberIndependentInputProps<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputProps<number, NumberSpec<undefined, InputComponentProps, LayoutComponentProps>>;
 
-export type NumberLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+export type NumberLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
     number,
-    NumberSpec<any, any, LProps>
+    NumberSpec<any, any, LayoutComponentProps>
 >;
 
-export type NumberInput<IProps extends Record<string, any> = {}> = InputType<
+export type NumberInput<InputComponentProps extends Record<string, any> = {}> = InputType<
     number,
-    NumberSpec<any, IProps>
+    NumberSpec<undefined, InputComponentProps>
 >;
 
-export type NumberIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
-    number,
-    NumberSpec<any, IProps>
->;
-export type NumberLayout<LProps extends Record<string, any> = {}> = LayoutType<
+export type NumberIndependentInput<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputType<number, NumberSpec<undefined, InputComponentProps, LayoutComponentProps>>;
+
+export type NumberLayout<LayoutComponentProps extends Record<string, any> = {}> = LayoutType<
     number,
-    NumberSpec<any, any, LProps>
+    NumberSpec<undefined, any, LayoutComponentProps>
 >;
 
 export type NumberInputEntity = InputEntity<number, NumberSpec>;
diff --git a/src/lib/core/components/Form/types/object.ts b/src/lib/core/components/Form/types/object.ts
index 57e915c2..1946cbc4 100644
--- a/src/lib/core/components/Form/types/object.ts
+++ b/src/lib/core/components/Form/types/object.ts
@@ -16,13 +16,40 @@ import {
     ValidatorsMap,
 } from './';
 
-export type ObjectInputProps = InputProps<FieldObjectValue, ObjectSpec>;
-export type ObjectIndependentInputProps = IndependentInputProps<FieldObjectValue, ObjectSpec>;
-export type ObjectLayoutProps = LayoutProps<FieldObjectValue, ObjectSpec>;
+export type ObjectInputProps<InputComponentProps extends Record<string, any> = {}> = InputProps<
+    FieldObjectValue,
+    ObjectSpec<undefined, InputComponentProps>
+>;
+export type ObjectIndependentInputProps<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputProps<
+    FieldObjectValue,
+    ObjectSpec<undefined, InputComponentProps, LayoutComponentProps>
+>;
 
-export type ObjectInput = InputType<FieldObjectValue, ObjectSpec>;
-export type ObjectIndependentInput = IndependentInputType<FieldObjectValue, ObjectSpec>;
-export type ObjectLayout = LayoutType<FieldObjectValue, ObjectSpec>;
+export type ObjectLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
+    FieldObjectValue,
+    ObjectSpec<undefined, any, LayoutComponentProps>
+>;
+
+export type ObjectInput<InputComponentProps extends Record<string, any> = {}> = InputType<
+    FieldObjectValue,
+    ObjectSpec<undefined, InputComponentProps>
+>;
+
+export type ObjectIndependentInput<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputType<
+    FieldObjectValue,
+    ObjectSpec<undefined, InputComponentProps, LayoutComponentProps>
+>;
+
+export type ObjectLayout<LayoutComponentProps extends Record<string, any> = {}> = LayoutType<
+    FieldObjectValue,
+    ObjectSpec<undefined, any, LayoutComponentProps>
+>;
 
 export type ObjectInputEntity = InputEntity<FieldObjectValue, ObjectSpec>;
 export type ObjectIndependentInputEntity = IndependentInputEntity<FieldObjectValue, ObjectSpec>;
diff --git a/src/lib/core/components/Form/types/string.ts b/src/lib/core/components/Form/types/string.ts
index ac930658..932418aa 100644
--- a/src/lib/core/components/Form/types/string.ts
+++ b/src/lib/core/components/Form/types/string.ts
@@ -15,32 +15,34 @@ import {
     ValidatorsMap,
 } from './';
 
-export type StringInputProps<IProps extends Record<string, any> = {}> = InputProps<
+export type StringInputProps<InputComponentProps extends Record<string, any> = {}> = InputProps<
     string,
-    StringSpec<any, IProps>
+    StringSpec<undefined, InputComponentProps>
 >;
 
-export type StringIndependentInputProps<IProps extends Record<string, any> = {}> =
-    IndependentInputProps<string, StringSpec<any, IProps>>;
+export type StringIndependentInputProps<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputProps<string, StringSpec<undefined, InputComponentProps, LayoutComponentProps>>;
 
-export type StringLayoutProps<LProps extends Record<string, any> = {}> = LayoutProps<
+export type StringLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
     string,
-    StringSpec<any, any, LProps>
+    StringSpec<undefined, any, LayoutComponentProps>
 >;
 
-export type StringInput<IProps extends Record<string, any> = {}> = InputType<
+export type StringInput<InputComponentProps extends Record<string, any> = {}> = InputType<
     string,
-    StringSpec<any, IProps>
+    StringSpec<undefined, InputComponentProps>
 >;
 
-export type StringIndependentInput<IProps extends Record<string, any> = {}> = IndependentInputType<
-    string,
-    StringSpec<any, IProps>
->;
+export type StringIndependentInput<
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
+> = IndependentInputType<string, StringSpec<undefined, InputComponentProps, LayoutComponentProps>>;
 
-export type StringLayout<LProps extends Record<string, any> = {}> = LayoutType<
+export type StringLayout<LayoutComponentProps extends Record<string, any> = {}> = LayoutType<
     string,
-    StringSpec<any, any, LProps>
+    StringSpec<undefined, any, LayoutComponentProps>
 >;
 
 export type StringInputEntity = InputEntity<string, StringSpec>;
diff --git a/src/lib/core/types/specs.ts b/src/lib/core/types/specs.ts
index c81a5a7a..74a7111e 100644
--- a/src/lib/core/types/specs.ts
+++ b/src/lib/core/types/specs.ts
@@ -7,8 +7,8 @@ import {ArrayValue, ObjectValue} from './';
 
 export interface ArraySpec<
     LinkType = any,
-    InputProps extends Record<string, any> = {},
-    LayoutProps extends Record<string, any> = {},
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
 > {
     defaultValue?: ArrayValue;
     type: SpecTypes.Array;
@@ -40,15 +40,15 @@ export interface ArraySpec<
             filterPlaceholder?: string;
             meta?: Record<string, string>;
         };
-        inputProps?: InputProps;
-        layoutProps?: LayoutProps;
+        inputProps?: InputComponentProps;
+        layoutProps?: LayoutComponentProps;
     };
 }
 
 export interface BooleanSpec<
     LinkType = any,
-    InputProps extends Record<string, any> = {},
-    LayoutProps extends Record<string, any> = {},
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
 > {
     defaultValue?: boolean;
     type: SpecTypes.Boolean;
@@ -63,15 +63,15 @@ export interface BooleanSpec<
         layoutOpen?: boolean;
         link?: LinkType;
         hidden?: boolean;
-        inputProps?: InputProps;
-        layoutProps?: LayoutProps;
+        inputProps?: InputComponentProps;
+        layoutProps?: LayoutComponentProps;
     };
 }
 
 export interface NumberSpec<
     LinkType = any,
-    InputProps extends Record<string, any> = {},
-    LayoutProps extends Record<string, any> = {},
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
 > {
     defaultValue?: number;
     type: SpecTypes.Number;
@@ -91,15 +91,15 @@ export interface NumberSpec<
         placeholder?: string;
         copy?: boolean;
         hidden?: boolean;
-        inputProps?: InputProps;
-        layoutProps?: LayoutProps;
+        inputProps?: InputComponentProps;
+        layoutProps?: LayoutComponentProps;
     };
 }
 
 export interface ObjectSpec<
     LinkType = any,
-    InputProps extends Record<string, any> = {},
-    LayoutProps extends Record<string, any> = {},
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
 > {
     defaultValue?: ObjectValue;
     type: SpecTypes.Object;
@@ -121,15 +121,15 @@ export interface ObjectSpec<
         };
         placeholder?: string;
         hidden?: boolean;
-        layoutProps?: LayoutProps;
-        inputProps?: InputProps;
+        inputProps?: InputComponentProps;
+        layoutProps?: LayoutComponentProps;
     };
 }
 
 export interface StringSpec<
     LinkType = any,
-    InputProps extends Record<string, any> = {},
-    LayoutProps extends Record<string, any> = {},
+    InputComponentProps extends Record<string, any> = {},
+    LayoutComponentProps extends Record<string, any> = {},
 > {
     defaultValue?: string;
     type: SpecTypes.String;
@@ -177,8 +177,8 @@ export interface StringSpec<
             filterPlaceholder?: string;
             meta?: Record<string, string>;
         };
-        inputProps?: InputProps;
-        layoutProps?: LayoutProps;
+        inputProps?: InputComponentProps;
+        layoutProps?: LayoutComponentProps;
         generateRandomValueButton?: boolean;
     };
 }
diff --git a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
index 8550b7e9..d427135c 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
+++ b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
@@ -7,32 +7,57 @@ import {block} from '../../../utils';
 
 import './MultiSelect.scss';
 
+export interface MultiSelectProps
+    extends Omit<
+        SelectBaseProps,
+        | 'onUpdate'
+        | 'value'
+        | 'onOpenChange'
+        | 'disabled'
+        | 'placeholder'
+        | 'filterPlaceholder'
+        | 'multiple'
+        | 'qa'
+    > {
+    withCustomOptions?: boolean;
+}
+
 const b = block('multi-select');
 
-export const MultiSelect: ArrayInput<SelectBaseProps> = ({name, input, spec, inputProps}) => {
+export const MultiSelect: ArrayInput<MultiSelectProps> = ({name, input, spec, inputProps}) => {
     const {value, onBlur, onChange, onFocus} = input;
 
     const filterable = React.useMemo(() => (spec.enum?.length || 0) > 9, [spec.enum?.length]);
 
+    const {withCustomOptions, options: externalOptions} = inputProps || {};
+
     const options = React.useMemo(
         () =>
-            spec.enum?.map((id) => ({
-                id,
-                value: id,
-                text: spec.description?.[id] || id,
-                content: spec.viewSpec.selectParams?.meta?.[id] ? (
-                    <div key={id}>
-                        <Text>{spec.description?.[id] || id}</Text>
-                        <Text color="secondary" className={b('meta-text')}>
-                            {spec.viewSpec.selectParams.meta[id]}
-                        </Text>
-                    </div>
-                ) : (
-                    spec.description?.[id] || id
-                ),
-                key: id,
-            })),
-        [spec.enum, spec.description, spec.viewSpec.selectParams?.meta],
+            withCustomOptions
+                ? externalOptions
+                : spec.enum?.map((id) => ({
+                      id,
+                      value: id,
+                      text: spec.description?.[id] || id,
+                      content: spec.viewSpec.selectParams?.meta?.[id] ? (
+                          <div key={id}>
+                              <Text>{spec.description?.[id] || id}</Text>
+                              <Text color="secondary" className={b('meta-text')}>
+                                  {spec.viewSpec.selectParams.meta[id]}
+                              </Text>
+                          </div>
+                      ) : (
+                          spec.description?.[id] || id
+                      ),
+                      key: id,
+                  })),
+        [
+            spec.enum,
+            spec.description,
+            spec.viewSpec.selectParams?.meta,
+            externalOptions,
+            withCustomOptions,
+        ],
     );
 
     const renderOption = React.useCallback((option: {value: string; content?: React.ReactNode}) => {
@@ -69,19 +94,19 @@ export const MultiSelect: ArrayInput<SelectBaseProps> = ({name, input, spec, inp
         <Select
             width="max"
             className={b()}
+            filterable={filterable}
+            renderOption={renderOption}
+            getOptionHeight={getOptionHeight}
+            {...inputProps}
             value={_value}
             options={options}
             onUpdate={handleChange}
             onOpenChange={handleToggle}
             disabled={spec.viewSpec.disabled}
             placeholder={spec.viewSpec.placeholder}
-            filterable={filterable}
             filterPlaceholder={spec.viewSpec.selectParams?.filterPlaceholder}
-            renderOption={renderOption}
-            getOptionHeight={getOptionHeight}
             multiple
             qa={name}
-            {...inputProps}
         />
     );
 };
diff --git a/src/lib/kit/components/Inputs/Select/Select.tsx b/src/lib/kit/components/Inputs/Select/Select.tsx
index d28fe234..e99cc256 100644
--- a/src/lib/kit/components/Inputs/Select/Select.tsx
+++ b/src/lib/kit/components/Inputs/Select/Select.tsx
@@ -9,30 +9,54 @@ import './Select.scss';
 
 const b = block('select');
 
-export const Select: StringInput<SelectBaseProps> = ({name, input, spec, inputProps}) => {
-    const {value, onBlur, onChange, onFocus} = input;
+export interface SelectProps
+    extends Omit<
+        SelectBaseProps,
+        | 'onUpdate'
+        | 'value'
+        | 'onOpenChange'
+        | 'disabled'
+        | 'placeholder'
+        | 'filterPlaceholder'
+        | 'multiple'
+        | 'qa'
+    > {
+    withCustomOptions?: boolean;
+}
 
+export const Select: StringInput<SelectProps> = ({name, input, spec, inputProps}) => {
+    const {value, onBlur, onChange, onFocus} = input;
     const filterable = React.useMemo(() => (spec.enum?.length || 0) > 9, [spec.enum?.length]);
 
+    const {withCustomOptions, options: externalOptions} = inputProps || {};
+
     const options = React.useMemo(
         () =>
-            spec.enum?.map((id) => ({
-                id,
-                value: id,
-                text: spec.description?.[id] || id,
-                content: spec.viewSpec.selectParams?.meta?.[id] ? (
-                    <div key={id}>
-                        <Text>{spec.description?.[id] || id}</Text>
-                        <Text color="secondary" className={b('meta-text')}>
-                            {spec.viewSpec.selectParams.meta[id]}
-                        </Text>
-                    </div>
-                ) : (
-                    spec.description?.[id] || id
-                ),
-                key: id,
-            })),
-        [spec.enum, spec.description, spec.viewSpec.selectParams?.meta],
+            withCustomOptions
+                ? externalOptions
+                : spec.enum?.map((id) => ({
+                      id,
+                      value: id,
+                      text: spec.description?.[id] || id,
+                      content: spec.viewSpec.selectParams?.meta?.[id] ? (
+                          <div key={id}>
+                              <Text>{spec.description?.[id] || id}</Text>
+                              <Text color="secondary" className={b('meta-text')}>
+                                  {spec.viewSpec.selectParams.meta[id]}
+                              </Text>
+                          </div>
+                      ) : (
+                          spec.description?.[id] || id
+                      ),
+                      key: id,
+                  })),
+        [
+            spec.enum,
+            spec.description,
+            spec.viewSpec.selectParams?.meta,
+            externalOptions,
+            withCustomOptions,
+        ],
     );
 
     const renderOption = React.useCallback((option: {value: string; content?: React.ReactNode}) => {
@@ -64,18 +88,18 @@ export const Select: StringInput<SelectBaseProps> = ({name, input, spec, inputPr
         <SelectBase
             className={b()}
             width="max"
+            filterable={filterable}
+            getOptionHeight={getOptionHeight}
+            renderOption={renderOption}
+            {...inputProps}
             value={[value]}
             options={options}
             onUpdate={handleChange}
             onOpenChange={handleToggle}
             disabled={spec.viewSpec.disabled}
             placeholder={spec.viewSpec.placeholder}
-            filterable={filterable}
             filterPlaceholder={spec.viewSpec.selectParams?.filterPlaceholder}
-            getOptionHeight={getOptionHeight}
-            renderOption={renderOption}
             qa={name}
-            {...inputProps}
         />
     );
 };
diff --git a/src/lib/kit/components/Inputs/Text/Text.tsx b/src/lib/kit/components/Inputs/Text/Text.tsx
index 0867c889..83765c90 100644
--- a/src/lib/kit/components/Inputs/Text/Text.tsx
+++ b/src/lib/kit/components/Inputs/Text/Text.tsx
@@ -6,24 +6,28 @@ import _ from 'lodash';
 
 import {FieldRenderProps, NumberInputProps, StringInputProps} from '../../../../core';
 
-export const Text = <
-    T extends NumberInputProps<TextInputBaseProps> | StringInputProps<TextInputBaseProps>,
->({
+export interface TextProps
+    extends Omit<
+        TextInputBaseProps,
+        'value' | 'onBlur' | 'onFocus' | 'onUpdate' | 'disabled' | 'placeholder' | 'qa'
+    > {}
+
+export const Text = <T extends NumberInputProps<TextProps> | StringInputProps<TextProps>>({
     name,
     input: {value, onBlur, onChange, onFocus},
     spec,
     inputProps,
 }: T) => {
     const props = {
-        value: _.isNil(value) ? '' : `${value}`,
         hasClear: true,
+        ...inputProps,
+        value: _.isNil(value) ? '' : `${value}`,
         onBlur: onBlur,
         onFocus: onFocus,
         onUpdate: onChange as FieldRenderProps<string>['input']['onChange'],
         disabled: spec.viewSpec.disabled,
         placeholder: spec.viewSpec.placeholder,
         qa: name,
-        ...inputProps,
     };
 
     if (spec.viewSpec.type === 'password') {
diff --git a/src/lib/kit/components/Inputs/TextArea/TextArea.tsx b/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
index 9a15d12e..8c85c7d7 100644
--- a/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
+++ b/src/lib/kit/components/Inputs/TextArea/TextArea.tsx
@@ -4,22 +4,28 @@ import {TextArea as TextAreaBase, TextAreaProps as TextAreaBaseProps} from '@gra
 
 import {StringInput} from '../../../../core';
 
-export const TextArea: StringInput<TextAreaBaseProps> = ({name, input, spec, inputProps}) => {
+export interface TextAreaProps
+    extends Omit<
+        TextAreaBaseProps,
+        'value' | 'onBlur' | 'onFocus' | 'onUpdate' | 'disabled' | 'placeholder' | 'qa'
+    > {}
+
+export const TextArea: StringInput<TextAreaProps> = ({name, input, spec, inputProps}) => {
     const {value, onBlur, onChange, onFocus} = input;
 
     return (
         <TextAreaBase
+            maxRows={20}
+            minRows={8}
+            hasClear
+            {...inputProps}
             value={value || ''}
             onBlur={onBlur}
             onFocus={onFocus}
             onUpdate={onChange}
-            maxRows={20}
-            minRows={8}
-            hasClear
             disabled={spec.viewSpec.disabled}
             placeholder={spec.viewSpec.placeholder}
             qa={name}
-            {...inputProps}
         />
     );
 };

From e9d64ac8cfd7c4af5597c22f75602686a9555610 Mon Sep 17 00:00:00 2001
From: Andrei Bitiutskii <aobityutskiy@yandex-team.ru>
Date: Thu, 1 Feb 2024 16:40:40 +0300
Subject: [PATCH 3/4] fix(): fix issues

---
 src/lib/core/types/specs.ts                               | 1 +
 src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx | 2 +-
 src/lib/kit/components/Inputs/Select/Select.tsx           | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/core/types/specs.ts b/src/lib/core/types/specs.ts
index 74a7111e..732e6b4d 100644
--- a/src/lib/core/types/specs.ts
+++ b/src/lib/core/types/specs.ts
@@ -5,6 +5,7 @@ import {ReadAsMethod, SpecTypes} from '../constants';
 
 import {ArrayValue, ObjectValue} from './';
 
+//TODO: Need to move on InputComponentProps extends Record<string, any> | undefined = undefined;
 export interface ArraySpec<
     LinkType = any,
     InputComponentProps extends Record<string, any> = {},
diff --git a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
index d427135c..b1a6b7d8 100644
--- a/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
+++ b/src/lib/kit/components/Inputs/MultiSelect/MultiSelect.tsx
@@ -34,7 +34,7 @@ export const MultiSelect: ArrayInput<MultiSelectProps> = ({name, input, spec, in
     const options = React.useMemo(
         () =>
             withCustomOptions
-                ? externalOptions
+                ? externalOptions || []
                 : spec.enum?.map((id) => ({
                       id,
                       value: id,
diff --git a/src/lib/kit/components/Inputs/Select/Select.tsx b/src/lib/kit/components/Inputs/Select/Select.tsx
index e99cc256..dc1786f6 100644
--- a/src/lib/kit/components/Inputs/Select/Select.tsx
+++ b/src/lib/kit/components/Inputs/Select/Select.tsx
@@ -33,7 +33,7 @@ export const Select: StringInput<SelectProps> = ({name, input, spec, inputProps}
     const options = React.useMemo(
         () =>
             withCustomOptions
-                ? externalOptions
+                ? externalOptions || []
                 : spec.enum?.map((id) => ({
                       id,
                       value: id,

From 38376ed1bf8b785683a0d7b9717156cf3d811b03 Mon Sep 17 00:00:00 2001
From: Andrey Bitiutskiy <aobityutskiy@yandex-team.ru>
Date: Fri, 2 Feb 2024 09:58:19 +0300
Subject: [PATCH 4/4] fix(): fix issues

---
 src/lib/core/components/Form/types/number.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/core/components/Form/types/number.ts b/src/lib/core/components/Form/types/number.ts
index b488c967..1ac20473 100644
--- a/src/lib/core/components/Form/types/number.ts
+++ b/src/lib/core/components/Form/types/number.ts
@@ -27,7 +27,7 @@ export type NumberIndependentInputProps<
 
 export type NumberLayoutProps<LayoutComponentProps extends Record<string, any> = {}> = LayoutProps<
     number,
-    NumberSpec<any, any, LayoutComponentProps>
+    NumberSpec<undefined, any, LayoutComponentProps>
 >;
 
 export type NumberInput<InputComponentProps extends Record<string, any> = {}> = InputType<