Skip to content
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

Fix obscure error message when passing an invalid style value for SSR #11173

Merged
merged 7 commits into from
Oct 10, 2017
Merged

Fix obscure error message when passing an invalid style value for SSR #11173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a276ffc
Add failing iframe test
iamdustan Oct 10, 2017
8886e9f
Possible fix by returning null ownerName in SSR
iamdustan Oct 10, 2017
c62b42f
prettier
iamdustan Oct 10, 2017
dcfa52d
eslolint
iamdustan Oct 10, 2017
17fb7d6
gah c’mon really?
iamdustan Oct 10, 2017
6efdcc4
emptyFunction.thatReturnsNull
iamdustan Oct 10, 2017
5fe9a9b
One less property access
gaearon Oct 10, 2017
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
9 changes: 9 additions & 0 deletions src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,15 @@ describe('ReactDOMServer', () => {
'Objects are not valid as a React child (found: object with keys {x})',
);
});

it('should throw prop mapping error for an <iframe /> with invalid props', () => {
expect(() =>
ReactDOMServer.renderToString(<iframe style="border:none;" />),
).toThrowError(
'The `style` prop expects a mapping from style properties to values, not ' +
"a string. For example, style={{marginRight: spacing + 'em'}} when using JSX.",
);
});
});

describe('renderToStaticMarkup', () => {
Expand Down
4 changes: 3 additions & 1 deletion src/renderers/shared/server/ReactPartialRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');

var assertValidProps = require('assertValidProps');
var dangerousStyleValue = require('dangerousStyleValue');
var emptyFunction = require('fbjs/lib/emptyFunction');
var emptyObject = require('fbjs/lib/emptyObject');
var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName');
Expand All @@ -29,6 +30,7 @@ var omittedCloseTags = require('omittedCloseTags');
var isCustomComponent = require('isCustomComponent');

var toArray = React.Children.toArray;
var emptyFunctionThatReturnsNull = emptyFunction.thatReturnsNull;

if (__DEV__) {
var warning = require('fbjs/lib/warning');
Expand Down Expand Up @@ -780,7 +782,7 @@ class ReactDOMServerRenderer {
validatePropertiesInDevelopment(tag, props);
}

assertValidProps(tag, props);
assertValidProps(tag, props, emptyFunctionThatReturnsNull);

var out = createOpenTagMarkup(
element.type,
Expand Down