Merge pull request #3485 from jnu/ie10-flex-unitless

Treat flexPositive, flexNegative as unitless styles
facebook · Apr 14, 2015 · 41a6186 · 41a6186
2 parents 4504504 + 51b6092
commit 41a6186
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/docs/tips/06-style-props-value-px.md b/docs/tips/06-style-props-value-px.md
@@ -18,11 +18,15 @@ See [Inline Styles](/react/tips/inline-styles.html) for more info.
 
 Sometimes you _do_ want to keep the CSS properties unitless. Here's a list of properties that won't get the automatic "px" suffix:
 
+- `boxFlex`
+- `boxFlexGroup`
 - `columnCount`
 - `fillOpacity`
 - `flex`
 - `flexGrow`
+- `flexPositive`
 - `flexShrink`
+- `flexNegative`
 - `fontWeight`
 - `lineClamp`
 - `lineHeight`

diff --git a/src/browser/ui/dom/CSSProperty.js b/src/browser/ui/dom/CSSProperty.js
@@ -20,7 +20,9 @@ var isUnitlessNumber = {
   columnCount: true,
   flex: true,
   flexGrow: true,
+  flexPositive: true,
   flexShrink: true,
+  flexNegative: true,
   fontWeight: true,
   lineClamp: true,
   lineHeight: true,