fix(events): fix [emitChanges] not working with ES6-style Polymer ele…

…ments
hotforfeature · May 15, 2017 · 009fdbd · 009fdbd
1 parent 19fbc7d
commit 009fdbd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/events/emit-changes.directive.ts b/src/events/emit-changes.directive.ts
@@ -13,6 +13,9 @@ export class EmitChangesDirective implements OnInit {
     const klass = getCustomElementClass(this.elementRef);
     if (klass) {
       const properties = {};
+      this.copyKeysFrom((<any>klass).properties, properties);
+
+      // Hybrid element properties and behaviors
       this.copyKeysFrom(klass.prototype.properties, properties);
       if (klass.prototype.behaviors) {
         klass.prototype.behaviors.map(behavior => {

diff --git a/src/util/Polymer.ts b/src/util/Polymer.ts
@@ -45,6 +45,10 @@ export interface Polymer {
   (info?: any): any;
   CaseMap: Polymer.CaseMap;
   Path: Polymer.Path;
+  Element: {
+    prototype: HTMLElement;
+    new(): HTMLElement;
+  };
 }
 
 declare global {

diff --git a/src/util/getCustomElementClass.ts b/src/util/getCustomElementClass.ts
@@ -5,9 +5,9 @@ import { getTagName } from './getTagName';
 
 export function getCustomElementClass(elementRef: ElementRef): Function {
   if (elementRef && elementRef.nativeElement) {
-    const htmlElement = Object.getPrototypeOf(elementRef.nativeElement);
-    if (htmlElement && htmlElement.is) {
-      return getCustomElements().get(htmlElement.is);
+    const klass = getCustomElements().get(elementRef.nativeElement.tagName.toLowerCase());
+    if (klass) {
+      return klass;
     } else {
       console.warn(`${getTagName(elementRef)} is not registered`);
     }