From 706d7a29be56218a9133aa55c7bdd081396fbd21 Mon Sep 17 00:00:00 2001 From: jhuleatt Date: Tue, 12 Nov 2019 16:18:49 -0800 Subject: [PATCH] rxfire: objectVal bugfix --- packages/rxfire/database/object/index.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/rxfire/database/object/index.ts b/packages/rxfire/database/object/index.ts index c9437d55f16..dce755362b1 100644 --- a/packages/rxfire/database/object/index.ts +++ b/packages/rxfire/database/object/index.ts @@ -44,8 +44,15 @@ export function objectVal( } export function changeToData(change: QueryChange, keyField?: string): {} { + const val = change.snapshot.val(); + + // val can be a primitive type + if (typeof val !== 'object') { + return val; + } + return { - ...change.snapshot.val(), + ...val, ...(keyField ? { [keyField]: change.snapshot.key } : null) }; }