Merge pull request #242 from FrankSalad/v3-once-child-added

[v3] Support for ref.once('child_added')

Author: auser

ios/Firestack/FirestackDatabase.m

@@ -42,6 +42,12 @@ - (id) initWithPathAndModifiers:(RCTEventEmitter *) emitter
   return self;
 }
 
+- (NSString *) absPath:(FIRDatabaseReference *) ref {
+    NSString *url = ref.URL;
+    NSString *rooturl = ref.root.URL;
+    return [[url substringFromIndex:rooturl.length] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+}
+
 - (void) addEventHandler:(NSString *) eventName
 {
     if (![self isListeningTo:eventName]) {
@@ -51,9 +57,10 @@ - (void) addEventHandler:(NSString *) eventName
                         title:eventName
                         props: @{
                                  @"eventName": eventName,
-                                 @"path": _path,
+                                 @"path": [self absPath:[snapshot ref]],
                                  @"modifiersString": _modifiersString,
-                                 @"snapshot": props
+                                 @"snapshot": props,
+                                 @"handlePath": _path
                                  }];
         };
         id errorBlock = ^(NSError * _Nonnull error) {
@@ -71,13 +78,15 @@ - (void) addEventHandler:(NSString *) eventName
 }
 
 - (void) addSingleEventHandler:(RCTResponseSenderBlock) callback
+                        ofType:(NSString *) type
 {
-    [_query observeSingleEventOfType:FIRDataEventTypeValue
+    int eventType = [self eventTypeFromName:type];
+    [_query observeSingleEventOfType:eventType
                            withBlock:^(FIRDataSnapshot * _Nonnull snapshot) {
-                               NSDictionary *props = [self snapshotToDict:snapshot];
+                               NSDictionary *props = [FirestackDBReference snapshotToDict:snapshot];
                                callback(@[[NSNull null], @{
-                                              @"eventName": @"value",
-                                              @"path": _path,
+                                              @"eventName": type,
+                                              @"path": [self absPath:[snapshot ref]],
                                               @"modifiersString": _modifiersString,
                                               @"snapshot": props
                                               }]);
@@ -489,7 +498,7 @@ - (id) init
                 callback:(RCTResponseSenderBlock) callback)
 {
     FirestackDBReference *ref = [self getDBHandle:path modifiers:modifiers modifiersString:modifiersString];
-    [ref addSingleEventHandler:callback];
+    [ref addSingleEventHandler:callback ofType:name];
 }
 
 RCT_EXPORT_METHOD(off:(NSString *)path

lib/modules/database/index.js

@@ -185,14 +185,14 @@ export default class Database extends Base {
    */
   _handleDatabaseEvent(event: Object) {
     const body = event.body || {};
-    const { path, modifiersString, eventName, snapshot } = body;
-    const handle = this._handle(path, modifiersString);
+    const { path, modifiersString, eventName, snapshot, handlePath } = body;
+    const handle = this._handle(handlePath, modifiersString);
 
     this.log.debug('_handleDatabaseEvent: ', handle, eventName, snapshot && snapshot.key);
 
     if (this.subscriptions[handle] && this.subscriptions[handle][eventName]) {
       this.subscriptions[handle][eventName].forEach((cb) => {
-        cb(new Snapshot(new Reference(this, path.split('/'), modifiersString.split('|')), snapshot), body);
+        cb(new Snapshot(new Reference(this, path, modifiersString.split('|')), snapshot), body);
       });
     } else {
       FirestackDatabase.off(path, modifiersString, eventName, () => {

lib/modules/database/reference.js

@@ -120,7 +120,9 @@ export default class Reference extends ReferenceBase {
     const modifiers = this.query.getModifiers();
     const modifiersString = this.query.getModifiersString();
     return promisify('onOnce', FirestackDatabase)(path, modifiersString, modifiers, eventName)
-      .then(({ snapshot }) => new Snapshot(this, snapshot))
+      .then(({ snapshot, path, modifiersString}) => new Snapshot(
+        new Reference(this.db, path, modifiersString.split('|')),
+        snapshot))
       .then((snapshot) => {
         if (isFunction(cb)) cb(snapshot);
         return snapshot;