refactor: Ensure all setFocus methods return calls to setFocus (#7287)

**Related Issue:** #7270 ## Summary For consistency, components implementing `setFocus` that end up calling `setFocus` on internal, supporting components should return the promise from this method call. - Any component implementing `setFocus` whose method calls `setFocus` or the `focusElement` helper. - depends on #7277
Esri · Jul 7, 2023 · 4d60f54 · 4d60f54
1 parent bbe9201
commit 4d60f54
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 12 deletions.
diff --git a/packages/calcite-components/src/components/action-menu/action-menu.tsx b/packages/calcite-components/src/components/action-menu/action-menu.tsx
@@ -187,7 +187,7 @@ export class ActionMenu implements LoadableComponent {
   async setFocus(): Promise<void> {
     await componentFocusable(this);
 
-    focusElement(this.menuButtonEl);
+    return focusElement(this.menuButtonEl);
   }
 
   // --------------------------------------------------------------------------

diff --git a/packages/calcite-components/src/components/alert/alert.tsx b/packages/calcite-components/src/components/alert/alert.tsx
@@ -387,7 +387,7 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen
     if (!this.closeButton && !alertLinkEl) {
       return;
     } else if (alertLinkEl) {
-      alertLinkEl.setFocus();
+      return alertLinkEl.setFocus();
     } else if (this.closeButton) {
       this.closeButton.focus();
     }

diff --git a/packages/calcite-components/src/components/chip-group/chip-group.tsx b/packages/calcite-components/src/components/chip-group/chip-group.tsx
@@ -184,7 +184,7 @@ export class ChipGroup implements InteractiveComponent {
   async setFocus(): Promise<void> {
     await componentFocusable(this);
     if (!this.disabled) {
-      (this.selectedItems[0] || this.items[0])?.setFocus();
+      return (this.selectedItems[0] || this.items[0])?.setFocus();
     }
   }
 

diff --git a/packages/calcite-components/src/components/color-picker-hex-input/color-picker-hex-input.tsx b/packages/calcite-components/src/components/color-picker-hex-input/color-picker-hex-input.tsx
@@ -367,7 +367,7 @@ export class ColorPickerHexInput implements LoadableComponent {
   async setFocus(): Promise<void> {
     await componentFocusable(this);
 
-    focusElement(this.hexInputNode);
+    return focusElement(this.hexInputNode);
   }
 
   //--------------------------------------------------------------------------

diff --git a/packages/calcite-components/src/components/list/list.tsx b/packages/calcite-components/src/components/list/list.tsx
@@ -269,7 +269,7 @@ export class List implements InteractiveComponent, LoadableComponent {
   @Method()
   async setFocus(): Promise<void> {
     await componentFocusable(this);
-    this.enabledListItems.find((listItem) => listItem.active)?.setFocus();
+    return this.enabledListItems.find((listItem) => listItem.active)?.setFocus();
   }
 
   // --------------------------------------------------------------------------

diff --git a/packages/calcite-components/src/components/navigation/navigation.tsx b/packages/calcite-components/src/components/navigation/navigation.tsx
@@ -105,7 +105,7 @@ export class CalciteNavigation implements LoadableComponent {
   @Method()
   async setFocus(): Promise<void> {
     await componentFocusable(this);
-    await this.navigationActionEl?.setFocus();
+    return this.navigationActionEl?.setFocus();
   }
 
   //--------------------------------------------------------------------------

diff --git a/packages/calcite-components/src/components/notice/notice.tsx b/packages/calcite-components/src/components/notice/notice.tsx
@@ -222,7 +222,7 @@ export class Notice
       return;
     }
     if (noticeLinkEl) {
-      noticeLinkEl.setFocus();
+      return noticeLinkEl.setFocus();
     } else if (this.closeButton) {
       this.closeButton.focus();
     }

diff --git a/packages/calcite-components/src/components/radio-button-group/radio-button-group.tsx b/packages/calcite-components/src/components/radio-button-group/radio-button-group.tsx
@@ -169,11 +169,10 @@ export class RadioButtonGroup implements LoadableComponent {
   async setFocus(): Promise<void> {
     await componentFocusable(this);
     if (this.selectedItem && !this.selectedItem.disabled) {
-      this.selectedItem.setFocus();
-      return;
+      return this.selectedItem.setFocus();
     }
     if (this.radioButtons.length > 0) {
-      this.getFocusableRadioButton()?.setFocus();
+      return this.getFocusableRadioButton()?.setFocus();
     }
   }
 

diff --git a/packages/calcite-components/src/components/tile-select/tile-select.tsx b/packages/calcite-components/src/components/tile-select/tile-select.tsx
@@ -149,7 +149,7 @@ export class TileSelect implements InteractiveComponent, LoadableComponent {
   async setFocus(): Promise<void> {
     await componentFocusable(this);
 
-    this.input?.setFocus();
+    return this.input?.setFocus();
   }
 
   //--------------------------------------------------------------------------

diff --git a/packages/calcite-components/src/components/value-list-item/value-list-item.tsx b/packages/calcite-components/src/components/value-list-item/value-list-item.tsx
@@ -177,7 +177,7 @@ export class ValueListItem
   async setFocus(): Promise<void> {
     await componentFocusable(this);
 
-    this.pickListItem?.setFocus();
+    return this.pickListItem?.setFocus();
   }
 
   // --------------------------------------------------------------------------