[select] QueryList reset followups #2916
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
giladgray
commented
Sep 7, 2018
| (activeIndex < 0 || isItemDisabled(this.props.activeItem, activeIndex, this.props.itemDisabled)) | ||
| ) { | ||
| this.setFirstActiveItem(); | ||
| } |
There was a problem hiding this comment.
this was the bad logic. i think the setState callback above was the main culprit. refactored that to simply reuse the setQuery logic, and merged this logic into the reset check in setQuery below.
| const { activeItem } = this.state; | ||
| // NOTE: this operation is O(n) so it should be avoided in render(). safe for events though. | ||
| return activeItem == null ? -1 : this.state.filteredItems.indexOf(activeItem); | ||
| return activeItem == null ? -1 : items.indexOf(activeItem); |
There was a problem hiding this comment.
specifying the array allowed me to undo the setState callbacks.
| @@ -36,7 +36,7 @@ export function selectComponentSuite<P extends IListItemsProps<IFilm>, S>( | |||
|
|
|||
| describe("common behavior", () => { | |||
| it("itemRenderer is called for each child", () => { | |||
| const wrapper = render({ ...testProps, resetOnQuery: false }); | |||
There was a problem hiding this comment.
@switz I was able to remove this prop! default props do the right thing now. the one below stays, which makes sense cuz those tests are about specific reset logic.
3 tasks
omnibar example hotkey propsPreviews: documentation | landing | table |
test commentsPreviews: documentation | landing | table |
themadcreator
approved these changes
Sep 11, 2018
| global={true} | ||
| combo="shift + o" | ||
| label="Show Omnibar" | ||
| onKeyDown={this.handleToggle} | ||
| // prevent typing "O" in omnibar input | ||
| preventDefault={true} |
| @@ -229,10 +227,10 @@ export class QueryList<T> extends React.Component<IQueryListProps<T>, IQueryList | |||
| return undefined; | |||
| } | |||
|
|
|||
| private getActiveIndex() { | |||
| private getActiveIndex(items = this.state.filteredItems) { | |||
There was a problem hiding this comment.
nit: since this is private it doesn't matter much, but if you call getActiveIndex() elsewhere, maybe it'd be better just to use an explicit non-optional argument.
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.
Follow up from #2894
Changes proposed in this pull request:
resetOnQuery=false).shouldCheckActiveItemInViewportso the active item is always visible in the viewport.CC @switz - followups from your recent PR.