diff --git a/Examples/UIExplorer/AppStateExample.js b/Examples/UIExplorer/AppStateExample.js index a5f2e55ed..814039414 100644 --- a/Examples/UIExplorer/AppStateExample.js +++ b/Examples/UIExplorer/AppStateExample.js @@ -1,11 +1,4 @@ /** - * Copyright (c) 2013-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * * The examples provided by Facebook are for non-commercial testing and * evaluation purposes only. * @@ -23,9 +16,9 @@ */ 'use strict'; -const React = require('react'); -const ReactNative = require('react-native'); -const { +var React = require('react'); +var ReactNative = require('react-native'); +var { AppState, Text, View @@ -36,19 +29,13 @@ var AppStateSubscription = React.createClass({ return { appState: AppState.currentState, previousAppStates: [], - memoryWarnings: 0, }; }, componentDidMount: function() { AppState.addEventListener('change', this._handleAppStateChange); - AppState.addEventListener('memoryWarning', this._handleMemoryWarning); }, componentWillUnmount: function() { AppState.removeEventListener('change', this._handleAppStateChange); - AppState.removeEventListener('memoryWarning', this._handleMemoryWarning); - }, - _handleMemoryWarning: function() { - this.setState({memoryWarnings: this.state.memoryWarnings + 1}); }, _handleAppStateChange: function(appState) { var previousAppStates = this.state.previousAppStates.slice(); @@ -59,13 +46,6 @@ var AppStateSubscription = React.createClass({ }); }, render() { - if (this.props.showMemoryWarnings) { - return ( - - {this.state.memoryWarnings} - - ); - } if (this.props.showCurrentOnly) { return ( @@ -98,10 +78,4 @@ exports.examples = [ title: 'Previous states:', render(): ReactElement { return ; } }, - { - platform: 'ios', - title: 'Memory Warnings', - description: 'In the IOS simulator, hit Shift+Command+M to simulate a memory warning.', - render(): ReactElement { return ; } - }, ]; diff --git a/Examples/UIExplorer/AppStateIOSExample.js b/Examples/UIExplorer/AppStateIOSExample.js new file mode 100644 index 000000000..10aaed8aa --- /dev/null +++ b/Examples/UIExplorer/AppStateIOSExample.js @@ -0,0 +1,99 @@ +/** + * The examples provided by Facebook are for non-commercial testing and + * evaluation purposes only. + * + * Facebook reserves all rights not expressly granted. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL + * FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * @providesModule AppStateIOSExample + * @flow + */ +'use strict'; + +var React = require('react'); +var ReactNative = require('react-native'); +var { + AppStateIOS, + Text, + View +} = ReactNative; + +var AppStateSubscription = React.createClass({ + getInitialState() { + return { + appState: AppStateIOS.currentState, + previousAppStates: [], + memoryWarnings: 0, + }; + }, + componentDidMount: function() { + AppStateIOS.addEventListener('change', this._handleAppStateChange); + AppStateIOS.addEventListener('memoryWarning', this._handleMemoryWarning); + }, + componentWillUnmount: function() { + AppStateIOS.removeEventListener('change', this._handleAppStateChange); + AppStateIOS.removeEventListener('memoryWarning', this._handleMemoryWarning); + }, + _handleMemoryWarning: function() { + this.setState({memoryWarnings: this.state.memoryWarnings + 1}); + }, + _handleAppStateChange: function(appState) { + var previousAppStates = this.state.previousAppStates.slice(); + previousAppStates.push(this.state.appState); + this.setState({ + appState, + previousAppStates, + }); + }, + render() { + if (this.props.showMemoryWarnings) { + return ( + + {this.state.memoryWarnings} + + ); + } + if (this.props.showCurrentOnly) { + return ( + + {this.state.appState} + + ); + } + return ( + + {JSON.stringify(this.state.previousAppStates)} + + ); + } +}); + +exports.title = 'AppStateIOS'; +exports.description = 'iOS app background status'; +exports.examples = [ + { + title: 'AppStateIOS.currentState', + description: 'Can be null on app initialization', + render() { return {AppStateIOS.currentState}; } + }, + { + title: 'Subscribed AppStateIOS:', + description: 'This changes according to the current state, so you can only ever see it rendered as "active"', + render(): ReactElement { return ; } + }, + { + title: 'Previous states:', + render(): ReactElement { return ; } + }, + { + title: 'Memory Warnings', + description: 'In the simulator, hit Shift+Command+M to simulate a memory warning.', + render(): ReactElement { return ; } + }, +]; diff --git a/Examples/UIExplorer/UIExplorerList.ios.js b/Examples/UIExplorer/UIExplorerList.ios.js index e9ddd367b..c63763e1e 100644 --- a/Examples/UIExplorer/UIExplorerList.ios.js +++ b/Examples/UIExplorer/UIExplorerList.ios.js @@ -171,6 +171,10 @@ const APIExamples: Array = [ key: 'AnExApp', module: require('./AnimatedGratuitousApp/AnExApp'), }, + { + key: 'AppStateIOSExample', + module: require('./AppStateIOSExample'), + }, { key: 'AppStateExample', module: require('./AppStateExample'), diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m index e9559d558..4fe88ee93 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTEventDispatcherTests.m @@ -105,7 +105,9 @@ #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_eventDispatcher sendDeviceEventWithName:_eventName body:_body]; + #pragma clang diagnostic pop [_bridge verify]; diff --git a/Examples/UIExplorer/XHRExample.ios.js b/Examples/UIExplorer/XHRExample.ios.js index 0deaa4eed..b84c8b0a0 100644 --- a/Examples/UIExplorer/XHRExample.ios.js +++ b/Examples/UIExplorer/XHRExample.ios.js @@ -1,11 +1,4 @@ /** - * Copyright (c) 2013-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - * * The examples provided by Facebook are for non-commercial testing and * evaluation purposes only. * @@ -28,7 +21,7 @@ var { AlertIOS, CameraRoll, Image, - Linking, + LinkingIOS, ProgressViewIOS, StyleSheet, Text, @@ -222,7 +215,7 @@ class FormUploader extends React.Component { return; } var url = xhr.responseText.slice(index).split('\n')[0]; - Linking.openURL(url); + LinkingIOS.openURL(url); }; var formdata = new FormData(); if (this.state.randomPhoto) { diff --git a/Libraries/Geolocation/Geolocation.js b/Libraries/Geolocation/Geolocation.js index f2eed384b..f49a9ebf0 100644 --- a/Libraries/Geolocation/Geolocation.js +++ b/Libraries/Geolocation/Geolocation.js @@ -11,16 +11,15 @@ */ 'use strict'; -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTLocationObserver = require('NativeModules').LocationObserver; +var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); +var RCTLocationObserver = require('NativeModules').LocationObserver; -const invariant = require('fbjs/lib/invariant'); -const logError = require('logError'); -const warning = require('fbjs/lib/warning'); - -const LocationEventEmitter = new NativeEventEmitter(RCTLocationObserver); +var invariant = require('fbjs/lib/invariant'); +var logError = require('logError'); +var warning = require('fbjs/lib/warning'); var subscriptions = []; + var updatesEnabled = false; type GeoOptions = { @@ -81,11 +80,11 @@ var Geolocation = { } var watchID = subscriptions.length; subscriptions.push([ - LocationEventEmitter.addListener( + RCTDeviceEventEmitter.addListener( 'geolocationDidChange', success ), - error ? LocationEventEmitter.addListener( + error ? RCTDeviceEventEmitter.addListener( 'geolocationError', error ) : null, diff --git a/Libraries/Geolocation/RCTLocationObserver.h b/Libraries/Geolocation/RCTLocationObserver.h index a60715558..873eeff6a 100644 --- a/Libraries/Geolocation/RCTLocationObserver.h +++ b/Libraries/Geolocation/RCTLocationObserver.h @@ -7,8 +7,8 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import "RCTBridgeModule.h" -@interface RCTLocationObserver : RCTEventEmitter +@interface RCTLocationObserver : NSObject @end diff --git a/Libraries/Geolocation/RCTLocationObserver.m b/Libraries/Geolocation/RCTLocationObserver.m index 319477c99..23179c5ca 100644 --- a/Libraries/Geolocation/RCTLocationObserver.m +++ b/Libraries/Geolocation/RCTLocationObserver.m @@ -113,6 +113,8 @@ static NSDictionary *RCTPositionError(RCTPositionErrorCode code, RCT_EXPORT_MODULE() +@synthesize bridge = _bridge; + #pragma mark - Lifecycle - (void)dealloc @@ -126,13 +128,9 @@ RCT_EXPORT_MODULE() return dispatch_get_main_queue(); } -- (NSArray *)supportedEvents -{ - return @[@"geolocationDidChange", @"geolocationError"]; -} - #pragma mark - Private API + - (void)beginLocationUpdatesWithDesiredAccuracy:(CLLocationAccuracy)desiredAccuracy distanceFilter:(CLLocationDistance)distanceFilter { if (!_locationManager) { @@ -281,7 +279,11 @@ RCT_EXPORT_METHOD(getCurrentPosition:(RCTLocationOptions)options // Send event if (_observingLocation) { - [self sendEventWithName:@"geolocationDidChange" body:_lastLocationEvent]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"geolocationDidChange" + body:_lastLocationEvent]; +#pragma clang diagnostic pop } // Fire all queued callbacks @@ -322,7 +324,11 @@ RCT_EXPORT_METHOD(getCurrentPosition:(RCTLocationOptions)options // Send event if (_observingLocation) { - [self sendEventWithName:@"geolocationError" body:jsError]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"geolocationError" + body:jsError]; +#pragma clang diagnostic pop } // Fire all queued error callbacks diff --git a/Libraries/LinkingIOS/RCTLinkingManager.m b/Libraries/LinkingIOS/RCTLinkingManager.m index ca4112fc7..96f9e75b4 100644 --- a/Libraries/LinkingIOS/RCTLinkingManager.m +++ b/Libraries/LinkingIOS/RCTLinkingManager.m @@ -88,11 +88,8 @@ continueUserActivity:(NSUserActivity *)userActivity - (void)handleOpenURLNotification:(NSNotification *)notification { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"openURL" body:notification.userInfo]; -#pragma clang diagnostic pop } RCT_EXPORT_METHOD(openURL:(NSURL *)URL diff --git a/Libraries/Network/NetInfo.js b/Libraries/Network/NetInfo.js index 70d513cc8..768fb795f 100644 --- a/Libraries/Network/NetInfo.js +++ b/Libraries/Network/NetInfo.js @@ -12,14 +12,12 @@ 'use strict'; const Map = require('Map'); -const NativeEventEmitter = require('NativeEventEmitter'); const NativeModules = require('NativeModules'); const Platform = require('Platform'); +const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); const RCTNetInfo = NativeModules.NetInfo; const deprecatedCallback = require('deprecatedCallback'); -const NetInfoEventEmitter = new NativeEventEmitter(RCTNetInfo); - const DEVICE_CONNECTIVITY_EVENT = 'networkStatusDidChange'; type ChangeEventName = $Enum<{ @@ -178,7 +176,7 @@ const NetInfo = { eventName: ChangeEventName, handler: Function ): {remove: () => void} { - const listener = NetInfoEventEmitter.addListener( + const listener = RCTDeviceEventEmitter.addListener( DEVICE_CONNECTIVITY_EVENT, (appStateData) => { handler(appStateData.network_info); diff --git a/Libraries/Network/RCTNetInfo.h b/Libraries/Network/RCTNetInfo.h index 9c280b2cf..6c2556e0a 100644 --- a/Libraries/Network/RCTNetInfo.h +++ b/Libraries/Network/RCTNetInfo.h @@ -9,10 +9,10 @@ #import -#import "RCTEventEmitter.h" +#import "RCTBridgeModule.h" -@interface RCTNetInfo : RCTEventEmitter +@interface RCTNetInfo : NSObject -- (instancetype)initWithHost:(NSString *)host; +- (instancetype)initWithHost:(NSString *)host NS_DESIGNATED_INITIALIZER; @end diff --git a/Libraries/Network/RCTNetInfo.m b/Libraries/Network/RCTNetInfo.m index 5981e9f7f..28d0fc073 100644 --- a/Libraries/Network/RCTNetInfo.m +++ b/Libraries/Network/RCTNetInfo.m @@ -22,9 +22,10 @@ static NSString *const RCTReachabilityStateCell = @"cell"; { SCNetworkReachabilityRef _reachability; NSString *_status; - NSString *_host; } +@synthesize bridge = _bridge; + RCT_EXPORT_MODULE() static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SCNetworkReachabilityFlags flags, void *info) @@ -50,7 +51,11 @@ static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SC if (![status isEqualToString:self->_status]) { self->_status = status; - [self sendEventWithName:@"networkStatusDidChange" body:@{@"network_info": status}]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [self->_bridge.eventDispatcher sendDeviceEventWithName:@"networkStatusDidChange" + body:@{@"network_info": status}]; +#pragma clang diagnostic pop } } @@ -61,40 +66,34 @@ static void RCTReachabilityCallback(__unused SCNetworkReachabilityRef target, SC RCTAssertParam(host); RCTAssert(![host hasPrefix:@"http"], @"Host value should just contain the domain, not the URL scheme."); - if ((self = [self init])) { - _host = [host copy]; + if ((self = [super init])) { + _status = RCTReachabilityStateUnknown; + _reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, host.UTF8String); + SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL }; + SCNetworkReachabilitySetCallback(_reachability, RCTReachabilityCallback, &context); + SCNetworkReachabilityScheduleWithRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes); } return self; } -- (NSArray *)supportedEvents +- (instancetype)init { - return @[@"networkStatusDidChange"]; + return [self initWithHost:@"apple.com"]; } -- (void)startObserving +- (void)dealloc { - _status = RCTReachabilityStateUnknown; - _reachability = SCNetworkReachabilityCreateWithName(kCFAllocatorDefault, _host.UTF8String ?: "apple.com"); - SCNetworkReachabilityContext context = { 0, ( __bridge void *)self, NULL, NULL, NULL }; - SCNetworkReachabilitySetCallback(_reachability, RCTReachabilityCallback, &context); - SCNetworkReachabilityScheduleWithRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes); -} - -- (void)stopObserving -{ - if (_reachability) { - SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes); - CFRelease(_reachability); - } + SCNetworkReachabilityUnscheduleFromRunLoop(_reachability, CFRunLoopGetMain(), kCFRunLoopCommonModes); + CFRelease(_reachability); } #pragma mark - Public API +// TODO: remove error callback - not needed except by Subscribable interface RCT_EXPORT_METHOD(getCurrentConnectivity:(RCTPromiseResolveBlock)resolve reject:(__unused RCTPromiseRejectBlock)reject) { - resolve(@{@"network_info": _status ?: RCTReachabilityStateUnknown}); + resolve(@{@"network_info": _status}); } @end diff --git a/Libraries/Network/RCTNetworking.android.js b/Libraries/Network/RCTNetworking.android.js index 23aa9e8bf..38f694d54 100644 --- a/Libraries/Network/RCTNetworking.android.js +++ b/Libraries/Network/RCTNetworking.android.js @@ -12,66 +12,39 @@ // Do not require the native RCTNetworking module directly! Use this wrapper module instead. // It will add the necessary requestId, so that you don't have to generate it yourself. -const FormData = require('FormData'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; +var RCTNetworkingNative = require('NativeModules').Networking; -type Header = [string, string]; - -function convertHeadersMapToArray(headers: Object): Array
{ - const headerArray = []; - for (const name in headers) { - headerArray.push([name, headers[name]]); - } - return headerArray; -} - -let _requestId = 1; -function generateRequestId() { +var _requestId = 1; +var generateRequestId = function() { return _requestId++; -} +}; /** * This class is a wrapper around the native RCTNetworking module. It adds a necessary unique * requestId to each network request that can be used to abort that request later on. */ -class RCTNetworking extends NativeEventEmitter { +class RCTNetworking { - constructor() { - super(RCTNetworkingNative); - } - - sendRequest(method, url, headers, data, incrementalUpdates, timeout, callback) { - if (typeof data === 'string') { - data = {string: data}; - } else if (data instanceof FormData) { - data = { - formData: data.getParts().map((part) => { - part.headers = convertHeadersMapToArray(part.headers); - return part; - }), - }; - } - const requestId = generateRequestId(); + static sendRequest(method, url, headers, data, useIncrementalUpdates, timeout) { + var requestId = generateRequestId(); RCTNetworkingNative.sendRequest( method, url, requestId, - convertHeadersMapToArray(headers), + headers, data, - incrementalUpdates, - timeout - ); - callback(requestId); + useIncrementalUpdates, + timeout); + return requestId; } - abortRequest(requestId) { + static abortRequest(requestId) { RCTNetworkingNative.abortRequest(requestId); } - clearCookies(callback) { + static clearCookies(callback) { RCTNetworkingNative.clearCookies(callback); } } -module.exports = new RCTNetworking(); +module.exports = RCTNetworking; diff --git a/Libraries/Network/RCTNetworking.h b/Libraries/Network/RCTNetworking.h index a06a1eeab..cd8b99dde 100644 --- a/Libraries/Network/RCTNetworking.h +++ b/Libraries/Network/RCTNetworking.h @@ -7,10 +7,12 @@ * of patent rights can be found in the PATENTS file in the same directory. */ -#import "RCTEventEmitter.h" +#import + +#import "RCTBridge.h" #import "RCTNetworkTask.h" -@interface RCTNetworking : RCTEventEmitter +@interface RCTNetworking : NSObject /** * Does a handler exist for the specified request? diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js index 3e0e4c352..677f2c1c9 100644 --- a/Libraries/Network/RCTNetworking.ios.js +++ b/Libraries/Network/RCTNetworking.ios.js @@ -10,39 +10,21 @@ */ 'use strict'; -const FormData = require('FormData'); -const NativeEventEmitter = require('NativeEventEmitter'); -const RCTNetworkingNative = require('NativeModules').Networking; +var RCTNetworkingNative = require('NativeModules').Networking; -class RCTNetworking extends NativeEventEmitter { +/** + * This class is a wrapper around the native RCTNetworking module. + */ +class RCTNetworking { - constructor() { - super(RCTNetworkingNative); + static sendRequest(query, callback) { + RCTNetworkingNative.sendRequest(query, callback); } - sendRequest(method, url, headers, data, incrementalUpdates, timeout, callback) { - if (typeof data === 'string') { - data = {string: data}; - } else if (data instanceof FormData) { - data = {formData: data.getParts()}; - } - RCTNetworkingNative.sendRequest({ - method, - url, - data, - headers, - incrementalUpdates, - timeout - }, callback); + static abortRequest(requestId) { + RCTNetworkingNative.cancelRequest(requestId); } - abortRequest(requestId) { - RCTNetworkingNative.abortRequest(requestId); - } - - clearCookies(callback) { - console.warn('RCTNetworking.clearCookies is not supported on iOS'); - } } -module.exports = new RCTNetworking(); +module.exports = RCTNetworking; diff --git a/Libraries/Network/RCTNetworking.m b/Libraries/Network/RCTNetworking.m index 07c21f095..5c7e3b9ee 100644 --- a/Libraries/Network/RCTNetworking.m +++ b/Libraries/Network/RCTNetworking.m @@ -129,18 +129,11 @@ static NSString *RCTGenerateFormBoundary() NSArray> *_handlers; } +@synthesize bridge = _bridge; @synthesize methodQueue = _methodQueue; RCT_EXPORT_MODULE() -- (NSArray *)supportedEvents -{ - return @[@"didCompleteNetworkResponse", - @"didReceiveNetworkResponse", - @"didSendNetworkData", - @"didReceiveNetworkData"]; -} - - (id)handlerForRequest:(NSURLRequest *)request { if (!request.URL) { @@ -149,7 +142,7 @@ RCT_EXPORT_MODULE() if (!_handlers) { // Get handlers, sorted in reverse priority order (highest priority first) - _handlers = [[self.bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)] sortedArrayUsingComparator:^NSComparisonResult(id a, id b) { + _handlers = [[_bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)] sortedArrayUsingComparator:^NSComparisonResult(id a, id b) { float priorityA = [a respondsToSelector:@selector(handlerPriority)] ? [a handlerPriority] : 0; float priorityB = [b respondsToSelector:@selector(handlerPriority)] ? [b handlerPriority] : 0; if (priorityA > priorityB) { @@ -353,7 +346,11 @@ RCT_EXPORT_MODULE() } NSArray *responseJSON = @[task.requestID, responseText ?: @""]; - [self sendEventWithName:@"didReceiveNetworkData" body:responseJSON]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"didReceiveNetworkData" + body:responseJSON]; +#pragma clang diagnostic pop } - (void)sendRequest:(NSURLRequest *)request @@ -367,7 +364,10 @@ RCT_EXPORT_MODULE() RCTURLRequestProgressBlock uploadProgressBlock = ^(int64_t progress, int64_t total) { dispatch_async(_methodQueue, ^{ NSArray *responseJSON = @[task.requestID, @((double)progress), @((double)total)]; - [self sendEventWithName:@"didSendNetworkData" body:responseJSON]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"didSendNetworkData" body:responseJSON]; +#pragma clang diagnostic pop }); }; @@ -385,7 +385,11 @@ RCT_EXPORT_MODULE() } id responseURL = response.URL ? response.URL.absoluteString : [NSNull null]; NSArray *responseJSON = @[task.requestID, @(status), headers, responseURL]; - [self sendEventWithName:@"didReceiveNetworkResponse" body:responseJSON]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"didReceiveNetworkResponse" + body:responseJSON]; +#pragma clang diagnostic pop }); }; @@ -406,7 +410,12 @@ RCT_EXPORT_MODULE() error.code == kCFURLErrorTimedOut ? @YES : @NO ]; - [self sendEventWithName:@"didCompleteNetworkResponse" body:responseJSON]; +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + [_bridge.eventDispatcher sendDeviceEventWithName:@"didCompleteNetworkResponse" + body:responseJSON]; +#pragma clang diagnostic pop + [_tasksByRequestID removeObjectForKey:task.requestID]; }); }; @@ -460,7 +469,7 @@ RCT_EXPORT_METHOD(sendRequest:(NSDictionary *)query }]; } -RCT_EXPORT_METHOD(abortRequest:(nonnull NSNumber *)requestID) +RCT_EXPORT_METHOD(cancelRequest:(nonnull NSNumber *)requestID) { [_tasksByRequestID[requestID] cancel]; [_tasksByRequestID removeObjectForKey:requestID]; diff --git a/Libraries/Network/XMLHttpRequest.android.js b/Libraries/Network/XMLHttpRequest.android.js new file mode 100644 index 000000000..099df7526 --- /dev/null +++ b/Libraries/Network/XMLHttpRequest.android.js @@ -0,0 +1,62 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule XMLHttpRequest + * @flow + */ +'use strict'; + +var FormData = require('FormData'); +var RCTNetworking = require('RCTNetworking'); +var XMLHttpRequestBase = require('XMLHttpRequestBase'); + +type Header = [string, string]; + +function convertHeadersMapToArray(headers: Object): Array
{ + var headerArray = []; + for (var name in headers) { + headerArray.push([name, headers[name]]); + } + return headerArray; +} + +class XMLHttpRequest extends XMLHttpRequestBase { + sendImpl( + method: ?string, + url: ?string, + headers: Object, + data: any, + useIncrementalUpdates: boolean, + timeout: number, + ): void { + var body; + if (typeof data === 'string') { + body = {string: data}; + } else if (data instanceof FormData) { + body = { + formData: data.getParts().map((part) => { + part.headers = convertHeadersMapToArray(part.headers); + return part; + }), + }; + } else { + body = data; + } + var requestId = RCTNetworking.sendRequest( + method, + url, + convertHeadersMapToArray(headers), + body, + useIncrementalUpdates, + timeout + ); + this.didCreateRequest(requestId); + } +} + +module.exports = XMLHttpRequest; diff --git a/Libraries/Network/XMLHttpRequest.ios.js b/Libraries/Network/XMLHttpRequest.ios.js new file mode 100644 index 000000000..dd4ee0dd6 --- /dev/null +++ b/Libraries/Network/XMLHttpRequest.ios.js @@ -0,0 +1,47 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + * @providesModule XMLHttpRequest + * @flow + */ +'use strict'; + +var FormData = require('FormData'); +var RCTNetworking = require('RCTNetworking'); + +var XMLHttpRequestBase = require('XMLHttpRequestBase'); + +class XMLHttpRequest extends XMLHttpRequestBase { + sendImpl( + method: ?string, + url: ?string, + headers: Object, + data: any, + incrementalUpdates: boolean, + timeout: number, + ): void { + if (typeof data === 'string') { + data = {string: data}; + } else if (data instanceof FormData) { + data = {formData: data.getParts()}; + } + RCTNetworking.sendRequest( + { + method, + url, + data, + headers, + incrementalUpdates, + timeout + }, + this.didCreateRequest.bind(this) + ); + } +} + +module.exports = XMLHttpRequest; diff --git a/Libraries/Network/XMLHttpRequest.js b/Libraries/Network/XMLHttpRequestBase.js similarity index 95% rename from Libraries/Network/XMLHttpRequest.js rename to Libraries/Network/XMLHttpRequestBase.js index 7b742c62f..d5d5da5c5 100644 --- a/Libraries/Network/XMLHttpRequest.js +++ b/Libraries/Network/XMLHttpRequestBase.js @@ -6,12 +6,13 @@ * LICENSE file in the root directory of this source tree. An additional grant * of patent rights can be found in the PATENTS file in the same directory. * - * @providesModule XMLHttpRequest + * @providesModule XMLHttpRequestBase * @flow */ 'use strict'; -const RCTNetworking = require('RCTNetworking'); +var RCTNetworking = require('RCTNetworking'); +var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter'); const EventTarget = require('event-target-shim'); const invariant = require('fbjs/lib/invariant'); @@ -211,19 +212,19 @@ class XMLHttpRequestBase extends EventTarget(...XHR_EVENTS) { didCreateRequest(requestId: number): void { this._requestId = requestId; - this._subscriptions.push(RCTNetworking.addListener( + this._subscriptions.push(RCTDeviceEventEmitter.addListener( 'didSendNetworkData', (args) => this.__didUploadProgress(...args) )); - this._subscriptions.push(RCTNetworking.addListener( + this._subscriptions.push(RCTDeviceEventEmitter.addListener( 'didReceiveNetworkResponse', (args) => this._didReceiveResponse(...args) )); - this._subscriptions.push(RCTNetworking.addListener( + this._subscriptions.push(RCTDeviceEventEmitter.addListener( 'didReceiveNetworkData', (args) => this._didReceiveData(...args) )); - this._subscriptions.push(RCTNetworking.addListener( + this._subscriptions.push(RCTDeviceEventEmitter.addListener( 'didCompleteNetworkResponse', (args) => this.__didCompleteResponse(...args) )); @@ -336,18 +337,10 @@ class XMLHttpRequestBase extends EventTarget(...XHR_EVENTS) { url: ?string, headers: Object, data: any, - useIncrementalUpdates: boolean, - timeout: number, + incrementalEvents: boolean, + timeout: number ): void { - RCTNetworking.sendRequest( - method, - url, - headers, - data, - useIncrementalUpdates, - timeout, - this.didCreateRequest.bind(this), - ); + throw new Error('Subclass must define sendImpl method'); } send(data: any): void { diff --git a/Libraries/Network/__tests__/XMLHttpRequest-test.js b/Libraries/Network/__tests__/XMLHttpRequestBase-test.js similarity index 95% rename from Libraries/Network/__tests__/XMLHttpRequest-test.js rename to Libraries/Network/__tests__/XMLHttpRequestBase-test.js index a08d67c5d..9d967d4b3 100644 --- a/Libraries/Network/__tests__/XMLHttpRequest-test.js +++ b/Libraries/Network/__tests__/XMLHttpRequestBase-test.js @@ -12,11 +12,13 @@ jest .disableAutomock() .dontMock('event-target-shim') - .dontMock('XMLHttpRequest'); + .dontMock('XMLHttpRequestBase'); -const XMLHttpRequest = require('XMLHttpRequest'); +const XMLHttpRequestBase = require('XMLHttpRequestBase'); -describe('XMLHttpRequest', function(){ +class XMLHttpRequest extends XMLHttpRequestBase {} + +describe('XMLHttpRequestBase', function(){ var xhr; var handleTimeout; var handleError; diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m index ac360e254..0d6453a36 100644 --- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.m +++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.m @@ -137,29 +137,20 @@ RCT_EXPORT_MODULE() - (void)handleLocalNotificationReceived:(NSNotification *)notification { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"localNotificationReceived" body:notification.userInfo]; -#pragma clang diagnostic pop } - (void)handleRemoteNotificationReceived:(NSNotification *)notification { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationReceived" body:notification.userInfo]; -#pragma clang diagnostic pop } - (void)handleRemoteNotificationsRegistered:(NSNotification *)notification { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"remoteNotificationsRegistered" body:notification.userInfo]; -#pragma clang diagnostic pop } /** diff --git a/Libraries/react-native/react-native.js b/Libraries/react-native/react-native.js index 6200bd42d..d867bd595 100644 --- a/Libraries/react-native/react-native.js +++ b/Libraries/react-native/react-native.js @@ -10,11 +10,11 @@ */ 'use strict'; -const warning = require('fbjs/lib/warning'); +var warning = require('fbjs/lib/warning'); if (__DEV__) { - const warningDedupe = {}; - const addonWarn = function(prevName, newPackageName) { + var warningDedupe = {}; + var addonWarn = function(prevName, newPackageName) { warning( warningDedupe[prevName], 'React.addons.' + prevName + ' is deprecated. Please import the "' + @@ -25,7 +25,7 @@ if (__DEV__) { } // Export React, plus some native additions. -const ReactNative = { +var ReactNative = { // Components get ActivityIndicatorIOS() { return require('ActivityIndicatorIOS'); }, get ART() { return require('ReactNativeART'); }, @@ -87,11 +87,9 @@ const ReactNative = { get ImagePickerIOS() { return require('ImagePickerIOS'); }, get IntentAndroid() { return require('IntentAndroid'); }, get InteractionManager() { return require('InteractionManager'); }, - get Keyboard() { return require('Keyboard'); }, get LayoutAnimation() { return require('LayoutAnimation'); }, get Linking() { return require('Linking'); }, get LinkingIOS() { return require('LinkingIOS'); }, - get NativeEventEmitter() { return require('NativeEventEmitter'); }, get NavigationExperimental() { return require('NavigationExperimental'); }, get NetInfo() { return require('NetInfo'); }, get PanResponder() { return require('PanResponder'); }, @@ -173,7 +171,7 @@ const ReactNative = { // Preserve getters with warnings on the internal ReactNative copy without // invoking them. -const ReactNativeInternal = require('ReactNative'); +var ReactNativeInternal = require('ReactNative'); function applyForwarding(key) { if (__DEV__) { Object.defineProperty( @@ -185,7 +183,7 @@ function applyForwarding(key) { } ReactNative[key] = ReactNativeInternal[key]; } -for (const key in ReactNativeInternal) { +for (var key in ReactNativeInternal) { applyForwarding(key); } diff --git a/Libraries/react-native/react-native.js.flow b/Libraries/react-native/react-native.js.flow index 066736dac..d300af0c4 100644 --- a/Libraries/react-native/react-native.js.flow +++ b/Libraries/react-native/react-native.js.flow @@ -85,11 +85,9 @@ var ReactNative = Object.assign(Object.create(require('ReactNative')), { ImagePickerIOS: require('ImagePickerIOS'), IntentAndroid: require('IntentAndroid'), InteractionManager: require('InteractionManager'), - Keyboard: require('Keyboard'), LayoutAnimation: require('LayoutAnimation'), Linking: require('Linking'), LinkingIOS: require('LinkingIOS'), - NativeEventEmitter: require('NativeEventEmitter'), NavigationExperimental: require('NavigationExperimental'), NetInfo: require('NetInfo'), PanResponder: require('PanResponder'), diff --git a/React/Modules/RCTAccessibilityManager.m b/React/Modules/RCTAccessibilityManager.m index 3fcef1e5d..fd629cae3 100644 --- a/React/Modules/RCTAccessibilityManager.m +++ b/React/Modules/RCTAccessibilityManager.m @@ -92,11 +92,8 @@ RCT_EXPORT_MODULE() BOOL newIsVoiceOverEnabled = UIAccessibilityIsVoiceOverRunning(); if (_isVoiceOverEnabled != newIsVoiceOverEnabled) { _isVoiceOverEnabled = newIsVoiceOverEnabled; -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"voiceOverDidChange" body:@(_isVoiceOverEnabled)]; -#pragma clang diagnostic pop } } diff --git a/React/Modules/RCTDevMenu.m b/React/Modules/RCTDevMenu.m index f574f7b06..e853659a5 100644 --- a/React/Modules/RCTDevMenu.m +++ b/React/Modules/RCTDevMenu.m @@ -182,10 +182,7 @@ RCT_EXPORT_MODULE() selectedTitle:@"Hide Inspector" handler:^(__unused BOOL enabled) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [weakSelf.bridge.eventDispatcher sendDeviceEventWithName:@"toggleElementInspector" body:nil]; -#pragma clang diagnostic pop }]]; _webSocketExecutorName = [_defaults objectForKey:@"websocket-executor-name"] ?: @"JS Remotely"; @@ -217,11 +214,8 @@ RCT_EXPORT_MODULE() modifierFlags:UIKeyModifierCommand action:^(__unused UIKeyCommand *command) { [weakSelf.bridge.eventDispatcher -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" sendDeviceEventWithName:@"toggleElementInspector" body:nil]; -#pragma clang diagnostic pop }]; // Reload in normal mode @@ -394,10 +388,7 @@ RCT_EXPORT_MODULE() // Inspector can only be shown after JS has loaded if ([_settings[@"showInspector"] boolValue]) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [self.bridge.eventDispatcher sendDeviceEventWithName:@"toggleElementInspector" body:nil]; -#pragma clang diagnostic pop } }); } diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m index 3d4f70a5f..5f399e830 100644 --- a/React/Modules/RCTEventEmitter.m +++ b/React/Modules/RCTEventEmitter.m @@ -37,9 +37,7 @@ - (void)sendEventWithName:(NSString *)eventName body:(id)body { - RCTAssert(_bridge != nil, @"bridge is not set. This is probably because you've " - "explicitly synthesized the bridge in %@, even though it's inherited " - "from RCTEventEmitter.", [self class]); + RCTAssert(_bridge != nil, @"bridge is not set."); if (RCT_DEBUG && ![[self supportedEvents] containsObject:eventName]) { RCTLogError(@"`%@` is not a supported event type for %@. Supported events are: `%@`", diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m index 11112f92a..a819847d0 100644 --- a/React/Modules/RCTUIManager.m +++ b/React/Modules/RCTUIManager.m @@ -253,11 +253,8 @@ RCT_EXPORT_MODULE() !UIInterfaceOrientationIsPortrait(nextOrientation)) || (UIInterfaceOrientationIsLandscape(_currentInterfaceOrientation) && !UIInterfaceOrientationIsLandscape(nextOrientation))) { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions" body:RCTExportedDimensions(YES)]; -#pragma clang diagnostic pop } _currentInterfaceOrientation = nextOrientation;