Skip to content

feat(select): align selected option over trigger #2026

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 1 commit into from
Dec 2, 2016
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
2 changes: 2 additions & 0 deletions src/demo-app/select/select-demo.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<div style="height: 1000px">This div is for testing scrolled selects.</div>
<div class="demo-select">
<md-card>
<md-select placeholder="Food i would like to eat" [formControl]="foodControl">
Expand Down Expand Up @@ -28,3 +29,4 @@
</md-card>

</div>
<div style="height: 500px">This div is for testing scrolled selects.</div>
10 changes: 8 additions & 2 deletions src/demo-app/select/select-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@ export class SelectDemo {

drinks = [
{value: 'coke-0', viewValue: 'Coke'},
{value: 'sprite-1', viewValue: 'Sprite', disabled: true},
{value: 'water-2', viewValue: 'Water'}
{value: 'sprite-1', viewValue: 'Sprite'},
{value: 'water-2', viewValue: 'Water'},
{value: 'pepper-3', viewValue: 'Dr. Pepper'},
{value: 'coffee-4', viewValue: 'Coffee'},
{value: 'tea-5', viewValue: 'Tea'},
{value: 'juice-6', viewValue: 'Orange juice'},
{value: 'wine-7', viewValue: 'Wine'},
{value: 'milk-8', viewValue: 'Milk'},
];

toggleDisabled() {
Expand Down
19 changes: 2 additions & 17 deletions src/lib/select/select-animations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,10 @@ export const transformPlaceholder: AnimationEntryMetadata = trigger('transformPl
* When the panel is removed from the DOM, it simply fades out linearly.
*/
export const transformPanel: AnimationEntryMetadata = trigger('transformPanel', [
state('top-ltr', style({
state('showing', style({
opacity: 1,
width: 'calc(100% + 32px)',
transform: `translate3d(-16px, -9px, 0) scaleY(1)`
})),
state('top-rtl', style({
opacity: 1,
width: 'calc(100% + 32px)',
transform: `translate3d(16px, -9px, 0) scaleY(1)`
})),
state('bottom-ltr', style({
opacity: 1,
width: 'calc(100% + 32px)',
transform: `translate3d(-16px, 8px, 0) scaleY(1)`
})),
state('bottom-rtl', style({
opacity: 1,
width: 'calc(100% + 32px)',
transform: `translate3d(16px, 8px, 0) scaleY(1)`
transform: `translate3d(0,0,0) scaleY(1)`
})),
transition('void => *', [
style({
Expand Down
4 changes: 2 additions & 2 deletions src/lib/select/select.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<template connected-overlay [origin]="origin" [open]="panelOpen" hasBackdrop (backdropClick)="close()"
backdropClass="md-overlay-transparent-backdrop" [positions]="_positions" [width]="_getWidth()"
(positionChange)="_updateTransformOrigin($event)">
<div class="md-select-panel" [@transformPanel]="_getPanelState()" (@transformPanel.done)="_onPanelDone()"
[offsetY]="_offsetY" [offsetX]="_offsetX" (attach)="_setScrollTop()">
<div class="md-select-panel" [@transformPanel]="'showing'" (@transformPanel.done)="_onPanelDone()"
(keydown)="_keyManager.onKeydown($event)" [style.transformOrigin]="_transformOrigin">
<div class="md-select-content" [@fadeInContent]="'showing'">
<ng-content></ng-content>
Expand Down
4 changes: 3 additions & 1 deletion src/lib/select/select.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ $md-select-trigger-height: 30px !default;
$md-select-trigger-min-width: 112px !default;
$md-select-arrow-size: 5px !default;
$md-select-arrow-margin: 4px !default;
$md-select-panel-max-height: 256px !default;

md-select {
display: inline-block;
Expand All @@ -19,6 +20,7 @@ md-select {
min-width: $md-select-trigger-min-width;
cursor: pointer;
position: relative;
box-sizing: border-box;

[aria-disabled='true'] & {
@include md-control-disabled-underline();
Expand Down Expand Up @@ -78,7 +80,7 @@ md-select {
@include md-menu-base();
padding-top: 0;
padding-bottom: 0;
transform-origin: top;
max-height: $md-select-panel-max-height;
}

md-option {
Expand Down
Loading