Skip to content

Commit a84c2b9

Browse files
committed
Make key and name searchable
1 parent 57325aa commit a84c2b9

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

packages/react-devtools-shared/src/devtools/views/Components/Element.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ export default function Element({data, index, style}: Props): React.Node {
180180
className={styles.KeyValue}
181181
title={key}
182182
onDoubleClick={handleKeyDoubleClick}>
183-
<pre>{key}</pre>
183+
<pre>
184+
<IndexableDisplayName displayName={key} id={id} />
185+
</pre>
184186
</span>
185187
"
186188
</Fragment>
@@ -193,7 +195,9 @@ export default function Element({data, index, style}: Props): React.Node {
193195
className={styles.KeyValue}
194196
title={nameProp}
195197
onDoubleClick={handleKeyDoubleClick}>
196-
<pre>{nameProp}</pre>
198+
<pre>
199+
<IndexableDisplayName displayName={nameProp} id={id} />
200+
</pre>
197201
</span>
198202
"
199203
</Fragment>

packages/react-devtools-shared/src/devtools/views/Components/TreeContext.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,14 @@ function recursivelySearchTree(
995995
return;
996996
}
997997

998-
const {children, displayName, hocDisplayNames, compiledWithForget} = element;
998+
const {
999+
children,
1000+
displayName,
1001+
hocDisplayNames,
1002+
compiledWithForget,
1003+
key,
1004+
nameProp,
1005+
} = element;
9991006
if (displayName != null && regExp.test(displayName) === true) {
10001007
searchResults.push(elementID);
10011008
} else if (
@@ -1006,6 +1013,10 @@ function recursivelySearchTree(
10061013
searchResults.push(elementID);
10071014
} else if (compiledWithForget && regExp.test('Forget')) {
10081015
searchResults.push(elementID);
1016+
} else if (typeof key === 'string' && regExp.test(key)) {
1017+
searchResults.push(elementID);
1018+
} else if (typeof nameProp === 'string' && regExp.test(nameProp)) {
1019+
searchResults.push(elementID);
10091020
}
10101021

10111022
children.forEach(childID =>

0 commit comments

Comments
 (0)