Skip to content

Commit 3e65b4f

Browse files
committed
New Style.transform method for ordered transforms
Closes #333
1 parent 47e41f0 commit 3e65b4f

3 files changed

Lines changed: 166 additions & 0 deletions

File tree

‎lib/js/src/style.js‎

Lines changed: 110 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/style.re‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ type t;
22

33
type styleElement = (string, Js.Json.t);
44

5+
type styleTransformElement = (string, Js.Json.t);
6+
57
type pt_only =
68
| Pt(float);
79

@@ -55,6 +57,15 @@ let encode_string_interpolated =
5557
| String(value) => Encode.string(value)
5658
| Animated(value) => Encode.animatedValue(value);
5759

60+
type deg_animated('a) =
61+
| Deg(string)
62+
| Animated(AnimatedRe.value('a));
63+
64+
let encode_deg_animated =
65+
fun
66+
| Deg(value) => Encode.string(value)
67+
| Animated(value) => Encode.animatedValue(value);
68+
5869
external flatten: array(t) => t = "%identity";
5970

6071
external to_style: Js.Dict.t(Js.Json.t) => t = "%identity";
@@ -345,7 +356,25 @@ let shadowOpacity = floatStyle("shadowOpacity");
345356

346357
let shadowRadius = floatStyle("shadowRadius");
347358

359+
let transform = listyle =>
360+
listyle
361+
->Belt.List.map(ts => [ts]->Js.Dict.fromList->Encode.object_)
362+
->Belt.List.toArray
363+
|> arrayStyle("transform");
348364
module Transform = {
365+
let perspective = value => ("perspective", encode_float_animated(value));
366+
let translateX = value => ("translateX", encode_float_animated(value));
367+
let translateY = value => ("translateY", encode_float_animated(value));
368+
let scaleX = value => ("scaleX", encode_float_animated(value));
369+
let scaleY = value => ("scaleY", encode_float_animated(value));
370+
let scale = value => ("scale", encode_float_animated(value));
371+
let rotate = value => ("rotate", encode_deg_animated(value));
372+
let rotateX = value => ("rotateX", encode_deg_animated(value));
373+
let rotateY = value => ("rotateY", encode_deg_animated(value));
374+
let rotateZ = value => ("rotateZ", encode_deg_animated(value));
375+
let skewX = value => ("skewX", encode_deg_animated(value));
376+
let skewY = value => ("skewY", encode_deg_animated(value));
377+
349378
let create_ =
350379
(
351380
encoder,

‎src/style.rei‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
type t;
22
type styleElement;
3+
type styleTransformElement = (string, Js.Json.t);
34
type pt_only =
45
| Pt(float);
56
type pt_pct =
@@ -19,6 +20,9 @@ type float_animated('a) =
1920
type string_interpolated =
2021
| String(string)
2122
| Animated(AnimatedRe.Interpolation.t);
23+
type deg_animated('a) =
24+
| Deg(string)
25+
| Animated(AnimatedRe.value('a));
2226
external flatten: array(t) => t = "%identity";
2327
let combine: (t, t) => t;
2428
let concat: list(t) => t;
@@ -120,7 +124,26 @@ let shadowColor: string_interpolated => styleElement;
120124
let shadowOffset: (~height: float, ~width: float) => styleElement;
121125
let shadowOpacity: float => styleElement;
122126
let shadowRadius: float => styleElement;
127+
128+
let transform: list(styleTransformElement) => styleElement;
129+
123130
module Transform: {
131+
let perspective: float_animated('a) => styleTransformElement;
132+
let translateX: float_animated('a) => styleTransformElement;
133+
let translateY: float_animated('a) => styleTransformElement;
134+
let scaleX: float_animated('a) => styleTransformElement;
135+
let scaleY: float_animated('a) => styleTransformElement;
136+
let scale: float_animated('a) => styleTransformElement;
137+
let rotate: deg_animated('a) => styleTransformElement;
138+
let rotateX: deg_animated('a) => styleTransformElement;
139+
let rotateY: deg_animated('a) => styleTransformElement;
140+
let rotateZ: deg_animated('a) => styleTransformElement;
141+
let skewX: deg_animated('a) => styleTransformElement;
142+
let skewY: deg_animated('a) => styleTransformElement;
143+
144+
[@deprecated
145+
"Please use Style.transform instead. Read more at https://github.com/reasonml-community/bs-react-native/issues/333"
146+
]
124147
let make:
125148
(
126149
~perspective: float=?,
@@ -137,6 +160,10 @@ module Transform: {
137160
unit
138161
) =>
139162
styleElement;
163+
164+
[@deprecated
165+
"Please use Style.transform instead. Read more at https://github.com/reasonml-community/bs-react-native/issues/333"
166+
]
140167
let makeAnimated:
141168
(
142169
~perspective: AnimatedRe.value('a)=?,

0 commit comments

Comments
 (0)