diff --git a/shesha-reactjs/src/components/dropdown/dropdown.tsx b/shesha-reactjs/src/components/dropdown/dropdown.tsx index 8a37524ee..82a43795f 100644 --- a/shesha-reactjs/src/components/dropdown/dropdown.tsx +++ b/shesha-reactjs/src/components/dropdown/dropdown.tsx @@ -156,7 +156,6 @@ export const Dropdown: FC = ({ mode={selectedMode} placeholder={placeholder} showSearch - style={style} size={size} > {options.map((option, index) => ( diff --git a/shesha-reactjs/src/designer-components/dateField/datePickerWrapper.tsx b/shesha-reactjs/src/designer-components/dateField/datePickerWrapper.tsx index 65ec10619..a88247701 100644 --- a/shesha-reactjs/src/designer-components/dateField/datePickerWrapper.tsx +++ b/shesha-reactjs/src/designer-components/dateField/datePickerWrapper.tsx @@ -98,8 +98,7 @@ export const DatePickerWrapper: FC = (props) => { ); } - const evaluatedStyle = getStyle(style, formData, globalState); - + const evaluatedStyle = style ? getStyle(style, formData, globalState) : { width: '100%' }; if (range) { return ( @@ -135,7 +134,7 @@ export const DatePickerWrapper: FC = (props) => { showSecond={true} picker={picker} format={pickerFormat} - style={{...evaluatedStyle, width: '100%'}} + style={evaluatedStyle} {...rest} {...getDatePickerValue(props, pickerFormat)} allowClear