Skip to content

[v2] Fixes issues#1397 #1816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2018
Merged

[v2] Fixes issues#1397 #1816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77b43c6
Fixes issues#1397
joonhocho Sep 9, 2017
0db175b
Merge branch 'v2' into patch-1
guyca Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lib/ios/RNNEventEmitter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#import "RNNEventEmitter.h"

@implementation RNNEventEmitter
@implementation RNNEventEmitter {
NSInteger _appLaunchedListenerCount;
BOOL _appLaunchedEventDeferred;
}

RCT_EXPORT_MODULE();

Expand All @@ -16,7 +19,11 @@ @implementation RNNEventEmitter
# pragma mark public

-(void)sendOnAppLaunched {
[self send:onAppLaunched body:nil];
if (_appLaunchedListenerCount > 0) {
[self send:onAppLaunched body:nil];
} else {
_appLaunchedEventDeferred = TRUE;
}
}

-(void)sendContainerDidAppear:(NSString *)containerId {
Expand All @@ -31,6 +38,17 @@ -(void)sendOnNavigationButtonPressed:(NSString *)containerId buttonId:(NSString*
[self send:onNavigationButtonPressed body:@{@"containerId":containerId , @"buttonId": buttonId }];
}

- (void)addListener:(NSString *)eventName {
[super addListener:eventName];
if ([eventName isEqualToString:onAppLaunched]) {
_appLaunchedListenerCount++;
if (_appLaunchedEventDeferred) {
_appLaunchedEventDeferred = FALSE;
[self sendOnAppLaunched];
}
}
}

# pragma mark private

-(void)send:(NSString *)eventName body:(id)body {
Expand Down