@24i/bigscreen-sdk 1.0.54-alpha.2836 → 1.1.0

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

@@ -1,7 +1,7 @@
 import { KeyMap, KeycodeKeyMap } from '@24i/bigscreen-sdk/driver-base';
-import { Tizen } from './ITizen';
+import { ITizen } from './types';
 
-declare const tizen: Tizen;
+declare const tizen: ITizen;
 
 type KeyCodeMap = { [key: string]: number };
 

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

@@ -8,10 +8,6 @@ export const webapis = {
         getModelCode: () => 'model code',
         getFirmware: () => 'firmware',
     },
-    adinfo: {
-        getTIFA: () => 'adid',
-        isLATEnabled: () => true,
-    },
 };
 
 export const application = {
@@ -28,7 +24,12 @@ export const tizen = {
         unregisterKey: () => {},
         registerKey: () => {},
     },
-    systeminfo: {
-        getPropertyValue: async () => {},
-    },
 };
+
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Window {
+        webapis: typeof webapis,
+        tizen: typeof tizen,
+    }
+}

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

@@ -1,3 +1,197 @@
+/* eslint-disable no-magic-numbers */
+
 export const VENDOR = 'Samsung Tizen';
 
-export const DPI_SUCCESS = '100000';
+// MARK: TVAudioControl
+
+export type AudioOutputMode = (
+    | 'PCM'
+    | 'DOLBY'
+    | 'DTS'
+    | 'AAC'
+);
+
+export type AudioBeepType = (
+    | 'UP'
+    | 'DOWN'
+    | 'LEFT'
+    | 'RIGHT'
+    | 'PAGE_LEFT'
+    | 'PAGE_RIGHT'
+    | 'BACK'
+    | 'SELECT'
+    | 'CANCEL'
+    | 'KEYPAD'
+    | 'KEYPAD_ENTER'
+    | 'KEYPAD_DEL'
+    | 'MOVE'
+    | 'PREPARING'
+);
+
+// MARK: SystemInfo
+
+export type SystemInfoPropertyId = (
+    | 'BATTERY'
+    | 'CPU'
+    | 'STORAGE'
+    | 'DISPLAY'
+    | 'DEVICE_ORIENTATION'
+    | 'BUILD'
+    | 'LOCALE'
+    | 'NETWORK'
+    | 'WIFI_NETWORK'
+    | 'ETHERNET_NETWORK'
+    | 'CELLULAR_NETWORK'
+    | 'NET_PROXY_NETWORK'
+    | 'SIM'
+    | 'PERIPHERAL'
+    | 'MEMORY'
+    | 'VIDEOSOURCE'
+    | 'CAMERA_FLASH'
+    | 'ADS'
+    | 'SERVICE_COUNTRY'
+    | 'SOURCE_INFO'
+    | 'PANEL'
+);
+
+export type SystemInfoNetworkType = (
+    | 'NONE'
+    | '2G'
+    | '2.5G'
+    | '3G'
+    | '4G'
+    | 'WIFI'
+    | 'ETHERNET'
+    | 'NET_PROXY'
+    | 'UNKNOWN'
+);
+
+export type SystemInfoWifiSecurityMode = (
+    | 'NONE'
+    | 'WEP'
+    | 'WPA_PSK'
+    | 'WPA2_PSK'
+    | 'EAP'
+);
+
+export type SystemInfoWifiEncryptionType = (
+    | 'NONE'
+    | 'WEP'
+    | 'TKIP'
+    | 'AES'
+    | 'TKIP_AES_MIXED'
+);
+
+export type SystemInfoNetworkIpMode = (
+    | 'NONE'
+    | 'STATIC'
+    | 'DYNAMIC'
+    | 'AUTO'
+    | 'FIXED'
+);
+
+export type SystemInfoDeviceOrientationStatus = (
+    | 'PORTRAIT_PRIMARY'
+    | 'PORTRAIT_SECONDARY'
+    | 'LANDSCAPE_PRIMARY'
+    | 'LANDSCAPE_SECONDARY'
+);
+
+export type SystemInfoSimState = (
+    | 'ABSENT'
+    | 'INITIALIZING'
+    | 'READY'
+    | 'PIN_REQUIRED'
+    | 'PUK_REQUIRED'
+    | 'NETWORK_LOCKED'
+    | 'SIM_LOCKED'
+    | 'UNKNOWN'
+);
+
+export type SystemInfoProfile = 'MOBILE_FULL' | 'MOBILE_WEB' | 'MOBILE' | 'WEARABLE' | 'TV';
+
+export type SystemInfoLowMemoryStatus = 'NORMAL' | 'WARNING';
+
+export type SystemInfoVideoSourceType = (
+    | 'TV'
+    | 'AV'
+    | 'SVIDEO'
+    | 'COMP'
+    | 'PC'
+    | 'HDMI'
+    | 'SCART'
+    | 'DVI'
+    | 'MEDIA'
+);
+
+// MARK: ProductInfo
+
+export enum ProductInfoConfigKey {
+    CONFIG_KEY_DATA_SERVICE = 0,
+    CONFIG_KEY_SERVICE_COUNTRY = 1,
+}
+
+export enum ProductInfoNoGlass3dSupport {
+    NO_GLASS_3D_NOT_SUPPORTED = 0,
+    NO_GLASS_3D_SUPPORTED = 1,
+}
+
+export enum ProductInfoSiServerType {
+    SI_TYPE_OPERATIING_SERVER = 0,
+    SI_TYPE_DEVELOPMENT_SERVER = 1,
+    SI_TYPE_DEVELOPING_SERVER = 2,
+}
+
+// MARK: Network
+
+export enum NetworkActiveConnectionType {
+    DISCONNECTED = 0,
+    WIFI = 1,
+    CELLULAR = 2,
+    ETHERNET = 3,
+}
+
+export enum NetworkIpMode {
+    NONE = 0,
+    STATIC = 1,
+    DYNAMIC = 2,
+    AUTO = 3,
+    FIXED = 4,
+    UNKNOWN = 5,
+}
+
+export enum NetworkState {
+    LAN_CABLE_ATTACHED = 1,
+    LAN_CABLE_DETACHED = 2,
+    LAN_CABLE_STATE_UNKNOWN = 3,
+    GATEWAY_CONNECTED = 4,
+    GATEWAY_DISCONNECTED = 5,
+    WIFI_MODULE_STATE_ATTACHED = 6,
+    WIFI_MODULE_STATE_DETACHED = 7,
+    WIFI_MODULE_STATE_UNKNOWN = 8,
+}
+
+export enum NetworkWiFiSecurityMode {
+    WEP = 1,
+    WPA_PSK = 2,
+    WPA2_PSK = 3,
+    EAP = 4,
+    NONE = 5,
+    UNKNOWN = 6,
+}
+
+export enum NetworkWiFiEncryptionType {
+    WEP = 1,
+    TKIP = 2,
+    AES = 3,
+    TKIP_AES_MIXED = 4,
+    NONE = 5,
+    UNKNOWN = 6,
+}
+
+// MARK: AppCommon
+
+export enum AppCommonScreenSaverState {
+    SCREEN_SAVER_OFF = 0,
+    SCREEN_SAVER_ON = 1,
+}

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

