Skip to content

[TextField] delete irrelevant default numeric-range props, prevent unconditional aria-invalid='false' #2339

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
Dec 17, 2019
Merged

[TextField] delete irrelevant default numeric-range props, prevent unconditional aria-invalid='false' #2339

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
3 changes: 3 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

### Bug fixes

- Fixed `TextField` to no longer render `aria-invalid="false"` ([#2282](https://github.com/Shopify/polaris-react/pull/2282))
- Fixed `TextField` to only render `min` ,`max` and `step` attributes when explicitly passed ([#2282](https://github.com/Shopify/polaris-react/pull/2282))

### Documentation

### Development workflow
Expand Down
19 changes: 12 additions & 7 deletions src/components/TextField/TextField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,11 +144,11 @@ export function TextField({
name,
id: idProp,
role,
step = 1,
step,
autoComplete,
max = Infinity,
max,
maxLength,
min = -Infinity,
min,
minLength,
pattern,
spellCheck,
Expand Down Expand Up @@ -183,6 +183,11 @@ export function TextField({

const normalizedValue = value != null ? value : '';
const {unstableGlobalTheming = false} = useFeatures();

const normalizedStep = step != null ? step : 1;
const normalizedMax = max != null ? max : Infinity;
const normalizedMin = min != null ? min : -Infinity;

const className = classNames(
styles.TextField,
Boolean(normalizedValue) && styles.hasValue,
Expand Down Expand Up @@ -268,16 +273,16 @@ export function TextField({

// Making sure the new value has the same length of decimal places as the
// step / value has.
const decimalPlaces = Math.max(dpl(numericValue), dpl(step));
const decimalPlaces = Math.max(dpl(numericValue), dpl(normalizedStep));

const newValue = Math.min(
Number(max),
Math.max(numericValue + steps * step, Number(min)),
Number(normalizedMax),
Math.max(numericValue + steps * normalizedStep, Number(normalizedMin)),
);

onChange(String(newValue.toFixed(decimalPlaces)), id);
},
[id, max, min, onChange, step, value],
[id, normalizedMax, normalizedMin, onChange, normalizedStep, value],
);

const handleButtonRelease = useCallback(() => {
Expand Down