Skip to content

fix(material/slider): handle null values in slider input #30621

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/material/slider/slider-input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ export class MatSliderThumb implements _MatSliderThumb, OnDestroy, ControlValueA
return numberAttribute(this._hostElement.value, 0);
}
set value(value: number) {
if (value === null) {
value = this._getDefaultValue();
}
value = isNaN(value) ? 0 : value;
const stringValue = value + '';
if (!this._hasSetInitialValue) {
Expand Down
43 changes: 42 additions & 1 deletion src/material/slider/slider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
tick,
waitForAsync,
} from '@angular/core/testing';
import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {FormControl, FormGroup, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {By} from '@angular/platform-browser';
import {of} from 'rxjs';
import {MatSliderModule} from './module';
Expand Down Expand Up @@ -1314,6 +1314,25 @@ describe('MatSlider', () => {
}));
});

describe('slider with form group', () => {
it('should reset to initial min-max value when form reset is done', fakeAsync(() => {
const fixture = createComponent(SliderWithFormGroup);
fixture.detectChanges();
const sliderDebugElement = fixture.debugElement.query(By.directive(MatSlider));
const slider = sliderDebugElement.componentInstance;
const minInput = slider._getInput(_MatThumb.START) as MatSliderRangeThumb;
const maxInput = slider._getInput(_MatThumb.END) as MatSliderRangeThumb;
flush();

expect(minInput.value).toBe(0);
expect(maxInput.value).toBe(10);
slideToValue(slider, minInput, 20);
fixture.componentInstance.fg.reset();
expect(minInput.value).toBe(0);
expect(maxInput.value).toBe(10);
}));
});

describe('slider as a custom form control', () => {
let fixture: ComponentFixture<SliderWithFormControl>;
let slider: MatSlider;
Expand Down Expand Up @@ -2024,6 +2043,28 @@ class RangeSliderWithTickMarks {
@ViewChild(MatSlider) slider: MatSlider;
}

@Component({
template: `
<div [formGroup]="fg" >
<mat-slider [min]="MIN" [max]="MAX" >
<input formControlName="min" matSliderStartThumb>
<input formControlName="max" matSliderEndThumb>
</mat-slider>
<div>
`,
styles: SLIDER_STYLES,
standalone: false,
})
class SliderWithFormGroup {
readonly MIN = 0;
readonly MAX = 10;

readonly fg = new FormGroup({
min: new FormControl<number | null>(null),
max: new FormControl<number | null>(null),
});
}

/** Clicks on the MatSlider at the coordinates corresponding to the given value. */
function setValueByClick(
slider: MatSlider,
Expand Down
4 changes: 2 additions & 2 deletions src/material/slider/slider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export class MatSlider implements AfterViewInit, OnDestroy, _MatSlider {
return this._min;
}
set min(v: number) {
const min = isNaN(v) ? this._min : v;
const min = v === undefined || v === null || isNaN(v) ? this._min : v;
if (this._min !== min) {
this._updateMin(min);
}
Expand Down Expand Up @@ -216,7 +216,7 @@ export class MatSlider implements AfterViewInit, OnDestroy, _MatSlider {
return this._max;
}
set max(v: number) {
const max = isNaN(v) ? this._max : v;
const max = v === undefined || v === null || isNaN(v) ? this._max : v;
if (this._max !== max) {
this._updateMax(max);
}
Expand Down
Loading