@@ -66,24 +66,11 @@ let encode_deg_animated =
6666 | Deg (value ) => Internals . Encoder . string(value)
6767 | Animated (value ) => Internals . Encoder . animatedValue(value);
6868
69- external flatten : array (t ) => t = "% identity " ;
70-
7169external to_style : Js . Dict . t (Js . Json . t ) => t = "% identity " ;
7270
7371external style_to_dict : t => Js . Dict . t (Js . Json . t ) = "% identity " ;
7472
75- external array_to_style : array (t ) => t = "% identity " ;
76-
77- let combine = (a, b) => {
78- let entries =
79- Array . append(
80- Js . Dict . entries(style_to_dict(a)),
81- Js . Dict . entries(style_to_dict(b)),
82- );
83- Js . Dict . fromArray(entries) |> to_style;
84- };
85-
86- let concat = styles => array_to_style(Array . of_list(styles));
73+ external arrayOfStyle : array (t ) => t = "% identity " ;
8774
8875let floatStyle = (key, value) => (key, Internals . Encoder . float(value));
8976
@@ -94,14 +81,28 @@ let objectStyle = (key, value) => (key, Internals.Encoder.object_(value));
9481let arrayStyle = (key, value) => (key, Internals . Encoder . array(value));
9582
9683let style = sarr => sarr |> Js . Dict . fromList |> to_style;
84+ let emptyStyle = Js . Dict . empty() -> to_style;
9785
98- let emptyStyle = style([] );
99-
100- let combineOptional = (s, so) =>
101- so-> Belt . Option . map(so => s-> combine(so))-> Belt . Option . getWithDefault(s);
102-
86+ external fromArray : array (t ) => t = "% identity " ;
87+ let fromList = styles => styles-> Belt . List . toArray-> arrayOfStyle;
88+ let merge = (a, b) => {
89+ let entries =
90+ Array . append(
91+ Js . Dict . entries(style_to_dict(a)),
92+ Js . Dict . entries(style_to_dict(b)),
93+ );
94+ Js . Dict . fromArray(entries) |> to_style;
95+ };
96+ let mergeOptional = (s, so) =>
97+ so-> Belt . Option . map(so => s-> merge(so))-> Belt . Option . getWithDefault(s);
10398let optional = s => s-> Belt . Option . getWithDefault(emptyStyle);
10499
100+ /* deprecated */
101+ let flatten = fromArray;
102+ let concat = fromList;
103+ let combine = merge;
104+ let combineOptional = mergeOptional;
105+
105106/** *
106107 * Layout Props
107108 */
0 commit comments