{"files":[{"path":"packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js","status":"M"},{"path":"packages\/react-dom\/src\/server\/ReactPartialRenderer.js","status":"M"}],"parents":["d9a3cc070c3b554ce6c4b43b917c1ba8951f9b5f"],"patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\nindex 88b47fde82..b6afd3ebae 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n@@ -13,6 +13,7 @@\n let React;\n let ReactDOMServer;\n let PropTypes;\n+let ReactCurrentOwner;\n \n function normalizeCodeLocInfo(str) {\n return str && str.replace(\/\$at .+?:\\d+\$\/g, '(at **)');\n@@ -24,6 +25,9 @@ describe('ReactDOMServer', () => {\n React = require('react');\n PropTypes = require('prop-types');\n ReactDOMServer = require('react-dom\/server');\n+ ReactCurrentOwner =\n+ React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED\n+ .ReactCurrentOwner;\n });\n \n describe('renderToString', () => {\n@@ -431,6 +435,44 @@ describe('ReactDOMServer', () => {\n expect(results).toEqual([2, 1, 3, 1]);\n });\n \n+ it('renders with dispatcher.readContext mechanism', () => {\n+ const Context = React.createContext(0);\n+\n+ function readContext(context) {\n+ return ReactCurrentOwner.currentDispatcher.readContext(context);\n+ }\n+\n+ function Consumer(props) {\n+ return 'Result: ' + readContext(Context);\n+ }\n+\n+ const Indirection = React.Fragment;\n+\n+ function App(props) {\n+ return (\n+ \n+ \n+ \n+ <\/Context.Provider>\n+ \n+ \n+ \n+ \n+ \n+ <\/Context.Provider>\n+ <\/Indirection>\n+ <\/Indirection>\n+ \n+ <\/Context.Provider>\n+ );\n+ }\n+\n+ const markup = ReactDOMServer.renderToString();\n+ \/\/ Extract the numbers rendered by the consumers\n+ const results = markup.match(\/\\d+\/g).map(Number);\n+ expect(results).toEqual([2, 1, 3, 1]);\n+ });\n+\n it('renders context API, reentrancy', () => {\n const Context = React.createContext(0);\n \ndiff --git a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\nindex 7d6cfc729e..faa24884d1 100644\n--- a\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n+++ b\/packages\/react-dom\/src\/server\/ReactPartialRenderer.js\n@@ -75,6 +75,7 @@ const toArray = ((React.Children.toArray: any): toArrayType);\n \/\/ Each stack is an array of frames which may contain nested stacks of elements.\n let currentDebugStacks = [];\n \n+let ReactCurrentOwner = ReactSharedInternals.ReactCurrentOwner;\n let ReactDebugCurrentFrame;\n let prevGetCurrentStackImpl = null;\n let getCurrentServerStackImpl = () => '';\n@@ -85,6 +86,15 @@ let pushCurrentDebugStack = (stack: Array) => {};\n let pushElementToDebugStack = (element: ReactElement) => {};\n let popCurrentDebugStack = () => {};\n \n+let Dispatcher = {\n+ readContext(\n+ context: ReactContext,\n+ observedBits: void | number | boolean,\n+ ): T {\n+ return context._currentValue;\n+ },\n+};\n+\n if (__DEV__) {\n ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;\n \n@@ -787,49 +797,54 @@ class ReactDOMServerRenderer {\n return null;\n }\n \n- let out = '';\n- while (out.length < bytes) {\n- if (this.stack.length === 0) {\n- this.exhausted = true;\n- break;\n- }\n- const frame: Frame = this.stack[this.stack.length - 1];\n- if (frame.childIndex >= frame.children.length) {\n- const footer = frame.footer;\n- out += footer;\n- if (footer !== '') {\n- this.previousWasTextNode = false;\n+ ReactCurrentOwner.currentDispatcher = Dispatcher;\n+ try {\n+ let out = '';\n+ while (out.length < bytes) {\n+ if (this.stack.length === 0) {\n+ this.exhausted = true;\n+ break;\n }\n- this.stack.pop();\n- if (frame.type === 'select') {\n- this.currentSelectValue = null;\n- } else if (\n- frame.type != null &&\n- frame.type.type != null &&\n- frame.type.type.$$typeof === REACT_PROVIDER_TYPE\n- ) {\n- const provider: ReactProvider = (frame.type: any);\n- this.popProvider(provider);\n+ const frame: Frame = this.stack[this.stack.length - 1];\n+ if (frame.childIndex >= frame.children.length) {\n+ const footer = frame.footer;\n+ out += footer;\n+ if (footer !== '') {\n+ this.previousWasTextNode = false;\n+ }\n+ this.stack.pop();\n+ if (frame.type === 'select') {\n+ this.currentSelectValue = null;\n+ } else if (\n+ frame.type != null &&\n+ frame.type.type != null &&\n+ frame.type.type.$$typeof === REACT_PROVIDER_TYPE\n+ ) {\n+ const provider: ReactProvider = (frame.type: any);\n+ this.popProvider(provider);\n+ }\n+ continue;\n }\n- continue;\n- }\n- const child = frame.children[frame.childIndex++];\n- if (__DEV__) {\n- pushCurrentDebugStack(this.stack);\n- \/\/ We're starting work on this frame, so reset its inner stack.\n- ((frame: any): FrameDev).debugElementStack.length = 0;\n- try {\n- \/\/ Be careful! Make sure this matches the PROD path below.\n+ const child = frame.children[frame.childIndex++];\n+ if (__DEV__) {\n+ pushCurrentDebugStack(this.stack);\n+ \/\/ We're starting work on this frame, so reset its inner stack.\n+ ((frame: any): FrameDev).debugElementStack.length = 0;\n+ try {\n+ \/\/ Be careful! Make sure this matches the PROD path below.\n+ out += this.render(child, frame.context, frame.domNamespace);\n+ } finally {\n+ popCurrentDebugStack();\n+ }\n+ } else {\n+ \/\/ Be careful! Make sure this matches the DEV path above.\n out += this.render(child, frame.context, frame.domNamespace);\n- } finally {\n- popCurrentDebugStack();\n }\n- } else {\n- \/\/ Be careful! Make sure this matches the DEV path above.\n- out += this.render(child, frame.context, frame.domNamespace);\n }\n+ return out;\n+ } finally {\n+ ReactCurrentOwner.currentDispatcher = null;\n }\n- return out;\n }\n \n render(\n","body":"Will be used by react-cache.","commit":{"shortRevision":"fa65c58e15","authoredAt":"2018-10-18T20:20:03-07:00","authorEmail":"sebastian@calyptus.eu","authorName":"Sebastian Markbåge","subject":"Add readContext to SSR (#13888)","revision":"fa65c58e15ca6b718a9771782e77d8a990a011d7"}}

dillon1000/react

Files changed