Wrong focus on close findbar #1429
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
jstoffan
reviewed
Sep 20, 2021
| <button | ||
| ref={buttonReference} | ||
| className="bp-FindBarToggle" | ||
| onClick={(): void => onFindBarToggle(buttonReference.current)} |
There was a problem hiding this comment.
Can we do the following to avoid the ref?
onClick={({ target }) => onFindBarToggle(target)}
src/lib/viewers/doc/DocBaseViewer.js
Outdated
| @@ -410,8 +410,8 @@ class DocBaseViewer extends BaseViewer { | |||
| } | |||
|
|
|||
| handleFindBarClose() { | |||
| if (this.docEl) { | |||
| this.docEl.focus(); // Prevent focus from transferring to the root document element | |||
| if (this.findBarToggleElement) { | |||
There was a problem hiding this comment.
We may also want to check that .focus exists.
jstoffan
reviewed
Sep 20, 2021
| const wrapper = getWrapper({ onFindBarToggle: onToggle }); | ||
|
|
||
| wrapper.simulate('click'); | ||
| wrapper.simulate('click', mockedEvent); | ||
|
|
||
| expect(onToggle).toBeCalled(); |
There was a problem hiding this comment.
Should we update this to toBeCalledWith and an explicit assertion?
src/lib/viewers/doc/DocBaseViewer.js
Outdated
| @@ -410,8 +410,8 @@ class DocBaseViewer extends BaseViewer { | |||
| } | |||
|
|
|||
| handleFindBarClose() { | |||
| if (this.docEl) { | |||
| this.docEl.focus(); // Prevent focus from transferring to the root document element | |||
| if (this.findBarToggleElement && this.findBarToggleElement.focus) { | |||
There was a problem hiding this comment.
Do we have a test for this logic?
src/lib/viewers/doc/DocBaseViewer.js
Outdated
| @@ -1483,7 +1483,8 @@ class DocBaseViewer extends BaseViewer { | |||
| this.pinchPage = null; | |||
| } | |||
|
|
|||
| toggleFindBar() { | |||
| toggleFindBar(elementToFocus) { | |||
| this.findBarToggleElement = elementToFocus; | |||
There was a problem hiding this comment.
It looks like the convention in this file shortens Element to El. Should we rename to findBarToggleEl?
jstoffan
approved these changes
Sep 20, 2021
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.
When the findBar is closed the focus should go back to the find toggle button located on toolbar.