Skip to content

Commit ac9430f

Browse files
committed
Polish settings
1 parent eed3764 commit ac9430f

File tree

1 file changed

+33
-28
lines changed

1 file changed

+33
-28
lines changed

packages/react-devtools-shared/src/devtools/views/Settings/ComponentsSettings.js

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -367,34 +367,33 @@ export default function ComponentsSettings({
367367
{componentFilters.map((componentFilter, index) => (
368368
<tr className={styles.TableRow} key={index}>
369369
<td className={styles.TableCell}>
370-
<Toggle
371-
className={
372-
componentFilter.isValid !== false
373-
? ''
374-
: styles.InvalidRegExp
375-
}
376-
isChecked={componentFilter.isEnabled}
377-
isDisabled={
378-
componentFilter.type === ComponentFilterActivitySlice
379-
}
380-
onChange={isEnabled =>
381-
toggleFilterIsEnabled(componentFilter, isEnabled)
382-
}
383-
title={
384-
componentFilter.isValid === false
385-
? 'Filter invalid'
386-
: componentFilter.isEnabled
387-
? 'Filter enabled'
388-
: 'Filter disabled'
389-
}>
390-
<ToggleIcon
391-
isEnabled={componentFilter.isEnabled}
392-
isValid={
393-
componentFilter.isValid == null ||
394-
componentFilter.isValid === true
370+
{componentFilter.type !== ComponentFilterActivitySlice && (
371+
<Toggle
372+
className={
373+
componentFilter.isValid !== false
374+
? ''
375+
: styles.InvalidRegExp
395376
}
396-
/>
397-
</Toggle>
377+
isChecked={componentFilter.isEnabled}
378+
onChange={isEnabled =>
379+
toggleFilterIsEnabled(componentFilter, isEnabled)
380+
}
381+
title={
382+
componentFilter.isValid === false
383+
? 'Filter invalid'
384+
: componentFilter.isEnabled
385+
? 'Filter enabled'
386+
: 'Filter disabled'
387+
}>
388+
<ToggleIcon
389+
isEnabled={componentFilter.isEnabled}
390+
isValid={
391+
componentFilter.isValid == null ||
392+
componentFilter.isValid === true
393+
}
394+
/>
395+
</Toggle>
396+
)}
398397
</td>
399398
<td className={styles.TableCell}>
400399
<select
@@ -422,7 +421,11 @@ export default function ComponentsSettings({
422421
environment
423422
</option>
424423
)}
425-
<option value={ComponentFilterActivitySlice}>activity</option>
424+
{componentFilter.type === ComponentFilterActivitySlice && (
425+
<option value={ComponentFilterActivitySlice}>
426+
component
427+
</option>
428+
)}
426429
</select>
427430
</td>
428431
<td className={styles.TableCell}>
@@ -432,6 +435,8 @@ export default function ComponentsSettings({
432435
{(componentFilter.type === ComponentFilterLocation ||
433436
componentFilter.type === ComponentFilterDisplayName) &&
434437
'matches'}
438+
{componentFilter.type === ComponentFilterActivitySlice &&
439+
'within'}
435440
</td>
436441
<td className={styles.TableCell}>
437442
{componentFilter.type === ComponentFilterElementType && (

0 commit comments

Comments
 (0)