File tree 3 files changed +9
-4
lines changed
3 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ describe('#rpxTransformers', () => {
10
10
const remProps = { theme : { transformers : { ...rpxTransformers } } }
11
11
expect ( th . space ( 1 ) ( remProps ) ) . toBe ( '0.0625rem' )
12
12
expect ( th . space ( 2 ) ( remProps ) ) . toBe ( '0.125rem' )
13
+ expect ( th . space ( 200 ) ( remProps ) ) . toBe ( '12.5rem' )
13
14
expect ( th . border ( 2 ) ( remProps ) ) . toBe ( '0.125rem solid' )
14
15
} )
15
16
} )
Original file line number Diff line number Diff line change @@ -6,7 +6,6 @@ describe('unit', () => {
6
6
const em = unit ( 'em' )
7
7
expect ( em ( 0 ) ) . toBe ( 0 )
8
8
expect ( em ( 10 ) ) . toBe ( '10em' )
9
- expect ( em ( null ) ) . toBe ( null )
10
9
expect ( em ( undefined ) ) . toBe ( undefined )
11
10
expect ( em ( '10px' ) ) . toBe ( '10px' )
12
11
} )
@@ -16,7 +15,6 @@ describe('unit', () => {
16
15
it ( 'adds px if it is a number' , ( ) => {
17
16
expect ( px ( 0 ) ) . toBe ( 0 )
18
17
expect ( px ( 10 ) ) . toBe ( '10px' )
19
- expect ( px ( null ) ) . toBe ( null )
20
18
expect ( px ( undefined ) ) . toBe ( undefined )
21
19
expect ( px ( '10px' ) ) . toBe ( '10px' )
22
20
} )
Original file line number Diff line number Diff line change @@ -21,8 +21,14 @@ const pxToRem = (
21
21
{ rootFontSize = 16 } : PxToRemOptions = { } ,
22
22
) : number => round ( value / rootFontSize )
23
23
24
- export const remPx = ( value : CSSScalar , options ?: PxToRemOptions ) : CSSScalar =>
25
- num ( value ) && value !== 0 ? `${ pxToRem ( value , options ) } rem` : value
24
+ export const remPx = (
25
+ value : CSSScalar ,
26
+ options ?: PxToRemOptions ,
27
+ ) : CSSScalar => {
28
+ const num = Number ( value )
29
+ if ( Number . isNaN ( num ) || num === 0 ) return value
30
+ return `${ pxToRem ( num , options ) } rem`
31
+ }
26
32
27
33
export const rpx = ( value : CSSScalar , options ?: PxToRemOptions ) : CSSScalar => {
28
34
if ( ! string ( value ) || value . length < 4 ) return value
You can’t perform that action at this time.
0 commit comments