Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clear button no grow #908

Merged
merged 2 commits into from
Jan 30, 2025
Merged

Clear button no grow #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08cc2d5
Remove grow from clear button
thecalcc Jan 30, 2025
4a54e47
4.0.14
thecalcc Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 33 additions & 29 deletions app-typescript/components/DateTimePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,39 @@ export class DateTimePicker extends React.PureComponent<IProps> {

return (
<div style={{width: this.props.width ? this.props.width : MIN_WIDTH}}>
<Spacer h gap="8" alignItems='end'>
<DatePicker
disabled={this.props.disabled}
preview={this.props.preview}
required={this.props.required}
hideClearButton={true}
value={this.props.value}
onChange={(val) => {
this.handleDateChange(val);
}}
dateFormat={this.props.dateFormat}
label={this.props.label.text}
inlineLabel={this.props.label.hidden ?? false}
labelHidden={this.props.label.hidden ?? false}
fullWidth={this.props.fullWidth}
/>
<TimePicker
disabled={this.props.disabled}
preview={this.props.preview}
value={convertedTimeValue}
onChange={(val) => {
this.handleTimeChange(val);
}}
inlineLabel
labelHidden
allowSeconds={this.props.allowSeconds}
fullWidth={this.props.fullWidth}
required={this.props.required}
/>
<Spacer h gap="8" alignItems='end' noWrap>
<div style={{flexGrow: 1}}>
<DatePicker
disabled={this.props.disabled}
preview={this.props.preview}
required={this.props.required}
hideClearButton={true}
value={this.props.value}
onChange={(val) => {
this.handleDateChange(val);
}}
dateFormat={this.props.dateFormat}
label={this.props.label.text}
inlineLabel={this.props.label.hidden ?? false}
labelHidden={this.props.label.hidden ?? false}
fullWidth={this.props.fullWidth}
/>
</div>
<div style={{flexGrow: 1}}>
<TimePicker
disabled={this.props.disabled}
preview={this.props.preview}
value={convertedTimeValue}
onChange={(val) => {
this.handleTimeChange(val);
}}
inlineLabel
labelHidden
allowSeconds={this.props.allowSeconds}
fullWidth={this.props.fullWidth}
required={this.props.required}
/>
</div>
{this.props.preview !== true && (
<IconButton
disabled={this.props.disabled}
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "superdesk-ui-framework",
"version": "4.0.13",
"version": "4.0.14",
"license": "AGPL-3.0",
"repository": {
"type": "git",
Expand Down
Loading