Add render method for manual renderer invocation, rename _render obse…

…rver to _rendererOrItemChanged
vaadin · Aug 29, 2018 · e9eed1e · e9eed1e
1 parent e7a05d1
commit e9eed1e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/vaadin-combo-box-item.html b/src/vaadin-combo-box-item.html
@@ -107,7 +107,7 @@
 
       static get observers() {
         return [
-          '_render(renderer, index, item.*)',
+          '_rendererOrItemChanged(renderer, index, item.*)',
           '_updateLabel(label, _itemTemplateInstance)',
           '_updateTemplateInstanceVariable("index", index, _itemTemplateInstance)',
           '_updateTemplateInstanceVariable("item", item, _itemTemplateInstance)',
@@ -133,7 +133,20 @@
         }
       }
 
-      _render(renderer, index, item) {
+      _render() {
+        if (!this.renderer) {
+          return;
+        }
+
+        const model = {
+          index: this.index,
+          item: this.item
+        };
+
+        this.renderer(this.$.content, this._comboBox, model);
+      }
+
+      _rendererOrItemChanged(renderer, index, item) {
         if (item === undefined || index === undefined) {
           return;
         }
@@ -144,12 +157,7 @@
 
         if (renderer) {
           this._oldRenderer = renderer;
-          const model = {
-            index: index,
-            item: item.value
-          };
-
-          this.renderer(this.$.content, this._comboBox, model);
+          this._render();
         }
       }
 

diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html
@@ -258,6 +258,14 @@
       });
     }
 
+
+    /**
+     * Manually invoke existing renderer.
+     */
+    render() {
+      this.$.overlay._selector.querySelectorAll('vaadin-combo-box-item').forEach(item => item._render());
+    }
+
     _setTemplateFromNodes(nodes) {
       this._itemTemplate = nodes.filter(node => node.localName && node.localName === 'template')[0] || this._itemTemplate;
     }