fix(ld-select): remove unnecessary settimeout for autofocus

emdgroup-liquid · Nov 30, 2021 · 9fcd2c6 · 9fcd2c6
1 parent ebb43ff
commit 9fcd2c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 26 deletions.
diff --git a/src/liquid/components/ld-select/ld-select.tsx b/src/liquid/components/ld-select/ld-select.tsx
@@ -884,11 +884,10 @@ export class LdSelect implements InnerFocusable {
     setTimeout(() => {
       this.initObserver()
       this.initialized = true
-
-      if (this.autofocus) {
-        this.focusInner()
-      }
     })
+    if (this.autofocus) {
+      this.focusInner()
+    }
   }
 
   componentDidUpdate() {

diff --git a/src/liquid/components/ld-select/test/ld-select.spec.ts b/src/liquid/components/ld-select/test/ld-select.spec.ts
@@ -2008,26 +2008,4 @@ describe('ld-select', () => {
     await page.root.focusInner()
     expect((btnTrigger as HTMLElement).focus).toHaveBeenCalledTimes(1)
   })
-
-  it('auto-focuses', async () => {
-    const page = await newSpecPage({
-      components,
-      html: `
-        <ld-select autofocus placeholder="Pick a fruit" name="fruit" popper-class="ld-select__popper--fruits">
-          <ld-option value="apple">Apple</ld-option>
-          <ld-option value="banana">Banana</ld-option>
-        </ld-select>
-      `,
-    })
-
-    const ldSelect = page.root
-    const btnTrigger = ldSelect.shadowRoot.querySelector(
-      '.ld-select__btn-trigger'
-    )
-    ;(btnTrigger as HTMLElement).focus = jest.fn()
-
-    await page.waitForChanges()
-    jest.advanceTimersByTime(0)
-    expect((btnTrigger as HTMLElement).focus).toHaveBeenCalledTimes(1)
-  })
 })