Skip to content

DOM diff and component stack in SSR hydrate mismatch warnings (#10085) #12063

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

Closed
sompylasar wants to merge 14 commits into from
Closed

DOM diff and component stack in SSR hydrate mismatch warnings (#10085) #12063

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a11486a
Add DOM hydrate mismatch test cases to fixtures/ssr
sompylasar Jan 20, 2018
6fc330d
Add all warning cases to fixtures/ssr
sompylasar Feb 18, 2018
283a56c
Add tests for all hydrate warning cases like in fixtures/ssr
sompylasar Feb 18, 2018
7ea192a
Proof-of-concept hydrate warning diff
sompylasar Feb 18, 2018
3aec458
Add diff to hydrate warnings
sompylasar Feb 26, 2018
9050bc5
Refactor hydrate warnings with feedback from KidkArolis, mxstbr
sompylasar Jun 8, 2018
bec7032
Add placeholder element to fixtures/ssr to keep it focused in DevTools
sompylasar Jun 9, 2018
8b9be96
Replace unicode ellipsis with ASCII ellipsis (three dots)
sompylasar Jun 19, 2018
949f2de
Add tests to emphasize special character output problem
sompylasar Jun 19, 2018
2240ab9
Add failing test: fiber.index is not the SSR host node index for the …
sompylasar Jun 23, 2018
31d7c85
Refactor ReactMount SSR warning tests
sompylasar Jun 27, 2018
b8c5b9d
Rename SSR warning variables to be more descriptive what they stand for
sompylasar Jun 27, 2018
221bc1f
Compute hydrationWarningHostInstanceIndex by traversing the fiber tree
sompylasar Jul 8, 2018
1a15f08
Change hydration warning index algorithm to use `.return` pointers, n…
sompylasar Aug 3, 2018
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
Prev Previous commit
Next Next commit
Replace unicode ellipsis with ASCII ellipsis (three dots) 
Stick to ASCII in the source code to avoid potential cross-browser compatibility and charset issues.
  • Loading branch information
@sompylasar
sompylasar committed Sep 8, 2018
commit 8b9be96305379107c198b08a0719de01655b357d
4 changes: 2 additions & 2 deletions packages/react-dom/src/__tests__/ReactMount-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ describe('ReactMount', () => {
' <!-- -->\n' +
" {' '}\n" +
'- <p>children <b>text</b></p>\n' +
"+ <div>{['children ', …]}</div>\n" +
"+ <div>{['children ', ...]}</div>\n" +
' </div>\n\n' +
' in div (at **)\n' +
' in Component (at **)',
Expand Down Expand Up @@ -356,7 +356,7 @@ describe('ReactMount', () => {
' <!-- -->\n' +
" {' '}\n" +
' <p>children <b>text</b></p>\n' +
"+ <div>{['children ', …]}</div>\n" +
"+ <div>{['children ', ...]}</div>\n" +
' </div>\n\n' +
' in div (at **)\n' +
' in Component (at **)',
Expand Down
2 changes: 1 addition & 1 deletion packages/react-dom/src/__tests__/ReactRenderDocument-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ describe('rendering React components at document', () => {
' <head>\n' +
'- <meta charset="utf-8" />\n' +
' <title>test doc long title long title long title long title long title' +
' long title long title long title lon…</title>\n' +
' long title long title long title lon...</title>\n' +
' </head>\n\n' +
' in title (at **)\n' +
' in head (at **)\n' +
Expand Down
14 changes: 7 additions & 7 deletions packages/react-dom/src/client/ReactDOMComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ const HTML = '__html';
const {html: HTML_NAMESPACE} = Namespaces;

let getTextContentSignature = (textContent: string) => '';
let getNodeSignatureForDiff = (node: Node, openTagOnly = false) => '<…>';
let getNodeSignatureForMessage = (node: Node) => '<…>';
let getTagWithPropsSignature = (tag: string, props: Object) => '<…>';
let getNodeSignatureForDiff = (node: Node, openTagOnly = false) => '<...>';
let getNodeSignatureForMessage = (node: Node) => '<...>';
let getTagWithPropsSignature = (tag: string, props: Object) => '<...>';
let getNodeSurroundingsAndDiff = (
parentNode: Element | Document,
deletedIndex: number,
Expand Down Expand Up @@ -98,7 +98,7 @@ if (__DEV__) {

const clipStringWithEllipsis = function(str: string, clipAtLength: number) {
return (
str.substring(0, clipAtLength) + (str.length > clipAtLength ? '…' : '')
str.substring(0, clipAtLength) + (str.length > clipAtLength ? '...' : '')
);
};

Expand Down Expand Up @@ -207,7 +207,7 @@ if (__DEV__) {
}
let markup = null;
if (propKey === STYLE) {
markup = propKey + '={…}';
markup = propKey + '={...}';
} else if (typeof propValue === 'function') {
markup = propKey + '={' + propValue.name || propValue.toString() + '}';
} else {
Expand Down Expand Up @@ -237,12 +237,12 @@ if (__DEV__) {
if (typeof child === 'string') {
ret += "'" + child + "'";
} else {
ret += '…';
ret += '...';
}
}
ret += ']}</';
} else if (props.children) {
ret += '>{…}</';
ret += '>{...}</';
} else {
ret += '></';
}
Expand Down