Skip to content

devtools: Display shortcuts for prev/next search result #20470

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

Merged
merged 2 commits into from
Dec 21, 2020
Merged

devtools: Display shortcuts for prev/next search result #20470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1b9f2d
Remove duplicate arrow up/down key handling
eps1lon Dec 15, 2020
839cb42
devtools: Display shortcuts for prev/next search result
eps1lon Dec 15, 2020
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
4 changes: 2 additions & 2 deletions packages/react-devtools-shared/src/devtools/views/Button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import tooltipStyles from './Tooltip.css';
type Props = {
children: React$Node,
className?: string,
title?: string,
title: React$Node,
...
};

export default function Button({
children,
className = '',
title = '',
title,
...rest
}: Props) {
let button = (
Expand Down
33 changes: 11 additions & 22 deletions packages/react-devtools-shared/src/devtools/views/Components/SearchInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,6 @@ export default function SearchInput(props: Props) {
[dispatch],
);

const handleKeyDown = useCallback(
event => {
// For convenience, let up/down arrow keys change Tree selection.
switch (event.key) {
case 'ArrowDown':
dispatch({type: 'SELECT_NEXT_ELEMENT_IN_TREE'});
event.preventDefault();
break;
case 'ArrowUp':
dispatch({type: 'SELECT_PREVIOUS_ELEMENT_IN_TREE'});
event.preventDefault();
break;
default:
break;
}
},
[dispatch],
);

const handleInputKeyPress = useCallback(
({key, shiftKey}) => {
if (key === 'Enter') {
Expand Down Expand Up @@ -98,7 +79,6 @@ export default function SearchInput(props: Props) {
<input
className={styles.Input}
onChange={handleTextChange}
onKeyDown={handleKeyDown}
onKeyPress={handleInputKeyPress}
placeholder="Search (text or /regex/)"
ref={inputRef}
Expand All @@ -115,14 +95,23 @@ export default function SearchInput(props: Props) {
className={styles.IconButton}
disabled={!searchText}
onClick={() => dispatch({type: 'GO_TO_PREVIOUS_SEARCH_RESULT'})}
title="Scroll to previous search result">
title={
<React.Fragment>
Scroll to previous search result (<kbd>Shift</kbd> +{' '}
<kbd>Enter</kbd>)
</React.Fragment>
}>
<ButtonIcon type="up" />
</Button>
<Button
className={styles.IconButton}
disabled={!searchText}
onClick={() => dispatch({type: 'GO_TO_NEXT_SEARCH_RESULT'})}
title="Scroll to next search result">
title={
<React.Fragment>
Scroll to next search result (<kbd>Enter</kbd>)
</React.Fragment>
}>
<ButtonIcon type="down" />
</Button>
<Button
Expand Down