fix(firestore): onSnapshot handling

triniwiz · triniwiz · commit ba384c21ff63 · 2022-10-19T17:35:25.000-04:00
diff --git a/packages/firebase-firestore/index.android.ts b/packages/firebase-firestore/index.android.ts
@@ -543,10 +543,13 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {
 							}
 						} else {
 							if (error) {
-								onError?.(FirebaseError.fromNative(error));
+								// onNext -> onError
+								onNext?.(FirebaseError.fromNative(error));
 							} else {
-								onCompletion?.();
-								onNext?.(QuerySnapshot.fromNative(ss));
+								// onError -> onCompletion
+								onError?.();
+								// options -> onNext
+								options?.(QuerySnapshot.fromNative(ss));
 							}
 						}
 					} else {
diff --git a/packages/firebase-firestore/index.ios.ts b/packages/firebase-firestore/index.ios.ts
@@ -476,10 +476,13 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {
 						}
 					} else {
 						if (error) {
-							onError?.(FirebaseError.fromNative(error));
+							// onNext -> onError
+							onNext?.(FirebaseError.fromNative(error));
 						} else {
-							onCompletion?.();
-							onNext?.(QuerySnapshot.fromNative(ss));
+							// onError -> onCompletion
+							onError?.();
+							// options -> onNext
+							options?.(QuerySnapshot.fromNative(ss));
 						}
 					}
 				} else {

Original file line number	Diff line number	Diff line change
`@@ -543,10 +543,13 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {`
`543`	`543`	`}`
`544`	`544`	`} else {`
`545`	`545`	`if (error) {`
`546`		`- onError?.(FirebaseError.fromNative(error));`
	`546`	`+ // onNext -> onError`
	`547`	`+ onNext?.(FirebaseError.fromNative(error));`
`547`	`548`	`} else {`
`548`		`- onCompletion?.();`
`549`		`- onNext?.(QuerySnapshot.fromNative(ss));`
	`549`	`+ // onError -> onCompletion`
	`550`	`+ onError?.();`
	`551`	`+ // options -> onNext`
	`552`	`+ options?.(QuerySnapshot.fromNative(ss));`
`550`	`553`	`}`
`551`	`554`	`}`
`552`	`555`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -476,10 +476,13 @@ export class Query<T extends DocumentData = DocumentData> implements IQuery<T> {`
`476`	`476`	`}`
`477`	`477`	`} else {`
`478`	`478`	`if (error) {`
`479`		`- onError?.(FirebaseError.fromNative(error));`
	`479`	`+ // onNext -> onError`
	`480`	`+ onNext?.(FirebaseError.fromNative(error));`
`480`	`481`	`} else {`
`481`		`- onCompletion?.();`
`482`		`- onNext?.(QuerySnapshot.fromNative(ss));`
	`482`	`+ // onError -> onCompletion`
	`483`	`+ onError?.();`
	`484`	`+ // options -> onNext`
	`485`	`+ options?.(QuerySnapshot.fromNative(ss));`
`483`	`486`	`}`
`484`	`487`	`}`
`485`	`488`	`} else {`