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

Jump to bottom

fix(sort): reverse directions and better animation #6802

Merged
merged 4 commits into from
Sep 18, 2017
Merged

fix(sort): reverse directions and better animation #6802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39882cf
fix(sort): directions are reversed
andrewseguin Sep 1, 2017
6ca5376
different animation type, so material
andrewseguin Sep 5, 2017
3d44462
add newline
andrewseguin Sep 5, 2017
f040a0e
make lint happy
andrewseguin Sep 5, 2017
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
11 changes: 6 additions & 5 deletions src/lib/sort/sort-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
<ng-content></ng-content>
</button>

<div *ngIf="_isSorted()"
class="mat-sort-header-arrow"
[@indicatorRotate]="_sort.direction">
<div *ngIf="_isSorted()" class="mat-sort-header-arrow">
<div class="mat-sort-header-stem"></div>
<div class="mat-sort-header-pointer-left"></div>
<div class="mat-sort-header-pointer-right"></div>
<div class="mat-sort-header-indicator" [@indicator]="_sort.direction" >
<div class="mat-sort-header-pointer-left" [@leftPointer]="_sort.direction"></div>
<div class="mat-sort-header-pointer-right" [@rightPointer]="_sort.direction"></div>
<div class="mat-sort-header-pointer-middle"></div>
</div>
</div>
</div>

Expand Down
48 changes: 35 additions & 13 deletions src/lib/sort/sort-header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
$mat-sort-header-arrow-margin: 6px;
$mat-sort-header-arrow-container-size: 10px;
$mat-sort-header-arrow-pointer-length: 8px;
$mat-sort-header-arrow-container-size: 12px;
$mat-sort-header-arrow-stem-size: 10px;
$mat-sort-header-arrow-pointer-length: 6px;
$mat-sort-header-arrow-thickness: 2px;
$mat-sort-header-arrow-transition: 225ms cubic-bezier(0.4, 0, 0.2, 1);

.mat-sort-header-container {
display: flex;
Expand All @@ -27,9 +29,9 @@ $mat-sort-header-arrow-thickness: 2px;
.mat-sort-header-arrow {
height: $mat-sort-header-arrow-container-size;
width: $mat-sort-header-arrow-container-size;
position: relative;
margin: 0 0 0 $mat-sort-header-arrow-margin;
transform: rotate(45deg);
position: relative;
display: flex;

.mat-sort-header-position-before & {
margin: 0 $mat-sort-header-arrow-margin 0 0;
Expand All @@ -38,26 +40,46 @@ $mat-sort-header-arrow-thickness: 2px;

.mat-sort-header-stem {
background: currentColor;
transform: rotate(135deg);
height: $mat-sort-header-arrow-container-size;
height: $mat-sort-header-arrow-stem-size;
width: $mat-sort-header-arrow-thickness;
margin: auto;
display: flex;
align-items: center;
}

.mat-sort-header-pointer-left {
background: currentColor;
width: $mat-sort-header-arrow-thickness;
height: $mat-sort-header-arrow-pointer-length;
.mat-sort-header-indicator {
width: 100%;
height: $mat-sort-header-arrow-thickness;
display: flex;
align-items: center;
position: absolute;
bottom: 0;
right: 0;
top: 0;
transition: $mat-sort-header-arrow-transition;
}

.mat-sort-header-pointer-middle {
margin: auto;
height: $mat-sort-header-arrow-thickness;
width: $mat-sort-header-arrow-thickness;
background: currentColor;
transform: rotate(45deg);
}

.mat-sort-header-pointer-left,
.mat-sort-header-pointer-right {
background: currentColor;
width: $mat-sort-header-arrow-pointer-length;
height: $mat-sort-header-arrow-thickness;
transition: $mat-sort-header-arrow-transition;
position: absolute;
bottom: 0;
}

.mat-sort-header-pointer-left {
transform-origin: right;
left: 0;
}

.mat-sort-header-pointer-right {
transform-origin: left;
right: 0;
}
20 changes: 17 additions & 3 deletions src/lib/sort/sort-header.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ import {merge} from 'rxjs/observable/merge';
import {MdSort, MdSortable} from './sort';
import {MdSortHeaderIntl} from './sort-header-intl';
import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
import {AnimationCurves, AnimationDurations} from '../core/animation/animation';

const SORT_ANIMATION_TRANSITION =
AnimationDurations.ENTERING + ' ' + AnimationCurves.STANDARD_CURVE;

/**
* Applies sorting behavior (click to change sort) and styles to an element, including an
Expand All @@ -51,10 +54,21 @@ import {getMdSortHeaderNotContainedWithinMdSortError} from './sort-errors';
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
animations: [
trigger('indicatorRotate', [
trigger('indicator', [
state('asc', style({transform: 'translateY(0px)'})),
// 10px is the height of the sort indicator, minus the width of the pointers
state('desc', style({transform: 'translateY(10px)'})),
transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
]),
trigger('leftPointer', [
state('asc', style({transform: 'rotate(-45deg)'})),
state('desc', style({transform: 'rotate(45deg)'})),
transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
]),
trigger('rightPointer', [
state('asc', style({transform: 'rotate(45deg)'})),
state('desc', style({transform: 'rotate(225deg)'})),
transition('asc <=> desc', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)'))
state('desc', style({transform: 'rotate(-45deg)'})),
transition('asc <=> desc', animate(SORT_ANIMATION_TRANSITION))
])
]
})
Expand Down