Skip to content

DevTools show error icon when hook name parsing fails #21820

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
bvaughn merged 1 commit into from
Jul 7, 2021
Merged

DevTools show error icon when hook name parsing fails #21820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
inspectElement,
} from 'react-devtools-shared/src/inspectedElementCache';
import {loadHookNames} from 'react-devtools-shared/src/hookNamesCache';
import {ElementTypeFunction} from 'react-devtools-shared/src/types';
import LoadHookNamesFunctionContext from 'react-devtools-shared/src/devtools/views/Components/LoadHookNamesFunctionContext';
import {SettingsContext} from '../Settings/SettingsContext';

Expand Down Expand Up @@ -112,7 +111,6 @@ export function InspectedElementContextController({children}: Props) {
if (parseHookNames) {
if (
inspectedElement !== null &&
inspectedElement.type === ElementTypeFunction &&
inspectedElement.hooks !== null &&
loadHookNamesFunction !== null
) {
Expand Down
4 changes: 4 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementHooksTree.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,8 @@

.HookName {
color: var(--color-component-name);
}

.ToggleError {
color: var(--color-error-text);
}
22 changes: 15 additions & 7 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementHooksTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,17 @@ export function InspectedElementHooksTree({
toggleParseHookNames();
};

const hookParsingFailed = parseHookNames && hookNames === null;

let toggleTitle;
if (hookParsingFailed) {
toggleTitle = 'Hook parsing failed';
} else if (parseHookNames) {
toggleTitle = 'Parsing hook names ...';
} else {
toggleTitle = 'Parse hook names (may be slow)';
}

const handleCopy = () => copy(serializeHooksForCopy(hooks));

if (hooks === null) {
Expand All @@ -73,16 +84,13 @@ export function InspectedElementHooksTree({
<div className={styles.HooksTreeView}>
<div className={styles.HeaderRow}>
<div className={styles.Header}>hooks</div>
{enableHookNameParsing && !parseHookNames && (
{enableHookNameParsing && (!parseHookNames || hookParsingFailed) && (
<Toggle
className={hookParsingFailed ? styles.ToggleError : null}
isChecked={parseHookNamesOptimistic}
isDisabled={parseHookNamesOptimistic}
isDisabled={parseHookNamesOptimistic || hookParsingFailed}
onChange={handleChange}
title={
parseHookNames
? 'Parse hook names'
: 'Parse hook names (may be slow)'
}>
title={toggleTitle}>
<ButtonIcon type="parse-hook-names" />
</Toggle>
)}
Expand Down