Skip to content
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
12 changes: 6 additions & 6 deletions src/material/slider/slider.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ $mat-slider-focus-ring-size: 30px !default;
padding: $mat-slider-padding;
outline: none;
vertical-align: middle;

&:not(.mat-slider-disabled):active,
&.mat-slider-sliding:not(.mat-slider-disabled) {
@include cursor-grabbing;
}
}

.mat-slider-wrapper {
Expand Down Expand Up @@ -102,14 +107,9 @@ $mat-slider-focus-ring-size: 30px !default;
}

%_mat-slider-cursor {
.mat-slider:not(.mat-slider-disabled) & {
.mat-slider:not(.mat-slider-disabled):not(.mat-slider-sliding) & {
@include cursor-grab;
}

.mat-slider:not(.mat-slider-disabled) &:active,
.mat-slider-sliding:not(.mat-slider-disabled) & {
@include cursor-grabbing;
}
}

.mat-slider-thumb {
Expand Down
7 changes: 7 additions & 0 deletions src/material/slider/slider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,13 @@ describe('MatSlider', () => {
expect(sliderInstance.value).toBe(100);
});

it('should prevent the default action of the `selectstart` event', () => {
const event = dispatchFakeEvent(sliderNativeElement, 'selectstart');
fixture.detectChanges();

expect(event.defaultPrevented).toBe(true);
});

});

describe('disabled slider', () => {
Expand Down
3 changes: 3 additions & 0 deletions src/material/slider/slider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ const _MatSliderMixinBase:
'(slide)': '_onSlide($event)',
'(slideend)': '_onSlideEnd()',
'(slidestart)': '_onSlideStart($event)',
// On Safari starting to slide temporarily triggers text selection mode which
// show the wrong cursor. We prevent it by stopping the `selectstart` event.
'(selectstart)': '$event.preventDefault()',
'class': 'mat-slider',
'role': 'slider',
'[tabIndex]': 'tabIndex',
Expand Down