@@ -6,6 +6,7 @@ import type {ButtonProps, PopupProps, TextInputProps} from '@gravity-ui/uikit';
66import type { Calendar , CalendarInstance } from '../../Calendar' ;
77import { useDateFieldProps } from '../../DateField' ;
88import type { DateFieldProps } from '../../DateField' ;
9+ import { useRelativeDateFieldProps } from '../../RelativeDateField' ;
910import { getButtonSizeForInput } from '../../utils/getButtonSizeForInput' ;
1011import { mergeProps } from '../../utils/mergeProps' ;
1112import type { RelativeDatePickerProps } from '../RelativeDatePicker' ;
@@ -96,14 +97,12 @@ export function useRelativeDatePickerProps(
9697 onUpdate : undefined ,
9798 } ) ;
9899
99- const relativeDateProps : TextInputProps = {
100- disabled : relativeDateState . disabled ,
101- value : relativeDateState . text ,
102- onUpdate : relativeDateState . setText ,
103- hasClear : props . hasClear && ! relativeDateState . readOnly ,
104- placeholder : props . placeholder ,
105- size : props . size ,
106- } ;
100+ const { inputProps : relativeDateProps } = useRelativeDateFieldProps ( relativeDateState , {
101+ ...props ,
102+ value : undefined ,
103+ defaultValue : undefined ,
104+ onUpdate : undefined ,
105+ } ) ;
107106
108107 let validationState = props . validationState ;
109108 if ( ! validationState ) {
@@ -163,7 +162,7 @@ export function useRelativeDatePickerProps(
163162 size : getButtonSizeForInput ( props . size ) ,
164163 disabled : state . readOnly || state . disabled ,
165164 view : 'flat-secondary' ,
166- style : { zIndex : 2 } ,
165+ style : { zIndex : 2 , marginInlineEnd : 2 } ,
167166 selected : mode === 'relative' ,
168167 extraProps : {
169168 'aria-label' : i18n ( 'Formula input mode' ) ,
0 commit comments