taro-css-to-react-native 3.5.0-beta.0 → 3.5.0-beta.3

package/dist/css-to-react-native/tokenTypes.js

@@ -54,6 +54,24 @@ var valueForTypeToken = function valueForTypeToken(type) {
   };
 };
 
+var functionValueForTypeToken = function functionValueForTypeToken(type) {
+  return function (node) {
+    if (node.type === type) {
+      // handle rgb(a) function value
+      if (/^rgba?$/i.test(node.value)) {
+        var result = node.nodes.filter(function (token) {
+          return token.type === 'word';
+        }).map(function (token) {
+          return token.value;
+        });
+        return "".concat(node.value, "(").concat(result.join(', '), ")");
+      }
+    }
+
+    return null;
+  };
+};
+
 var regExpToken = function regExpToken(regExp) {
   var transform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : String;
   return function (node) {
@@ -82,6 +100,7 @@ var tokens = {
     return node.type === 'div' && node.value === ',';
   }),
   WORD: valueForTypeToken('word'),
+  FUNC: functionValueForTypeToken('function'),
   NONE: regExpToken(noneRe),
   AUTO: regExpToken(autoRe),
   NUMBER: regExpToken(numberRe, Number),

package/dist/css-to-react-native/transforms/border.js

@@ -12,6 +12,7 @@ var _util = require("./util");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var WORD = _tokenTypes.tokens.WORD,
+    FUNC = _tokenTypes.tokens.FUNC,
     COLOR = _tokenTypes.tokens.COLOR,
     LENGTH = _tokenTypes.tokens.LENGTH,
     UNSUPPORTED_LENGTH_UNIT = _tokenTypes.tokens.UNSUPPORTED_LENGTH_UNIT;
@@ -44,7 +45,7 @@ exports.borderBottom = borderBottom;
 var borderLeft = borderDirectionFactory('Left');
 exports.borderLeft = borderLeft;
 var borderColor = (0, _util.directionFactory)({
-  types: [WORD],
+  types: [WORD, FUNC],
   prefix: 'border',
   suffix: 'Color'
 });

package/dist/index.js

@@ -65,6 +65,11 @@ var transformDecls = function transformDecls(styles, declarations, result) {
 
     if (typeof options.scalable === 'boolean' && !options.scalable && /(\d+)px/.test(value)) {
       value = value.replace(/(\d+)px/g, '$1PX');
+    } // expect value is legal so that remove !import
+
+
+    if (/!import/i.test(value)) {
+      value = value.replace(/!import/, '');
     }
 
     if (shorthandBorderProps.indexOf(property) > -1) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "taro-css-to-react-native",
   "description": "Convert CSS text to a React Native stylesheet object",
-  "version": "3.5.0-beta.0",
+  "version": "3.5.0-beta.3",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {
@@ -63,5 +63,5 @@
     "CHANGELOG.md",
     "README.md"
   ],
-  "gitHead": "ee17506905a260bacd1aa6217a2376ba7bb8200f"
+  "gitHead": "bd1aa21707e51500eac9b16526e4ba4171fa8e5f"
 }

package/src/css-to-react-native/tokenTypes.js

@@ -38,6 +38,20 @@ const noopToken = predicate => node => (predicate(node) ? '<token>' : null)
 
 const valueForTypeToken = type => node => (node.type === type ? node.value : null)
 
+const functionValueForTypeToken = type => node => {
+  if (node.type === type) {
+    // handle rgb(a) function value
+    if (/^rgba?$/i.test(node.value)) {
+      const result = node.nodes
+        .filter(token => token.type === 'word')
+        .map(token => token.value)
+
+      return `${node.value}(${result.join(', ')})`
+    }
+  }
+  return null
+}
+
 export const regExpToken = (regExp, transform = String) => node => {
   if (node.type !== 'word') return null
 
@@ -57,6 +71,7 @@ export const tokens = {
   SLASH: noopToken(node => node.type === 'div' && node.value === '/'),
   COMMA: noopToken(node => node.type === 'div' && node.value === ','),
   WORD: valueForTypeToken('word'),
+  FUNC: functionValueForTypeToken('function'),
   NONE: regExpToken(noneRe),
   AUTO: regExpToken(autoRe),
   NUMBER: regExpToken(numberRe, Number),

package/src/css-to-react-native/transforms/border.js

@@ -3,6 +3,7 @@ import { directionFactory, anyOrderFactory } from './util'
 
 const {
   WORD,
+  FUNC,
   COLOR,
   LENGTH,
   UNSUPPORTED_LENGTH_UNIT
@@ -34,7 +35,7 @@ export const borderBottom = borderDirectionFactory('Bottom')
 export const borderLeft = borderDirectionFactory('Left')
 
 export const borderColor = directionFactory({
-  types: [WORD],
+  types: [WORD, FUNC],
   prefix: 'border',
   suffix: 'Color'
 })

package/src/index.js

@@ -59,6 +59,10 @@ const transformDecls = (styles, declarations, result, options = {}) => {
     ) {
       value = value.replace(/(\d+)px/g, '$1PX')
     }
+    // expect value is legal so that remove !import
+    if (/!import/i.test(value)) {
+      value = value.replace(/!import/, '')
+    }
 
     if (shorthandBorderProps.indexOf(property) > -1) {
       // transform single value shorthand border properties back to