Limit some conversions

Author: asamuzaK

src/js/css-calc.js

@@ -42,7 +42,7 @@ export const resolveDimension = (token, opt = {}) => {
   }
   const [, value,,, detail = {}] = token;
   const { unit, value: relativeValue } = detail;
-  const { dimension = {}, format } = opt;
+  const { dimension = {} } = opt;
   if (unit === 'px') {
     return value;
   }
@@ -53,42 +53,22 @@ export const resolveDimension = (token, opt = {}) => {
       pixelValue = dimension[unit];
     } else if (typeof dimension.callback === 'function') {
       pixelValue = dimension.callback(unit);
-    } else if (/^(?:ch|ex|lh)$/.test(unit) &&
+    } else if (/^(?:ch|lh)$/.test(unit) &&
                Object.hasOwnProperty.call(dimension, 'em')) {
       const { em } = dimension;
       if (unit === 'lh') {
         pixelValue = em * 1.2;
       } else {
         pixelValue = em / 2;
       }
-    } else if (/^(?:rch|rex|rlh)$/.test(unit) &&
+    } else if (/^(?:rch|rlh)$/.test(unit) &&
                Object.hasOwnProperty.call(dimension, 'rem')) {
       const { rem } = dimension;
       if (unit === 'rlh') {
         pixelValue = rem * 1.2;
       } else {
         pixelValue = rem / 2;
       }
-    } else if (format === VAL_SPEC) {
-      const lengthInPx = {
-        ch: 8,
-        cm: 96 / 2.54,
-        em: 16,
-        ex: 8,
-        in: 96,
-        lh: 1.2 * 16,
-        mm: 96 / 2.54 / 10,
-        pc: 16,
-        pt: 16 / 12,
-        q: 96 / 2.54 / 40,
-        rch: 8,
-        rem: 16,
-        rex: 8,
-        rlh: 1.2 * 16
-      };
-      if (Object.hasOwnProperty.call(lengthInPx, unit)) {
-        pixelValue = lengthInPx[unit];
-      }
     }
     if (Number.isFinite(pixelValue)) {
       res = `${relativeValue * pixelValue}px`;

test/css-calc.test.js

@@ -168,7 +168,7 @@ describe('resolve dimension', () => {
     assert.strictEqual(res, '600px', 'result');
   });
 
-  it('should get value', () => {
+  it('should get null', () => {
     const token = [
       'dimension-token',
       '100ex',
@@ -188,7 +188,7 @@ describe('resolve dimension', () => {
         vw: 10.26
       }
     });
-    assert.strictEqual(res, '600px', 'result');
+    assert.strictEqual(res, null, 'result');
   });
 
   it('should get value', () => {
@@ -238,7 +238,7 @@ describe('resolve dimension', () => {
     assert.strictEqual(res, '80px', 'result');
   });
 
-  it('should get value', () => {
+  it('should get null', () => {
     const token = [
       'dimension-token',
       '10rex',
@@ -258,7 +258,7 @@ describe('resolve dimension', () => {
         vw: 10.26
       }
     });
-    assert.strictEqual(res, '80px', 'result');
+    assert.strictEqual(res, null, 'result');
   });
 
   it('should get value', () => {
@@ -285,7 +285,7 @@ describe('resolve dimension', () => {
     assert.strictEqual(res, '1920px', 'result');
   });
 
-  it('should get value', () => {
+  it('should get null', () => {
     const token = [
       'dimension-token',
       '100em',
@@ -301,7 +301,7 @@ describe('resolve dimension', () => {
     const res = func(token, {
       format: 'specifiedValue'
     });
-    assert.strictEqual(res, '1600px', 'result');
+    assert.strictEqual(res, null, 'result');
   });
 });