Merge pull request #57 from jonathannewman/maint/main/avoid-selecting-when-no-specification

(maint) Limit scope and timing of selection

Author: jonathannewman

addon/components/ivy-tabs-tab.js

@@ -56,7 +56,9 @@ export default class IvyTabsTabComponent extends Component {
   @action
   handleClick(event) {
     event.preventDefault();
-    this.select();
+    if (this.args.tabList.isRegistered(this)) {
+      this.select();
+    }
   }
 
   get href() {
@@ -116,7 +118,7 @@ export default class IvyTabsTabComponent extends Component {
 
   @action
   focus() {
-    let element = document.getElementById(this.id);
+    const element = document.getElementById(this.id);
     if (element) {
       element.focus();
     }

addon/components/ivy-tabs-tablist.js

@@ -24,11 +24,6 @@ let instanceCount = 0;
 export default class IvyTabsTabListComponent extends Component {
   registerWithTabsContainer = modifier(() => {
     this.args.tabsContainer.registerTabList(this);
-    // if none of the tabs are selected, try to select one
-    let selected = this.tabs.find((tab) => tab.isSelected);
-    if (!selected && this.tabs.length > 0) {
-      this.selectTab();
-    }
     return () => {
       this.args.tabsContainer.unregisterTabList(this);
     };
@@ -125,9 +120,14 @@ export default class IvyTabsTabListComponent extends Component {
    */
   @action
   registerTab(tab) {
+    this.tabs = this.tabs.concat(tab);
+    // run this later so that all the tabs are registered before we try to select one
     runTask(this, () => {
-      this.tabs = this.tabs.concat(tab);
-      this.selectTab();
+      // if none of the tabs are selected, try to select one
+      let selected = this.tabs.find((tab) => tab.isSelected);
+      if (!selected && this.tabs.length > 0) {
+        this.selectTab();
+      }
     });
   }
 
@@ -208,8 +208,7 @@ export default class IvyTabsTabListComponent extends Component {
   @action
   selectTab() {
     const selection = this.selection;
-
-    if (isNone(selection) || this.tabs.length === 1) {
+    if (isNone(selection)) {
       this.selectTabByIndex(0);
     } else {
       this.selectTabByModel(selection);
@@ -225,20 +224,18 @@ export default class IvyTabsTabListComponent extends Component {
   selectTabByIndex(index) {
     const tab = this.tabs[index];
 
-    if (tab && tab.isSelected === false) {
-      runTask(tab, () => {
-        tab.select();
-      });
+    if (tab) {
+      tab.select();
     }
   }
 
   selectTabByModel(model) {
     const tab = this.tabs.find((element) => element.model === model);
 
     if (tab) {
-      runTask(tab, () => {
-        tab.select();
-      });
+      tab.select();
+    } else {
+      this.selectTabByIndex(0);
     }
   }
 
@@ -279,4 +276,8 @@ export default class IvyTabsTabListComponent extends Component {
       return element !== tab;
     });
   }
+
+  isRegistered(tab) {
+    return this.tabs.includes(tab);
+  }
 }