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

feat(dropdown): add experimental dropdown component #1269

Merged
merged 7 commits into from
Oct 19, 2018
+591 −29
Merged

feat(dropdown): add experimental dropdown component #1269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
887ea86
feat(dropdown): add experimental dropdown component
tw15egan Oct 16, 2018
84643a5
feat(combo-box): update combo-box, listbox styles. Add animation
tw15egan Oct 17, 2018
9e42883
fix(dropdown): update heights
tw15egan Oct 17, 2018
b915e55
fix(dropdown): small browser tweaks
tw15egan Oct 18, 2018
1c29969
fix(dropdown): unnest selectors
tw15egan Oct 19, 2018
53e790b
Merge branch 'master' into experimental-dropdown
tw15egan Oct 19, 2018
927dc3f
Merge branch 'master' into experimental-dropdown
tw15egan Oct 19, 2018
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
48 changes: 23 additions & 25 deletions src/components/combo-box/combo-box.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
<div class="bx--form-item bx--combo-box bx--list-box{{#if disabled}} bx--list-box--disabled{{/if}}">
<div role="button" class="bx--list-box__field" tabindex="0" aria-label="open menu" aria-expanded="false" aria-haspopup="true"
{{#if disabled}} disabled{{/if}}>
<input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="false" autocomplete="off" value=""
id="downshift-input-2" placeholder="Filter..." {{#if disabled}} disabled{{/if}}>
<div class="bx--list-box__menu-icon">
<svg width="10" height="5" viewBox="0 0 10 5" aria-label="Open menu" name="caret--down" role="img">
<title>Close menu</title>
<path d="M0 0l5 4.998L10 0z" fill-rule="evenodd" />
</svg>
</div>
<div role="button" class="bx--list-box__field" aria-label="open menu" aria-expanded="false" aria-haspopup="true"
{{#if disabled}} disabled{{/if}}> <input class="bx--text-input" role="combobox" aria-autocomplete="list"
aria-expanded="false" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter..." {{#if disabled}}
disabled{{/if}}> <div class="bx--list-box__menu-icon">
<svg width="10" height="5" viewBox="0 0 10 5" aria-label="Open menu" name="caret--down" role="img">
<title>Close menu</title>
<path d="M0 0l5 4.998L10 0z" fill-rule="evenodd" />
</svg>
</div>
</div>
</div>
<div class="bx--form-item bx--combo-box bx--list-box{{#if disabled}} bx--list-box--disabled{{/if}}">
<div role="button" class="bx--list-box__field" tabindex="0" aria-label="close menu" aria-expanded="true" aria-haspopup="true"
{{#if disabled}} disabled{{/if}}>
<input class="bx--text-input" role="combobox" aria-autocomplete="list" aria-expanded="true" autocomplete="off" value="" id="downshift-input-2"
placeholder="Filter..." aria-activedescendant="downshift-1-item-2" {{#if disabled}} disabled{{/if}}>
<div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
<svg width="10" height="5" viewBox="0 0 10 5" aria-label="Open menu" name="caret--down" role="img">
<title>Close menu</title>
<path d="M0 0l5 4.998L10 0z" fill-rule="evenodd" />
</svg>
</div>
</div>
<div class="bx--list-box__menu">
{{#each items}}
<div class="bx--list-box__menu-item{{#if selected}} bx--list-box__menu-item--highlighted{{/if}}" id="{{id}}">{{label}}</div>
{{/each}}
<div role="button" class="bx--list-box__field" aria-label="close menu" aria-expanded="true" aria-haspopup="true"
{{#if disabled}} disabled{{/if}}> <input class="bx--text-input" role="combobox" aria-autocomplete="list"
aria-expanded="true" autocomplete="off" value="" id="downshift-input-2" placeholder="Filter..."
aria-activedescendant="downshift-1-item-2" {{#if disabled}} disabled{{/if}}> <div class="bx--list-box__menu-icon bx--list-box__menu-icon--open">
<svg width="10" height="5" viewBox="0 0 10 5" aria-label="Open menu" name="caret--down" role="img">
<title>Close menu</title>
<path d="M0 0l5 4.998L10 0z" fill-rule="evenodd" />
</svg>
</div>
</div>
<div class="bx--list-box__menu">
{{#each items}}
<div class="bx--list-box__menu-item{{#if selected}} bx--list-box__menu-item--highlighted{{/if}}" id="{{id}}">{{label}}</div>
{{/each}}
</div>
</div>
241 changes: 240 additions & 1 deletion src/components/dropdown/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@import '../../globals/scss/css--typography';
@import '../../globals/scss/layout';

@include exports('dropdown') {
@mixin dropdown {
.#{$prefix}--dropdown {
@include reset;
@include font-family;
Expand Down Expand Up @@ -224,3 +224,242 @@
@include skeleton;
}
}

@mixin dropdown--x {
.#{$prefix}--dropdown {
@include reset;
@include font-family;
@include typescale('zeta');
position: relative;
list-style: none;
display: block;
background-color: $field-01;
border: none;
box-shadow: 0 1px 0 0 $ui-04;
order: 1;
width: 100%;
height: rem(32px);
cursor: pointer;
color: $text-01;
outline: 2px solid transparent;
transition: $transition--base all;

&:focus {
outline: 2px solid $brand-01;
}

&:hover {
background-color: $ui-03;
}
}

.#{$prefix}--dropdown--open:focus {
outline: 1px solid transparent;
box-shadow: none;
}

.#{$prefix}--dropdown--open .#{$prefix}--dropdown-list {
@include layer('overlay');
}

.#{$prefix}--dropdown--light {
background-color: $field-02;
}

.#{$prefix}--dropdown--up .#{$prefix}--dropdown-list {
bottom: 2rem;
}

.#{$prefix}--dropdown__arrow {
fill: $ui-05;
position: absolute;
right: 1rem;
top: rem(13px);
width: rem(10px);
height: rem(5px);
pointer-events: none;
transition: transform $transition--expansion $carbon--standard-easing;
transform-origin: 50% 45%;
}

.#{$prefix}--dropdown[data-value=''] .#{$prefix}--dropdown-text {
color: $text-01;
}

.#{$prefix}--dropdown-text {
height: rem(32px);
padding-top: rem(9px);
padding-bottom: rem(9px);
padding-left: rem(15px);
padding-right: $spacing-2xl;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border: $input-border;
}

.#{$prefix}--dropdown-list {
@include reset;
@include layer('overlay');
@include typescale('zeta');
background-color: $ui-01;
display: flex;
flex-direction: column;
width: 100%;
list-style: none;
position: absolute;
z-index: z('dropdown');
max-height: 0;
transition: max-height $transition--expansion cubic-bezier(0, 0, 0.38, 0.9);
overflow: hidden;
}

.#{$prefix}--dropdown-item {
transition: opacity $transition--expansion cubic-bezier(0, 0, 0.38, 0.9);
opacity: 0;
margin-top: -1px;

&:hover {
background-color: $ui-03;
}

&:first-of-type {
padding-top: 3px;
}
}

.#{$prefix}--dropdown-item:last-of-type .#{$prefix}--dropdown-link {
border-bottom: none;
margin-bottom: 2px;
}

.#{$prefix}--dropdown-link {
display: block;
color: currentColor;
text-decoration: none;
font-weight: normal;
line-height: rem(16px);
padding: $spacing-xs 0;
margin: 0 rem(16px);
border: 1px solid transparent;
border-bottom: 1px solid $ui-03;
text-overflow: ellipsis;
overflow: hidden;

&:focus {
outline: 2px solid $brand-01;
margin: 0 rem(2px);
padding: $spacing-xs rem(14px);
}

&:hover {
color: $text-01;
}
}

.#{$prefix}--dropdown--selected {
display: none;
}

.#{$prefix}--dropdown--open .#{$prefix}--dropdown__arrow {
transform: rotate(-180deg);
}

.#{$prefix}--dropdown--open .#{$prefix}--dropdown-list {
max-height: 15rem;

&:hover {
overflow: auto;
}
}

.#{$prefix}--dropdown--open .#{$prefix}--dropdown-item {
opacity: 1;
}

.#{$prefix}--dropdown--disabled {
opacity: 0.5;
cursor: not-allowed;

&:focus {
outline: none;
}
}

.#{$prefix}--dropdown--auto-width {
width: auto;
max-width: rem(400px);
}

.#{$prefix}--dropdown--inline {
background-color: transparent;
box-shadow: none;
transition-property: none;

&:focus {
outline: none;
box-shadow: none;
}

&:hover {
background-color: transparent;
}
}

