Skip to content

Commit bb7b1d0

Browse files
committed
chore: mocing button logic to src/, fixing icon rendering
1 parent 1206d5f commit bb7b1d0

File tree

6 files changed

+22
-35
lines changed

6 files changed

+22
-35
lines changed

anypoint-dropdown-menu-icons.js

Lines changed: 0 additions & 27 deletions
This file was deleted.

anypoint-dropdown-menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import { AnypointDropdownMenu } from './AnypointDropdownMenu.js';
1+
import { AnypointDropdownMenu } from './src/AnypointDropdownMenu.js';
22

33
window.customElements.define('anypoint-dropdown-menu', AnypointDropdownMenu);

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"@anypoint-web-components/anypoint-control-mixins": "^1.0.2",
3434
"@anypoint-web-components/anypoint-dropdown": "^1.0.0",
3535
"@anypoint-web-components/validatable-mixin": "^1.0.2",
36-
"@polymer/iron-iconset-svg": "^3.0.1",
3736
"lit-element": "^2.0.1",
3837
"lit-html": "^1.1.2"
3938
},

AnypointDropdownMenu.js renamed to src/AnypointDropdownMenu.js

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ControlStateMixin } from '@anypoint-web-components/anypoint-control-mix
33
import { ValidatableMixin } from '@anypoint-web-components/validatable-mixin/validatable-mixin.js';
44
import '@anypoint-web-components/anypoint-dropdown/anypoint-dropdown.js';
55
import '@anypoint-web-components/anypoint-button/anypoint-icon-button.js';
6-
import './anypoint-dropdown-menu-icons.js';
6+
import { arrowDown } from './icons.js';
77
/**
88
* Accessible dropdown menu for Anypoint platform.
99
*
@@ -174,6 +174,10 @@ export class AnypointDropdownMenu extends ValidatableMixin(ControlStateMixin(Lit
174174
transition: transform 0.12s ease-in-out;
175175
will-change: transform;
176176
color: var(--anypoint-dropdown-menu-label-color, #616161);
177+
fill: currentColor;
178+
display: inline-block;
179+
width: 24px;
180+
height: 24px;
177181
}
178182
179183
.trigger-icon.opened {
@@ -384,10 +388,9 @@ export class AnypointDropdownMenu extends ValidatableMixin(ControlStateMixin(Lit
384388
tabindex="-1"
385389
aria-label="Toggles dropdown menu"
386390
class="${_triggerClass}"
387-
?compatibility="${compatibility}">
388-
<iron-icon
389-
class="trigger-icon ${opened ? 'opened' : ''}"
390-
icon="anypoint-dropdown-menu:adm-arrow-down"></iron-icon>
391+
?compatibility="${compatibility}"
392+
>
393+
<span class="trigger-icon ${opened ? 'opened' : ''}">${arrowDown}</span>
391394
</anypoint-icon-button>
392395
</div>
393396
@@ -408,7 +411,9 @@ export class AnypointDropdownMenu extends ValidatableMixin(ControlStateMixin(Lit
408411
@overlay-closed="${this._dropdownClosed}"
409412
@overlay-opened="${this._dropdownOpened}"
410413
@select="${this._selectHandler}"
411-
@deselect="${this._deselectHandler}">
414+
@deselect="${this._deselectHandler}"
415+
@activate="${this._activateHandler}"
416+
>
412417
<div slot="dropdown-content" class="dropdown-content">
413418
<slot id="content" name="dropdown-content"></slot>
414419
</div>
@@ -1173,4 +1178,8 @@ export class AnypointDropdownMenu extends ValidatableMixin(ControlStateMixin(Lit
11731178
node.removeAttribute('role');
11741179
}, 1000);
11751180
}
1181+
1182+
_activateHandler() {
1183+
this.close();
1184+
}
11761185
}

src/icons.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { svg } from 'lit-element';
2+
/* eslint-disable max-len */
3+
const iconWrapper = (tpl) => svg`<svg viewBox="0 0 16 16" preserveAspectRatio="xMidYMid meet" focusable="false" style="pointer-events: none; display: block; width: 100%; height: 100%;">${tpl}</svg>`;
4+
5+
export const arrowDown = iconWrapper(svg`<path xmlns="http://www.w3.org/2000/svg" d="M8.002 11.352L3.501 4.924l1.027-.276 3.473 4.96 3.471-4.959 1.027.275-4.497 6.428z"></path>`);

0 commit comments

Comments
 (0)