@24i/bigscreen-sdk 1.0.12 → 1.0.13-alpha.2281

package/README.md

@@ -8,7 +8,7 @@ sidebar_label: README
 # SmartApps BIGscreen SDK
 
 [![Build Status](https://travis-ci.com/24i/smartapps-bigscreen-sdk.svg?token=TvpGGSB2Z1L12QwPagEp&branch=development)](https://travis-ci.com/24i/smartapps-bigscreen-sdk)
-[![Coverage Status](https://coveralls.io/repos/github/24i/smartapps-bigscreen-sdk/badge.svg?branch=development&t=dGc701&kill_cache=1)](https://coveralls.io/github/24i/smartapps-bigscreen-sdk?branch=development)
+[![Coverage Status](https://coveralls.io/repos/github/24i/smartapps-bigscreen-sdk/badge.svg?branch=development&t=8n9LTd&kill_cache=1)](https://coveralls.io/github/24i/smartapps-bigscreen-sdk?branch=development)
 
 * [GitHub](https://github.com/24i/smartapps-bigscreen-sdk)
 * [Confluence](https://24imedia.atlassian.net/wiki/spaces/PRDNGBIGSCR/overview)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.12",
+    "version": "1.0.13-alpha.2281",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {
@@ -17,8 +17,8 @@
         "lintcheck:cached": "npm run eslint -- --cache && npm run stylelint -- --cache",
         "typecheck": "tsc --noEmit",
         "typecheck:cached": "npm run typecheck -- --incremental",
-        "test": "npm run jest -- --no-cache && npm run lintcheck",
-        "test:cached": "npm run jest && npm run lintcheck:cached",
+        "test": "npm run jest -- --no-cache",
+        "test:cached": "npm run jest",
         "coverage": "npm run jest -- --runInBand --coverage && coveralls < coverage/lcov.info",
         "branchlint": "branchlint",
         "generate-changelog": "smartapps-bigscreen-changelog-generator",
@@ -37,11 +37,11 @@
     },
     "homepage": "https://github.com/24i/smartapps-bigscreen-sdk#readme",
     "dependencies": {
-        "@24i/appstage-shared-analytics": "1.0.7",
-        "@24i/appstage-shared-events-manager": "1.0.5",
+        "@24i/appstage-shared-analytics": "1.0.1-alpha1",
+        "@24i/appstage-shared-events-manager": "1.0.7",
         "@24i/appstage-shared-perf-utils": "1.0.5",
         "@24i/player-base": "6.10.0",
-        "@24i/smartapps-datalayer": "3.0.6-alpha.978",
+        "@24i/smartapps-datalayer": "3.0.7-alpha.990",
         "@sentry/browser": "7.35.0",
         "@sentry/types": "7.35.0",
         "@types/gtag.js": "^0.0.12",
@@ -55,15 +55,15 @@
         "@24i/bigscreen-sdk": "file:.",
         "@24i/eslint-config-smartapps-bigscreen-linters": "file:./libs/linters",
         "@24i/smartapps-bigscreen-changelog-generator": "0.17.0",
-        "@babel/core": "^7.19.0",
+        "@babel/core": "^7.21.0",
         "@babel/preset-env": "^7.20.2",
         "@types/fs-extra": "^11.0.1",
         "@types/inquirer": "^9.0.3",
         "@types/jest": "^29.2.3",
         "@types/minimist": "^1.2.2",
         "@types/node": "^18.7.18",
-        "@types/react": "^18.0.26",
-        "babel-jest": "^29.4.1",
+        "@types/react": "^18.0.28",
+        "babel-jest": "^29.4.3",
         "chalk": "^5.2.0",
         "coveralls": "^3.1.1",
         "cross-env": "^7.0.3",

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

@@ -34,15 +34,20 @@ export class GoogleAnalytics implements AnalyticsClient {
         cid: '',
         sid: 0,
         uamb: 0,
-        uap: '',
-        uapv: '',
-        uam: '',
         seg: 0,
         sct: 0,
         _p: generateUuid(),
+        'up.device_manufacturer': '',
+        'up.device_platform': '',
+        'up.device_platform_version': '',
+        'up.app_version': '',
     };
 
-    a24iOperational = false;
+    manufacturer = '';
+
+    platform = '';
+
+    platformVersion = '';
 
     lastOnEvent: number | undefined = undefined;
 
@@ -58,7 +63,7 @@ export class GoogleAnalytics implements AnalyticsClient {
 
     firstVisit: boolean | undefined = undefined;
 
-    constructor(private id: string) {
+    constructor(private id: string, private appVersion: string = '') {
         this.init();
     }
 
@@ -73,16 +78,20 @@ export class GoogleAnalytics implements AnalyticsClient {
         if (this.firstVisit) {
             await Storage.setItem(GA_FIRST_VISIT, '0');
         }
+        this.manufacturer = await device.getManufacturerName();
+        this.platform = await device.getPlatformName();
+        this.platformVersion = await device.getPlatformVersion();
         await this.startSession();
-        params.uap = await device.getPlatformName();
-        params.uapv = await device.getPlatformVersion();
-        params.uam = await device.getModelName();
     }
 
     async startSession() {
         const sessionNumber = parseInt(await Storage.getItem(GA_SESSION_COUNTER) ?? '0', 10) + 1;
         this.constantUrlParams.sct = sessionNumber;
         this.constantUrlParams.sid = generateSessionId();
+        this.constantUrlParams['up.device_manufacturer'] = this.manufacturer;
+        this.constantUrlParams['up.device_platform'] = this.platform;
+        this.constantUrlParams['up.device_platform_version'] = this.platformVersion;
+        this.constantUrlParams['up.app_version'] = this.appVersion;
         await Storage.setItem(GA_SESSION_COUNTER, sessionNumber.toString());
         this.isSessionActive = true;
         this.setSessionTimeout();
@@ -113,11 +122,14 @@ export class GoogleAnalytics implements AnalyticsClient {
         const engagementTime = this.lastOnEvent ? now - this.lastOnEvent : undefined;
         this.lastOnEvent = now;
         await Promise.all(events.map(async (event, index) => {
-            if (event === 'a24i_operational' && !this.shouldContinueWithA24iOperational()) return;
+            const sessionInfo = await this.getSessionInfo(
+                index === 0 ? engagementTime : undefined,
+            );
             const gtagPayload = mapPayload(
-                event, triggerName, await this.getSessionInfo(
-                    index === 0 ? engagementTime : undefined,
-                ),
+                event, triggerName, {
+                    ...payload,
+                    ...sessionInfo,
+                },
             );
             const urlParams = mapEventParamsToUrlParams(payload as SceneInfo);
             this.send(event, gtagPayload, urlParams);
@@ -162,12 +174,6 @@ export class GoogleAnalytics implements AnalyticsClient {
 
     private sendQueueWithDelay = debounce(this.sendQueue, SEND_DEBOUNCE_MS);
 
-    private shouldContinueWithA24iOperational() {
-        const { a24iOperational } = this;
-        if (!a24iOperational) this.a24iOperational = true;
-        return !a24iOperational;
-    }
-
     private async getSessionInfo(engagementTime: number | undefined): Promise<SessionInfo> {
         const sessionStarted = !this.sessionStartSent;
         this.sessionStartSent = true;
@@ -176,6 +182,9 @@ export class GoogleAnalytics implements AnalyticsClient {
         const { firstVisit } = this;
         this.firstVisit = false;
         return {
+            appVersion: this.appVersion,
+            manufacturer: this.manufacturer,
+            platform: this.platform,
             sessionStarted,
             engagementTime,
             firstEvent,

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

@@ -1,7 +1,12 @@
 import { GAEventsNames } from './interface';
 
+const stringParameter = 'ep';
+const numericParameter = 'epn';
+
 export const GOOGLE_ANALYTICS_TRIGGERS = [
+    'scene_view',
     'app_close',
+    // player triggers
     'playback_10',
     'playback_25',
     'playback_50',
@@ -12,42 +17,92 @@ export const GOOGLE_ANALYTICS_TRIGGERS = [
     'playback_stop',
     'player_close',
     'player_open',
-    'scene_view',
+    'heartbeat_5',
+    // scroll triggers
     'scroll_25',
     'scroll_50',
     'scroll_75',
     'scroll_90',
+    // additional triggers
+    'app_error',
+    'toggle_favorite',
+    'search',
+    'rate_content',
+    // ads triggers
+    'ad_loaded',
+    'ad_skipped',
+    // user triggers
+    'login',
+    'logout',
+    'sign_up',
+    // purchases
+    'purchase_cancel',
+    'purchase_complete',
+    'purchase_start',
+
 ] as const;
 
 export const TRIGGER_NAME_TO_GA_EVENTS: Record<
     typeof GOOGLE_ANALYTICS_TRIGGERS[number], GAEventsNames[]
 > = {
     // App
-    app_close: ['app_close', 'video_progress'],
+    app_close: ['close_player_session', 'video_progress'],
 
     // Playback
+    heartbeat_5: ['video_progress'],
     playback_10: ['video_progress'],
     playback_25: ['video_progress'],
     playback_50: ['video_progress'],
     playback_75: ['video_progress'],
-    playback_90: ['video_progress'],
+    playback_90: ['video_complete'],
     playback_pause: ['video_progress'],
     playback_start: ['video_start'],
     playback_stop: ['video_progress'],
 
     // Player
-    player_close: ['a24i_content', 'video_progress'],
-    player_open: ['a24i_content'],
+    player_close: ['close_player_session', 'video_progress'],
+    player_open: ['open_player_session'],
 
     // Scenes
-    scene_view: [
-        'page_view',
-        'a24i_operational',
-    ],
+    scene_view: ['page_view'],
 
     // Scrolling in scene
     scroll_25: ['scroll'],
     scroll_50: ['scroll'],
     scroll_75: ['scroll'],
     scroll_90: ['scroll'],
+
+    // purchases
+    purchase_cancel: [],
+    purchase_complete: [],
+    purchase_start: [],
+
+    // additional triggers
+    app_error: [],
+    toggle_favorite: [],
+    search: [],
+    rate_content: [],
+
+    // ads triggers
+    ad_loaded: [],
+    ad_skipped: [],
+
+    // user triggers
+    login: ['login'],
+    logout: [],
+    sign_up: [],
+};
+
+export const gtagPayloadParams: Record<string, string> = {
+    contentType: `${stringParameter}.content_type`,
+    episodeNumber: `${numericParameter}.episode_number`,
+    seasonNumber: `${numericParameter}.season_number`,
+    currentTime: `${numericParameter}.video_current_time`,
+    duration: `${numericParameter}.video_duration`,
+    percent: `${numericParameter}.video_current_percent`,
+    provider: `${stringParameter}.video_provider`,
+    title: `${stringParameter}.video_title`,
+    seriesTitle: `${stringParameter}.video_series_title`,
+    url: `${stringParameter}.video_url`,
+    assetId: `${stringParameter}.video_asset_id`,
 };

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

@@ -1,12 +1,19 @@
 export type GAEventsNames = (
-    | 'a24i_content'
-    | 'a24i_operational'
-    | 'app_close'
-    | 'buffering_start'
-    | 'page_view'
-    | 'scroll'
-    | 'video_progress'
-    | 'video_start'
+    | 'app_close' // When the playback is active at the time the app or website is closing.
+    | 'page_view' // Each time the page loads or the browser history state is changed
+    | 'scroll' // The first time a user reaches the bottom of each page
+    | 'video_progress' // When the video progresses past 10%, 25%, 50%, and 75% duration time
+    | 'video_start' // When the video starts playing
+    | 'video_complete' // When the video ends
+    | 'open_player_session' // When the user opens a player scene and the player is initiated
+    | 'close_player_session' // When the user exits the player scene with initiated player
+    | 'select_content' // When a user has selected content
+    | 'login' // When a user logs in
+    | 'sign_up' // When a user has signed up Allows you to see which methods of signup are popular
+    | 'search' // When a user searches your content
+    | 'purchase' // When a user completes a purchase
+    | 'share' // When a user has shared content
+    | 'user_engagement' // Periodically, while the app is in the foreground
 );
 
 export type QueuedEvent = {
@@ -16,6 +23,9 @@ export type QueuedEvent = {
 };
 
 export type SessionInfo = {
+    appVersion: string,
+    manufacturer: string,
+    platform: string,
     engagementTime: number | undefined,
     sessionStarted: boolean,
     firstEvent: boolean,
@@ -29,18 +39,20 @@ export type ConstantUrlParams = {
     sid: number,
     /** 1 for mobile devices, 0 otherwise */
     uamb: number,
-    /** Platform name */
-    uap: string,
-    /** Platform version */
-    uapv: string,
-    /** Device model name */
-    uam: string,
     /** Session engagement 0 for first event of session, 1 otherwise */
     seg: number,
     /** Session count */
     sct: number,
     /** Random page hash */
     _p: string,
+    /** Device manufacturer e.g. 'Samsung' */
+    'up.device_manufacturer': string,
+    /** Platform e.g. 'Tizen' */
+    'up.device_platform': string,
+    /** Platform version e.g. '5.0' */
+    'up.device_platform_version': string,
+    /** Version of application 'v1.0.0' */
+    'up.app_version': string,
 };
 
 export type EventUrlParams = {

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

@@ -1,29 +1,46 @@
-import type { AnalyticsEventsNames } from '../../interface';
-import type { EventUrlParams, GAEventsNames, SessionInfo } from './interface';
+import type { AnalyticsEventsNames, AnyPayload } from '../../interface';
+import type { EventUrlParams, GAEventsNames } from './interface';
+import { gtagPayloadParams } from './constants';
 
-export const mapEventParamsToUrlParams = (eventParams: Record<string, any>) => {
-    const urlParams: Partial<EventUrlParams> = {};
-    if (eventParams.language) urlParams.ul = eventParams.language;
-    if (eventParams.resolution) urlParams.sr = eventParams.resolution;
-    if (eventParams.sceneId) urlParams.dl = eventParams.sceneId;
-    if (eventParams.sceneName) urlParams.dt = eventParams.sceneName;
+const map: Record<string, string> = {
+    language: 'ul',
+    resolution: 'sr',
+    sceneId: 'dl',
+    sceneName: 'dt',
+};
+
+export const mapEventParamsToUrlParams = (eventParams: Record<string, any>)
+: EventUrlParams => {
+    const urlParams = {};
+    Object.entries(eventParams).forEach(([key]) => {
+        if (map[key]) {
+            Object.assign(urlParams, {
+                [map[key]]: eventParams[key] || '',
+            });
+        }
+    });
     return urlParams as EventUrlParams;
 };
 
 export const mapPayload = (
     eventName: GAEventsNames,
     triggerName: AnalyticsEventsNames,
-    sessionInfo: SessionInfo,
+    payload: AnyPayload,
 ) => {
     const gtagPayload: Record<string, any> = {
         'ep.event_trigger': triggerName,
-        _et: sessionInfo.engagementTime ?? 0,
-        _ee: sessionInfo.firstEvent ? 1 : 0,
-        _fv: sessionInfo.firstVisit ? 1 : 0,
-        _ss: sessionInfo.sessionStarted ? 1 : 0,
+        _et: payload.engagementTime ?? 0,
+        _ee: payload.firstEvent ? 1 : 0,
+        _fv: payload.firstVisit ? 1 : 0,
+        _ss: payload.sessionStarted ? 1 : 0,
     };
     if (eventName === 'scroll') {
-        gtagPayload['epn.percent_scroll'] = parseInt(triggerName.split('_')[1], 10);
+        gtagPayload['epn.percent_scrolled'] = parseInt(triggerName.split('_')[1], 10);
     }
+    Object.keys(payload).forEach((key: keyof typeof payload) => {
+        if (gtagPayloadParams[key] !== undefined) {
+            gtagPayload[gtagPayloadParams[key]] = payload[key];
+        }
+    });
     return gtagPayload;
 };

package/packages/create-package/dist/createPackage.js

@@ -0,0 +1,66 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.main = void 0;
+const path = require("path");
+const fs = require("fs");
+const fse = require("fs-extra");
+const chalk = require("chalk");
+const minimist = require("minimist");
+const questions_1 = require("./questionnaire/questions");
+const Settings_1 = require("./settings/Settings");
+async function isDirectoryEmpty(dirPath) {
+    const files = await fs.promises.readdir(dirPath);
+    return !files.length;
+}
+async function copyTemplateFiles(templateDir, targetDir) {
+    return fse.copy(templateDir, targetDir);
+}
+function updatePackageJsonFile(filePath, options) {
+    let data = fs.readFileSync(filePath, 'utf8');
+    const keywords = options.keywords.map((word) => `"${word}"`).join(', ');
+    data = data.replace(/("name": ")(.*)(")/, `$1${options.name}$3`);
+    data = data.replace(/("version": ")(.*)(")/, `$1${options.version}$3`);
+    data = data.replace(/("description": ")(.*)(")/, `$1${options.description}$3`);
+    data = data.replace(/("keywords": \[)(.*)(\])/, `$1${keywords}$3`);
+    data = data.replace(/("author": ")(.*)(")/, `$1${options.author}$3`);
+    fs.writeFileSync(filePath, data);
+}
+function parseArguments(rawArgv) {
+    const argv = minimist(rawArgv.slice(2));
+    const dirName = argv._[0];
+    if (!dirName) {
+        console.error('Error: Missing package name');
+        process.exit(1);
+    }
+    return {
+        dirName,
+    };
+}
+async function main() {
+    const { dirName: destDirName } = parseArguments(process.argv);
+    const destDir = path.join(process.cwd(), 'packages/', destDirName);
+    if (fs.existsSync(destDir)) {
+        console.error(`Error: Target directory "${destDir}" already exists`);
+        process.exit(1);
+    }
+    fs.mkdirSync(destDir, { recursive: true });
+    const isDirEmpty = await isDirectoryEmpty(destDir);
+    if (!isDirEmpty) {
+        console.error(`Error: Target directory "${destDir}" is not empty.`);
+        process.exit(1);
+    }
+    const settings = Object.assign({}, Settings_1.Settings);
+    settings.name = `${Settings_1.Settings.name}${destDirName}`.toLowerCase();
+    const details = await (0, questions_1.promptPackageDetails)(settings);
+    const templateDir = path.join(__dirname, '..', 'templates/typescript');
+    await copyTemplateFiles(templateDir, destDir);
+    const packageJsonFile = path.join(destDir, 'package.json');
+    updatePackageJsonFile(packageJsonFile, details);
+    const docsSymlinkTarget = path.join('../../../packages/', destDirName, '/README.md');
+    const docsSymlinkPath = path.join(process.cwd(), 'docs/packages/', destDirName, '/README.md');
+    await fse.ensureSymlink(docsSymlinkTarget, docsSymlinkPath);
+    console.log(`${chalk.green('Success')}, package has been initialized!`);
+}
+exports.main = main;
+//# sourceMappingURL=createPackage.js.map

package/packages/create-package/dist/createPackage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createPackage.js","sourceRoot":"","sources":["../src/createPackage.ts"],"names":[],"mappings":"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"}

package/packages/create-package/dist/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const createPackage_1 = require("./createPackage");
+(0, createPackage_1.main)();
+//# sourceMappingURL=index.js.map

package/packages/create-package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mDAAuC;AAEvC,IAAA,oBAAI,GAAE,CAAC"}

package/packages/create-package/dist/questionnaire/questions.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptPackageDetails = void 0;
+const inquirer = require("inquirer");
+async function promptPackageDetails(defaultValues) {
+    return inquirer.prompt([
+        {
+            type: 'input',
+            name: 'name',
+            message: 'Package name:',
+            default: defaultValues.name,
+        }, {
+            type: 'input',
+            name: 'version',
+            message: 'Version:',
+            default: defaultValues.version,
+        }, {
+            type: 'input',
+            name: 'description',
+            message: 'Description:',
+        }, {
+            type: 'input',
+            name: 'keywords',
+            message: 'Keywords:',
+            filter: (ans) => ans.split(/[\s,]+/),
+        }, {
+            type: 'input',
+            name: 'author',
+            message: 'Author:',
+            default: defaultValues.author,
+        },
+    ]);
+}
+exports.promptPackageDetails = promptPackageDetails;
+//# sourceMappingURL=questions.js.map

package/packages/create-package/dist/questionnaire/questions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"questions.js","sourceRoot":"","sources":["../../src/questionnaire/questions.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAWrC,KAAK,UAAU,oBAAoB,CAAC,aAA4C;IAC5E,OAAO,QAAQ,CAAC,MAAM,CAAC;QACnB;YACI,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE,aAAa,CAAC,IAAI;SAC9B,EAAE;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,UAAU;YACnB,OAAO,EAAE,aAAa,CAAC,OAAO;SACjC,EAAE;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,cAAc;SAC1B,EAAE;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvC,EAAE;YACC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,aAAa,CAAC,MAAM;SAChC;KACJ,CAAC,CAAC;AACP,CAAC;AAEQ,oDAAoB"}

package/packages/create-package/dist/settings/Settings.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Settings = void 0;
+const Settings = {
+    name: '@24i/smartapps-bigscreen-',
+    version: '0.0.1',
+    author: '24i',
+};
+exports.Settings = Settings;
+//# sourceMappingURL=Settings.js.map

package/packages/create-package/dist/settings/Settings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Settings.js","sourceRoot":"","sources":["../../src/settings/Settings.ts"],"names":[],"mappings":";;;AAAA,MAAM,QAAQ,GAAG;IACb,IAAI,EAAE,2BAA2B;IACjC,OAAO,EAAE,OAAO;IAChB,MAAM,EAAE,KAAK;CAChB,CAAC;AAEO,4BAAQ"}

package/packages/create-package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/packages/create-package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/packages/driver-androidtv/src/DeviceAndroidTV.ts

@@ -52,6 +52,7 @@ export class DeviceAndroidTV extends DeviceBase {
      * on the active (focused) element in the DOM tree.
      * @param event keyboard event
      */
+    // eslint-disable-next-line complexity
     relaunchKeyEvent = (event: CustomKeyboardEvent) => {
         if (event.bigscreenSdkRelaunched) { // prevent to relaunch event in loop
             return;
@@ -60,6 +61,16 @@ export class DeviceAndroidTV extends DeviceBase {
         const { key } = event;
         let { keyCode } = event;
 
+        // KeyCodes collisions for some key sent from Android wrapper or JavaScript (webView)
+        if (
+            key === 'u' // keyCode 85, same like PLAYPAUSE
+            || key === 'v' // keyCode 86, same like STOP
+            || key === 'y' // keyCode 89, same like REW
+            || key === 'z' // keyCode 90, same like FF
+        ) {
+            return;
+        }
+
         /**
          * Remap KeyCode by its key value.
          * On Android all colors keys and some others coming with "0" keyCode.

package/packages/driver-base/src/KeyMap/Key.ts

@@ -12,21 +12,25 @@ export class Key {
 
     alternativeKeyCodes: number[];
 
+    key: string;
+
     constructor({
         id,
         code = '',
         keyCode = 0,
         alternativeCodes = [],
         alternativeKeyCodes = [],
+        key = '',
     }: Partial<KeyConfig> = {}) {
         this.id = id!;
         this.code = code;
         this.keyCode = keyCode;
         this.alternativeCodes = alternativeCodes;
         this.alternativeKeyCodes = alternativeKeyCodes;
+        this.key = key;
     }
 
-    is({ keyCode, code }: KeyboardEvent) {
+    is({ keyCode, code, key }: KeyboardEvent) {
         return Boolean(
             code && ( // empty string code means unknown/invalid --> should not compare
                 code === this.code
@@ -35,6 +39,9 @@ export class Key {
             || keyCode && ( // keyCode 0 means unknown/invalid --> should not compare
                 keyCode === this.keyCode
                 || this.alternativeKeyCodes.length && includes(this.alternativeKeyCodes, keyCode)
+            )
+            || key && ( // empty string code means unknown/invalid --> should not compare
+                key === this.key
             ),
         );
     }

package/packages/driver-base/src/KeyMap/interface.ts

@@ -4,4 +4,5 @@ export interface KeyConfig {
     code: string,
     alternativeKeyCodes: number[],
     alternativeCodes: string[],
+    key : string,
 }

package/packages/driver-base/src/KeyMap/overrideValues.ts

@@ -6,11 +6,12 @@ import * as KeyMap from './KeyMap';
 export const overrideValues = (map: Partial<Record<keyof KeycodeKeyMap, Partial<Key>>>) => {
     // @ts-ignore - map and KeyMap have same keys
     forEach(Object.entries(map), ([keyName, {
-        keyCode, code, alternativeKeyCodes, alternativeCodes,
+        keyCode, code, alternativeKeyCodes, alternativeCodes, key,
     }]: [keyof typeof import('./KeyMap'), Partial<Key>]) => {
         if (typeof keyCode === 'number') KeyMap[keyName].keyCode = keyCode;
         if (typeof code === 'string') KeyMap[keyName].code = code;
         if (alternativeKeyCodes) KeyMap[keyName].alternativeKeyCodes = alternativeKeyCodes;
         if (alternativeCodes) KeyMap[keyName].alternativeCodes = alternativeCodes;
+        if (key) KeyMap[keyName].key = key;
     });
 };

package/packages/driver-webos/src/keymap.ts

@@ -2,7 +2,7 @@ import { generateKeyCodeKeyMap, overrideValues } from '@24i/bigscreen-sdk/driver
 
 export const getKeyMap = () => {
     overrideValues({
-        BACK: { keyCode: 461 },
+        BACK: { keyCode: 461, key: 'RCUBack' },
         TXT: { keyCode: 110 },
         SUBTITLES: { keyCode: 460 },
     });

package/packages/input/src/Input.tsx

@@ -126,12 +126,14 @@ export class Input extends Component<Props> implements IFocusable {
         const range = new Range();
         range.selectNode(textNode);
         const wholeText = range.getBoundingClientRect();
-        range.setStart(textNode, position);
+        range.setStart(textNode, 0);
         range.setEnd(textNode, position);
         const caretText = range.getBoundingClientRect();
-        const offset = isRtl()
-            ? wholeText.left - caretText.left
-            : wholeText.left + wholeText.width - caretText.left;
+        const [initialCaretPosition, currentCarretPosition, offsetBase] = isRtl()
+            ? [wholeText.right, caretText.left, wholeText.left]
+            : [wholeText.left, caretText.right, wholeText.right];
+        const caretPos = position === 0 ? initialCaretPosition : currentCarretPosition;
+        const offset = offsetBase - caretPos;
         offsetPosition(this.caret, { x: -offset }, false);
     }
 
@@ -220,7 +222,7 @@ export class Input extends Component<Props> implements IFocusable {
                     >
                         {placeholder}
                     </div>
-                    <div ref={this.text} className="text" dir="auto">
+                    <div ref={this.text} className="text">
                         {this.filterText(value)}
                     </div>
                     <div ref={this.caret} className="caret" />

package/packages/types-bigscreen-jsx/index.d.ts

@@ -783,10 +783,10 @@ declare namespace React {
 
     /** Ensures that the props do not include ref at all */
     type PropsWithoutRef<P> =
-        // Pick would not be sufficient for this. We'd like to avoid unnecessary mapping and need a distributive conditional to support unions.
+        // Omit would not be sufficient for this. We'd like to avoid unnecessary mapping and need a distributive conditional to support unions.
         // see: https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
         // https://github.com/Microsoft/TypeScript/issues/28339
-        P extends any ? ('ref' extends keyof P ? Pick<P, Exclude<keyof P, 'ref'>> : P) : P;
+        P extends any ? ('ref' extends keyof P ? Omit<P, 'ref'> : P) : P;
     /** Ensures that the props do not include string ref, which cannot be forwarded */
     type PropsWithRef<P> =
         // Just "P extends { ref?: infer R }" looks sufficient, but R will infer as {} if P is {}.
@@ -1941,7 +1941,7 @@ declare namespace React {
         content?: string | undefined;
         controls?: boolean | undefined;
         coords?: string | undefined;
-        crossOrigin?: string | undefined;
+        crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
         data?: string | undefined;
         dateTime?: string | undefined;
         default?: boolean | undefined;
@@ -2229,7 +2229,7 @@ declare namespace React {
         autoFocus?: boolean | undefined;
         capture?: boolean | 'user' | 'environment' | undefined; // https://www.w3.org/TR/html-media-capture/#the-capture-attribute
         checked?: boolean | undefined;
-        crossOrigin?: string | undefined;
+        crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
         disabled?: boolean | undefined;
         enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send' | undefined;
         form?: string | undefined;
@@ -2281,7 +2281,7 @@ declare namespace React {
 
     interface LinkHTMLAttributes<T> extends HTMLAttributes<T> {
         as?: string | undefined;
-        crossOrigin?: string | undefined;
+        crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
         href?: string | undefined;
         hrefLang?: string | undefined;
         integrity?: string | undefined;
@@ -2307,7 +2307,7 @@ declare namespace React {
         autoPlay?: boolean | undefined;
         controls?: boolean | undefined;
         controlsList?: string | undefined;
-        crossOrigin?: string | undefined;
+        crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
         loop?: boolean | undefined;
         mediaGroup?: string | undefined;
         muted?: boolean | undefined;
@@ -2392,7 +2392,7 @@ declare namespace React {
         async?: boolean | undefined;
         /** @deprecated */
         charSet?: string | undefined;
-        crossOrigin?: string | undefined;
+        crossOrigin?: "anonymous" | "use-credentials" | "" | undefined;
         defer?: boolean | undefined;
         integrity?: string | undefined;
         noModule?: boolean | undefined;