@24i/bigscreen-sdk 1.1.0 → 2.1.1-alpha.2133

package/packages/digital-clock/src/DigitalClock.tsx

@@ -8,14 +8,9 @@ export type Props = {
     withSeconds?: boolean,
     domRef?: Reference<HTMLDivElement>,
     className?: string,
-    isHiddenForAria?: boolean,
 };
 
-const WITHOUT_SECONDS_OPTIONS = {
-    hour: 'numeric',
-    minute: '2-digit',
-    formatType: 'timeFormat',
-} as const;
+const WITHOUT_SECONDS_OPTIONS = { hour: 'numeric', minute: '2-digit' } as const;
 const WITH_SECONDS_OPTIONS = { ...WITHOUT_SECONDS_OPTIONS, second: '2-digit' } as const;
 
 export class DigitalClock extends Component<Props> {
@@ -45,7 +40,7 @@ export class DigitalClock extends Component<Props> {
 
     setTime() {
         const { withSeconds } = this.props;
-        const currentTimestampMs = time.getCurrentTime().getTime();
+        const currentTimestampMs = time.getCurrentUnixTime();
         if (this.oldUnixTimestampMs !== currentTimestampMs) {
             const options = withSeconds ? WITH_SECONDS_OPTIONS : WITHOUT_SECONDS_OPTIONS;
             this.clearMount((
@@ -66,13 +61,7 @@ export class DigitalClock extends Component<Props> {
     }
 
     render() {
-        const { className, isHiddenForAria } = this.props;
-        return (
-            <div
-                ref={this.clockRef}
-                className={className}
-                {...isHiddenForAria && { 'aria-hidden': true }}
-            />
-        );
+        const { className } = this.props;
+        return <div ref={this.clockRef} className={className} />;
     }
 }

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

@@ -4,9 +4,9 @@ import {
     ScreenSaverStatus,
     VolumeRange,
 } from '@24i/bigscreen-sdk/driver-base';
-import { IJavaScriptBridge, DeviceInfo } from './types';
+import { IJavaScriptBridge } from './types';
 import { getFirmware } from './formatUserAgent';
-import { getKeyMap, AndroidKeyMap } from './keymap';
+import { getKeyMap } from './keymap';
 
 interface CustomKeyboardEvent extends KeyboardEvent {
     /** Flag indicating that the driver has already re-emitted this event. */
@@ -25,9 +25,7 @@ declare global {
 export class DeviceAndroidTV extends DeviceBase {
     keyMap = getKeyMap();
 
-    deviceInfo = window.JavaScriptBridge.bridgeJavaScriptToAndroid_GetDeviceInfo();
-
-    platformInfo: DeviceInfo = this.deviceInfo ? JSON.parse(this.deviceInfo) : '';
+    platformInfo = window.JavaScriptBridge.bridgeJavaScriptToAndroid_GetDeviceInfo();
 
     firmware = getFirmware(navigator.userAgent);
 
@@ -46,54 +44,17 @@ export class DeviceAndroidTV extends DeviceBase {
     }
 
     /**
-     * Handles keydown/up events for the BACK, FF, REW, STOP, PLAY key which are
-     * dispatched on the document from the Android TV Bridge. We must catch them
-     * and re-emit them properly on the active (focused) element in the DOM tree.
+     * Handles keydown/up events for the BACK key which are dispatched on the document
+     * from the Android TV Bridge. We must catch them and re-emit them properly
+     * 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;
         }
-
-        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.
-         */
-        if (key === 'ColorF0Red') keyCode = this.keyMap.RED;
-        if (key === 'ColorF1Green') keyCode = this.keyMap.GREEN;
-        if (key === 'ColorF2Yellow') keyCode = this.keyMap.YELLOW;
-        if (key === 'ColorF3Blue') keyCode = this.keyMap.BLUE;
-        if (key === 'ClosedCaptionToggle') keyCode = this.keyMap.SUBTITLES;
-        if (keyCode === AndroidKeyMap.STOP) keyCode = this.keyMap.STOP;
-        if (keyCode === AndroidKeyMap.PAUSE) keyCode = this.keyMap.PAUSE;
-
-        if (keyCode === this.keyMap.BACK
-            || keyCode === this.keyMap.STOP
-            || keyCode === this.keyMap.FF
-            || keyCode === this.keyMap.REW
-            || keyCode === this.keyMap.PLAYPAUSE
-            || keyCode === this.keyMap.PLAY
-            || keyCode === this.keyMap.RED
-            || keyCode === this.keyMap.GREEN
-            || keyCode === this.keyMap.YELLOW
-            || keyCode === this.keyMap.BLUE
-            || keyCode === this.keyMap.SUBTITLES
-        ) {
+        const { keyCode } = event;
+        if (keyCode === this.keyMap.BACK) {
             event.preventDefault();
             event.stopImmediatePropagation();
             const newEvent = new KeyboardEvent(event.type, {
@@ -166,10 +127,6 @@ export class DeviceAndroidTV extends DeviceBase {
         return VolumeRange.UNSUPPORTED;
     }
 
-    async getWrapperVersion(): Promise<string> {
-        return this.platformInfo.appVersion;
-    }
-
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async setVolume(volumePercentage: number): Promise<void> {
         // not supported on AndroidTV platform
@@ -211,9 +168,7 @@ export class DeviceAndroidTV extends DeviceBase {
     }
 
     async getLocalIP(): Promise<string> {
-        const ipv4RegExp = /\b(?:[0-9]{1,3}\.){3}[0-9]{1,3}\b/;
-        const ip = this.platformInfo.ipLocal.toString().match(ipv4RegExp);
-        if (ip) return ip.toString();
+        // not supported on AndroidTV platform
         return '';
     }
 

package/packages/driver-androidtv/src/__mocks__/javaScriptBridge.ts

@@ -2,35 +2,11 @@ import { IJavaScriptBridge } from '../types';
 
 export const mockJavaScriptBridge: IJavaScriptBridge = {
     JavaScriptBridge: {
-        bridgeJavaScriptToAndroid_GetDeviceInfo: () => (
-            JSON.stringify({
-                deviceBrand: 'Sony',
-                deviceModel: 'BRAVIA 4K 2015',
-                osVersion: '8.0.0',
-                appVersion: '0.0.1',
-                appFlavor: 'appstage-bigscreen',
-                drmKeySystems: '["W3C Clear Key", "Google Widevine"]',
-                ipLocal: '127.0.0.1',
-            })
-        ),
+        bridgeJavaScriptToAndroid_GetDeviceInfo: () => ({
+            deviceBrand: 'Sony',
+            deviceModel: 'BRAVIA 4K 2015',
+            osVersion: '8.0.0',
+        }),
         bridgeJavaScriptToAndroid_Back: () => {},
-        bridgeJavaScriptToAndroid_StopVideo: () => {},
-        bridgeJavaScriptToAndroid_FullScreenVideo: () => {},
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        bridgeJavaScriptToAndroid_SetVideoPath: (url: string) => {},
-        bridgeJavaScriptToAndroid_IsPlaying: () => true,
-        bridgeJavaScriptToAndroid_PauseVideo: () => {},
-        bridgeJavaScriptToAndroid_PlayVideo: () => {},
-        bridgeJavaScriptToAndroid_IsLive: () => false,
-        bridgeJavaScriptToAndroid_GetCurrentTime: () => Date.now(),
-        bridgeJavaScriptToAndroid_GetTotalTime: () => Date.now(),
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        bridgeJavaScriptToAndroid_SeekTo: (milliseconds: number) => {},
-        bridgeJavaScriptToAndroid_getCurrentSubtitleTrack: () => '{}',
-        bridgeJavaScriptToAndroid_getCurrentAudioTrack: () => '{}',
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        bridgeJavaScriptToAndroid_SetTrack: (track: string) => {},
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        bridgeJavaScriptToAndroid_SetAudioTrack: (track: string) => {},
     },
 };

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

@@ -4,24 +4,6 @@ import { KeyMap } from '@24i/bigscreen-sdk/driver-base';
 export const getKeyMap = () => {
     KeyMap.overrideValues({
         BACK: { keyCode: 4 },
-        STOP: { keyCode: 86 },
-        FF: { keyCode: 90 },
-        REW: { keyCode: 89 },
-        PLAY: { keyCode: 126 },
-        PAUSE: { keyCode: 127 },
-        PLAYPAUSE: { keyCode: 85 },
-        SUBTITLES: { keyCode: 175 },
     });
     return KeyMap.generateKeyCodeKeyMap();
 };
-
-/**
- * For the specific AndroidTV devices like Sony Bravia or Nvidia Shield
- * there are different KeyCodes for some buttons than on other platforms.
- * In that case we need to re-map this specific KeyCodes to the
- * same values as we using in generic KeyMap list for the AndroidTV.
- */
-export const AndroidKeyMap = {
-    STOP: 178,
-    PAUSE: 85,
-};

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

@@ -1,113 +1,27 @@
 interface JavaScriptBridge {
     /**
-     * It returns a JSON string with device info.
-     * @return JSON string with the information about the device brand, model and Android version.
-     * Ex. '{"deviceBrand": "Sony", "deviceModel": "BRAVIA 4K 2015", "osVersion": "7.0",
-     * "appFlavor": "appstage-bigscreen", "drmKeySystems": ["Widewine", "W3C ClearKey"],
-     * "ipLocal": "fe80::475:3045:2928:3a32%wlan0127.0.0.1", "appVersion": '0.0.1' }'
-     */
-    bridgeJavaScriptToAndroid_GetDeviceInfo: () => string,
+     * It returns device info.
+     */
+    bridgeJavaScriptToAndroid_GetDeviceInfo: () => {
+        /**
+         * Device brand. Ex. "Sony"
+         */
+        deviceBrand: string,
+        /**
+         * Device model. Ex. "BRAVIA 4K 2015"
+         */
+        deviceModel: string,
+        /**
+         * Android version. Ex. "7.0"
+         */
+        osVersion: string,
+    },
     /**
      * It simulates a native Android back press.
      */
     bridgeJavaScriptToAndroid_Back: () => void,
-    /**
-     * It simulates a native Android stop button press.
-     */
-    bridgeJavaScriptToAndroid_StopVideo: () => void;
-    /**
-     * It sets the video to fullscreen mode
-     */
-    bridgeJavaScriptToAndroid_FullScreenVideo: () => void;
-    /**
-     * It sets the video url
-     */
-    bridgeJavaScriptToAndroid_SetVideoPath: (url: string) => void;
-    /**
-     * It returns whether the video is playing
-     */
-    bridgeJavaScriptToAndroid_IsPlaying: () => boolean;
-    /**
-     * It pauses the video
-     */
-    bridgeJavaScriptToAndroid_PauseVideo: () => void;
-    /**
-     * It plays the video
-     */
-    bridgeJavaScriptToAndroid_PlayVideo: () => void;
-    /**
-     * It returns whether the video is live
-     */
-    bridgeJavaScriptToAndroid_IsLive: () => boolean;
-    /**
-     * It returns current time of currently played video
-     */
-    bridgeJavaScriptToAndroid_GetCurrentTime: () => number;
-    /**
-     * It returns total duration of the video
-     */
-    bridgeJavaScriptToAndroid_GetTotalTime: () => number;
-    /**
-     * It seeks the video to specified milliseconds
-     */
-    bridgeJavaScriptToAndroid_SeekTo: (milliseconds: number) => void;
-    /**
-     * It returns current text track
-     */
-    bridgeJavaScriptToAndroid_getCurrentSubtitleTrack: () => string | undefined;
-    /**
-     * It returns current audio track
-     */
-    bridgeJavaScriptToAndroid_getCurrentAudioTrack: () => string | undefined;
-    /**
-     * It sets text track to be shown.
-    */
-    bridgeJavaScriptToAndroid_SetTrack: (track: string) => void;
-    /**
-     * It sets audio track to be used.
-     */
-    bridgeJavaScriptToAndroid_SetAudioTrack: (track: string) => void;
 }
 
-export type DeviceInfo = {
-    /**
-     * Device brand. Ex. "Sony"
-     */
-    deviceBrand: string,
-    /**
-     * Device model. Ex. "BRAVIA 4K 2015"
-     */
-    deviceModel: string,
-    /**
-     * Android version. Ex. "7.0"
-     */
-    osVersion: string,
-    /**
-     * Android wrapper version. Ex. "0.0.1"
-     */
-    appVersion: string,
-    /**
-     * Android flavor. Ex. "appstage-bigscreen"
-     */
-    appFlavor: string,
-    /**
-     * Underlying player engine name. Ex. "exoplayer"
-     */
-    engineName: string,
-    /**
-     * Version of player engine. Ex. "2.18.1"
-     */
-    engineVersion: string,
-    /**
-     * Android DRM key systems. Ex. ["Widewine", "W3C ClearKey"]
-     */
-    drmKeySystems: Array<string>,
-    /**
-     * Android local IP adress in array Ex. "fe80::475:3045:2928:3a32%wlan0127.0.0.1"
-     */
-    ipLocal: string,
-};
-
 export interface IJavaScriptBridge {
     JavaScriptBridge: JavaScriptBridge,
 }

package/packages/driver-base/src/DeviceBase.ts

@@ -1,5 +1,4 @@
 import { Storage } from '@24i/bigscreen-sdk/storage';
-import { config } from '@24i/bigscreen-sdk/runtime-config';
 import { generateUuid } from '@24i/bigscreen-sdk/utils/generateUuid';
 import { EventsManager, IEvents, EventMapType } from '@24i/bigscreen-sdk/events-manager';
 import { isRtl } from '@24i/bigscreen-sdk/i18n';
@@ -13,15 +12,10 @@ import { ExitOptions } from './types/ExitOptions';
 import { inRange } from './utils';
 import { ErrorTemplate } from './errors';
 import { bindPreventDefaultEvent } from './bindPreventDefaultEvent';
-import { LEFT, RIGHT, UP, DOWN, ENTER, BACK, ESC } from './KeyMap';
+import { LEFT, RIGHT, UP, DOWN, ENTER, BACK } from './KeyMap';
 
 export const STORAGE_UUID_KEY = '__UUID__';
 
-const DEFAULT_POLLING_INTERVAL = 15000;
-const DEFAULT_POLLING_TIMEOUT = 15000;
-
-const CHECKED_URL = '//www.google-analytics.com/__utm.gif';
-
 export abstract class DeviceBase<
     CustomEventMap extends EventMapType = {},
     EventMap extends EventMapType = DeviceEventMap & CustomEventMap,
@@ -47,14 +41,6 @@ export abstract class DeviceBase<
 
     screenSize: ScreenSize = 'unknown';
 
-    pollingInterval: number = DEFAULT_POLLING_INTERVAL;
-
-    pollingTimeout: number = DEFAULT_POLLING_TIMEOUT;
-
-    imageTimeout: number = 0;
-
-    isOffline: boolean = false;
-
     // MARK: Initialization
 
     /**
@@ -66,7 +52,6 @@ export abstract class DeviceBase<
         if (!this.isInitialized) {
             this.bindPreventDefaultEvents(rootElement);
             const initializer = await this.internalInit();
-            this.checkNetworkConnection();
             this.isInitialized = true;
             return initializer;
         }
@@ -86,46 +71,6 @@ export abstract class DeviceBase<
         return this.initializer;
     }
 
-    doOnlineCheck = () => {
-        const protocol = window.location.protocol === 'http:' ? 'http:' : 'https:';
-        const tester = new Image();
-        this.imageTimeout = window.setTimeout(() => {
-            this.connectionNotFound();
-        }, this.pollingTimeout || DEFAULT_POLLING_TIMEOUT);
-        tester.onload = this.connectionFound;
-        tester.onerror = this.connectionNotFound;
-        tester.src = `${protocol}${CHECKED_URL}?ts=${Date.now()}`;
-    };
-
-    connectionFound = () => {
-        window.clearTimeout(this.imageTimeout);
-        if (!this.isOffline) return;
-        this.triggerEvent('networkchange',
-            { isConnected: true } as any);
-        this.isOffline = false;
-    };
-
-    connectionNotFound = () => {
-        window.clearTimeout(this.imageTimeout);
-        if (this.isOffline) return;
-        this.triggerEvent('networkchange',
-            { isConnected: false } as any);
-        this.isOffline = true;
-    };
-
-    checkNetworkConnection() {
-        const networkConfig: any = config.get('network.checkConnection');
-        this.pollingInterval = Number(networkConfig?.pollingInterval);
-        this.pollingTimeout = Number(networkConfig?.pollingTimeout);
-        const enableCheckNetwork: any = Boolean(networkConfig?.enableCheckNetwork) ?? false;
-        if (enableCheckNetwork) {
-            window.setInterval(
-                this.doOnlineCheck,
-                this.pollingInterval || DEFAULT_POLLING_INTERVAL,
-            );
-        }
-    }
-
     // MARK: Interface implemented by individual platform-specific drivers
 
     abstract initDevice(): Promise<void>;
@@ -260,7 +205,7 @@ export abstract class DeviceBase<
     }
 
     isBackOrEscape(event: MouseEvent | KeyboardEvent) {
-        return BACK.is(event as KeyboardEvent) || ESC.is(event as KeyboardEvent);
+        return BACK.is(event as KeyboardEvent);
     }
 
     getDeviceClass() : string {
@@ -272,8 +217,4 @@ export abstract class DeviceBase<
     isMouseUsed() {
         return this.isMouseActive;
     }
-
-    getResolution() {
-        return { width: window.screen?.width, height: window.screen?.height };
-    }
 }

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

@@ -12,25 +12,21 @@ 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, key }: KeyboardEvent) {
+    is({ keyCode, code }: KeyboardEvent) {
         return Boolean(
             code && ( // empty string code means unknown/invalid --> should not compare
                 code === this.code
@@ -39,9 +35,6 @@ 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/KeyMap.ts

@@ -320,10 +320,6 @@ export const GUIDE = new Key({
     keyCode: 458,
 });
 
-export const SUBTITLES = new Key({
-    id: 'SUBTITLES',
-});
-
 // MARK: Xbox specials
 export const GAMEPAD_LEFT_THUMBSTICK_UP = new Key({
     id: 'GAMEPAD_LEFT_THUMBSTICK_UP',

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

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

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

@@ -6,12 +6,11 @@ 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, key,
+        keyCode, code, alternativeKeyCodes, alternativeCodes,
     }]: [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-base/src/__mocks__/keyMap.ts

@@ -38,5 +38,4 @@ export const KEYMAP = {
     KP_9: 105,
     CHANNEL_UP: 33,
     CHANNEL_DOWN: 34,
-    SUBTITLES: 83,
 };

package/packages/driver-base/src/types/DeviceEvent.ts

@@ -1,11 +1,9 @@
 type NetworkChangeListener = (payload: { isConnected: boolean }) => void;
 type VisibilityChangeListener = (payload: { isVisible: boolean }) => void;
 type MouseActiveListener = (payload: { isMouseActive: boolean }) => void;
-type CCToggleListener = (payload: { isEnabled: boolean }) => void;
 
 export interface DeviceEventMap {
     'networkchange': NetworkChangeListener,
     'visibilitychange': VisibilityChangeListener,
     'mouseactive': MouseActiveListener,
-    'cctoggle': CCToggleListener,
 }

package/packages/driver-base/src/types/KeycodeKeyMap.ts

@@ -61,7 +61,6 @@ export type KeycodeKeyMap = {
     EXIT: number,
     INFO: number,
     GUIDE: number,
-    SUBTITLES: number,
 
     // Xbox specials
     GAMEPAD_LEFT_THUMBSTICK_UP: number,

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

@@ -9,14 +9,6 @@ export const getKeyMap = () => {
         VOL_UP: { code: 'KeyU', keyCode: 85 },
         VOL_DOWN: { code: 'KeyJ', keyCode: 74 },
         MUTE: { code: 'KeyM', keyCode: 77 },
-        PLAY: { code: 'KeyO', keyCode: 79 },
-        PAUSE: { code: 'KeyP', keyCode: 80 },
-        PLAYPAUSE: { code: 'Space', keyCode: 32 },
-        FF: { code: 'Period', keyCode: 190 },
-        REW: { code: 'Comma', keyCode: 188 },
-        STOP: { code: 'Escape', keyCode: 27 },
-        SUBTITLES: { code: 'KeyS', keyCode: 83 },
-        REC: { code: 'KeyI', keyCode: 73 },
     });
     return generateKeyCodeKeyMap();
 };

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

@@ -51,7 +51,6 @@ export function getKeyMap() {
         EXIT: { keyCode: EntoneInput.KEY_EXIT },
         INFO: { keyCode: EntoneInput.KEY_INFO },
         GUIDE: { keyCode: EntoneInput.KEY_GUIDE },
-        SUBTITLES: { keyCode: EntoneInput.KEY_SUBTITLE },
     });
     return KeyMap.generateKeyCodeKeyMap();
 }

package/packages/driver-tizen/src/TizenKeys.ts

@@ -49,7 +49,6 @@ export class TizenKeys {
         tizen.tvinputdevice.registerKey('PreviousChannel');
         tizen.tvinputdevice.registerKey('Info');
         tizen.tvinputdevice.registerKey('Guide');
-        tizen.tvinputdevice.registerKey('Caption');
     }
 
     buildKeyMap(keyCodeMap: KeyCodeMap) {
@@ -85,7 +84,6 @@ export class TizenKeys {
             EXIT: { keyCode: keyCodeMap.Exit },
             INFO: { keyCode: keyCodeMap.Info },
             GUIDE: { keyCode: keyCodeMap.Guide },
-            SUBTITLES: { keyCode: keyCodeMap.Caption },
         });
         this.keyMap = KeyMap.generateKeyCodeKeyMap();
     }

package/packages/driver-vidaa/src/DeviceVidaa.ts

@@ -43,7 +43,7 @@ export class DeviceVidaa extends DeviceBase {
     }
 
     async getManufacturerName(): Promise<string> {
-        return window.Hisense_GetBrand() || '';
+        return 'Hisense';
     }
 
     async getPlatformName(): Promise<string> {
@@ -56,8 +56,7 @@ export class DeviceVidaa extends DeviceBase {
     }
 
     async getDeviceName(): Promise<string> {
-        const manufacturerName = await this.getManufacturerName();
-        return `${manufacturerName} VIDAA ${await this.getModelName()}`.trim();
+        return `Hisense VIDAA ${await this.getModelName()}`.trim();
     }
 
     async getModelName(): Promise<string> {

package/packages/driver-vidaa/src/__mocks__/vidaa.ts

@@ -1,7 +1,7 @@
 import { HisenseVidaaApi, HisenseVidaaKeys } from '../types';
 
 export const mockHisenseVidaaApi: HisenseVidaaApi = {
-    Hisense_GetBrand: () => 'Hisense',
+    Hisense_GetBrand: () => 'hisense',
     Hisense_GetModelName: () => '5U61FQEVS',
     Hisense_GetFirmWareVersion: () => 'V0000.01.00Q.L0301',
     Hisense_Get4KSupportState: () => true,

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

@@ -49,8 +49,6 @@ export const getKeyMap = () => {
         CHANNEL_UP: { keyCode: window.VK_CHANNEL_UP || 427 },
         CHANNEL_DOWN: { keyCode: window.VK_CHANNEL_DOWN || 428 },
         INFO: { keyCode: window.VK_INFO },
-        // VK_SUBTITLE defined on 2019, not on 2021.
-        SUBTITLES: { keyCode: window.VK_SUBTITLE || 460 },
     });
     return KeyMap.generateKeyCodeKeyMap();
 };

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

@@ -95,15 +95,7 @@ export class DeviceWebos extends DeviceBase {
     }
 
     initMouseActiveListener() {
-        // checks if mouse is already being used since startup - PRDSAPPSBW-1005
-        const mouseActiveAtStartupHandler = () => {
-            document.removeEventListener('mousemove', mouseActiveAtStartupHandler);
-            this.isMouseActive = true;
-            this.triggerEvent('mouseactive', { isMouseActive: true });
-        };
-        document.addEventListener('mousemove', mouseActiveAtStartupHandler);
         document.addEventListener('cursorStateChange', (event) => {
-            document.removeEventListener('mousemove', mouseActiveAtStartupHandler);
             // @ts-ignore - the LG event has this structure.
             this.isMouseActive = event.detail.visibility;
             this.triggerEvent('mouseactive', {

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

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

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

@@ -4,7 +4,7 @@
 import { KeyMap } from '@24i/bigscreen-sdk/driver-base';
 
 export const getKeyMap = () => {
-    const { VirtualKey } = window.Windows.System;
+    const { VirtualKey } = window.Windows?.System;
     KeyMap.overrideValues({
         LEFT: {
             keyCode: VirtualKey.left,