chore: ComboBoxのカスタムhookを整理する #5334
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e-add-use-decorators
…y.from + map をシンプルなforに置き換える
yagimushi
force-pushed
the
chore-refactoring-ComboBox-useFocusControl
branch
from
45cd39a to
0ee6ef6
Compare
…e-refactoring-ComboBox-useOptions
…e-refactoring-ComboBox-useListBox
…e-refactoring-ComboBox-useFocusControl
…toring-ComboBox-useFocusControl
…toring-ComboBox-useFocusControl
…e-refactoring-ComboBox-useFocusControl
yagimushi
force-pushed
the
chore-refactoring-ComboBox-useFocusControl
branch
from
856ccf7 to
9c0181a
Compare
yagimushi
force-pushed
the
chore-refactoring-ComboBox-useFocusControl
branch
from
9c0181a to
25e7e80
Compare
AtsushiM
commented
Feb 21, 2025
Comment on lines
+27
to
+33
| let nextIndex = 0 | ||
|
|
||
| if (currentActiveIndex !== -1) { | ||
| nextIndex = (currentActiveIndex + delta + options.length) % options.length | ||
| } else if (delta !== 1) { | ||
| nextIndex = options.length - 1 | ||
| } |
There was a problem hiding this comment.
生成するのはnextIndexだけであり、他の変数の生成などもないため、無名関数でスコープを切り出すほどではないと判断しました。
またletでnextIndexの初期値を0にすることで条件分岐を整理しています
AtsushiM
commented
Feb 21, 2025
Comment on lines
+22
to
+27
| if (focusedIndex !== null) { | ||
| const nextIndex = Math.max(focusedIndex - 1, 0) | ||
|
|
||
| deletionButtonRefs[nextIndex].current?.focus() | ||
| setFocusedIndex(nextIndex) | ||
| } else if (inputRef.current?.selectionStart === 0) { |
There was a problem hiding this comment.
条件がややこしいことになっていたのでネストしなくても良いように条件調整しました
AtsushiM
commented
Feb 21, 2025
| deletionButtonRefs[nextIndex].current?.focus() | ||
| setFocusedIndex(nextIndex) | ||
| } | ||
| }, [deletionButtonRefs, focusedIndex, selectedItemLength]) | ||
|
|
||
| const focusNextDeletionButton = useCallback(() => { | ||
| if (deletionButtonRefs.length === 0) { | ||
| if (deletionButtonRefs.length === 0 || focusedIndex === null) { |
There was a problem hiding this comment.
せっかく早期returnしているので、即終了する条件をまとめています
…e-refactoring-ComboBox-useFocusControl
AtsushiM
commented
Feb 24, 2025
Comment on lines
-48
to
-54
| const moveActivePositionDown = useCallback(() => { | ||
| moveActiveOptionIndex(activeOption, 1) | ||
| }, [activeOption, moveActiveOptionIndex]) | ||
|
|
||
| const moveActivePositionUp = useCallback(() => { | ||
| moveActiveOptionIndex(activeOption, -1) | ||
| }, [activeOption, moveActiveOptionIndex]) |
There was a problem hiding this comment.
activeOption が変更される度にmemoが更新され、また利用箇所も一箇所だけ、引数や処理なども複雑ではないため、あまり旨味のあるuseCallbackでは有りませんでした。
moveActiveOptionIndexをexportするようにします
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
関連URL
概要
変更内容
確認方法