|
8 | 8 | */
|
9 | 9 |
|
10 | 10 | import * as React from 'react';
|
11 |
| -import {Fragment, useCallback, useContext, useMemo, useRef} from 'react'; |
| 11 | +import {Fragment, useContext, useMemo} from 'react'; |
12 | 12 | import Button from '../Button';
|
13 | 13 | import ButtonIcon from '../ButtonIcon';
|
14 | 14 | import {ProfilerContext} from './ProfilerContext';
|
@@ -85,88 +85,90 @@ export default function SnapshotSelector(_: Props) {
|
85 | 85 | }
|
86 | 86 |
|
87 | 87 | let label = null;
|
88 |
| - const commitInputRef = useRef(null); |
89 |
| - const handleCommitInputKeyDown = useCallback(event => { |
90 |
| - switch (event.key) { |
91 |
| - case 'Enter': |
92 |
| - event.stopPropagation(); |
93 |
| - if (commitInputRef.current) { |
94 |
| - commitInputRef.current.blur(); |
95 |
| - } |
96 |
| - break; |
97 |
| - default: |
98 |
| - break; |
99 |
| - } |
100 |
| - }, []); |
101 |
| - const handleCommitInputChange = useCallback( |
102 |
| - event => { |
103 |
| - const value = parseInt(event.target.value, 10); |
| 88 | + if (numFilteredCommits > 0) { |
| 89 | + const handleCommitInputChange = event => { |
| 90 | + const value = parseInt(event.currentTarget.value, 10); |
104 | 91 | if (!isNaN(value)) {
|
105 | 92 | const filteredIndex = Math.min(
|
106 | 93 | Math.max(value - 1, 0),
|
| 94 | + |
| 95 | + // Snashots are shown to the user as 1-based |
| 96 | + // but the indices within the profiler data array ar 0-based. |
107 | 97 | numFilteredCommits - 1,
|
108 | 98 | );
|
109 | 99 | selectCommitIndex(filteredCommitIndices[filteredIndex]);
|
110 | 100 | }
|
111 |
| - }, |
112 |
| - [numFilteredCommits, selectCommitIndex, filteredCommitIndices], |
113 |
| - ); |
114 |
| - if (numFilteredCommits > 0) { |
115 |
| - const numFilteredCommitsString = `${numFilteredCommits}`; |
116 |
| - const selectedFilteredCommitIndexString = `${selectedFilteredCommitIndex + |
117 |
| - 1}`; |
| 101 | + }; |
| 102 | + |
| 103 | + const handleClick = event => { |
| 104 | + event.currentTarget.select(); |
| 105 | + }; |
| 106 | + |
| 107 | + const handleKeyDown = event => { |
| 108 | + switch (event.key) { |
| 109 | + case 'ArrowDown': |
| 110 | + viewPrevCommit(); |
| 111 | + event.stopPropagation(); |
| 112 | + break; |
| 113 | + case 'ArrowUp': |
| 114 | + viewNextCommit(); |
| 115 | + event.stopPropagation(); |
| 116 | + break; |
| 117 | + default: |
| 118 | + break; |
| 119 | + } |
| 120 | + }; |
| 121 | + |
118 | 122 | const input = (
|
119 | 123 | <input
|
120 |
| - ref={commitInputRef} |
121 | 124 | className={styles.Input}
|
122 | 125 | type="text"
|
123 | 126 | inputMode="numeric"
|
124 | 127 | pattern="[0-9]*"
|
125 |
| - value={selectedFilteredCommitIndexString} |
126 |
| - size={numFilteredCommitsString.length} |
| 128 | + value={selectedFilteredCommitIndex + 1} |
| 129 | + size={`${numFilteredCommits}`.length} |
127 | 130 | onChange={handleCommitInputChange}
|
128 |
| - onKeyDown={handleCommitInputKeyDown} |
| 131 | + onClick={handleClick} |
| 132 | + onKeyDown={handleKeyDown} |
129 | 133 | />
|
130 | 134 | );
|
| 135 | + |
131 | 136 | label = (
|
132 | 137 | <Fragment>
|
133 |
| - {input} / {numFilteredCommitsString} |
| 138 | + {input} / {numFilteredCommits} |
134 | 139 | </Fragment>
|
135 | 140 | );
|
136 | 141 | }
|
137 | 142 |
|
138 |
| - const viewNextCommit = useCallback(() => { |
| 143 | + const viewNextCommit = () => { |
139 | 144 | let nextCommitIndex = ((selectedFilteredCommitIndex: any): number) + 1;
|
140 | 145 | if (nextCommitIndex === filteredCommitIndices.length) {
|
141 | 146 | nextCommitIndex = 0;
|
142 | 147 | }
|
143 | 148 | selectCommitIndex(filteredCommitIndices[nextCommitIndex]);
|
144 |
| - }, [selectedFilteredCommitIndex, filteredCommitIndices, selectCommitIndex]); |
145 |
| - const viewPrevCommit = useCallback(() => { |
| 149 | + }; |
| 150 | + const viewPrevCommit = () => { |
146 | 151 | let nextCommitIndex = ((selectedFilteredCommitIndex: any): number) - 1;
|
147 | 152 | if (nextCommitIndex < 0) {
|
148 | 153 | nextCommitIndex = filteredCommitIndices.length - 1;
|
149 | 154 | }
|
150 | 155 | selectCommitIndex(filteredCommitIndices[nextCommitIndex]);
|
151 |
| - }, [selectedFilteredCommitIndex, filteredCommitIndices, selectCommitIndex]); |
| 156 | + }; |
152 | 157 |
|
153 |
| - const handleKeyDown = useCallback( |
154 |
| - event => { |
155 |
| - switch (event.key) { |
156 |
| - case 'ArrowLeft': |
157 |
| - viewPrevCommit(); |
158 |
| - event.stopPropagation(); |
159 |
| - break; |
160 |
| - case 'ArrowRight': |
161 |
| - viewNextCommit(); |
162 |
| - event.stopPropagation(); |
163 |
| - break; |
164 |
| - default: |
165 |
| - break; |
166 |
| - } |
167 |
| - }, |
168 |
| - [viewNextCommit, viewPrevCommit], |
169 |
| - ); |
| 158 | + const handleKeyDown = event => { |
| 159 | + switch (event.key) { |
| 160 | + case 'ArrowLeft': |
| 161 | + viewPrevCommit(); |
| 162 | + event.stopPropagation(); |
| 163 | + break; |
| 164 | + case 'ArrowRight': |
| 165 | + viewNextCommit(); |
| 166 | + event.stopPropagation(); |
| 167 | + break; |
| 168 | + default: |
| 169 | + break; |
| 170 | + } |
| 171 | + }; |
170 | 172 |
|
171 | 173 | if (commitData.length === 0) {
|
172 | 174 | return null;
|
|
0 commit comments