Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html

Issue 1862213002: Roll third_party/polymer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete appearance_browsertest.js, result of a previous bad merge. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html b/third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html
index 39ea31ad5bccd2531aa4a4f3e9f7efc6b56a3268..e9cd0b4f48573c145af0a2d8fd2ac0b28a054a6f 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-dropdown-menu/paper-dropdown-menu.html
@@ -7,17 +7,19 @@ The complete set of contributors may be found at http://polymer.github.io/CONTRI
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--><html><head><link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-styles/default-theme.html">
-<link rel="import" href="../paper-input/paper-input.html">
-<link rel="import" href="../paper-menu-button/paper-menu-button.html">
-<link rel="import" href="../paper-ripple/paper-ripple.html">
<link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
-<link rel="import" href="../iron-behaviors/iron-control-state.html">
<link rel="import" href="../iron-behaviors/iron-button-state.html">
-<link rel="import" href="../iron-icons/iron-icons.html">
-<link rel="import" href="../iron-icon/iron-icon.html">
+<link rel="import" href="../iron-behaviors/iron-control-state.html">
<link rel="import" href="../iron-form-element-behavior/iron-form-element-behavior.html">
+<link rel="import" href="../iron-icon/iron-icon.html">
<link rel="import" href="../iron-validatable-behavior/iron-validatable-behavior.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-menu-button/paper-menu-button.html">
+<link rel="import" href="../paper-ripple/paper-ripple.html">
+<link rel="import" href="../paper-styles/default-theme.html">
+
+<link rel="import" href="paper-dropdown-menu-icons.html">
+<link rel="import" href="paper-dropdown-menu-shared-styles.html">
<!--
Material design: [Dropdown menus](https://www.google.com/design/spec/components/buttons.html#buttons-dropdown-buttons)
@@ -27,25 +29,31 @@ Material design: [Dropdown menus](https://www.google.com/design/spec/components/
item is displayed in the control. If no item is selected, the `label` is
displayed instead.
-The child element with the class `dropdown-content` will be used as the dropdown
-menu. It could be a `paper-menu` or element that triggers `iron-select` when
-selecting its children.
-
Example:
<paper-dropdown-menu label="Your favourite pastry">
- <paper-menu class="dropdown-content">
+ <paper-listbox class="dropdown-content">
<paper-item>Croissant</paper-item>
<paper-item>Donut</paper-item>
<paper-item>Financier</paper-item>
<paper-item>Madeleine</paper-item>
- </paper-menu>
+ </paper-listbox>
</paper-dropdown-menu>
This example renders a dropdown menu with 4 options.
-Similarly to using `iron-select`, `iron-deselect` events will cause the
-current selection of the `paper-dropdown-menu` to be cleared.
+The child element with the class `dropdown-content` is used as the dropdown
+menu. This can be a [`paper-listbox`](paper-listbox), or any other or
+element that acts like an [`iron-selector`](iron-selector).
+
+Specifically, the menu child must fire an
+[`iron-select`](iron-selector#event-iron-select) event when one of its
+children is selected, and an [`iron-deselect`](iron-selector#event-iron-deselect)
+event when a child is deselected. The selected or deselected item must
+be passed as the event's `detail.item` property.
+
+Applications can listen for the `iron-select` and `iron-deselect` events
+to react when options are selected and deselected.
### Styling
@@ -72,69 +80,7 @@ respectively.
</head><body><dom-module id="paper-dropdown-menu">
<template>
- <style>
- :host {
- display: inline-block;
- position: relative;
- text-align: left;
- cursor: pointer;
-
- /* NOTE(cdata): Both values are needed, since some phones require the
- * value to be `transparent`.
- */
- -webkit-tap-highlight-color: rgba(0,0,0,0);
- -webkit-tap-highlight-color: transparent;
-
- --paper-input-container-input: {
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- max-width: 100%;
- box-sizing: border-box;
- cursor: pointer;
- };
-
- @apply(--paper-dropdown-menu);
- }
-
- :host([disabled]) {
- @apply(--paper-dropdown-menu-disabled);
- }
-
- :host([noink]) paper-ripple {
- display: none;
- }
-
- :host([no-label-float]) paper-ripple {
- top: 8px;
- }
-
- paper-ripple {
- top: 12px;
- left: 0px;
- bottom: 8px;
- right: 0px;
-
- @apply(--paper-dropdown-menu-ripple);
- }
-
- paper-menu-button {
- display: block;
- padding: 0;
-
- @apply(--paper-dropdown-menu-button);
- }
-
- paper-input {
- @apply(--paper-dropdown-menu-input);
- }
-
- iron-icon {
- color: var(--disabled-text-color);
-
- @apply(--paper-dropdown-menu-icon);
- }
- </style>
+ <style include="paper-dropdown-menu-shared-styles"></style>
<!-- this div fulfills an a11y requirement for combobox, do not remove -->
<div role="button"></div>
@@ -143,7 +89,7 @@ respectively.
<paper-ripple></paper-ripple>
<!-- paper-input has type="text" for a11y, do not remove -->
<paper-input type="text" invalid="[[invalid]]" readonly="" disabled="[[disabled]]" value="[[selectedItemLabel]]" placeholder="[[placeholder]]" error-message="[[errorMessage]]" always-float-label="[[alwaysFloatLabel]]" no-label-float="[[noLabelFloat]]" label="[[label]]">
- <iron-icon icon="arrow-drop-down" suffix=""></iron-icon>
+ <iron-icon icon="paper-dropdown-menu:arrow-drop-down" suffix=""></iron-icon>
</paper-input>
</div>
<content id="content" select=".dropdown-content"></content>

Powered by Google App Engine
This is Rietveld 408576698