Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrong focus on close findbar #1429

Merged
merged 10 commits into from
Sep 20, 2021
Merged

Wrong focus on close findbar #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee722ae
fix(findbar): Store element to focus after close findbar
Sep 20, 2021
9161106
fix(findbar): make prop not required on props
Sep 20, 2021
b4872d0
fix(findbar): add function to onclick method
Sep 20, 2021
668db18
Merge branch 'master' into wrong-focus-on-close-findbar
matiaslionel Sep 20, 2021
4414d11
fix(findbar): remove unnesesary hook adding event.target
Sep 20, 2021
3d6f9b1
fix(findbar): prettier fix
Sep 20, 2021
e80b6c9
fix(findbar): check that focus exist
Sep 20, 2021
2b12cd1
fix(findbar): update test
Sep 20, 2021
b72d0d4
fix(findbar): update test since onFindbar toggle has attributtes
Sep 20, 2021
c5fe3e3
fix(findbar): renaming property because convention
Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/lib/viewers/controls/findbar/FindBarToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import IconSearch24 from '../icons/IconSearch24';
import './FindBarToggle.scss';

export type Props = {
onFindBarToggle?: () => void;
onFindBarToggle?: (buttonElement: EventTarget | null) => void;
};

export default function FindBarToggle({ onFindBarToggle }: Props): JSX.Element | null {
Expand All @@ -12,7 +12,12 @@ export default function FindBarToggle({ onFindBarToggle }: Props): JSX.Element |
}

return (
<button className="bp-FindBarToggle" onClick={onFindBarToggle} title={__('toggle_findbar')} type="button">
<button
className="bp-FindBarToggle"
onClick={({ target }): void => onFindBarToggle(target)}
title={__('toggle_findbar')}
type="button"
>
<IconSearch24 />
</button>
);
Expand Down
5 changes: 3 additions & 2 deletions src/lib/viewers/controls/findbar/__tests__/FindBarToggle-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ describe('FindBarToggle', () => {
describe('event handlers', () => {
test('should forward the click from the button', () => {
const onToggle = jest.fn();
const mockedEvent = { target: document.createElement('button') };
const wrapper = getWrapper({ onFindBarToggle: onToggle });

wrapper.simulate('click');
wrapper.simulate('click', mockedEvent);

expect(onToggle).toBeCalled();
expect(onToggle).toBeCalledWith(mockedEvent.target);
});
});

Expand Down
7 changes: 4 additions & 3 deletions src/lib/viewers/doc/DocBaseViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.findBarToggleEl && this.findBarToggleEl.focus) {
this.findBarToggleEl.focus();
}
}

Expand Down Expand Up @@ -1483,7 +1483,8 @@ class DocBaseViewer extends BaseViewer {
this.pinchPage = null;
}

toggleFindBar() {
toggleFindBar(findBarToggleEl) {
this.findBarToggleEl = findBarToggleEl;
this.findBar.toggle();
}

Expand Down