{"parents":["c9841001b07200660de21a3275afd1cd7d9554a8"],"files":[{"path":"packages\/react-dom\/src\/server\/ReactPartialRenderer.js","status":"M"},{"path":"packages\/react-events\/src\/__tests__\/TouchHitTarget-test.internal.js","status":"M"}],"patch":"diff --git a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\nindex c493c0398c..ce078dcb71 100644\n--- a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n+++ b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n@@ -1173,24 +1173,15 @@ class ReactDOMServerRenderer {\n elementType.$$typeof === REACT_EVENT_TARGET_TYPE &&\n elementType.type === REACT_EVENT_TARGET_TOUCH_HIT\n ) {\n- const props = nextElement.props;\n- const bottom = props.bottom || 0;\n- const left = props.left || 0;\n- const right = props.right || 0;\n- const top = props.top || 0;\n-\n- if (bottom === 0 && left === 0 && right === 0 && top === 0) {\n- return '';\n- }\n- let topString = top ? `-${top}px` : '0px';\n- let leftString = left ? `-${left}px` : '0px';\n- let rightString = right ? `-${right}px` : '0x';\n- let bottomString = bottom ? `-${bottom}px` : '0px';\n-\n- return (\n- `

<\/div>`\n- );\n+ \/\/ We do not render a hit slop element anymore. Instead we rely\n+ \/\/ on hydration adding in the hit slop element. The previous\n+ \/\/ logic had a bug where rendering a hit slop at SSR meant that\n+ \/\/ mouse events incorrectly registered events on the hit slop\n+ \/\/ even though it designed to be used for touch events only.\n+ \/\/ The logic that filters out mouse events from the hit slop\n+ \/\/ is handled in event responder modules, which only get\n+ \/\/ initialized upon hydration.\n+ return '';\n }\n const nextChildren = toArray(\n ((nextChild: any): ReactElement).props.children,\ndiff --git a\/packages\/react-events\/src\/__tests__\/TouchHitTarget-test.internal.js b\/packages\/react-events\/src\/__tests__\/TouchHitTarget-test.internal.js\nindex e0bb517518..672e0b8bfc 100644\n--- a\/packages\/react-events\/src\/__tests__\/TouchHitTarget-test.internal.js\n+++ b\/packages\/react-events\/src\/__tests__\/TouchHitTarget-test.internal.js\n@@ -507,39 +507,6 @@ describe('TouchHitTarget', () => {\n );\n });\n \n- it('should hydrate TouchHitTarget hit slop elements correcty', () => {\n- const Test = () => (\n- \n-

\n- \n- <\/div>\n- <\/EventComponent>\n- );\n-\n- const container = document.createElement('div');\n- container.innerHTML = '

<\/div>';\n- ReactDOM.hydrate(, container);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container.innerHTML).toBe('

<\/div>');\n-\n- const Test2 = () => (\n- \n-

\n- \n- <\/div>\n- <\/EventComponent>\n- );\n-\n- const container2 = document.createElement('div');\n- container2.innerHTML =\n- '

<\/div><\/div>';\n- ReactDOM.hydrate(, container2);\n- expect(Scheduler).toFlushWithoutYielding();\n- expect(container2.innerHTML).toBe(\n- '

<\/div><\/div>',\n- );\n- });\n-\n it('should hydrate TouchHitTarget hit slop elements correcty and patch them', () => {\n const Test = () => (\n \n@@ -586,7 +553,7 @@ describe('TouchHitTarget', () => {\n expect(output).toBe('

<\/div>');\n });\n \n- it('should render a TouchHitTarget with hit slop values', () => {\n+ it('should render a TouchHitTarget without hit slop values', () => {\n const Test = () => (\n \n

\n@@ -596,9 +563,7 @@ describe('TouchHitTarget', () => {\n );\n \n let output = ReactDOMServer.renderToString();\n- expect(output).toBe(\n- '

<\/div><\/div>',\n- );\n+ expect(output).toBe('

<\/div>');\n \n const Test2 = () => (\n \n@@ -609,9 +574,7 @@ describe('TouchHitTarget', () => {\n );\n \n output = ReactDOMServer.renderToString();\n- expect(output).toBe(\n- '

<\/div><\/div>',\n- );\n+ expect(output).toBe('

<\/div>');\n \n const Test3 = () => (\n \n@@ -622,9 +585,7 @@ describe('TouchHitTarget', () => {\n );\n \n output = ReactDOMServer.renderToString();\n- expect(output).toBe(\n- '

<\/div><\/div>',\n- );\n+ expect(output).toBe('

<\/div>');\n });\n });\n });\n","commit":{"authorEmail":"trueadm@users.noreply.github.com","authoredAt":"2019-04-11T12:05:26+01:00","revision":"a9eff329c6086cc12b7a61ff1b40ec9cc21c1c05","authorName":"Dominic Gannaway","subject":"Remove TouchHitTarget SSR logic to prevent issues with mouse events (#15381)","shortRevision":"a9eff329c6"},"body":""}

dillon1000/react

Files changed