Skip to content

Commit 4d60f54

Browse files
authored
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
1 parent bbe9201 commit 4d60f54

File tree

10 files changed

+11
-12
lines changed

10 files changed

+11
-12
lines changed

packages/calcite-components/src/components/action-menu/action-menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ export class ActionMenu implements LoadableComponent {
187187
async setFocus(): Promise<void> {
188188
await componentFocusable(this);
189189

190-
focusElement(this.menuButtonEl);
190+
return focusElement(this.menuButtonEl);
191191
}
192192

193193
// --------------------------------------------------------------------------

packages/calcite-components/src/components/alert/alert.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen
387387
if (!this.closeButton && !alertLinkEl) {
388388
return;
389389
} else if (alertLinkEl) {
390-
alertLinkEl.setFocus();
390+
return alertLinkEl.setFocus();
391391
} else if (this.closeButton) {
392392
this.closeButton.focus();
393393
}

packages/calcite-components/src/components/chip-group/chip-group.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export class ChipGroup implements InteractiveComponent {
184184
async setFocus(): Promise<void> {
185185
await componentFocusable(this);
186186
if (!this.disabled) {
187-
(this.selectedItems[0] || this.items[0])?.setFocus();
187+
return (this.selectedItems[0] || this.items[0])?.setFocus();
188188
}
189189
}
190190

packages/calcite-components/src/components/color-picker-hex-input/color-picker-hex-input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ export class ColorPickerHexInput implements LoadableComponent {
367367
async setFocus(): Promise<void> {
368368
await componentFocusable(this);
369369

370-
focusElement(this.hexInputNode);
370+
return focusElement(this.hexInputNode);
371371
}
372372

373373
//--------------------------------------------------------------------------

packages/calcite-components/src/components/list/list.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ export class List implements InteractiveComponent, LoadableComponent {
269269
@Method()
270270
async setFocus(): Promise<void> {
271271
await componentFocusable(this);
272-
this.enabledListItems.find((listItem) => listItem.active)?.setFocus();
272+
return this.enabledListItems.find((listItem) => listItem.active)?.setFocus();
273273
}
274274

275275
// --------------------------------------------------------------------------

packages/calcite-components/src/components/navigation/navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class CalciteNavigation implements LoadableComponent {
105105
@Method()
106106
async setFocus(): Promise<void> {
107107
await componentFocusable(this);
108-
await this.navigationActionEl?.setFocus();
108+
return this.navigationActionEl?.setFocus();
109109
}
110110

111111
//--------------------------------------------------------------------------

packages/calcite-components/src/components/notice/notice.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export class Notice
222222
return;
223223
}
224224
if (noticeLinkEl) {
225-
noticeLinkEl.setFocus();
225+
return noticeLinkEl.setFocus();
226226
} else if (this.closeButton) {
227227
this.closeButton.focus();
228228
}

packages/calcite-components/src/components/radio-button-group/radio-button-group.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,10 @@ export class RadioButtonGroup implements LoadableComponent {
169169
async setFocus(): Promise<void> {
170170
await componentFocusable(this);
171171
if (this.selectedItem && !this.selectedItem.disabled) {
172-
this.selectedItem.setFocus();
173-
return;
172+
return this.selectedItem.setFocus();
174173
}
175174
if (this.radioButtons.length > 0) {
176-
this.getFocusableRadioButton()?.setFocus();
175+
return this.getFocusableRadioButton()?.setFocus();
177176
}
178177
}
179178

packages/calcite-components/src/components/tile-select/tile-select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export class TileSelect implements InteractiveComponent, LoadableComponent {
149149
async setFocus(): Promise<void> {
150150
await componentFocusable(this);
151151

152-
this.input?.setFocus();
152+
return this.input?.setFocus();
153153
}
154154

155155
//--------------------------------------------------------------------------

packages/calcite-components/src/components/value-list-item/value-list-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export class ValueListItem
177177
async setFocus(): Promise<void> {
178178
await componentFocusable(this);
179179

180-
this.pickListItem?.setFocus();
180+
return this.pickListItem?.setFocus();
181181
}
182182

183183
// --------------------------------------------------------------------------

0 commit comments

Comments
 (0)