{"files":[{"path":"packages\/react-devtools-shared\/src\/__tests__\/treeContext-test.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/devtools\/store.js","status":"M"}],"parents":["986d0e61d7085d4b8eea0386235d1b5ca9f47349"],"patch":"diff --git a\/packages\/react-devtools-shared\/src\/__tests__\/treeContext-test.js b\/packages\/react-devtools-shared\/src\/__tests__\/treeContext-test.js\nindex 0db248c017..30d21c0335 100644\n--- a\/packages\/react-devtools-shared\/src\/__tests__\/treeContext-test.js\n+++ b\/packages\/react-devtools-shared\/src\/__tests__\/treeContext-test.js\n@@ -2119,6 +2119,64 @@ describe('TreeListContext', () => {\n `);\n });\n \n+ it('should update correctly when elements are added\/removed', () => {\n+ const container = document.createElement('div');\n+ let errored = false;\n+ function ErrorOnce() {\n+ if (!errored) {\n+ errored = true;\n+ console.error('test-only:one-time-error');\n+ }\n+ return null;\n+ }\n+ withErrorsOrWarningsIgnored(['test-only:'], () =>\n+ utils.act(() =>\n+ legacyRender(\n+ \n+ \n+ <\/React.Fragment>,\n+ container,\n+ ),\n+ ),\n+ );\n+\n+ let renderer;\n+ utils.act(() => (renderer = TestRenderer.create()));\n+ expect(state).toMatchInlineSnapshot(`\n+ ✕ 1, ⚠ 0\n+ [root]\n+ ✕\n+ `);\n+\n+ withErrorsOrWarningsIgnored(['test-only:'], () =>\n+ utils.act(() =>\n+ legacyRender(\n+ \n+ \n+ \n+ <\/React.Fragment>,\n+ container,\n+ ),\n+ ),\n+ );\n+\n+ utils.act(() => renderer.update());\n+ expect(state).toMatchInlineSnapshot(`\n+ ✕ 1, ⚠ 0\n+ [root]\n+ \n+ ✕\n+ `);\n+\n+ selectNextErrorOrWarning();\n+ expect(state).toMatchInlineSnapshot(`\n+ ✕ 1, ⚠ 0\n+ [root]\n+ \n+ → ✕\n+ `);\n+ });\n+\n it('should update select and auto-expand parts components within hidden parts of the tree', () => {\n const Wrapper = ({children}) => children;\n \ndiff --git a\/packages\/react-devtools-shared\/src\/devtools\/store.js b\/packages\/react-devtools-shared\/src\/devtools\/store.js\nindex 16bc56ae64..7cd5c41e8b 100644\n--- a\/packages\/react-devtools-shared\/src\/devtools\/store.js\n+++ b\/packages\/react-devtools-shared\/src\/devtools\/store.js\n@@ -1187,6 +1187,18 @@ export default class Store extends EventEmitter<{|\n console.groupEnd();\n }\n \n+ const indicesOfCachedErrorsOrWarningsAreStale =\n+ !haveErrorsOrWarningsChanged &&\n+ (addedElementIDs.length > 0 || removedElementIDs.size > 0);\n+ if (indicesOfCachedErrorsOrWarningsAreStale) {\n+ this._cachedErrorAndWarningTuples.forEach(entry => {\n+ const index = this.getIndexOfElementID(entry.id);\n+ if (index !== null) {\n+ entry.index = index;\n+ }\n+ });\n+ }\n+\n this.emit('mutated', [addedElementIDs, removedElementIDs]);\n };\n \n","body":"","commit":{"shortRevision":"b6ff9ad163","subject":"DevTools: update error indices when elements are added\/removed (#22144)","authoredAt":"2021-08-20T17:55:42+02:00","revision":"b6ff9ad1630b4f1d7cb98e9b9ec46bca315bb302","authorName":"Sebastian Silbermann","authorEmail":"silbermann.sebastian@gmail.com"}}

dillon1000/react

Files changed