@24i/bigscreen-sdk 1.0.42-alpha.2710 → 1.0.43-alpha.2725

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.42-alpha.2710",
+    "version": "1.0.43-alpha.2725",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {

package/packages/analytics/src/clients/GoogleAnalytics/GoogleAnalytics.ts

@@ -5,7 +5,7 @@ import { createTimeout } from '@24i/bigscreen-sdk/utils/timers';
 import { MINUTE_IN_MS } from '@24i/bigscreen-sdk/utils/timeConstants';
 import { generateUuid } from '@24i/bigscreen-sdk/utils/generateUuid';
 import { i18n } from '@24i/bigscreen-sdk/i18n';
-import type { AnalyticsClient, AnalyticsEventsMap, SceneInfo } from '../../interface';
+import type { AnalyticsClient, AnalyticsEventsMap, AnyPayload } from '../../interface';
 import { mapEventParamsToUrlParams, mapPayload } from './mapPayload';
 import { prepareBody } from './prepareBody';
 import { getUrl } from './getUrl';
@@ -74,7 +74,7 @@ export class GoogleAnalytics implements AnalyticsClient {
             params.cid = generateUuid();
             await Storage.setItem(GA_CLIENT_ID, params.cid);
         }
-        this.firstVisit = !(await Storage.getItem(GA_FIRST_VISIT)) ?? true;
+        this.firstVisit = !(await Storage.getItem(GA_FIRST_VISIT));
         if (this.firstVisit) {
             await Storage.setItem(GA_FIRST_VISIT, '0');
         }
@@ -123,18 +123,10 @@ export class GoogleAnalytics implements AnalyticsClient {
         this.lastOnEvent = now;
         await Promise.all(events.map(async (event, index) => {
             const sessionInfo = await this.getSessionInfo(
-                index === 0 ? engagementTime : undefined,
+                payload!, index === 0 ? engagementTime : undefined,
             );
-            const gtagPayload = mapPayload(
-                event, triggerName, {
-                    ...payload,
-                    ...sessionInfo,
-                },
-            );
-            const urlParams = mapEventParamsToUrlParams({
-                ...sessionInfo as SessionInfo,
-                ...payload as SceneInfo,
-            });
+            const gtagPayload = mapPayload(event, triggerName, { ...payload, ...sessionInfo });
+            const urlParams = mapEventParamsToUrlParams({ ...sessionInfo, ...payload });
             this.send(event, gtagPayload, urlParams);
         }));
     }
@@ -177,7 +169,10 @@ export class GoogleAnalytics implements AnalyticsClient {
 
     private sendQueueWithDelay = debounce(this.sendQueue, SEND_DEBOUNCE_MS);
 
-    private async getSessionInfo(engagementTime: number | undefined): Promise<SessionInfo> {
+    private async getSessionInfo(
+        payload: AnyPayload,
+        engagementTime: number | undefined,
+    ): Promise<SessionInfo> {
         const sessionStarted = !this.sessionStartSent;
         this.sessionStartSent = true;
         const { firstEvent } = this;
@@ -194,6 +189,7 @@ export class GoogleAnalytics implements AnalyticsClient {
             sessionStarted,
             engagementTime,
             firstEvent,
+            isAuthenticated: payload?.userId ? '1' : '0',
             firstVisit: firstVisit as boolean,
         };
     }

package/packages/analytics/src/clients/GoogleAnalytics/interface.ts

@@ -38,6 +38,7 @@ export type SessionInfo = {
     referrer: string,
     engagementTime: number | undefined,
     sessionStarted: boolean,
+    isAuthenticated: '0' | '1',
     firstEvent: boolean,
     firstVisit: boolean,
 };

package/packages/analytics/src/clients/GoogleAnalytics/mapPayload.ts

@@ -8,6 +8,7 @@ const map: Record<string, string> = {
     referrer: 'dr',
     sceneId: 'dl',
     sceneName: 'dt',
+    isAuthenticated: 'up.is_authenticated',
 };
 
 export const mapEventParamsToUrlParams = (eventParams: Record<string, any>)

package/packages/list/src/BasicList/BasicList.tsx

@@ -127,34 +127,34 @@ export class BasicList<T extends Item<U>, U>
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         if (list.index < safeIndex) {
-            this.scrollToForward(safeIndex);
+            this.scrollToForward(safeIndex, animate);
         } else {
-            this.scrollToBackward(safeIndex);
+            this.scrollToBackward(safeIndex, animate);
         }
     }
 
-    private scrollToForward(index: number) {
+    private scrollToForward(index: number, animate?: boolean) {
         const { visibleItems } = this.props;
         const list = this.base.current!;
         list.index = index;
         const scrollTarget = list.index - visibleItems + VISIBLE_ITEMS_OFFSET;
         if (scrollTarget > this.controller.scrollIndex) {
-            this.controller.scroll(scrollTarget);
+            this.controller.scroll(scrollTarget, animate);
         }
     }
 
-    private scrollToBackward(index: number) {
+    private scrollToBackward(index: number, animate?: boolean) {
         const { firstScrollStep, scrollStep } = this.props;
         const list = this.base.current!;
         list.index = index;
         const offset = firstScrollStep < scrollStep ? 1 : 0;
         if (list.index - offset < this.controller.scrollIndex) {
-            this.controller.scroll(list.index);
+            this.controller.scroll(list.index, animate);
         }
     }
 

package/packages/list/src/CenteredList/CenteredList.tsx

@@ -90,12 +90,12 @@ export class CenteredList<T extends Item<U>, U>
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         list.index = safeIndex;
-        this.controller.scroll(list.index);
+        this.controller.scroll(list.index, animate);
     }
 
     render() {

package/packages/list/src/EdgeOffsetList/EdgeOffsetList.tsx

@@ -120,18 +120,18 @@ export class EdgeOffsetList<T extends Item<U>, U>
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         if (list.index < safeIndex) {
-            this.scrollToForward(safeIndex);
+            this.scrollToForward(safeIndex, animate);
         } else {
-            this.scrollToBackward(safeIndex);
+            this.scrollToBackward(safeIndex, animate);
         }
     }
 
-    private scrollToForward(index: number) {
+    private scrollToForward(index: number, animate?: boolean) {
         const { visibleItems, edgeOffset } = this.props;
         const list = this.base.current!;
         list.index = index;
@@ -140,16 +140,16 @@ export class EdgeOffsetList<T extends Item<U>, U>
             : edgeOffset + list.index - list.data.length - 1;
         const scrollTarget = list.index - visibleItems + offset + VISIBLE_ITEMS_OFFSET;
         if (scrollTarget > this.controller.scrollIndex) {
-            this.controller.scroll(scrollTarget);
+            this.controller.scroll(scrollTarget, animate);
         }
     }
 
-    private scrollToBackward(index: number) {
+    private scrollToBackward(index: number, animate?: boolean) {
         const { edgeOffset } = this.props;
         const list = this.base.current!;
         list.index = index;
         if (list.index <= this.controller.scrollIndex) {
-            this.controller.scroll(list.index < edgeOffset ? 0 : list.index - edgeOffset);
+            this.controller.scroll(list.index < edgeOffset ? 0 : list.index - edgeOffset, animate);
         }
     }
 

package/packages/list/src/FirstOnlyList/FirstOnlyList.tsx

@@ -96,12 +96,12 @@ export class FirstOnlyList<T extends Item<U>, U>
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         list.index = safeIndex;
-        this.controller.scroll(list.index);
+        this.controller.scroll(list.index, animate);
     }
 
     render() {

package/packages/list/src/FirstOnlyVariedList/FirstOnlyVariedList.tsx

@@ -106,12 +106,12 @@ export class FirstOnlyVariedList<T extends Item<U>, U> extends Component<Props<T
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         list.index = safeIndex;
-        this.controller.scroll(0);
+        this.controller.scroll(0, animate);
     }
 
     render() {

package/packages/list/src/FixedToEndList/FixedToEndList.tsx

@@ -99,12 +99,12 @@ export class FixedToEndList<T extends Item<U>, U>
         this.controller.focusCurrentItem(options);
     }
 
-    scrollTo(index: number) {
+    scrollTo(index: number, animate?: boolean) {
         const list = this.base.current!;
         const safeIndex = Math.max(0, Math.min(index, list.data.length - 1));
         if (list.index === safeIndex) return;
         list.index = safeIndex;
-        this.controller.scroll(list.index);
+        this.controller.scroll(list.index, animate);
     }
 
     render() {

package/packages/list/src/interface.ts

@@ -12,7 +12,7 @@ export interface List<
     controller: UnifiedListController<U>,
     appendData(data: U[]): void,
     prependData(data: U[]): void,
-    scrollTo(index: number): void,
+    scrollTo(index: number, animate?: boolean): void,
 }
 
 export interface VariedList<
@@ -22,7 +22,7 @@ export interface VariedList<
     controller: UnifiedVariedListController<U>,
     appendData(data: U[]): void,
     prependData(data: U[]): void,
-    scrollTo(index: number): void,
+    scrollTo(index: number, animate?: boolean): void,
 }
 
 export interface ListComponent<