- iOS: Handling multiple targets when sequence is started

prscX · Jul 17, 2018 · f326d96 · f326d96
1 parent 0d2c0d6
commit f326d96
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/ios/RNAppTour.m b/ios/RNAppTour.m
@@ -81,17 +81,29 @@ - (dispatch_queue_t)methodQueue {
 
 RCT_EXPORT_METHOD(ShowSequence:(NSArray *)views props:(NSDictionary *)props)
 {
-    targets = [[MutableOrderedDictionary alloc] init];
+    bool tourStarted = false;
+    if (targets == nil || [[targets allKeys] count] <= 0) {
+        targets = [[MutableOrderedDictionary alloc] init];
+    } else {
+        for (NSNumber *view in views) {
+            if (![targets objectForKey: [view stringValue]]) {
+                tourStarted = true;
+            }
+        }
+    }
+
     for (NSNumber *view in views) {
         [targets setObject:[props objectForKey: [view stringValue]] forKey: [view stringValue]];
     }
 
+    if (tourStarted == true) return;
     if ([[targets allKeys] count] <= 0) return;
 
     NSString *showTargetKey = [ [targets allKeys] objectAtIndex: 0];
     [self ShowFor:[NSNumber numberWithLongLong:[showTargetKey longLongValue]] props:[targets objectForKey:showTargetKey] ];
 }
 
+
 RCT_EXPORT_METHOD(ShowFor:(nonnull NSNumber *)view props:(NSDictionary *)props)
 {
     MaterialShowcase *materialShowcase = [self generateMaterialShowcase:view props:props];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-app-tour",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "React Native: Native App Tour Library",
   "repository": {
     "type": "git",