File tree Expand file tree Collapse file tree 2 files changed +24
-18
lines changed Expand file tree Collapse file tree 2 files changed +24
-18
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,23 @@ describe("scale", () => {
44
44
} ) ;
45
45
46
46
test ( "unparsed" , ( ) => {
47
+ registerCSS ( `
48
+ .my-class {
49
+ --scale-x: 2%;
50
+ --scale-y: 2%;
51
+ scale: var(--scale-x) var(--scale-y);
52
+ }
53
+ ` ) ;
54
+ const component = render (
55
+ < View testID = { testID } className = "my-class" /> ,
56
+ ) . getByTestId ( testID ) ;
57
+
58
+ expect ( component . props . style ) . toStrictEqual ( {
59
+ transform : [ { scale : "2%" } ] ,
60
+ } ) ;
61
+ } ) ;
62
+
63
+ test ( "unparsed - different values" , ( ) => {
47
64
registerCSS ( `
48
65
:root {
49
66
--scale-x: 2;
Original file line number Diff line number Diff line change @@ -66,25 +66,14 @@ export function applyValue(
66
66
}
67
67
68
68
const transformArray : Record < string , unknown > [ ] = target . transform ;
69
- const transform = transformArray . find ( ( t : any ) => t [ prop ] !== undefined ) ;
70
-
71
- /**
72
- * If our value is an array, this means a shorthand was split into multiple values
73
- * e.g scale -> scaleX, scaleY
74
- */
75
- if ( transform ) {
76
- if ( Array . isArray ( value ) ) {
77
- target . transform = transformArray . filter ( ( t ) => ! ( prop in t ) ) ;
78
- target . transform . push ( ...value ) ;
79
- } else {
80
- transform [ prop ] = value ;
81
- }
69
+
70
+ // Remove any existing values
71
+ target . transform = transformArray . filter ( ( t ) => ! ( prop in t ) ) ;
72
+
73
+ if ( Array . isArray ( value ) ) {
74
+ target . transform . push ( ...value ) ;
82
75
} else {
83
- if ( Array . isArray ( value ) ) {
84
- transformArray . push ( ...value ) ;
85
- } else {
86
- transformArray . push ( value ) ;
87
- }
76
+ target . transform . push ( value ) ;
88
77
}
89
78
return ;
90
79
} else if ( typeof value === "object" && value && ShortHandSymbol in value ) {
You can’t perform that action at this time.
0 commit comments