Merge 7358020 into 89b104a

invertase · Oct 25, 2021 · 512d449 · 512d449
2 parents 89b104a + 7358020
commit 512d449
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/analytics/__tests__/analytics.test.ts b/packages/analytics/__tests__/analytics.test.ts
@@ -137,6 +137,13 @@ describe('Analytics', function () {
           'firebase.analytics().logScreenView(*):',
         );
       });
+      it('accepts arbitrary custom event parameters while rejecting defined parameters with wrong types', function () {
+        expect(() => firebase.analytics().logScreenView({ foo: 'bar' })).not.toThrow();
+        expect(() =>
+          // @ts-ignore test
+          firebase.analytics().logScreenView({ screen_name: 123, foo: 'bar' }),
+        ).toThrowError('firebase.analytics().logScreenView(*):');
+      });
     });
 
     describe('logAddPaymentInfo()', function () {

diff --git a/packages/analytics/lib/index.d.ts b/packages/analytics/lib/index.d.ts
@@ -344,6 +344,10 @@ export namespace FirebaseAnalyticsTypes {
      * Current class associated with the view the user is currently viewing.
      */
     screen_class?: string;
+    /**
+     * Custom event parameters.
+     */
+    [key: string]: any;
   }
 
   export interface RefundEventParameters {

diff --git a/packages/analytics/lib/structs.js b/packages/analytics/lib/structs.js
@@ -32,7 +32,7 @@ const Item = struct({
   price: 'number?',
 });
 
-export const ScreenView = struct({
+export const ScreenView = struct.interface({
   screen_class: 'string?',
   screen_name: 'string?',
 });