@vaadin/select 23.1.0-alpha1 → 23.1.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/select",
-  "version": "23.1.0-alpha1",
+  "version": "23.1.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -34,24 +34,24 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.2.0",
-    "@vaadin/button": "23.1.0-alpha1",
-    "@vaadin/component-base": "23.1.0-alpha1",
-    "@vaadin/field-base": "23.1.0-alpha1",
-    "@vaadin/input-container": "23.1.0-alpha1",
-    "@vaadin/item": "23.1.0-alpha1",
-    "@vaadin/list-box": "23.1.0-alpha1",
-    "@vaadin/vaadin-list-mixin": "23.1.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "23.1.0-alpha1",
-    "@vaadin/vaadin-material-styles": "23.1.0-alpha1",
-    "@vaadin/vaadin-overlay": "23.1.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "23.1.0-alpha1"
+    "@vaadin/button": "23.1.0-alpha2",
+    "@vaadin/component-base": "23.1.0-alpha2",
+    "@vaadin/field-base": "23.1.0-alpha2",
+    "@vaadin/input-container": "23.1.0-alpha2",
+    "@vaadin/item": "23.1.0-alpha2",
+    "@vaadin/list-box": "23.1.0-alpha2",
+    "@vaadin/vaadin-list-mixin": "23.1.0-alpha2",
+    "@vaadin/vaadin-lumo-styles": "23.1.0-alpha2",
+    "@vaadin/vaadin-material-styles": "23.1.0-alpha2",
+    "@vaadin/vaadin-overlay": "23.1.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "23.1.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "23.1.0-alpha1",
+    "@vaadin/polymer-legacy-adapter": "23.1.0-alpha2",
     "@vaadin/testing-helpers": "^0.3.2",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "5d0cdee069f866037c507265fafb4d0476795333"
+  "gitHead": "6842dcb8b163d4512fae8d3d12a6559077a4aee6"
 }

package/src/vaadin-select-value-button.js

@@ -3,54 +3,75 @@
  * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { Button } from '@vaadin/button/src/vaadin-button.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-select-value-button',
-  css`
-    :host {
-      margin: 0;
-      min-width: 0;
-      width: 0;
-      height: auto;
-    }
-
-    ::slotted(:not([slot])) {
-      padding-left: 0;
-      padding-right: 0;
-      flex: auto;
-    }
-
-    /* placeholder styles */
-    ::slotted(:not([slot]):not([selected])) {
-      line-height: 1;
-    }
-
-    /* TODO: unsupported selector */
-    .vaadin-button-container {
-      text-align: inherit;
-    }
-
-    [part='label'] {
-      width: 100%;
-      padding: 0;
-      line-height: inherit;
-    }
-  `,
-  { moduleId: 'vaadin-select-value-button-styles' }
-);
+import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
+import { ButtonMixin } from '@vaadin/button/src/vaadin-button-mixin.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
  * An element used internally by `<vaadin-select>`. Not intended to be used separately.
  *
- * @extends Button
+ * @extends HTMLElement
+ * @mixes ButtonMixin
+ * @mixes ThemableMixin
  * @protected
  */
-class SelectValueButton extends Button {
+class SelectValueButton extends ButtonMixin(ThemableMixin(PolymerElement)) {
   static get is() {
     return 'vaadin-select-value-button';
   }
+
+  static get template() {
+    return html`
+      <style>
+        :host {
+          display: inline-block;
+          position: relative;
+          outline: none;
+          white-space: nowrap;
+          -webkit-user-select: none;
+          -moz-user-select: none;
+          user-select: none;
+          min-width: 0;
+          width: 0;
+        }
+
+        ::slotted(*) {
+          padding-left: 0;
+          padding-right: 0;
+          flex: auto;
+        }
+
+        /* placeholder styles */
+        ::slotted(*:not([selected])) {
+          line-height: 1;
+        }
+
+        .vaadin-button-container {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+          text-align: inherit;
+          width: 100%;
+          height: 100%;
+          min-height: inherit;
+          text-shadow: inherit;
+        }
+
+        [part='label'] {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          width: 100%;
+          line-height: inherit;
+        }
+      </style>
+      <div class="vaadin-button-container">
+        <span part="label">
+          <slot></slot>
+        </span>
+      </div>
+    `;
+  }
 }
 
 customElements.define(SelectValueButton.is, SelectValueButton);

package/src/vaadin-select.js

@@ -142,7 +142,6 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
       <style>
         ::slotted([slot='value']) {
           flex-grow: 1;
-          background-color: transparent;
         }
       </style>
 

package/theme/lumo/vaadin-select-styles.js

@@ -48,7 +48,7 @@ const select = css`
   }
 
   :host([theme~='small']) [part='input-field'] ::slotted([slot='value']) {
-    --lumo-button-size: var(--lumo-size-s);
+    --_lumo-selected-item-height: var(--lumo-size-s);
     --_lumo-selected-item-padding: 0;
   }
 `;
@@ -59,26 +59,20 @@ registerStyles(
   'vaadin-select-value-button',
   css`
     :host {
+      font-family: var(--lumo-font-family);
+      font-size: var(--lumo-font-size-m);
       padding: 0 0.25em;
+      --_lumo-selected-item-height: var(--lumo-size-m);
       --_lumo-selected-item-padding: 0.5em;
     }
 
-    :host::before,
-    :host::after {
-      display: none;
-    }
-
-    :host([focus-ring]) {
-      box-shadow: none;
-    }
-
-    ::slotted(:not([slot])) {
-      min-height: var(--lumo-button-size);
+    ::slotted(*) {
+      min-height: var(--_lumo-selected-item-height);
       padding-top: var(--_lumo-selected-item-padding);
       padding-bottom: var(--_lumo-selected-item-padding);
     }
 
-    ::slotted(:not([slot]):hover) {
+    ::slotted(*:hover) {
       background-color: transparent;
     }
   `,

package/theme/lumo/vaadin-select.js

@@ -3,7 +3,6 @@
  * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import '@vaadin/button/theme/lumo/vaadin-button.js';
 import '@vaadin/input-container/theme/lumo/vaadin-input-container.js';
 import '@vaadin/item/theme/lumo/vaadin-item.js';
 import '@vaadin/list-box/theme/lumo/vaadin-list-box.js';

package/theme/material/vaadin-select-styles.js

@@ -49,17 +49,12 @@ registerStyles(
       text-transform: none;
     }
 
-    :host::before,
-    :host::after {
-      display: none;
-    }
-
-    ::slotted(:not([slot])) {
+    ::slotted(*) {
       font: inherit;
       padding: 4px 0;
     }
 
-    ::slotted(:not([slot]):hover) {
+    ::slotted(*:hover) {
       background-color: transparent;
     }
   `,

package/theme/material/vaadin-select.js

@@ -3,7 +3,6 @@
  * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import '@vaadin/button/theme/material/vaadin-button.js';
 import '@vaadin/input-container/theme/material/vaadin-input-container.js';
 import '@vaadin/item/theme/material/vaadin-item.js';
 import '@vaadin/list-box/theme/material/vaadin-list-box.js';