feat!: move search button to light dom

vaadin-component-factory · Oct 28, 2024 · 45085b3 · 45085b3
1 parent 9fe64b4
commit 45085b3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vaadin-component-factory/vcf-lookup-field",
-  "version": "24.0.0",
+  "version": "5.0.0",
   "description": "Vaadin Lookup field component",
   "main": "theme/lumo/vcf-lookup-field.js",
   "author": "Vaadin Ltd",

diff --git a/src/vcf-lookup-field.d.ts b/src/vcf-lookup-field.d.ts
@@ -158,6 +158,7 @@ export class LookupField extends LookupField_base {
     _filterValue: any;
     _forceFooterRerender: boolean;
     _forceHeaderRerender: boolean;
+    _createSearchButton(): void;
     focus(): void;
     __onSelectItem(event: any): void;
     __onSelectChanged(event: any): void;

diff --git a/src/vcf-lookup-field.d.ts.map b/src/vcf-lookup-field.d.ts.map
diff --git a/src/vcf-lookup-field.js b/src/vcf-lookup-field.js
@@ -60,7 +60,7 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
           width: 100%;
           min-width: 0;
         }
-        vaadin-button.search-button {
+        ::slotted(vaadin-button.search-button) {
           margin-left: var(--lumo-space-xs);
           flex: 0 0 auto;
         }
@@ -70,24 +70,24 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
         :host([theme~='integrated']) vaadin-combo-box::part(input-field) {
           border-radius: var(--lumo-border-radius-s) 0 0 var(--lumo-border-radius-s);
         }
-        :host([theme~='integrated']) .search-button {
+        :host([theme~='integrated']) ::slotted(.search-button) {
           margin-left: 0;
           border-radius: 0 var(--lumo-border-radius-s) var(--lumo-border-radius-s) 0;
         }
         :host([theme~='full-width']) vaadin-combo-box::part(input-field) {
           margin-inline-end: var(--lumo-size-m);
         }
-        :host([theme~='full-width']) vaadin-button.search-button {
+        :host([theme~='full-width']) ::slotted(vaadin-button.search-button) {
           margin-inline-start: calc(var(--lumo-space-xs) + (var(--lumo-size-m) * -1));
         }
-        :host([theme~='integrated'][theme~='full-width']) vaadin-button.search-button {
+        :host([theme~='integrated'][theme~='full-width']) ::slotted(vaadin-button.search-button) {
           margin-inline-start: calc((var(--lumo-size-m) * -1));
         }
-        :host([readonly]) vaadin-button.search-button {
+        :host([readonly]) ::slotted(vaadin-button.search-button) {
           background-color: transparent;
           border: 1px dashed var(--lumo-contrast-30pct);
         }
-        :host([invalid]) vaadin-button.search-button {
+        :host([invalid]) ::slotted(vaadin-button.search-button) {
           color: var(--lumo-error-text-color);
           background-color: var(--lumo-error-color-10pct);
         }
@@ -106,17 +106,7 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
           ></vaadin-combo-box>
         </slot>
 
-        <vaadin-button
-          id="searchButton"
-          class="search-button"
-          theme="icon"
-          on-click="__open"
-          on-keydown="__searchKeydown"
-          aria-label="[[i18n.searcharialabel]]"
-          disabled$="[[buttondisabled]]"
-        >
-          <vaadin-icon icon="vaadin:search"></vaadin-icon>
-        </vaadin-button>
+        <slot name="search-button-slot"></slot>
 
         <vaadin-dialog
           aria-label="lookup-grid"
@@ -201,6 +191,9 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
 
   ready() {
     super.ready();
+
+    this._createSearchButton();
+
     if (this.$.gridSlot.assignedNodes()[0]) {
       this._grod = this.$.gridSlot.assignedNodes()[0];
     } else {
@@ -307,6 +300,30 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
     });
   }
 
+  _createSearchButton() {
+    const icon = document.createElement('vaadin-icon');
+    icon.setAttribute('icon', 'vaadin:search');
+    icon.setAttribute('slot', 'prefix');
+
+    const button = document.createElement('vaadin-button');
+    button.setAttribute('slot', 'search-button-slot');
+    button.setAttribute('id', 'searchButton');
+    button.classList.add('search-button');
+    button.setAttribute('theme', 'icon');
+    button.setAttribute('aria-label', this.i18n.searcharialabel);
+    button.disabled = this.buttondisabled;
+
+    button.addEventListener('click', () => {
+      this.__open();
+    });
+    button.addEventListener('keydown', () => {
+      this.__searchKeydown();
+    });
+
+    button.appendChild(icon);
+    this.appendChild(button);
+  }
+
   focus() {
     setTimeout(() => {
       this._field.focusElement.focus();
@@ -535,7 +552,7 @@ export class LookupField extends ElementMixin(ThemableMixin(PolymerElement)) {
   }
 
   static get version() {
-    return '24.0.0';
+    return '5.0.0';
   }
 
   static get properties() {