.#{$prefix}--dropdown--inline:focus .#{$prefix}--dropdown-text {
outline: 2px solid $brand-01;
}

.#{$prefix}--dropdown--inline[data-value=''] .#{$prefix}--dropdown-text {
color: $text-01;
}

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown-text {
display: inline-block;
padding-right: 1.5rem;
overflow: visible;
color: $text-01;
}

.#{$prefix}--dropdown--inline.#{$prefix}--dropdown--open:focus {
box-shadow: none;
}

.#{$prefix}--dropdown--inline.#{$prefix}--dropdown--open:focus .#{$prefix}--dropdown-list {
@include layer('overlay');
}

.#{$prefix}--dropdown--inline.#{$prefix}--dropdown--open:focus .#{$prefix}--dropdown-text {
outline: none;
}

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown-item:first-of-type {
padding-top: 3px;
}

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown__arrow {
position: relative;
top: -2px;
left: 8px;
right: 0;
bottom: 0;
}

.#{$prefix}--dropdown--inline .#{$prefix}--dropdown-link {
font-weight: normal;
}

// Skeleton State
.#{$prefix}--dropdown-v2.#{$prefix}--skeleton,
.#{$prefix}--dropdown.#{$prefix}--skeleton {
@include skeleton;
}
}

@include exports('dropdown') {
@if feature-flag-enabled('components-x') {
@include dropdown--x;
} @else {
@include dropdown;
}
}
Loading