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

feat(date-picker): add warning styles, style audit fixes #7368

Merged
merged 2 commits into from
Dec 5, 2020
Merged

feat(date-picker): add warning styles, style audit fixes #7368

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
7672e3d
feat(date-picker): add warning styles, style audit fixes
tw15egan Nov 30, 2020
ad7152a
Merge branch 'master' into datepicker-audit
tw15egan Dec 4, 2020
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
35 changes: 31 additions & 4 deletions packages/components/src/components/date-picker/_date-picker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,19 @@
align-items: center;
}

.#{$prefix}--date-picker.#{$prefix}--date-picker--simple {
.#{$prefix}--date-picker__input {
width: rem(120px);
.#{$prefix}--date-picker.#{$prefix}--date-picker--simple
.#{$prefix}--date-picker__input,
.#{$prefix}--date-picker.#{$prefix}--date-picker--simple .#{$prefix}--label {
width: rem(120px);
}

.#{$prefix}--date-picker.#{$prefix}--date-picker--simple
.#{$prefix}--date-picker-input__wrapper--invalid,
.#{$prefix}--date-picker.#{$prefix}--date-picker--simple
.#{$prefix}--date-picker-input__wrapper--warn {
.#{$prefix}--date-picker__input,
~ .#{$prefix}--form-requirement {
width: rem(152px);
}
}

Expand All @@ -66,7 +76,6 @@

position: relative;
display: block;
min-width: rem(144px);
height: rem(40px);
padding: 0 $carbon--spacing-05;
color: $text-01;
Expand Down Expand Up @@ -127,6 +136,24 @@
}
}

.#{$prefix}--date-picker__icon--invalid,
.#{$prefix}--date-picker__icon--warn {
cursor: auto;
}

.#{$prefix}--date-picker__icon--warn {
fill: $support-03;
}

.#{$prefix}--date-picker__icon--warn path:first-of-type {
opacity: 1;
fill: $carbon__black-100;
}

.#{$prefix}--date-picker__icon--invalid {
fill: $support-01;
}

.#{$prefix}--date-picker__icon ~ .#{$prefix}--date-picker__input {
padding-right: $carbon--spacing-09;
}
Expand Down
6 changes: 5 additions & 1 deletion packages/components/src/components/date-picker/_flatpickr.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@
height: rem(40px);
display: flex;
align-items: center;
margin-bottom: $carbon--spacing-02;
background-color: transparent;
color: $text-01;
line-height: 1;
Expand Down Expand Up @@ -271,6 +270,11 @@
border-bottom-color: $interactive-01;
border-top-color: $interactive-01;
}

&:active::after {
border-bottom-color: $interactive-04;
border-top-color: $interactive-04;
}
}

.numInputWrapper .arrowUp {
Expand Down
5 changes: 3 additions & 2 deletions packages/components/src/components/form/_form.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
input[data-invalid],
.#{$prefix}--number[data-invalid] .#{$prefix}--number__input-wrapper,
.#{$prefix}--number__input-wrapper--warning,
.#{$prefix}--date-picker-input__wrapper,
.#{$prefix}--date-picker-input__wrapper--warn,
.#{$prefix}--date-picker-input__wrapper--invalid,
.#{$prefix}--time-picker--invalid,
.#{$prefix}--text-input__field-wrapper[data-invalid],
.#{$prefix}--text-input__field-wrapper--warning,
Expand All @@ -99,7 +100,7 @@

input[data-invalid],
.#{$prefix}--number[data-invalid] .#{$prefix}--number__input-wrapper,
.#{$prefix}--date-picker-input__wrapper,
.#{$prefix}--date-picker-input__wrapper--invalid,
.#{$prefix}--time-picker--invalid,
.#{$prefix}--text-input__field-wrapper[data-invalid],
.#{$prefix}--text-area__wrapper[data-invalid],
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/number-input/_number-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
fill: $support-03;
}

.#{$prefix}--number__invalid--warning path[data-icon-path='inner-path'] {
.#{$prefix}--number__invalid--warning path:first-of-type {
opacity: 1;
fill: $carbon__black-100;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/text-input/_text-input.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
.#{$prefix}--text-input__invalid-icon--warning {
fill: $support-03;

