Skip to content

Commit 5686438

Browse files
committed
Revert "Update example to avoid deprecation warnings :)"
This reverts commit a60d831.
1 parent 7aad46d commit 5686438

1 file changed

Lines changed: 42 additions & 52 deletions

File tree

‎bs-react-native-example/src/pages/ViewExample.re‎

Lines changed: 42 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -106,55 +106,47 @@ module ZIndexExample = {
106106
{ReasonReact.string("Tap to flip sorting order")}
107107
</Text>
108108
<View
109-
style={
110-
styles##zIndex
111-
->merge(
112-
style([
113-
marginTop(Pt(0.)),
114-
backgroundColor(String("#E57373")),
115-
zIndex(Array.unsafe_get(indices, 0)),
116-
]),
117-
)
118-
}>
109+
style={concat([
110+
styles##zIndex,
111+
style([
112+
marginTop(Pt(0.)),
113+
backgroundColor(String("#E57373")),
114+
zIndex(Array.unsafe_get(indices, 0)),
115+
]),
116+
])}>
119117
<Text> {ReasonReact.string(zIndexStr(0))} </Text>
120118
</View>
121119
<View
122-
style={
123-
styles##zIndex
124-
->merge(
125-
style([
126-
marginLeft(Pt(50.)),
127-
backgroundColor(String("#FFF176")),
128-
zIndex(Array.unsafe_get(indices, 1)),
129-
]),
130-
)
131-
}>
120+
style={concat([
121+
styles##zIndex,
122+
style([
123+
marginLeft(Pt(50.)),
124+
backgroundColor(String("#FFF176")),
125+
zIndex(Array.unsafe_get(indices, 1)),
126+
]),
127+
])}>
132128
<Text> {ReasonReact.string(zIndexStr(1))} </Text>
133129
</View>
134130
<View
135-
style={
136-
styles##zIndex
137-
->merge(
138-
style([
139-
marginLeft(Pt(100.)),
140-
backgroundColor(String("#81C784")),
141-
zIndex(Array.unsafe_get(indices, 2)),
142-
]),
143-
)
144-
}>
131+
style={concat([
132+
styles##zIndex,
133+
style([
134+
marginLeft(Pt(100.)),
135+
backgroundColor(String("#81C784")),
136+
zIndex(Array.unsafe_get(indices, 2)),
137+
]),
138+
])}>
145139
<Text> {ReasonReact.string(zIndexStr(2))} </Text>
146140
</View>
147141
<View
148-
style={
149-
styles##zIndex
150-
->merge(
151-
style([
152-
marginLeft(Pt(150.)),
153-
backgroundColor(String("#64B5F6")),
154-
zIndex(Array.unsafe_get(indices, 3)),
155-
]),
156-
)
157-
}>
142+
style={concat([
143+
styles##zIndex,
144+
style([
145+
marginLeft(Pt(150.)),
146+
backgroundColor(String("#64B5F6")),
147+
zIndex(Array.unsafe_get(indices, 3)),
148+
]),
149+
])}>
158150
<Text> {ReasonReact.string(zIndexStr(3))} </Text>
159151
</View>
160152
</View>
@@ -212,27 +204,25 @@ let examples: array(Example.t) =
212204
borderColor(String("#bb0000")),
213205
borderWidth(1.),
214206
])}>
215-
<View style={styles##box->merge(style([padding(Pt(5.))]))}>
207+
<View style={concat([styles##box, style([padding(Pt(5.))])])}>
216208
<Text style={style([fontSize(Float(11.))])}>
217209
{ReasonReact.string("5px padding")}
218210
</Text>
219211
</View>
220-
<View style={styles##box->merge(style([margin(Pt(5.))]))}>
212+
<View style={concat([styles##box, style([margin(Pt(5.))])])}>
221213
<Text style={style([fontSize(Float(11.))])}>
222214
{ReasonReact.string("5px margin")}
223215
</Text>
224216
</View>
225217
<View
226-
style={
227-
styles##box
228-
->merge(
229-
style([
230-
margin(Pt(5.)),
231-
padding(Pt(5.)),
232-
alignSelf(FlexStart),
233-
]),
234-
)
235-
}>
218+
style={concat([
219+
styles##box,
220+
style([
221+
margin(Pt(5.)),
222+
padding(Pt(5.)),
223+
alignSelf(FlexStart),
224+
]),
225+
])}>
236226
<Text style={style([fontSize(Float(11.))])}>
237227
{ReasonReact.string("5px margin and padding,")}
238228
</Text>

0 commit comments

Comments
 (0)