@@ -0,0 +1,14 @@
+export {
+    ITizen,
+    SystemInfo,
+    TVAudioControl,
+    TVInputDevice,
+    TizenApplication,
+    WebSetting,
+} from './ITizen';
+export {
+    AppCommon,
+    IWebapis,
+    Network,
+    ProductInfo,
+} from './IWebapis';

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

@@ -3,10 +3,7 @@ import {
     ConnectionType,
     ScreenSaverStatus,
     VolumeRange,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } from '@24i/bigscreen-sdk/driver-base';
-import { generateUuid } from '@24i/bigscreen-sdk/utils';
 import { NetworkConnectionTypeMap } from './constants';
 import { getPlatformInfo } from './formatUserAgent';
 import { HisenseVidaaApi } from './types';
@@ -83,17 +80,6 @@ export class DeviceVidaa extends DeviceBase {
         return window.Hisense_GetDeviceID() || '';
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume(): Promise<number> {
         return VolumeRange.UNSUPPORTED;
     }
@@ -152,16 +138,4 @@ export class DeviceVidaa extends DeviceBase {
         // not supported on Hisense VIDAA platform
         return '';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -4,8 +4,6 @@ import {
     ScreenSaverStatus,
     VolumeRange,
     ExitOptions,
-    IAPSuccessPayload,
-    IAPPurchaseProductData,
 } from '@24i/bigscreen-sdk/driver-base';
 import { Storage } from '@24i/bigscreen-sdk/storage';
 import { initWebOSTVjs } from './webOSTVjs/webOSTVjs';
@@ -247,39 +245,6 @@ export class DeviceWebos extends DeviceBase {
         return this.duid!;
     }
 
-    async getAdInfo() {
-        const adId = await this.getLgDeviceId() ?? null;
-        const type = 'lgudid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage(): Promise<string> {
-        return new Promise<string>((resolve) => {
-            webOS.service.request(ApiUrls.SETTINGS_SERVICE, {
-                method: 'getSystemSettings',
-                parameters: {
-                    keys: ['localeInfo'],
-                },
-                onSuccess: (response) => {
-                    if (response.returnValue) {
-                        const uiLanguage = response?.settings?.localeInfo?.locales?.UI;
-                        resolve((uiLanguage || '').slice(0, 2));
-                    }
-                    resolve('');
-                },
-                onFailure: (error) => {
-                    // ex. returns error for webOS 1.0, 2.0 as not supported
-                    const { errorCode = '0', errorText } = error || {};
-                    console.error(
-                        `[DeviceWebos] getOsLanguage onFailure: [${errorCode}] ${errorText}`,
-                    );
-                    resolve('');
-                },
-            });
-        });
-    }
-
     async getVolume() {
         // TODO: not yet implemented
         return VolumeRange.UNSUPPORTED;
@@ -345,16 +310,4 @@ export class DeviceWebos extends DeviceBase {
         // Not supported on LG webOS platform (for date 12.4.2021, latest webOS TV 5.x)
         return '';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

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

@@ -63,39 +63,6 @@ const mockServices = {
                 callbackName: 'onSuccess',
             },
         },
-        'luna://com.webos.settingsservice#getSystemSettings': {
-            responses: {
-                success: {
-                    returnValue: true,
-                    method: 'getSystemSettings',
-                    settings: {
-                        localeInfo: {
-                            locales: {
-                                UI: 'en-GB',
-                                TV: 'en-GB',
-                                FMT: 'en-GB',
-                                NLP: 'en-GB',
-                                STT: 'fr-FR',
-                                AUD: 'fr-FR',
-                                AUD2: 'en-GB',
-                            },
-                            clock: 'locale',
-                            keyboards: ['en'],
-                            timezone: '',
-                        },
-                    },
-                },
-                error: {
-                    returnValue: false,
-                    errorCode: 'ERR.001',
-                    errorText: 'There is no matched result from DB',
-                },
-            },
-            selected: {
-                responseId: 'success',
-                callbackName: 'onSuccess',
-            },
-        },
         'luna://com.webos.service.connectionmanager#getStatus': {
             responses: {
                 successWired: {

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

@@ -17,5 +17,4 @@ export const ApiUrls = {
     CONNECTION_MANAGER_WEBOS: 'luna://com.webos.service.connectionmanager',
     SYSTEM_PROPERTY: 'luna://com.webos.service.tv.systemproperty',
     SM: 'luna://com.webos.service.sm',
-    SETTINGS_SERVICE: 'luna://com.webos.settingsservice',
 } as const;

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

@@ -331,41 +331,11 @@ export type DuidOptions = {
     onComplete?: (response: NegativeResponse | DuidResponse) => any,
 };
 
-type SettingsService = {
-    method: 'getSystemSettings',
-    settings: {
-        localeInfo: {
-            locales: {
-                UI: string,
-                TV: string,
-                FMT: string,
-                NLP: string,
-                STT: string,
-                AUD: string,
-                AUD2: string,
-            },
-            clock: string,
-            keyboards: string[],
-            timezone: string,
-        },
-    },
-};
-export type SettingsServiceResponse = PositiveResponse & SettingsService;
-export type SettingsServiceOptions = {
-    method: 'getSystemSettings',
-    parameters: {
-        keys: ['localeInfo'],
-    },
-    onSuccess?: (response: NegativeResponse | SettingsServiceResponse) => any,
-    onFailure?: (response: NegativeResponse) => any,
-};
-
 interface RequestTypeMap {
     [ApiUrls.CONNECTION_MANAGER_PALM]: ConnectionManagerOptions,
     [ApiUrls.CONNECTION_MANAGER_WEBOS]: ConnectionManagerOptions,
     [ApiUrls.SYSTEM_PROPERTY]: SystemPropertyOptions,
     [ApiUrls.SM]: DuidOptions,
-    [ApiUrls.SETTINGS_SERVICE]: SettingsServiceOptions,
 }
 
 // MARK: IPalmSystem

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

@@ -1,10 +1,4 @@
-import {
-    DeviceBase,
-    IAPPurchaseProductData,
-    IAPSuccessPayload,
-    ScreenSaverStatus,
-    VolumeRange,
-} from '@24i/bigscreen-sdk/driver-base';
+import { DeviceBase, ScreenSaverStatus, VolumeRange } from '@24i/bigscreen-sdk/driver-base';
 import { runAsync } from '@24i/bigscreen-sdk/utils/timers';
 import { generateUuid } from '@24i/bigscreen-sdk/utils/generateUuid';
 import { find } from '@24i/bigscreen-sdk/perf-utils/array';
@@ -158,17 +152,6 @@ export class DeviceXbox extends DeviceBase {
         return uuid;
     }
 
-    async getAdInfo() {
-        const adId = generateUuid();
-        const type = 'sessionid';
-        const latEnabled = null;
-        return { adId, type, latEnabled };
-    }
-
-    async getOsLanguage() {
-        return (window.navigator.language || '').slice(0, 2);
-    }
-
     async getVolume() {
         return VolumeRange.UNSUPPORTED;
     }
@@ -245,16 +228,4 @@ export class DeviceXbox extends DeviceBase {
     getDeviceClass(): string {
         return 'xbox';
     }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async purchaseProduct(data: IAPPurchaseProductData): Promise<IAPSuccessPayload> {
-        // not supported
-        throw new Error('Not supported');
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    async cancelSubscription(data: IAPPurchaseProductData): Promise<void> {
-        // not supported
-        throw new Error('Not supported');
-    }
 }

package/packages/grid/src/UnifiedGridController/UnifiedGridController.ts

@@ -298,13 +298,13 @@ export class UnifiedGridController<T> implements IUnifiedGridController<T> {
         const { grid } = this;
         const base = grid.base.current!;
         const targetScrollIndex = this.itemIndexToScrollIndex(dataIndex);
+        if (targetScrollIndex > this.scrollIndex) {
+            this.adjustGroupsOffsetsForward(targetScrollIndex);
+        } else if (targetScrollIndex < this.scrollIndex) {
+            this.adjustGroupsOffsetsBackward(targetScrollIndex);
+        }
         if (targetScrollIndex !== this.scrollIndex) {
-            const backwards = targetScrollIndex < this.scrollIndex;
-            const lastScrollIndex = this.scrollIndex;
-            const scrollToIndex = Math.abs(targetScrollIndex - this.scrollIndex);
-            for (let i = 1; i <= scrollToIndex; i++) {
-                this.scroll(backwards ? lastScrollIndex - i : lastScrollIndex + i, animate);
-            }
+            this.scroll(targetScrollIndex, animate);
         }
         base.index = dataIndex;
         this.focusCurrentItem();

package/packages/input/README.md

@@ -60,3 +60,6 @@ The reason for no styling is to limit unnecessary CSS code that would be overrid
 `.native-input-wrap` is set to `display: none`. This is the native input used on the background.
 
 `.input-field` is a custom component that should look like input field with possibility of custom styling.
+
+`.caret` position is counted from the left side of the input in LTR layout and from the right side of the
+input in RTL layout.

package/packages/input/src/Input.tsx

@@ -1,4 +1,4 @@
-import { createRef, Component, setText, DeclareProps } from '@24i/bigscreen-sdk/jsx';
+import { createRef, Component, DeclareProps } from '@24i/bigscreen-sdk/jsx';
 import { Interactable } from '@24i/bigscreen-sdk/interactable';
 import { IFocusable } from '@24i/bigscreen-sdk/focus';
 import { isRtl } from '@24i/bigscreen-sdk/i18n';
@@ -9,7 +9,7 @@ import { stopEvent } from '@24i/bigscreen-sdk/utils/stopEvent';
 import { addClass } from '@24i/bigscreen-sdk/utils/addClass';
 import { removeClass } from '@24i/bigscreen-sdk/utils/removeClass';
 import { offsetPosition } from '@24i/bigscreen-sdk/utils/offsetPosition';
-import { handleOverflow } from './handleOverflow';
+import { checkCharOrderMishmash, handleOverflow } from './utils';
 import './Input.scss';
 
 type Props = {
@@ -42,6 +42,8 @@ export class Input extends Component<Props> implements IFocusable {
 
     caret = createRef<HTMLDivElement>();
 
+    caretPosition = 0;
+
     isInputting = false;
 
     lastValue: string;
@@ -68,6 +70,11 @@ export class Input extends Component<Props> implements IFocusable {
         this.isPlaceholderVisible = value.length === 0;
     }
 
+    componentDidMount() {
+        const { value } = this.props;
+        if (value) this.setText(value);
+    }
+
     getType() {
         return this.nativeInput.current?.type;
     }
@@ -85,13 +92,10 @@ export class Input extends Component<Props> implements IFocusable {
 
     onCaretPositionChange = (position: number | null) => {
         if (position === null) return;
-        const { shouldHandleOverflow } = this.props;
         const value = this.getValue();
-        setText(this.text, this.filterText(value));
-        this.setCaretPosition(position);
-        if (shouldHandleOverflow) {
-            handleOverflow(this.wrap.current, this.caret.current, this.text.current);
-        }
+        this.setText(value);
+        this.updateCaretPosition(position);
+        this.updateTextOverflow();
         if (this.lastValue !== value) {
             const { onChange } = this.props;
             this.lastValue = value;
@@ -106,39 +110,59 @@ export class Input extends Component<Props> implements IFocusable {
 
     setValue(value: string) {
         this.nativeInput.current!.value = value;
-        setText(this.text, this.filterText(value));
-        if (value.length === 0) {
-            this.showPlaceholder();
-        } else {
-            this.hidePlaceholder();
-        }
+        this.setText(value);
     }
 
     setType(type: Props['type']) {
         if (this.getType() === type) return;
         const value = this.getValue();
         this.nativeInput.current!.type = type;
-        setText(this.text, this.filterText(value));
+        this.setText(value);
+    }
+
+    setText(text: string): void {
+        const filtered = this.filterText(text);
+        this.renderText(filtered);
     }
 
-    setCaretPosition(position: number) {
+    updateCaretPosition(position: number) {
         const textNode = this.text.current!.firstChild;
-        if (!textNode) {
+        if (!textNode || position <= 0) {
+            this.caretPosition = 0;
             offsetPosition(this.caret, { x: 0 });
             return;
         }
-        const range = new Range();
-        range.selectNode(textNode);
-        const wholeText = range.getBoundingClientRect();
-        range.setStart(textNode, 0);
-        range.setEnd(textNode, position);
-        const caretText = range.getBoundingClientRect();
-        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);
+        const wholeTextDimensions = this.text.current!.getBoundingClientRect();
+        if (position >= this.text.current!.children.length) {
+            const offset = wholeTextDimensions.right - wholeTextDimensions.left;
+            this.caretPosition = isRtl() ? -offset : offset;
+            offsetPosition(this.caret, { x: this.caretPosition }, false);
+            return;
+        }
+        const charNode = this.text.current!.children[position - 1];
+        const charDimensions = charNode!.getBoundingClientRect();
+        const isCharMishmash = checkCharOrderMishmash(this.text.current!, position - 1);
+        if (isRtl()) {
+            if (isCharMishmash) {
+                this.caretPosition = charDimensions.right - wholeTextDimensions.right;
+            } else {
+                this.caretPosition = charDimensions.left - wholeTextDimensions.right;
+            }
+        } else if (isCharMishmash) {
+            this.caretPosition = charDimensions.left - wholeTextDimensions.left;
+        } else {
+            this.caretPosition = charDimensions.right - wholeTextDimensions.left;
+        }
+        offsetPosition(this.caret, { x: this.caretPosition }, false);
+    }
+
+    updateTextOverflow() {
+        const { shouldHandleOverflow } = this.props;
+        if (!shouldHandleOverflow) return;
+        const textMargin = handleOverflow(
+            this.wrap.current, this.caret.current, this.text.current,
+        );
+        offsetPosition(this.caret, { x: this.caretPosition - textMargin }, false);
     }
 
     /**
@@ -202,6 +226,14 @@ export class Input extends Component<Props> implements IFocusable {
         return text.replace(/ /g, NBSP);
     }
 
+    renderText(text: string): void {
+        const chars: JSX.Element[] = [];
+        for (let i = 0; i < text.length; i++) {
+            chars.push(<span className="char">{text[i]}</span>);
+        }
+        this.clearMount(chars, this.text);
+    }
+
     render() {
         const { value, type, placeholder, onFocus, onBlur } = this.props;
         return (
@@ -226,9 +258,7 @@ export class Input extends Component<Props> implements IFocusable {
                     >
                         {placeholder}
                     </div>
-                    <div ref={this.text} className="text">
-                        {this.filterText(value)}
-                    </div>
+                    <div ref={this.text} className="text" />
                     <div ref={this.caret} className="caret" />
                 </div>
             </Interactable>