Skip to content

Commit f7cf017

Browse files
vjeuxvjeux
committed
Updates from Tue 17 Mar
- [ReactNative] Remove pushNotification prop from renderApplication | Eric Vicenti - [react_native] Stub VibrationIOS on Android | Andy Street - [ReactNative] Simplify and test interpolators | Christopher Chedeau - [ReactNative] Increase timeout for obj-c tests | Christopher Chedeau - [ReactNative] Updated RKText to new UIManager system | Nick Lockwood - [ReactNative] Unforked RCTShadowView, moved RKTextView into FBReactKitTextModule | Nick Lockwood - [ReactKit] Remove NativeModulesDeprecated | Spencer Ahrens - [ReactNative] Allow single callbacks in NativeModules | Spencer Ahrens - [ReactNative] s/RK/RCT in OSS | Spencer Ahrens - [ReactNative] Cleanup StyleSheet API | Christopher Chedeau - [RCTVibration] Basic Vibration API | Christopher Chedeau - [React Native] Prevent crash in redbox code with two thrown errors | Ben Alpert - [ReactNative] unbreak Android | Andrew Rasmussen
1 parent 299dea8 commit f7cf017

77 files changed

Lines changed: 937 additions & 530 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Examples/UIExplorer/UIExplorer.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
2020
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2121
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 147CED4B1AB34F8C00DA3E4C /* libRCTActionSheet.a */; };
22+
D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */; };
2223
/* End PBXBuildFile section */
2324

2425
/* Begin PBXContainerItemProxy section */
@@ -78,6 +79,13 @@
7879
remoteGlobalIDString = 134814201AA4EA6300B7C361;
7980
remoteInfo = RCTActionSheet;
8081
};
82+
D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */ = {
83+
isa = PBXContainerItemProxy;
84+
containerPortal = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
85+
proxyType = 2;
86+
remoteGlobalIDString = 832C81801AAF6DEF007FA2F7;
87+
remoteInfo = RCTVibration;
88+
};
8189
/* End PBXContainerItemProxy section */
8290

8391
/* Begin PBXFileReference section */
@@ -98,6 +106,7 @@
98106
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
99107
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
100108
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = ../../Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj; sourceTree = "<group>"; };
109+
D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = ../../Libraries/Vibration/RCTVibration.xcodeproj; sourceTree = "<group>"; };
101110
/* End PBXFileReference section */
102111

103112
/* Begin PBXFrameworksBuildPhase section */
@@ -112,6 +121,7 @@
112121
isa = PBXFrameworksBuildPhase;
113122
buildActionMask = 2147483647;
114123
files = (
124+
D85B829E1AB6D5D7003F4FE2 /* libRCTVibration.a in Frameworks */,
115125
147CED4C1AB3532B00DA3E4C /* libRCTActionSheet.a in Frameworks */,
116126
134454601AAFCABD003F0779 /* libRCTAdSupport.a in Frameworks */,
117127
134A8A2A1AACED7A00945AAE /* libRCTGeolocation.a in Frameworks */,
@@ -145,6 +155,7 @@
145155
1316A21D1AA397F400C0188E /* Libraries */ = {
146156
isa = PBXGroup;
147157
children = (
158+
D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */,
148159
14E0EEC81AB118F7000DECC3 /* RCTActionSheet.xcodeproj */,
149160
13417FFA1AA91531003F314A /* ReactKit.xcodeproj */,
150161
134454551AAFCAAE003F0779 /* RCTAdSupport.xcodeproj */,
@@ -244,6 +255,14 @@
244255
name = Products;
245256
sourceTree = "<group>";
246257
};
258+
D85B82921AB6D5CE003F4FE2 /* Products */ = {
259+
isa = PBXGroup;
260+
children = (
261+
D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */,
262+
);
263+
name = Products;
264+
sourceTree = "<group>";
265+
};
247266
/* End PBXGroup section */
248267

249268
/* Begin PBXNativeTarget section */
@@ -333,6 +352,10 @@
333352
ProductGroup = 13417FEB1AA914B8003F314A /* Products */;
334353
ProjectRef = 13417FEA1AA914B8003F314A /* RCTText.xcodeproj */;
335354
},
355+
{
356+
ProductGroup = D85B82921AB6D5CE003F4FE2 /* Products */;
357+
ProjectRef = D85B82911AB6D5CE003F4FE2 /* RCTVibration.xcodeproj */;
358+
},
336359
{
337360
ProductGroup = 13417FFB1AA91531003F314A /* Products */;
338361
ProjectRef = 13417FFA1AA91531003F314A /* ReactKit.xcodeproj */;
@@ -396,6 +419,13 @@
396419
remoteRef = 147CED4A1AB34F8C00DA3E4C /* PBXContainerItemProxy */;
397420
sourceTree = BUILT_PRODUCTS_DIR;
398421
};
422+
D85B829C1AB6D5CE003F4FE2 /* libRCTVibration.a */ = {
423+
isa = PBXReferenceProxy;
424+
fileType = archive.ar;
425+
path = libRCTVibration.a;
426+
remoteRef = D85B829B1AB6D5CE003F4FE2 /* PBXContainerItemProxy */;
427+
sourceTree = BUILT_PRODUCTS_DIR;
428+
};
399429
/* End PBXReferenceProxy section */
400430

401431
/* Begin PBXResourcesBuildPhase section */

‎Examples/UIExplorer/UIExplorerList.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ var EXAMPLES = [
4747
require('./AdSupportIOSExample'),
4848
require('./AppStateExample'),
4949
require('./ActionSheetIOSExample'),
50+
require('./VibrationIOSExample'),
5051
];
5152

5253
var UIExplorerList = React.createClass({

‎Examples/UIExplorer/UIExplorerTests/UIExplorerTests.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#import <UIKit/UIKit.h>
44
#import <XCTest/XCTest.h>
55

6-
#define TIMEOUT_SECONDS 30
6+
#define TIMEOUT_SECONDS 240
77

88
@interface UIExplorerTests : XCTestCase
99

‎Examples/UIExplorer/VibrationIOSExample.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
* Copyright 2004-present Facebook. All Rights Reserved.
3+
*/
4+
'use strict';
5+
6+
var React = require('react-native');
7+
var {
8+
StyleSheet,
9+
View,
10+
Text,
11+
TouchableHighlight,
12+
VibrationIOS
13+
} = React;
14+
15+
exports.framework = 'React';
16+
exports.title = 'VibrationIOS';
17+
exports.description = 'Vibration API for iOS';
18+
exports.examples = [{
19+
title: 'VibrationIOS.vibrate()',
20+
render() {
21+
return (
22+
<TouchableHighlight
23+
style={styles.wrapper}
24+
onPress={() => VibrationIOS.vibrate()}>
25+
<View style={styles.button}>
26+
<Text>Vibrate</Text>
27+
</View>
28+
</TouchableHighlight>
29+
);
30+
},
31+
}];
32+
33+
var styles = StyleSheet.create({
34+
wrapper: {
35+
borderRadius: 5,
36+
marginBottom: 5,
37+
},
38+
button: {
39+
backgroundColor: '#eeeeee',
40+
padding: 10,
41+
},
42+
});

‎Libraries/ActionSheetIOS/ActionSheetIOS.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
*/
66
'use strict';
77

8+
var { RCTActionSheetManager } = require('NativeModules');
9+
810
var invariant = require('invariant');
9-
var RCTActionSheetManager = require('NativeModulesDeprecated').RKActionSheetManager;
1011

1112
var ActionSheetIOS = {
1213
showActionSheetWithOptions(options, callback) {

0 commit comments

Comments
 (0)