css-to-react-native
Advanced tools
Comparing version 2.2.2 to 2.3.0
12
index.js
@@ -22,3 +22,3 @@ 'use strict'; | ||
var cssColorKeywords = _interopDefault(require('css-color-keywords')); | ||
var camelizeStyleName = _interopDefault(require('fbjs/lib/camelizeStyleName')); | ||
var camelizeStyleName = _interopDefault(require('camelize')); | ||
@@ -278,4 +278,2 @@ var matchString = function matchString(node) { | ||
var FLEX_BASIS_AUTO = {}; // Used for reference equality | ||
var flex = function flex(tokenStream) { | ||
@@ -288,3 +286,3 @@ var flexGrow = void 0; | ||
tokenStream.expectEmpty(); | ||
return { $merge: { flexGrow: 0, flexShrink: 0 } }; | ||
return { $merge: { flexGrow: 0, flexShrink: 0, flexBasis: 'auto' } }; | ||
} | ||
@@ -294,3 +292,3 @@ | ||
if (tokenStream.matches(AUTO) && !tokenStream.hasTokens()) { | ||
return { $merge: { flexGrow: 1, flexShrink: 1 } }; | ||
return { $merge: { flexGrow: 1, flexShrink: 1, flexBasis: 'auto' } }; | ||
} | ||
@@ -315,3 +313,3 @@ tokenStream.rewind(); | ||
} else if (flexBasis === undefined && tokenStream.matches(AUTO)) { | ||
flexBasis = FLEX_BASIS_AUTO; | ||
flexBasis = 'auto'; | ||
} else { | ||
@@ -330,3 +328,3 @@ tokenStream.throw(); | ||
return flexBasis !== FLEX_BASIS_AUTO ? { $merge: { flexGrow: flexGrow, flexShrink: flexShrink, flexBasis: flexBasis } } : { $merge: { flexGrow: flexGrow, flexShrink: flexShrink } }; | ||
return { $merge: { flexGrow: flexGrow, flexShrink: flexShrink, flexBasis: flexBasis } }; | ||
}; | ||
@@ -333,0 +331,0 @@ |
{ | ||
"name": "css-to-react-native", | ||
"version": "2.2.2", | ||
"version": "2.3.0", | ||
"description": "Convert CSS text to a React Native stylesheet object", | ||
@@ -36,2 +36,5 @@ "main": "index.js", | ||
"homepage": "https://github.com/styled-components/css-to-react-native#readme", | ||
"jest": { | ||
"testURL": "http://localhost" | ||
}, | ||
"devDependencies": { | ||
@@ -51,4 +54,4 @@ "babel-cli": "^6.26.0", | ||
"dependencies": { | ||
"camelize": "^1.0.0", | ||
"css-color-keywords": "^1.0.0", | ||
"fbjs": "^0.8.5", | ||
"postcss-value-parser": "^3.3.0" | ||
@@ -55,0 +58,0 @@ }, |
@@ -76,2 +76,3 @@ import transformCss from '..' | ||
flexShrink: 1, | ||
flexBasis: 'auto', | ||
}) | ||
@@ -84,2 +85,3 @@ }) | ||
flexShrink: 1, | ||
flexBasis: 'auto', | ||
}) | ||
@@ -92,2 +94,3 @@ }) | ||
flexShrink: 1, | ||
flexBasis: 'auto', | ||
}) | ||
@@ -100,2 +103,3 @@ }) | ||
flexShrink: 0, | ||
flexBasis: 'auto', | ||
}) | ||
@@ -102,0 +106,0 @@ }) |
/* eslint-disable no-param-reassign */ | ||
import parse from 'postcss-value-parser' | ||
import camelizeStyleName from 'fbjs/lib/camelizeStyleName' | ||
import camelizeStyleName from 'camelize' | ||
import transforms from './transforms/index' | ||
@@ -5,0 +5,0 @@ import TokenStream from './TokenStream' |
@@ -9,4 +9,2 @@ import { tokens } from '../tokenTypes' | ||
const FLEX_BASIS_AUTO = {} // Used for reference equality | ||
export default tokenStream => { | ||
@@ -19,3 +17,3 @@ let flexGrow | ||
tokenStream.expectEmpty() | ||
return { $merge: { flexGrow: 0, flexShrink: 0 } } | ||
return { $merge: { flexGrow: 0, flexShrink: 0, flexBasis: 'auto' } } | ||
} | ||
@@ -25,3 +23,3 @@ | ||
if (tokenStream.matches(AUTO) && !tokenStream.hasTokens()) { | ||
return { $merge: { flexGrow: 1, flexShrink: 1 } } | ||
return { $merge: { flexGrow: 1, flexShrink: 1, flexBasis: 'auto' } } | ||
} | ||
@@ -46,3 +44,3 @@ tokenStream.rewind() | ||
} else if (flexBasis === undefined && tokenStream.matches(AUTO)) { | ||
flexBasis = FLEX_BASIS_AUTO | ||
flexBasis = 'auto' | ||
} else { | ||
@@ -61,5 +59,3 @@ tokenStream.throw() | ||
return flexBasis !== FLEX_BASIS_AUTO | ||
? { $merge: { flexGrow, flexShrink, flexBasis } } | ||
: { $merge: { flexGrow, flexShrink } } | ||
return { $merge: { flexGrow, flexShrink, flexBasis } } | ||
} |
82117
+ Addedcamelize@^1.0.0
+ Addedcamelize@1.0.1(transitive)
- Removedfbjs@^0.8.5
- Removedasap@2.0.6(transitive)
- Removedcore-js@1.2.7(transitive)
- Removedencoding@0.1.13(transitive)
- Removedfbjs@0.8.18(transitive)
- Removediconv-lite@0.6.3(transitive)
- Removedis-stream@1.1.0(transitive)
- Removedisomorphic-fetch@2.2.1(transitive)
- Removedjs-tokens@4.0.0(transitive)
- Removedloose-envify@1.4.0(transitive)
- Removednode-fetch@1.7.3(transitive)
- Removedobject-assign@4.1.1(transitive)
- Removedpromise@7.3.1(transitive)
- Removedsafer-buffer@2.1.2(transitive)
- Removedsetimmediate@1.0.5(transitive)
- Removedua-parser-js@0.7.37(transitive)
- Removedwhatwg-fetch@3.6.20(transitive)