path[data-icon-path='inner-path'] {
path:first-of-type {
opacity: 1;
fill: $carbon__black-100;
}
Expand Down
6 changes: 6 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2250,6 +2250,12 @@ Map {
"type": Object {
"type": "string",
},
"warn": Object {
"type": "bool",
},
"warnText": Object {
"type": "string",
},
},
},
"Dropdown" => Object {
Expand Down
25 changes: 23 additions & 2 deletions packages/react/src/components/DatePicker/DatePicker-story.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,24 @@ const sizes = {
'Small size (sm)': 'sm',
};

const types = {
Simple: 'simple',
Single: 'single',
Range: 'range',
};

const props = {
datePicker: () => ({
dateFormat: text('The date format (dateFormat in <DatePicker>)', 'm/d/Y'),
id: 'date-picker',
light: boolean('Light variant (light in <DatePicker>)', false),
datePickerType: select(
'Date Picker Type (datePickerType)',
types,
'single'
),
minDate: text('Disable dates before this date (minDate)', '11/15/2020'),
maxDate: text('Disabled dates after this date (maxDate)', '11/01/2040'),
}),
datePickerInput: () => ({
id: 'date-picker-input-id',
Expand All @@ -53,7 +66,12 @@ const props = {
),
invalidText: text(
'Form validation UI content (invalidText in <DatePickerInput>)',
'A valid value is required'
'A valid date is required'
),
warn: boolean('Show warning state (warn)', false),
warnText: text(
'Warning state text (warnText)',
'Selected dates may cause conflicts'
),
iconDescription: text(
'Icon description (iconDescription in <DatePickerInput>)',
Expand Down Expand Up @@ -123,8 +141,11 @@ export const Range = () => {
Range.storyName = 'range with calendar';

export const DatePickerPlayground = () => (
<DatePicker {...props.datePicker()} datePickerType="single">
<DatePicker {...props.datePicker()}>
<DatePickerInput {...props.datePickerInput()} />
{props.datePicker().datePickerType === 'range' && (
<DatePickerInput {...props.datePickerInput()} id="date-picker-input-2" />
)}
</DatePicker>
);

Expand Down
49 changes: 44 additions & 5 deletions packages/react/src/components/DatePickerInput/DatePickerInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classNames from 'classnames';
import { settings } from 'carbon-components';
import { WarningFilled16, WarningAltFilled16 } from '@carbon/icons-react';
import { Calendar16 } from '@carbon/icons-react';

const { prefix } = settings;
Expand Down Expand Up @@ -106,6 +107,14 @@ export default class DatePickerInput extends Component {
* Specify the type of the `<input>`
*/
type: PropTypes.string,
/**
* Specify whether the control is currently in warning state
*/
warn: PropTypes.bool,
/**
* Provide the text that is displayed when the control is in warning state
*/
warnText: PropTypes.string,
};

static defaultProps = {
Expand Down Expand Up @@ -134,6 +143,8 @@ export default class DatePickerInput extends Component {
iconDescription,
openCalendar,
size,
warn,
warnText,
...other
} = this.props;

Expand All @@ -154,19 +165,42 @@ export default class DatePickerInput extends Component {
pattern,
};

const wrapperClasses = classNames(`${prefix}--date-picker-input__wrapper`, {
[`${prefix}--date-picker-input__wrapper--invalid`]: invalid,
[`${prefix}--date-picker-input__wrapper--warn`]: warn,
});

const labelClasses = classNames(`${prefix}--label`, {
[`${prefix}--visually-hidden`]: hideLabel,
[`${prefix}--label--disabled`]: disabled,
});

const inputClasses = classNames(`${prefix}--date-picker__input`, {
[`${prefix}--date-picker__input--${size}`]: size,
[`${prefix}--date-picker__input--invalid`]: invalid,
});

const datePickerIcon = (() => {
if (datePickerType === 'simple') {
if (datePickerType === 'simple' && !invalid && !warn) {
return;
}

if (invalid) {
return (
<WarningFilled16
className={`${prefix}--date-picker__icon ${prefix}--date-picker__icon--invalid`}
/>
);
}

if (!invalid && warn) {
return (
<WarningAltFilled16
className={`${prefix}--date-picker__icon ${prefix}--date-picker__icon--warn`}
/>
);
}

return (
<Calendar16
className={`${prefix}--date-picker__icon`}
Expand All @@ -184,9 +218,14 @@ export default class DatePickerInput extends Component {
</label>
) : null;

const error = invalid ? (
<div className={`${prefix}--form-requirement`}>{invalidText}</div>
) : null;
let error = null;
if (invalid) {
error = (
<div className={`${prefix}--form-requirement`}>{invalidText}</div>
);
} else if (warn) {
error = <div className={`${prefix}--form-requirement`}>{warnText}</div>;
}

const containerClasses = classNames(`${prefix}--date-picker-container`, {
[`${prefix}--date-picker--nolabel`]: !label,
Expand Down Expand Up @@ -218,7 +257,7 @@ export default class DatePickerInput extends Component {
return (
<div className={containerClasses}>
{label}
<div className={`${prefix}--date-picker-input__wrapper`}>
<div className={wrapperClasses}>
{input}
{datePickerIcon}
</div>
Expand Down