Skip to content

Commit

Permalink
fix(combobox): fix focus on option select
Browse files Browse the repository at this point in the history
  • Loading branch information
danr-za committed Jun 10, 2022
1 parent aa0056f commit 19571f7
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 65 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/headlessui-fork.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/markdown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 12 additions & 13 deletions packages/@headlessui-react/src/components/combobox/combobox.tsx
@@ -1,19 +1,17 @@
import React, {
Fragment,
createContext,
createRef,
useCallback,
useContext,
useMemo,
useReducer,
useRef,

// Types
ElementType,
Fragment,
KeyboardEvent as ReactKeyboardEvent,
MouseEvent as ReactMouseEvent,
MutableRefObject,
Ref,
useCallback,
useContext,
useMemo,
useReducer,
useRef,
} from 'react'
import { Props } from '../../types'

Expand All @@ -30,16 +28,17 @@ import { useTreeWalker } from '../../hooks/use-tree-walker'

import { calculateActiveIndex, Focus } from '../../utils/calculate-active-index'
import { disposables } from '../../utils/disposables'
import { forwardRefWithAs, render, compact, PropsForFeatures, Features } from '../../utils/render'
import { compact, Features, forwardRefWithAs, PropsForFeatures, render } from '../../utils/render'
import { isDisabledReactIssue7711 } from '../../utils/bugs'
import { match } from '../../utils/match'
import { objectToFormEntries } from '../../utils/form'
import { FocusableMode, isFocusableElement, sortByDomNode } from '../../utils/focus-management'
import { sortByDomNode } from '../../utils/focus-management'

import { Hidden, Features as HiddenFeatures } from '../../internal/hidden'
import { useOpenClosed, State, OpenClosedProvider } from '../../internal/open-closed'
import { Features as HiddenFeatures, Hidden } from '../../internal/hidden'
import { OpenClosedProvider, State, useOpenClosed } from '../../internal/open-closed'

import { Keys } from '../keyboard'
import { microTask } from 'utils/micro-task'

enum ComboboxState {
Open,
Expand Down Expand Up @@ -1064,7 +1063,7 @@ let Option = forwardRefWithAs(function Option<
select()
if (data.mode === ValueMode.Single) {
actions.closeCombobox()
disposables().nextFrame(() => data.inputRef.current?.focus({ preventScroll: true }))
microTask(() => data.inputRef.current?.focus({ preventScroll: true }))
}
})

Expand Down

0 comments on commit 19571f7

Please sign in to comment.