getInitialSearchItem return empty initialIdentifier ignore the handleContinueUserActivity value

[luatnd]

Hi, this lib comes in handy, but I struggle with a bug:

I just debug the case:

self.initialIdentifier has value in handleContinueUserActivity:

self.initialIdentifier = uniqueItemIdentifier; // set break point here and got the correct value

- (void)handleContinueUserActivity:(NSUserActivity *)userActivity {
    NSString *uniqueItemIdentifier = userActivity.userInfo[CSSearchableItemActivityIdentifier];
    
    if (!uniqueItemIdentifier) {
        return;
    }

    self.initialIdentifier = uniqueItemIdentifier;
    
    if (!self.hasListeners) {
        return;
    }
    
    [self sendEventWithName:kSpotlightSearchItemTapped body:uniqueItemIdentifier];
}

But self.initialIdentifier became nil here:

RCT_EXPORT_METHOD(getInitialSearchItem:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
    resolve(self.initialIdentifier);
}

It leads to undefined on JS:

SpotlightSearch.getInitialSearchItem().then(console.log);

[deepak-ofb]

This is also returning undefined in my case:
"react-native-spotlight-search": "^2.0.0"
"react-native": "0.64.1"

[jedashford]

null in JS for us also anyone got a fix?

[jedashford]

This is fixed in the PR: #58

[ertucaglar]

diff --git a/node_modules/react-native-spotlight-search/ios/RCTSpotlightSearch/RCTSpotlightSearch/RCTSpotlightSearch.m b/node_modules/react-native-spotlight-search/ios/RCTSpotlightSearch/RCTSpotlightSearch/RCTSpotlightSearch.m
index a6cecab..4607027 100644
--- a/node_modules/react-native-spotlight-search/ios/RCTSpotlightSearch/RCTSpotlightSearch/RCTSpotlightSearch.m
+++ b/node_modules/react-native-spotlight-search/ios/RCTSpotlightSearch/RCTSpotlightSearch/RCTSpotlightSearch.m
@@ -26,7 +26,6 @@ @interface RCTSpotlightSearch ()
 @end
 
 @implementation RCTSpotlightSearch
-static NSString *initialIdentifier;
 
 RCT_EXPORT_MODULE();
 
@@ -39,14 +38,14 @@ - (instancetype)init {
                                                                                           object:nil
                                                                                            queue:[NSOperationQueue mainQueue]
                                                                                       usingBlock:^(NSNotification * _Nonnull note) {
-                                                                                          [weakSelf handleContinueUserActivity:note.userInfo[kUserActivityKey]];
-                                                                                      }];
+            [weakSelf handleContinueUserActivity:note.userInfo[kUserActivityKey]];
+        }];
         _bundleDidLoadObserver = [[NSNotificationCenter defaultCenter] addObserverForName:RCTJavaScriptDidLoadNotification
                                                                                    object:nil
                                                                                     queue:[NSOperationQueue mainQueue]
                                                                                usingBlock:^(NSNotification * _Nonnull note) {
-                                                                                   [weakSelf drainActivityQueue];
-                                                                               }];
+            [weakSelf drainActivityQueue];
+        }];
     }
     return self;
 }
@@ -115,6 +114,9 @@ - (void)handleContinueUserActivity:(NSUserActivity *)userActivity {
     
     initialIdentifier = uniqueItemIdentifier;
     
+    [[NSUserDefaults standardUserDefaults] setObject:uniqueItemIdentifier forKey:@"spotlightInitialIdentifier"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+    
     if (!self.hasListeners) {
         return;
     }
@@ -123,7 +125,22 @@ - (void)handleContinueUserActivity:(NSUserActivity *)userActivity {
 }
 
 RCT_EXPORT_METHOD(getInitialSearchItem:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-    resolve(initialIdentifier);
+    if (initialIdentifier != nil && ![initialIdentifier isEqualToString:@""]) {
+        NSString *identifier = initialIdentifier;
+        initialIdentifier = @""; // Bir kere kullanıldıktan sonra temizle
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"spotlightInitialIdentifier"];
+        resolve(identifier);
+        return;
+    }
+    
+    NSString *savedIdentifier = [[NSUserDefaults standardUserDefaults] stringForKey:@"spotlightInitialIdentifier"];
+    if (savedIdentifier != nil) {
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:@"spotlightInitialIdentifier"];
+        resolve(savedIdentifier);
+        return;
+    }
+    
+    resolve(nil);
 }
 
 RCT_EXPORT_METHOD(indexItem:(NSDictionary *)item resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -146,7 +163,7 @@ - (void)handleContinueUserActivity:(NSUserActivity *)userActivity {
             attributeSet.thumbnailURL = [NSURL fileURLWithPath:item[@"thumbnailUri"]];
         } else if (item[@"thumbnailData"]) {
             attributeSet.thumbnailData =
-                [[NSData alloc] initWithBase64EncodedString:item[@"thumbnailData"] options:0];
+            [[NSData alloc] initWithBase64EncodedString:item[@"thumbnailData"] options:0];
         }
         
         CSSearchableItem *searchableItem = [[CSSearchableItem alloc] initWithUniqueIdentifier:item[@"uniqueIdentifier"]
@@ -158,34 +175,34 @@ - (void)handleContinueUserActivity:(NSUserActivity *)userActivity {
     
     [[CSSearchableIndex defaultSearchableIndex] indexSearchableItems:itemsToIndex
                                                    completionHandler:^(NSError * _Nullable error) {
-                                                       if (error) {
-                                                           reject(nil, nil, error);
-                                                       } else {
-                                                           resolve(nil);
-                                                       }
-                                                   }];
+        if (error) {
+            reject(nil, nil, error);
+        } else {
+            resolve(nil);
+        }
+    }];
 }
 
 RCT_EXPORT_METHOD(deleteItemsWithIdentifiers:(NSArray *)identifiers resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [[CSSearchableIndex defaultSearchableIndex] deleteSearchableItemsWithIdentifiers:identifiers
                                                                    completionHandler:^(NSError * _Nullable error) {
-                                                                       if (error) {
-                                                                           reject(nil, nil, error);
-                                                                       } else {
-                                                                           resolve(nil);
-                                                                       }
-                                                                   }];
+        if (error) {
+            reject(nil, nil, error);
+        } else {
+            resolve(nil);
+        }
+    }];
 }
 
 RCT_EXPORT_METHOD(deleteItemsInDomains:(NSArray *)identifiers resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     [[CSSearchableIndex defaultSearchableIndex] deleteSearchableItemsWithDomainIdentifiers:identifiers
                                                                          completionHandler:^(NSError * _Nullable error) {
-                                                                             if (error) {
-                                                                                 reject(nil, nil, error);
-                                                                             } else {
-                                                                                 resolve(nil);
-                                                                             }
-                                                                         }];
+        if (error) {
+            reject(nil, nil, error);
+        } else {
+            resolve(nil);
+        }
+    }];
 }
 
 RCT_REMAP_METHOD(deleteAllItems, resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {