fix: simplify focus methods by removing unnecessary Promise.resolve calls

deleonio · deleonio · commit 8be7502459a4 · 2026-03-26T15:14:00.000+01:00
diff --git a/packages/components/src/components/accordion/shadow.tsx b/packages/components/src/components/accordion/shadow.tsx
@@ -54,7 +54,7 @@ export class KolAccordion implements AccordionAPI, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.buttonWcRef?.focus);
 	}
 
 	private handleOnClick = (event: MouseEvent) => {
diff --git a/packages/components/src/components/badge/shadow.tsx b/packages/components/src/components/badge/shadow.tsx
@@ -58,7 +58,7 @@ export class KolBadge implements BadgeAPI, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.smartButtonRef?.focus?.()));
+		return delegateFocus(this.host!, this.smartButtonRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/button-link/shadow.tsx b/packages/components/src/components/button-link/shadow.tsx
@@ -63,7 +63,7 @@ export class KolButtonLink implements ButtonLinkProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.buttonWcRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/button/shadow.tsx b/packages/components/src/components/button/shadow.tsx
@@ -55,7 +55,7 @@ export class KolButton implements ButtonProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.buttonWcRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/details/shadow.tsx b/packages/components/src/components/details/shadow.tsx
@@ -40,7 +40,7 @@ export class KolDetails implements DetailsAPI, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.buttonWcRef?.focus);
 	}
 
 	private toggleTimeout?: ReturnType<typeof setTimeout>;
diff --git a/packages/components/src/components/link-button/shadow.tsx b/packages/components/src/components/link-button/shadow.tsx
@@ -46,7 +46,7 @@ export class KolLinkButton implements LinkButtonProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.linkWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.linkWcRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/link/shadow.tsx b/packages/components/src/components/link/shadow.tsx
@@ -42,7 +42,7 @@ export class KolLink implements LinkProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.linkWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.linkWcRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/popover-button/shadow.tsx b/packages/components/src/components/popover-button/shadow.tsx
@@ -65,7 +65,7 @@ export class KolPopoverButton implements PopoverButtonProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.ref?.focus?.()));
+		return delegateFocus(this.host!, this.ref?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/select/shadow.tsx b/packages/components/src/components/select/shadow.tsx
@@ -52,7 +52,7 @@ export class KolSelect implements SelectProps, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.selectWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.selectWcRef?.focus);
 	}
 
 	public render(): JSX.Element {
diff --git a/packages/components/src/components/skip-nav/shadow.tsx b/packages/components/src/components/skip-nav/shadow.tsx
@@ -44,7 +44,7 @@ export class KolSkipNav implements SkipNavAPI {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.firstLinkRef?.focus?.()));
+		return delegateFocus(this.host!, this.firstLinkRef?.focus);
 	}
 
 	/**
diff --git a/packages/components/src/components/split-button/shadow.tsx b/packages/components/src/components/split-button/shadow.tsx
@@ -63,7 +63,7 @@ export class KolSplitButton implements SplitButtonProps /*, SplitButtonAPI*/ {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.primaryButtonWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.primaryButtonWcRef?.focus);
 	}
 
 	private readonly clickButtonHandler = {
diff --git a/packages/components/src/components/tabs/shadow.tsx b/packages/components/src/components/tabs/shadow.tsx
@@ -163,7 +163,7 @@ export class KolTabs implements TabsAPI, FocusableElement {
 	 */
 	@Method()
 	public async focus(): Promise<void> {
-		return delegateFocus(this.host!, () => Promise.resolve(this.currentTabButtonRef?.focus?.()));
+		return delegateFocus(this.host!, this.currentTabButtonRef?.focus);
 	}
 
 	private readonly setCurrentTabButtonRef = (ref?: HTMLKolButtonWcElement) => {
diff --git a/packages/components/src/components/toolbar/shadow.tsx b/packages/components/src/components/toolbar/shadow.tsx
@@ -35,7 +35,7 @@ export class KolToolbar implements ToolbarAPI, FocusableElement {
 	public async focus(): Promise<void> {
 		const firstEnabledItem = this.indexToElement.get(this.currentIndex);
 		if (firstEnabledItem) {
-			return delegateFocus(this.host!, () => Promise.resolve(firstEnabledItem?.focus?.()));
+			return delegateFocus(this.host!, firstEnabledItem?.focus);
 		}
 	}
 
diff --git a/packages/components/src/components/tree/shadow.tsx b/packages/components/src/components/tree/shadow.tsx
@@ -30,7 +30,7 @@ export class KolTree implements TreeProps, FocusableElement {
 	 */
 	@Method()
 	public async focus() {
-		return delegateFocus(this.host!, () => Promise.resolve(this.treeWcRef?.focus?.()));
+		return delegateFocus(this.host!, this.treeWcRef?.focus);
 	}
 
 	public render(): JSX.Element {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ export class KolAccordion implements AccordionAPI, FocusableElement {`
`54`	`54`	`*/`
`55`	`55`	`@Method()`
`56`	`56`	`public async focus(): Promise<void> {`
`57`		`- return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));`
	`57`	`+ return delegateFocus(this.host!, this.buttonWcRef?.focus);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private handleOnClick = (event: MouseEvent) => {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export class KolBadge implements BadgeAPI, FocusableElement {`
`58`	`58`	`*/`
`59`	`59`	`@Method()`
`60`	`60`	`public async focus(): Promise<void> {`
`61`		`- return delegateFocus(this.host!, () => Promise.resolve(this.smartButtonRef?.focus?.()));`
	`61`	`+ return delegateFocus(this.host!, this.smartButtonRef?.focus);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export class KolButtonLink implements ButtonLinkProps, FocusableElement {`
`63`	`63`	`*/`
`64`	`64`	`@Method()`
`65`	`65`	`public async focus(): Promise<void> {`
`66`		`- return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));`
	`66`	`+ return delegateFocus(this.host!, this.buttonWcRef?.focus);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ export class KolButton implements ButtonProps, FocusableElement {`
`55`	`55`	`*/`
`56`	`56`	`@Method()`
`57`	`57`	`public async focus(): Promise<void> {`
`58`		`- return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));`
	`58`	`+ return delegateFocus(this.host!, this.buttonWcRef?.focus);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export class KolDetails implements DetailsAPI, FocusableElement {`
`40`	`40`	`*/`
`41`	`41`	`@Method()`
`42`	`42`	`public async focus(): Promise<void> {`
`43`		`- return delegateFocus(this.host!, () => Promise.resolve(this.buttonWcRef?.focus?.()));`
	`43`	`+ return delegateFocus(this.host!, this.buttonWcRef?.focus);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private toggleTimeout?: ReturnType<typeof setTimeout>;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class KolLinkButton implements LinkButtonProps, FocusableElement {`
`46`	`46`	`*/`
`47`	`47`	`@Method()`
`48`	`48`	`public async focus(): Promise<void> {`
`49`		`- return delegateFocus(this.host!, () => Promise.resolve(this.linkWcRef?.focus?.()));`
	`49`	`+ return delegateFocus(this.host!, this.linkWcRef?.focus);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class KolLink implements LinkProps, FocusableElement {`
`42`	`42`	`*/`
`43`	`43`	`@Method()`
`44`	`44`	`public async focus(): Promise<void> {`
`45`		`- return delegateFocus(this.host!, () => Promise.resolve(this.linkWcRef?.focus?.()));`
	`45`	`+ return delegateFocus(this.host!, this.linkWcRef?.focus);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export class KolPopoverButton implements PopoverButtonProps, FocusableElement {`
`65`	`65`	`*/`
`66`	`66`	`@Method()`
`67`	`67`	`public async focus(): Promise<void> {`
`68`		`- return delegateFocus(this.host!, () => Promise.resolve(this.ref?.focus?.()));`
	`68`	`+ return delegateFocus(this.host!, this.ref?.focus);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export class KolSelect implements SelectProps, FocusableElement {`
`52`	`52`	`*/`
`53`	`53`	`@Method()`
`54`	`54`	`public async focus(): Promise<void> {`
`55`		`- return delegateFocus(this.host!, () => Promise.resolve(this.selectWcRef?.focus?.()));`
	`55`	`+ return delegateFocus(this.host!, this.selectWcRef?.focus);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public render(): JSX.Element {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export class KolSkipNav implements SkipNavAPI {`
`44`	`44`	`*/`
`45`	`45`	`@Method()`
`46`	`46`	`public async focus(): Promise<void> {`
`47`		`- return delegateFocus(this.host!, () => Promise.resolve(this.firstLinkRef?.focus?.()));`
	`47`	`+ return delegateFocus(this.host!, this.firstLinkRef?.focus);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`