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

Jump to bottom

Prevents adding units to css custom properties #9966

Merged
merged 6 commits into from
Jun 14, 2017
Merged

Prevents adding units to css custom properties #9966

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8638845
Prevents adding units to css custom properties
TrySound Jun 14, 2017
689bfe1
Fix code style
TrySound Jun 14, 2017
2276370
Optimize custom property checking
TrySound Jun 14, 2017
1235b39
Prevents adding units to css custom properties in markup creation
TrySound Jun 14, 2017
8b62b32
Update passing tests
gaearon Jun 14, 2017
97f8d00
Fix argument name and reuse check in DEV
gaearon Jun 14, 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
4 changes: 3 additions & 1 deletion src/renderers/dom/shared/CSSPropertyOperations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,17 @@ var CSSPropertyOperations = {
if (__DEV__) {
warnValidStyle(styleName, styles[styleName], component);
}
var isCustomProperty = styleName.indexOf('--') === 0;
var styleValue = dangerousStyleValue(
styleName,
styles[styleName],
component,
isCustomProperty,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the only place this function is called as far as I can see. Can you please make sure this argument always exists?

);
if (styleName === 'float') {
styleName = 'cssFloat';
}
if (styleName.indexOf('--') === 0) {
if (isCustomProperty) {
style.setProperty(styleName, styleValue);
} else if (styleValue) {
style[styleName] = styleValue;
Expand Down
15 changes: 14 additions & 1 deletion src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ describe('CSSPropertyOperations', () => {
);
});

it('should not warn when setting CSS variables', () => {
it('should not warn when setting CSS custom properties', () => {
class Comp extends React.Component {
render() {
return <div style={{'--foo-primary': 'red', backgroundColor: 'red'}} />;
Expand Down Expand Up @@ -287,4 +287,17 @@ describe('CSSPropertyOperations', () => {
'\n\nCheck the render method of `Comp`.',
);
});

it('should not add units to CSS custom properties', () => {
class Comp extends React.Component {
render() {
return <div style={{'--foo': 5}} />;
}
}

var root = document.createElement('div');
ReactDOM.render(<Comp />, root);

expect(root.children[0].style.Foo).toEqual('5');
});
});
3 changes: 2 additions & 1 deletion src/renderers/dom/shared/dangerousStyleValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ var isUnitlessNumber = CSSProperty.isUnitlessNumber;
* @param {ReactDOMComponent} component
* @return {string} Normalized style value with dimensions applied.
*/
function dangerousStyleValue(name, value, component) {
function dangerousStyleValue(name, value, component, isCustomProperty) {
// Note that we've removed escapeTextForBrowser() calls here since the
// whole string will be escaped when the attribute is injected into
// the markup. If you provide unsafe user data here they can inject
Expand All @@ -42,6 +42,7 @@ function dangerousStyleValue(name, value, component) {
}

if (
!isCustomProperty &&
typeof value === 'number' &&
value !== 0 &&
!(isUnitlessNumber.hasOwnProperty(name) && isUnitlessNumber[name])
Expand Down