chore: SingleComboBoxの内部ロジックを整理する #5337
Merged
+127
−129
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
…toring-SingleComboBox
…toring-SingleComboBox
…e-refactoring-SingleComboBox
…toring-SingleComboBox
…e-refactoring-SingleComboBox
…e-refactoring-SingleComboBox
AtsushiM
commented
Feb 25, 2025
| } else if (!selectedItem && defaultItem) { | ||
| if (onSelect) onSelect(defaultItem) | ||
| } else if (!selectedItem) { | ||
| selectDefaultItem() |
There was a problem hiding this comment.
selectDefaultItemにdefaultItemのある無しなどのロジックは押し込められているため、調整しています
AtsushiM
commented
Feb 25, 2025
Comment on lines
-335
to
+350
| if (selectedItem) { | ||
| setInputValue(innerText(selectedItem.label)) | ||
| } else { | ||
| setInputValue('') | ||
| } | ||
| setInputValue(selectedItem ? innerText(selectedItem.label) : '') |
There was a problem hiding this comment.
絶対にsetInputValueは実行されるため、引数のみを条件分岐することでわかりやすくしました
AtsushiM
commented
Feb 25, 2025
Comment on lines
-324
to
+346
| useCallback(() => { | ||
| if (!isFocused && onSelect && !selectedItem && defaultItem) { | ||
| onSelect(defaultItem) | ||
| } | ||
| }, [isFocused, selectedItem, onSelect, defaultItem]), | ||
| useCallback(() => { | ||
| unfocus() | ||
| }, [unfocus]), | ||
| isFocused || selectedItem ? NOOP : selectDefaultItem, | ||
| unfocus, |
There was a problem hiding this comment.
無意味にmemo化されていたので調整しています。
AtsushiM
commented
Feb 25, 2025
| if (!isExpanded) { | ||
| setIsExpanded(true) | ||
| } | ||
| } | ||
| handleListBoxKeyDown(e) | ||
| }, | ||
| [isComposing, isExpanded, setIsExpanded, unfocus, handleListBoxKeyDown], |
There was a problem hiding this comment.
setIsExpandedはuseStateのsetterなので依存関係に含める必要がありません
AtsushiM
commented
Feb 25, 2025
| if (isExpanded) { | ||
| e.stopPropagation() | ||
| setIsExpanded(false) | ||
| } | ||
| } else if (e.key === 'Tab') { | ||
| unfocus() | ||
| } else { | ||
| if (['Down', 'ArrowDown', 'Up', 'ArrowUp'].includes(e.key)) { |
There was a problem hiding this comment.
配列をチェックするより、正規表現一発のほうが明らかに高速のため置き換えています
masa0527
reviewed
Feb 26, 2025
| </button> | ||
| ) | ||
| } | ||
|
|
||
| const MemoizedNewIconWithText = React.memo<{ label: ReactNode }>(({ label }) => ( | ||
| <FaPlusCircleIcon color="TEXT_LINK" text={<Text color="TEXT_LINK">「{label}」を追加</Text>} /> |
There was a problem hiding this comment.
FaPlusCircleIconが旧名称でdeprecatedなのでこのタイミングで FaCirclePlusIconにしたい...!
masa0527
approved these changes
Feb 26, 2025
…e-refactoring-SingleComboBox
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
概要
変更内容
確認方法