Merge pull request #770 from HelixDesignSystem/surf-2077-angular-lifecycle-patch

100stacks · web-flow · commit ee9c9a7f65a1 · 2020-10-05T11:07:28.000-05:00
feat(tabset): accommodate angular lifecycle
diff --git a/src/elements/hx-tabset/index.js b/src/elements/hx-tabset/index.js
@@ -26,7 +26,6 @@ export class HXTabsetElement extends HXElement {
     }
 
     $onCreate () {
-        this.$defaultAttribute('id', `tabset-${generateId()}`);
         this.$onConnect = defer(this.$onConnect);
         this._onKeyUp = this._onKeyUp.bind(this);
     }
@@ -106,6 +105,8 @@ export class HXTabsetElement extends HXElement {
      * @type {HXTabElement[]}
      */
     get tabs () {
+        this.$defaultAttribute('id', `tabset-${generateId()}`);  // accommodate Angular lifecycle
+
         let _selector = `#${this.id} > hx-tablist > hx-tab`;
         return Array.from(this.querySelectorAll(_selector));
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ export class HXTabsetElement extends HXElement {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`$onCreate () {`
`29`		- this.$defaultAttribute('id', `tabset-${generateId()}`);
`30`	`29`	`this.$onConnect = defer(this.$onConnect);`
`31`	`30`	`this._onKeyUp = this._onKeyUp.bind(this);`
`32`	`31`	`}`
`@@ -106,6 +105,8 @@ export class HXTabsetElement extends HXElement {`
`106`	`105`	`* @type {HXTabElement[]}`
`107`	`106`	`*/`
`108`	`107`	`get tabs () {`
	`108`	+ this.$defaultAttribute('id', `tabset-${generateId()}`); // accommodate Angular lifecycle
	`109`	`+`
`109`	`110`	let _selector = `#${this.id} > hx-tablist > hx-tab`;
`110`	`111`	`return Array.from(this.querySelectorAll(_selector));`
`111`	`112`	`}`