-
Notifications
You must be signed in to change notification settings - Fork 6.8k
fix(slider): refactor the slider to use percent values for the track … #1663
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
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6dd63d5
fix(slider): refactor the slider to use percent values for the track …
mmalerba dccac45
Fix lint error.
mmalerba dda95a4
Fix tick position on firefox.
mmalerba 9a03857
Crisper ticks on firefox.
mmalerba 31eb479
Allow consecutive duplicate properties in SCSS.
mmalerba 42ed436
Addressed comments.
mmalerba a4ba485
PercentPipe was adding extra space before '%', so replaced it.
mmalerba f3604cf
Fixed tests.
mmalerba 565a6f3
Fix tab group on slider demo page.
mmalerba d5fb4e7
remove CommonModule from imports.
mmalerba c48f7d6
Addressed comments.
mmalerba File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
import {coerceNumberProperty} from './number-property'; | ||
|
||
|
||
describe('coerceNumberProperty', () => { | ||
it('should coerce undefined to 0 or default', () => { | ||
expect(coerceNumberProperty(undefined)).toBe(0); | ||
expect(coerceNumberProperty(undefined, 111)).toBe(111); | ||
}); | ||
|
||
it('should coerce null to 0 or default', () => { | ||
expect(coerceNumberProperty(null)).toBe(0); | ||
expect(coerceNumberProperty(null, 111)).toBe(111); | ||
}); | ||
|
||
it('should coerce true to 0 or default', () => { | ||
expect(coerceNumberProperty(true)).toBe(0); | ||
expect(coerceNumberProperty(true, 111)).toBe(111); | ||
}); | ||
|
||
it('should coerce false to 0 or default', () => { | ||
expect(coerceNumberProperty(false)).toBe(0); | ||
expect(coerceNumberProperty(false, 111)).toBe(111); | ||
|
||
}); | ||
|
||
it('should coerce the empty string to 0 or default', () => { | ||
expect(coerceNumberProperty('')).toBe(0); | ||
expect(coerceNumberProperty('', 111)).toBe(111); | ||
|
||
}); | ||
|
||
it('should coerce the string "1" to 1', () => { | ||
expect(coerceNumberProperty('1')).toBe(1); | ||
expect(coerceNumberProperty('1', 111)).toBe(1); | ||
}); | ||
|
||
it('should coerce the string "123.456" to 123.456', () => { | ||
expect(coerceNumberProperty('123.456')).toBe(123.456); | ||
expect(coerceNumberProperty('123.456', 111)).toBe(123.456); | ||
}); | ||
|
||
it('should coerce the string "-123.456" to -123.456', () => { | ||
expect(coerceNumberProperty('-123.456')).toBe(-123.456); | ||
expect(coerceNumberProperty('-123.456', 111)).toBe(-123.456); | ||
}); | ||
|
||
it('should coerce an arbitrary string to 0 or default', () => { | ||
expect(coerceNumberProperty('pink')).toBe(0); | ||
expect(coerceNumberProperty('pink', 111)).toBe(111); | ||
}); | ||
|
||
it('should coerce the number 1 to 1', () => { | ||
expect(coerceNumberProperty(1)).toBe(1); | ||
expect(coerceNumberProperty(1, 111)).toBe(1); | ||
}); | ||
|
||
it('should coerce the number 123.456 to 123.456', () => { | ||
expect(coerceNumberProperty(123.456)).toBe(123.456); | ||
expect(coerceNumberProperty(123.456, 111)).toBe(123.456); | ||
}); | ||
|
||
it('should coerce the number -123.456 to -123.456', () => { | ||
expect(coerceNumberProperty(-123.456)).toBe(-123.456); | ||
expect(coerceNumberProperty(-123.456, 111)).toBe(-123.456); | ||
}); | ||
|
||
it('should coerce an object to 0 or default', () => { | ||
expect(coerceNumberProperty({})).toBe(0); | ||
expect(coerceNumberProperty({}, 111)).toBe(111); | ||
}); | ||
|
||
it('should coerce an array to 0 or default', () => { | ||
expect(coerceNumberProperty([])).toBe(0); | ||
expect(coerceNumberProperty([], 111)).toBe(111); | ||
}); | ||
}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
/** Coerces a data-bound value (typically a string) to a number. */ | ||
export function coerceNumberProperty(value: any, fallbackValue = 0) { | ||
return isNaN(parseFloat(value as any)) ? fallbackValue : Number(value); | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,13 @@ | ||
<div class="md-slider-wrapper"> | ||
<div class="md-slider-container" | ||
[class.md-slider-sliding]="isSliding" | ||
[class.md-slider-active]="isActive" | ||
[class.md-slider-thumb-label-showing]="thumbLabel"> | ||
<div class="md-slider-track-container"> | ||
<div class="md-slider-track"></div> | ||
<div class="md-slider-track md-slider-track-fill"></div> | ||
<div class="md-slider-tick-container"></div> | ||
<div class="md-slider-last-tick-container"></div> | ||
</div> | ||
<div class="md-slider-thumb-container"> | ||
<div class="md-slider-thumb-position"> | ||
<div class="md-slider-thumb"></div> | ||
<div class="md-slider-thumb-label"> | ||
<span class="md-slider-thumb-label-text">{{value}}</span> | ||
</div> | ||
</div> | ||
<div class="md-slider-track"> | ||
<div class="md-slider-track-fill" [style.flexBasis]="trackFillFlexBasis"></div> | ||
<div class="md-slider-ticks-container" [style.marginLeft]="ticksContainerMarginLeft"> | ||
<div class="md-slider-ticks" [style.marginLeft]="ticksMarginLeft" | ||
[style.backgroundSize]="ticksBackgroundSize"></div> | ||
</div> | ||
<div class="md-slider-thumb-container"> | ||
<div class="md-slider-thumb"></div> | ||
<div class="md-slider-thumb-label"> | ||
<span class="md-slider-thumb-label-text">{{value}}</span> | ||
</div> | ||
</div> | ||
</div> | ||
</div> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On second look I realize that
parseFloat(value)
andNumber(value)
are subtly different in their handling of non-numeric characters. E.g.,We should just use one of these- probably
Number
: