Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit a878de1

Browse files
committed
chore(deps): update React Native to 0.39.2
1 parent 2649f28 commit a878de1

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"@angular/platform-server": "2.1.0",
6262
"@angular/router": "3.1.0",
6363
"hammerjs": "2.0.6",
64-
"react-native": "0.35.0",
64+
"react-native": "0.39.2",
6565
"reflect-metadata": "0.1.8",
6666
"rxjs": "5.0.0-beta.12",
6767
"zone.js": "mlaval/zone.js#0.6.23-fixed-for-RN"

sample/samples/ios/apis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export class APIsApp {
6262
{enableHighAccuracy: true, timeout: 20000, maximumAge: 1000}
6363
);
6464
NetInfo.fetch().then((reach: string) => { this.connectionType = reach });
65-
NetInfo.isConnectionExpensive((isConnectionExpensive: boolean) => { this.isConnectionExpensive = isConnectionExpensive });
65+
//NetInfo.isConnectionExpensive((isConnectionExpensive: boolean) => { this.isConnectionExpensive = isConnectionExpensive });
6666
NetInfo.isConnected.fetch().then((isConnected: boolean) => { this.isConnected = isConnected });
6767
this.styles = StyleSheet.create({
6868
button: {

src/components/common/scrollview.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export class ScrollView extends HighLevelComponent{
6262
private _nativeElement: Node;
6363
constructor(@Inject(REACT_NATIVE_WRAPPER) wrapper: ReactNativeWrapper, el: ElementRef) {
6464
super(wrapper);
65+
this.setDefaultStyle({overflow: 'scroll'});
6566
this._nativeElement = el.nativeElement;
6667
}
6768

src/wrapper/wrapper_impl.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ var UIManager = ReactNative.NativeModules.UIManager;
99
var resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
1010
var dismissKeyboard = require('react-native/Libraries/Utilities/dismissKeyboard');
1111

12-
var ReactNativeEventEmitter = require('react/lib/ReactNativeEventEmitter');
13-
var ReactNativeTagHandles = require('react/lib/ReactNativeTagHandles');
14-
var ReactNativeAttributePayload = require('react/lib/ReactNativeAttributePayload');
12+
var ReactNativeEventEmitter = require('react-native/Libraries/Renderer/src/renderers/native/ReactNativeEventEmitter');
13+
var ReactNativeTagHandles = require('react-native/Libraries/Renderer/src/renderers/native/ReactNativeTagHandles');
14+
var ReactNativeAttributePayload = require('react-native/Libraries/Renderer/src/renderers/native/ReactNativeAttributePayload');
1515
var ReactNativeViewAttributes = require('react-native/Libraries/Components/View/ReactNativeViewAttributes');
1616

1717
overridePlatform(ReactNative.Platform.OS);

test/components/scrollview_spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ describe('ScrollView component', () => {
1313
it('should render vertically', () => {
1414
initTest(TestComponent, `<ScrollView></ScrollView>`);
1515
expect(mock.commandLogs.toString()).toEqual(
16-
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"flexDirection":"column"},CREATE+4+native-view+{"collapsable":false,"flexDirection":null},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
16+
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"flexDirection":"column","overflow":"scroll"},CREATE+4+native-view+{"collapsable":false,"flexDirection":null},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
1717
});
1818

1919
it('should render horizontally', () => {
2020
initTest(TestComponent, `<ScrollView horizontal="true"></ScrollView>`);
2121
expect(mock.commandLogs.toString()).toEqual(
22-
'CREATE+2+test-cmp+{},CREATE+3+native-horizontalscrollview+{"horizontal":true,"flexDirection":"row"},CREATE+4+native-view+{"collapsable":false,"flexDirection":"row"},' +
22+
'CREATE+2+test-cmp+{},CREATE+3+native-horizontalscrollview+{"horizontal":true,"flexDirection":"row","overflow":"scroll"},CREATE+4+native-view+{"collapsable":false,"flexDirection":"row"},' +
2323
'ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
2424
});
2525

2626
it('should switch direction', () => {
2727
const {fixture, rootRenderer} = initTest(TestComponent, `<ScrollView [horizontal]="isHorizontal"></ScrollView>`);
2828
expect(mock.commandLogs.toString()).toEqual(
29-
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"horizontal":false,"flexDirection":"column"},CREATE+4+native-view+{"collapsable":false,"flexDirection":null},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
29+
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"horizontal":false,"flexDirection":"column","overflow":"scroll"},CREATE+4+native-view+{"collapsable":false,"flexDirection":null},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
3030

3131
mock.clearLogs();
3232
fixture.componentInstance.isHorizontal = true;
@@ -38,14 +38,14 @@ describe('ScrollView component', () => {
3838
it('should render with properties', () => {
3939
initTest(TestComponent, `<ScrollView scrollEnabled="{{false}}" removeClippedSubviews="true"></ScrollView>`);
4040
expect(mock.commandLogs.toString()).toEqual(
41-
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"scrollEnabled":false,"flexDirection":"column","removeClippedSubviews":true},' +
41+
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"scrollEnabled":false,"flexDirection":"column","removeClippedSubviews":true,"overflow":"scroll"},' +
4242
'CREATE+4+native-view+{"collapsable":false,"removeClippedSubviews":true,"flexDirection":null},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
4343
});
4444

4545
it('should render with styles', () => {
4646
initTest(TestComponent, `<ScrollView [styleSheet]="20" [style]="{fontSize: 42}" [contentContainerStyle]="20"></ScrollView>`);
4747
expect(mock.commandLogs.toString()).toEqual(
48-
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"flexDirection":"column","flex":1,"collapse":true,"fontSize":42},' +
48+
'CREATE+2+test-cmp+{},CREATE+3+native-scrollview+{"flexDirection":"column","overflow":"scroll","flex":1,"collapse":true,"fontSize":42},' +
4949
'CREATE+4+native-view+{"collapsable":false,"flexDirection":null,"flex":1,"collapse":true},ATTACH+1+2+0,ATTACH+2+3+0,ATTACH+3+4+0');
5050
});
5151

0 commit comments

Comments
 (0)