Skip to content

Commit 7aad46d

Browse files
committed
Revert "Dumber Style.merge"
This reverts commit 9eb91c3.
1 parent 26c0e95 commit 7aad46d

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

‎bs-react-native/src/style.bs.js‎

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

‎bs-react-native/src/style.re‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ let encode_deg_animated =
6868

6969
external to_style: Js.Dict.t(Js.Json.t) => t = "%identity";
7070

71+
external style_to_dict: t => Js.Dict.t(Js.Json.t) = "%identity";
72+
7173
external arrayOfStyle: array(t) => t = "%identity";
7274

7375
let floatStyle = (key, value) => (key, Internals.Encoder.float(value));
@@ -83,7 +85,14 @@ let emptyStyle = Js.Dict.empty()->to_style;
8385

8486
external fromArray: array(t) => t = "%identity";
8587
let fromList = styles => styles->Belt.List.toArray->arrayOfStyle;
86-
let merge = (a, b) => [|a, b|]->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+
};
8796
let mergeOptional = (s, so) =>
8897
so->Belt.Option.map(so => s->merge(so))->Belt.Option.getWithDefault(s);
8998
let optional = s => s->Belt.Option.getWithDefault(emptyStyle);

0 commit comments

Comments
 (0)