Skip to content

Commit

Permalink
Merge pull request facebook#214 from callstackincubator/feat/update-misc
Browse files Browse the repository at this point in the history
Rebolt: Update all remaining components
  • Loading branch information
ulrikstrid authored Aug 30, 2018
2 parents 7ba25ba + 2f92ea6 commit 65af108
Show file tree
Hide file tree
Showing 129 changed files with 1,159 additions and 677 deletions.
2 changes: 1 addition & 1 deletion RNTester/src/RNTesterApp.re
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ let header = (~onBack=?, ~title, ()) =>
</View>
(
switch (onBack) {
| None => ReasonReact.nullElement
| None => ReasonReact.null
| Some(onBack) =>
<View style=styles##headerLeft>
<Button title="Back" onPress=onBack />
Expand Down
4 changes: 2 additions & 2 deletions RNTester/src/RNTesterBlock.re
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ let make = (~description, ~title, children) => {
<Text style=styles##descriptionText>
(ReasonReact.string(description))
</Text>
| None => ReasonReact.nullElement
| None => ReasonReact.null
}
)
</View>
(View.make(~style=styles##children, children) |> ReasonReact.element)
</View>,
};
};
2 changes: 1 addition & 1 deletion RNTester/src/RNTesterExampleContainer.re
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ let make = (~example: ExampleList.item, _children) => {
...component,
render: (_self) =>
<RNTesterPage title=example.title>
(ReasonReact.arrayToElement(Array.mapi(renderExample, example.examples)))
(ReasonReact.array(Array.mapi(renderExample, example.examples)))
</RNTesterPage>
};
8 changes: 4 additions & 4 deletions RNTester/src/RNTesterPage.re
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let make = (~title=?, ~noScroll=false, ~noSpacer=false, children) => {
let contentWrapper = (children_: array(ReasonReact.reactElement)) =>
if (noScroll) {
<View key="wrapper" style=styles##wrapper>
(ReasonReact.arrayToElement(children_))
(ReasonReact.array(children_))
</View>;
} else {
let automaticallyAdjustContentInsets =
Expand All @@ -31,7 +31,7 @@ let make = (~title=?, ~noScroll=false, ~noSpacer=false, children) => {
keyboardShouldPersistTaps=`handled
keyboardDismissMode=`interactive
style=styles##wrapper>
(ReasonReact.arrayToElement(children_))
(ReasonReact.array(children_))
</ScrollView>;
};
{
Expand All @@ -40,11 +40,11 @@ let make = (~title=?, ~noScroll=false, ~noSpacer=false, children) => {
let title =
switch (title) {
| Some(title) => <RNTesterTitle key="title" title />
| None => ReasonReact.nullElement
| None => ReasonReact.null
};
let spacer =
if (noSpacer) {
ReasonReact.nullElement;
ReasonReact.null;
} else {
<View key="spacer" style=styles##spacer />;
};
Expand Down
4 changes: 2 additions & 2 deletions RNTester/src/examples/ImageBackgroundExample.re
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let examples: array(Example.t) =
)
imageStyle=(style([flex(1.)]))
source=(
URI(
`URI(
Image.(
imageURISource(
~uri=
Expand All @@ -47,4 +47,4 @@ let examples: array(Example.t) =
</ImageBackground>,
},
|]
);
);
2 changes: 1 addition & 1 deletion RNTester/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2884,7 +2884,7 @@ react-devtools-core@3.0.0:
shell-quote "^1.6.1"
ws "^2.0.3"

react-native@0.53.3:
react-native@^0.53.3:
version "0.53.3"
resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.53.3.tgz#930d1de5d68866f32a4b55112fc0228e29784e8f"
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion lib/js/src/RNEvent.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 20 additions & 23 deletions lib/js/src/actionSheetIOS.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/alert.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/alertIOS.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/animated.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

121 changes: 63 additions & 58 deletions lib/js/src/animatedRe.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/appRegistry.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/js/src/appState.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 65af108

Please sign in to comment.