Skip to content

Commit 1b7ab1e

Browse files
committed
fix(select): fix menu close animation
1 parent 1e86066 commit 1b7ab1e

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/lib/select/select-animations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ export const transformPanel: AnimationEntryMetadata = trigger('transformPanel',
5858
width: '100%',
5959
transform: `translate3d(0, 0, 0) scaleY(0)`
6060
}),
61-
animate(`150ms cubic-bezier(0.55, 0, 0.55, 0.2)`)
61+
animate(`150ms cubic-bezier(0.25, 0.8, 0.25, 1)`)
6262
]),
6363
transition('* => void', [
64-
animate('250ms linear', style({opacity: 0}))
64+
animate('250ms 100ms linear', style({opacity: 0}))
6565
])
6666
]);
6767

src/lib/select/select.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ md-select {
1616
height: $md-select-trigger-height;
1717
min-width: $md-select-trigger-min-width;
1818
cursor: pointer;
19+
user-select: none;
1920
}
2021

2122
.md-select-placeholder {

src/lib/select/select.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ export class MdSelect implements AfterContentInit, OnDestroy {
108108
/** Closes the overlay panel. */
109109
close(): void {
110110
this._panelOpen = false;
111+
this._focusHost();
111112
}
112113

113114
/** Whether or not the overlay panel is open. */
@@ -158,7 +159,6 @@ export class MdSelect implements AfterContentInit, OnDestroy {
158159
this._focusCorrectOption();
159160
this.onOpen.emit();
160161
} else {
161-
this._focusHost();
162162
this.onClose.emit();
163163
}
164164
}

0 commit comments

Comments
 (0)