Skip to content

Add default views for material date/time controls #1960

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

Merged
merged 1 commit into from
Jun 26, 2022
Merged

Add default views for material date/time controls #1960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/material/src/controls/MaterialDateControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ export const MaterialDateControl = (props: ControlProps)=> {
const format = appliedUiSchemaOptions.dateFormat ?? 'YYYY-MM-DD';
const saveFormat = appliedUiSchemaOptions.dateSaveFormat ?? 'YYYY-MM-DD';

const views = appliedUiSchemaOptions.views ?? ['year', 'day'];

const firstFormHelperText = showDescription
? description
: !isValid
Expand All @@ -90,7 +92,7 @@ export const MaterialDateControl = (props: ControlProps)=> {
onChange={onChange}
inputFormat={format}
disableMaskedInput
views={appliedUiSchemaOptions.views}
views={views}
disabled={!enabled}
cancelText={appliedUiSchemaOptions.cancelLabel}
clearText={appliedUiSchemaOptions.clearLabel}
Expand Down
4 changes: 3 additions & 1 deletion packages/material/src/controls/MaterialDateTimeControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ export const MaterialDateTimeControl = (props: ControlProps) => {
const format = appliedUiSchemaOptions.dateTimeFormat ?? 'YYYY-MM-DD HH:mm';
const saveFormat = appliedUiSchemaOptions.dateTimeSaveFormat ?? undefined;

const views = appliedUiSchemaOptions.views ?? ['year', 'day', 'hours', 'minutes'];

const firstFormHelperText = showDescription
? description
: !isValid
Expand All @@ -93,7 +95,7 @@ export const MaterialDateTimeControl = (props: ControlProps) => {
inputFormat={format}
disableMaskedInput
ampm={!!appliedUiSchemaOptions.ampm}
views={appliedUiSchemaOptions.views}
views={views}
disabled={!enabled}
cancelText={appliedUiSchemaOptions.cancelLabel}
clearText={appliedUiSchemaOptions.clearLabel}
Expand Down
6 changes: 4 additions & 2 deletions packages/material/src/controls/MaterialTimeControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ export const MaterialTimeControl = (props: ControlProps) => {
);

const format = appliedUiSchemaOptions.timeFormat ?? 'HH:mm';
const saveFormat = appliedUiSchemaOptions.timeSaveFormat ?? 'HH:mm:ss';
const saveFormat = appliedUiSchemaOptions.timeSaveFormat ?? 'HH:mm:ss';

const views = appliedUiSchemaOptions.views ?? ['hours', 'minutes'];

const firstFormHelperText = showDescription
? description
Expand All @@ -93,7 +95,7 @@ export const MaterialTimeControl = (props: ControlProps) => {
inputFormat={format}
disableMaskedInput
ampm={!!appliedUiSchemaOptions.ampm}
views={appliedUiSchemaOptions.views}
views={views}
disabled={!enabled}
cancelText={appliedUiSchemaOptions.cancelLabel}
clearText={appliedUiSchemaOptions.clearLabel}
Expand Down