Repository navigation
Commit 9eb91c3
committed
Dumber Style.merge
Currently merge was a real "object merge". This means you cannot pipe merge with style from a StyleSheet item (int) since merging {} with an int just doesn't work.
merge is now dumber and just make an array, rnw will handle the resolution on it's side.
Don't abuse about this merge anyway :)1 parent 2236a0e commit 9eb91c3
2 files changed
Lines changed: 9 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
72 | | - | |
73 | 71 | | |
74 | 72 | | |
75 | 73 | | |
| |||
85 | 83 | | |
86 | 84 | | |
87 | 85 | | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
| 86 | + | |
96 | 87 | | |
97 | 88 | | |
98 | 89 | | |
| |||
0 commit comments