@24i/bigscreen-sdk 1.0.8-alpha.2196 → 1.0.8-alpha.2201

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@24i/bigscreen-sdk",
-    "version": "1.0.8-alpha.2196",
+    "version": "1.0.8-alpha.2201",
     "description": "SmartApps BIGscreen SDK monorepo",
     "main": "index.js",
     "scripts": {
@@ -38,7 +38,7 @@
     "homepage": "https://github.com/24i/smartapps-bigscreen-sdk#readme",
     "dependencies": {
         "@24i/player-base": "6.10.0",
-        "@24i/smartapps-datalayer": "3.0.5-alpha.965",
+        "@24i/smartapps-datalayer": "3.0.5",
         "@sentry/browser": "^7.12.1",
         "@types/gtag.js": "^0.0.12",
         "@types/prop-types": "^15.7.5",
@@ -54,11 +54,11 @@
         "@babel/core": "^7.19.0",
         "@babel/preset-env": "^7.19.0",
         "@types/fs-extra": "^9.0.13",
-        "@types/inquirer": "^9.0.1",
-        "@types/jest": "^29.0.2",
+        "@types/inquirer": "^9.0.3",
+        "@types/jest": "^29.2.3",
         "@types/minimist": "^1.2.2",
         "@types/node": "^18.7.18",
-        "@types/react": "^18.0.20",
+        "@types/react": "^18.0.25",
         "babel-jest": "^29.0.3",
         "chalk": "^5.0.1",
         "coveralls": "^3.1.1",
@@ -66,15 +66,15 @@
         "fs-extra": "^10.1.0",
         "full-icu": "^1.5.0",
         "identity-obj-proxy": "^3.0.0",
-        "inquirer": "^9.1.1",
-        "jest": "^29.0.3",
+        "inquirer": "^9.1.4",
+        "jest": "^29.3.1",
         "jest-canvas-mock": "^2.4.0",
         "jest-environment-jsdom": "^29.0.3",
         "minimist": "^1.2.6",
         "patch-package": "^6.4.7",
         "sass": "^1.54.9",
         "sass-true": "^6.1.0",
-        "ts-jest": "^29.0.1",
+        "ts-jest": "^29.0.3",
         "ts-node": "^10.9.1",
         "tsconfig-paths-jest": "0.0.1",
         "typescript": "^4.8.3"
@@ -250,6 +250,7 @@
         "./storage": "./packages/storage/src/index.ts",
         "./throbber": "./packages/throbber/src/index.ts",
         "./time/adapters/worldTimeApi": "./packages/time/src/adapters/worldTimeApi.ts",
+        "./time/adapters/24iMediaTimeApi": "./packages/time/src/adapters/24iMediaTimeApi.ts",
         "./time": "./packages/time/src/index.ts",
         "./toast/styles": "./packages/toast/src/Toast/styles.ts",
         "./toast": "./packages/toast/src/index.ts",

package/packages/analytics/README.md

@@ -44,7 +44,7 @@ class DetailScene {
         });
         this.a('buffering_stop');
         // render
-        this.a('screen_view');
+        this.a('scene_view');
     }
 }
 ```
@@ -60,6 +60,6 @@ Clients have to opt-in to events they wish to listen to. This can be done by lis
 using a regular expression.
 
 ```typescript
-analytics.addClient(new GoogleAnalytics(), ['screen_view', 'buffering_start', 'buffering_stop']);
+analytics.addClient(new GoogleAnalytics(), ['scene_view', 'buffering_start', 'buffering_stop']);
 analytics.addClient(new ConsoleAnalytics(), /.*/);
 ```

package/packages/analytics/src/A.ts

@@ -16,8 +16,8 @@ export class A {
      * // Creates a function and sets the basic payload.
      * const a = A.of({ sceneType: 'HOME', sceneId: 'home' });
      *
-     * // Sends 'screen_view' event with the basic payload.
-     * a('screen_view');
+     * // Sends 'scene_view' event with the basic payload.
+     * a('scene_view');
      *
      * // Sends 'buffering_stop' with shallow merge of the basic payload and { asset } object.
      * a('buffering_stop', { asset });

package/packages/analytics/src/Analytics.ts

@@ -51,7 +51,7 @@ class Analytics {
             registeredEvents[eventName] = listener;
         });
         this.clients[client.name] = {
-            client: client,
+            client,
             registeredEvents,
         };
     }

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

@@ -80,7 +80,7 @@ export class GoogleAnalytics implements AnalyticsClient {
     }
 
     async startSession() {
-        const sessionNumber = parseInt(await Storage.getItem(GA_SESSION_COUNTER) ?? '0') + 1;
+        const sessionNumber = parseInt(await Storage.getItem(GA_SESSION_COUNTER) ?? '0', 10) + 1;
         this.constantUrlParams.sct = sessionNumber;
         this.constantUrlParams.sid = generateSessionId();
         await Storage.setItem(GA_SESSION_COUNTER, sessionNumber.toString());

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

@@ -12,7 +12,7 @@ export const GOOGLE_ANALYTICS_TRIGGERS = [
     'playback_stop',
     'player_close',
     'player_open',
-    'screen_view',
+    'scene_view',
     'scroll_25',
     'scroll_50',
     'scroll_75',
@@ -23,31 +23,31 @@ export const TRIGGER_NAME_TO_GA_EVENTS: Record<
     typeof GOOGLE_ANALYTICS_TRIGGERS[number], GAEventsNames[]
 > = {
     // App
-    'app_close': ['app_close', 'video_progress'],
+    app_close: ['app_close', 'video_progress'],
 
     // Playback
-    'playback_10': ['video_progress'],
-    'playback_25': ['video_progress'],
-    'playback_50': ['video_progress'],
-    'playback_75': ['video_progress'],
-    'playback_90': ['video_progress'],
-    'playback_pause': ['video_progress'],
-    'playback_start': ['video_start'],
-    'playback_stop': ['video_progress'],
+    playback_10: ['video_progress'],
+    playback_25: ['video_progress'],
+    playback_50: ['video_progress'],
+    playback_75: ['video_progress'],
+    playback_90: ['video_progress'],
+    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: ['a24i_content', 'video_progress'],
+    player_open: ['a24i_content'],
 
     // Scenes
-    'screen_view': [
+    scene_view: [
         'page_view',
         'a24i_operational',
     ],
 
     // Scrolling in scene
-    'scroll_25': ['scroll'],
-    'scroll_50': ['scroll'],
-    'scroll_75': ['scroll'],
-    'scroll_90': ['scroll'],
+    scroll_25: ['scroll'],
+    scroll_50: ['scroll'],
+    scroll_75: ['scroll'],
+    scroll_90: ['scroll'],
 };

package/packages/analytics/src/constants.ts

@@ -26,7 +26,7 @@ export const EVENT_NAMES = [
     'player_open',
 
     // Scenes
-    'screen_view',
+    'scene_view',
 
     // Scrolling in scene
     'scroll_25',
@@ -52,5 +52,5 @@ export const ONLY_ONCE_EVENTS: AnalyticsEventsNames[] = [
 
 export const UNREPEATABLE_EVENTS: AnalyticsEventsNames[] = [
     // Scenes
-    'screen_view',
+    'scene_view',
 ];

package/packages/analytics/src/interface.ts

@@ -47,7 +47,7 @@ export type AnalyticsEventsMap = {
     'player_open': (payload: void) => void,
 
     // Scenes
-    'screen_view': (payload: SceneInfo) => void,
+    'scene_view': (payload: SceneInfo) => void,
 
     // Scrolling in scene
     'scroll_25': (payload: SceneInfo) => void,

package/packages/device/src/resolver/resolver.ts

@@ -20,6 +20,11 @@ const getDevice = () => {
         info('HbbTV');
         return new DeviceHbbTV();
     }
+    // any because JavaScriptBridge property is defined on Android TV Bridge platform
+    if (typeof (window as any).JavaScriptBridge !== 'undefined') {
+        info('AndroidTV');
+        return new DeviceAndroidTV();
+    }
     if (userAgent.match(/Tizen/)) {
         info('Tizen');
         return new DeviceTizen();
@@ -40,11 +45,6 @@ const getDevice = () => {
         info('KreaTV');
         return new DeviceKreaTV();
     }
-    // any because JavaScriptBridge property is defined on Android TV Bridge platform
-    if (typeof (window as any).JavaScriptBridge !== 'undefined') {
-        info('AndroidTV');
-        return new DeviceAndroidTV();
-    }
     // any because ENTONE property is defined on Entone platform
     if (typeof (window as any).ENTONE !== 'undefined') {
         info('Entone');

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

@@ -384,3 +384,7 @@ export const GAMEPAD_A = new Key({
 export const GAMEPAD_B = new Key({
     id: 'GAMEPAD_B',
 });
+
+export const SUBTITLES = new Key({
+    id: 'SUBTITLES',
+});

package/packages/driver-base/src/__mocks__/keyMap.ts

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

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

@@ -82,4 +82,6 @@ export type KeycodeKeyMap = {
 
     GAMEPAD_A: number,
     GAMEPAD_B: number,
+
+    SUBTITLES: number,
 };

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

@@ -9,6 +9,14 @@ 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/epg/src/v2/DataManager.ts

@@ -122,6 +122,7 @@ export class DataManager implements IDataManager {
                     const newStart = lastRangeFrom - cellSize;
                     newRange[START] = newStart;
                 }
+                // eslint-disable-next-line no-continue
                 continue;
             }
             if (start < rangeFrom) {

package/packages/epg/src/v2/DatePicker.tsx

@@ -47,7 +47,7 @@ const prepareDateData = ({
 const defaultFormat = (date: Date) => {
     const locale = i18n.getLanguage();
     return l10n.date(date, locale).toLocaleDateString(
-        { weekday: 'short', day: 'numeric', month: 'short' }
+        { weekday: 'short', day: 'numeric', month: 'short' },
     );
 };
 

package/packages/epg/src/v2/Epg.tsx

@@ -297,6 +297,8 @@ export class Epg<
         return ref;
     }
 
+    isFocusInRows = () => this.focused === 'epg';
+
     focus(options?: FocusOptions) {
         if (this.focused === 'datepicker') {
             this.datePickerComponent.current!.focus(options);
@@ -376,10 +378,6 @@ export class Epg<
         return this.inputEvents.isVerticallyFastScrolling();
     }
 
-    isFocusInRows = () => {
-        return this.focused === 'epg';
-    };
-
     render() {
         const {
             datePickerProps, timelineWidthPx, channelHeaderWidthPx, scrollStepMs, rowHeightPx,

package/packages/focus/src/Layout/Matrix.tsx

@@ -144,24 +144,6 @@ export class Matrix extends Component<Props> implements IFocusable {
         return false;
     }
 
-    isDirectionLeft(event: KeyboardEvent) {
-        const { dir } = this.props;
-        const rtl = isRtl(dir);
-        return (
-            (!rtl && LEFT.is(event))
-            || (rtl && RIGHT.is(event))
-        );
-    }
-
-    isDirectionRight(event: KeyboardEvent) {
-        const { dir } = this.props;
-        const rtl = isRtl(dir);
-        return (
-            (!rtl && RIGHT.is(event))
-            || (rtl && LEFT.is(event))
-        );
-    }
-
     moveForwards = (isCircular: boolean) => (x: number, length: number) => {
         if (x === length - 1) {
             return isCircular ? 0 : length - 1;
@@ -204,6 +186,24 @@ export class Matrix extends Component<Props> implements IFocusable {
         return this.searchVertical(column, fromY, this.moveForwards(!!isCircular));
     };
 
+    isDirectionLeft(event: KeyboardEvent) {
+        const { dir } = this.props;
+        const rtl = isRtl(dir);
+        return (
+            (!rtl && LEFT.is(event))
+            || (rtl && RIGHT.is(event))
+        );
+    }
+
+    isDirectionRight(event: KeyboardEvent) {
+        const { dir } = this.props;
+        const rtl = isRtl(dir);
+        return (
+            (!rtl && RIGHT.is(event))
+            || (rtl && LEFT.is(event))
+        );
+    }
+
     isDifferentReferenceFromCurrent(index: Index2D): boolean {
         const { current } = this.getRefAt(this.index);
         const { current: searched } = this.getRefAt(index);

package/packages/grid/src/Base/Base.tsx

@@ -178,16 +178,6 @@ export class GridBase<T extends Item<U>, U>
         }
     };
 
-    shouldPreventBlur(event: KeyboardEvent) {
-        const { horizontal, preventBlurOnLongPress } = this.props;
-        return (this.preventBlurCounter >= PREVENT_BLUR_ON_LONG_PRESS_KEYDOWNS && (
-            (preventBlurOnLongPress.forward && isForward(event, horizontal))
-            || (preventBlurOnLongPress.backward && isBackward(event, horizontal))
-            || (preventBlurOnLongPress.forwardGroup && isFwGroup(event, horizontal))
-            || (preventBlurOnLongPress.backwardGroup && isBwGroup(event, horizontal))
-        ));
-    }
-
     getRefAtIndex(i: number): Reference<T> {
         const ref = this.itemRefs[i];
         if (!ref) {
@@ -253,6 +243,16 @@ export class GridBase<T extends Item<U>, U>
         this.fastScrollingCounter.reset();
     };
 
+    shouldPreventBlur(event: KeyboardEvent) {
+        const { horizontal, preventBlurOnLongPress } = this.props;
+        return (this.preventBlurCounter >= PREVENT_BLUR_ON_LONG_PRESS_KEYDOWNS && (
+            (preventBlurOnLongPress.forward && isForward(event, horizontal))
+            || (preventBlurOnLongPress.backward && isBackward(event, horizontal))
+            || (preventBlurOnLongPress.forwardGroup && isFwGroup(event, horizontal))
+            || (preventBlurOnLongPress.backwardGroup && isBwGroup(event, horizontal))
+        ));
+    }
+
     animatedScrollStarted() {
         this.isAnimatedScrollRunning = true;
     }

package/packages/grid/src/FirstOnlyGrid/FirstOnlyGrid.tsx

@@ -61,6 +61,8 @@ export class FirstOnlyGrid<T extends Item<U>, U>
         const linesDiff = Math.floor(grid.index / itemsInGroup) - oldLine;
         if (linesDiff > 0) {
             this.scrollForward(linesDiff);
+        } else if (linesDiff < 0) {
+            this.scrollBackward(Math.abs(linesDiff));
         }
     };
 
@@ -77,8 +79,8 @@ export class FirstOnlyGrid<T extends Item<U>, U>
         this.controller.scroll(targetScrollIndex);
     }
 
-    scrollBackward() {
-        const targetScrollIndex = this.controller.scrollIndex - 1;
+    scrollBackward(diff = 1) {
+        const targetScrollIndex = this.controller.scrollIndex - diff;
         this.controller.scroll(targetScrollIndex);
     }
 

package/packages/icon/src/Icon.tsx

@@ -1,12 +1,19 @@
 import { createRef, Reference, Component } from '@24i/bigscreen-sdk/jsx';
-import { addClass } from '@24i/bigscreen-sdk/utils/addClass';
-import { removeClass } from '@24i/bigscreen-sdk/utils/removeClass';
+import {
+    getDisplayToggler,
+    IDisplayToggler,
+    removeClass,
+    addClass,
+    DISPLAY_NONE,
+} from '@24i/bigscreen-sdk/utils';
 
 const ICON_PREFIX = 'icon-';
 
 type Props<SpritesJSON> = {
     icon?: keyof SpritesJSON,
-    domRef?: Reference<HTMLDivElement>;
+    domRef?: Reference<HTMLDivElement>,
+    className?: string,
+    initialIsHidden?: boolean,
 };
 
 export class Icon<T> extends Component<Props<T>> {
@@ -14,10 +21,13 @@ export class Icon<T> extends Component<Props<T>> {
 
     currentIcon: keyof T | undefined;
 
+    iconDisplay: IDisplayToggler;
+
     constructor(props: Props<T>) {
         super(props);
         this.ref = props.domRef || createRef();
         this.currentIcon = props.icon;
+        this.iconDisplay = getDisplayToggler(this.ref, props.initialIsHidden);
     }
 
     getClass(icon: keyof T): string {
@@ -31,6 +41,16 @@ export class Icon<T> extends Component<Props<T>> {
         this.currentIcon = icon;
     }
 
+    show() {
+        if (!this.currentIcon) return;
+        this.iconDisplay.show();
+    }
+
+    hide() {
+        if (!this.currentIcon) return;
+        this.iconDisplay.hide();
+    }
+
     clearIcon() {
         if (!this.currentIcon) return;
         removeClass(this.ref, this.getClass(this.currentIcon));
@@ -38,11 +58,13 @@ export class Icon<T> extends Component<Props<T>> {
     }
 
     render() {
-        const { icon } = this.props;
+        const { icon, className, initialIsHidden } = this.props;
         return (
             <div
                 ref={this.ref}
-                className={`icon ${icon ? this.getClass(icon) : ''}`}
+                className={`${className || ''} icon ${icon
+                    ? this.getClass(icon) : ''} ${initialIsHidden
+                    ? DISPLAY_NONE : ''}`}
             />
         );
     }

package/packages/keyboard/src/WhitelabelKeyboard/Keyboard.tsx

@@ -56,7 +56,7 @@ export class Keyboard extends KeyboardBase<Layouts, Props> {
     createLanguageFocusMatrix() {
         const { languageLayout } = this.props;
         this.languageFocusMatrix = generateFocusMatrixFromStringMatrix(
-            this.keyRefs, languageLayout!.makeFocusStrings(languageLayout!.layout, true)
+            this.keyRefs, languageLayout!.makeFocusStrings(languageLayout!.layout, true),
         );
     }
 
@@ -257,23 +257,25 @@ export class Keyboard extends KeyboardBase<Layouts, Props> {
                         <div className="key-row">
                             <div className="key key-wide key-empty">&nbsp;</div>
                         </div>
-                        {!!languageLayout ?
-                            <div className="key-row rounded-border-container">
-                                <Interactable
-                                    ref={this.keyRefs.language}
-                                    className="key key-wide key-with-icon key-language"
-                                    onPress={() => this.onLanguage()}
-                                >
-                                    <div className="key-background">
-                                        <div className="key-mask-icon" />
-                                    </div>
-                                </Interactable>
-                            </div>
-                            :
-                            <div className="key-row">
-                                <div className="key key-wide key-empty">&nbsp;</div>
-                            </div>
-                        }
+                        {languageLayout
+                            ? (
+                                <div className="key-row rounded-border-container">
+                                    <Interactable
+                                        ref={this.keyRefs.language}
+                                        className="key key-wide key-with-icon key-language"
+                                        onPress={() => this.onLanguage()}
+                                    >
+                                        <div className="key-background">
+                                            <div className="key-mask-icon" />
+                                        </div>
+                                    </Interactable>
+                                </div>
+                            )
+                            : (
+                                <div className="key-row">
+                                    <div className="key key-wide key-empty">&nbsp;</div>
+                                </div>
+                            )}
                     </div>
                     <div className="keys-container key-layout">
                         {layout}

package/packages/l10n/src/date/de.ts

@@ -1,7 +1,7 @@
 import { processYear, dateFormatter, toTwoDigitLocaleTimeString } from './common';
 import { DateTimeFormatOptions, Day, Month, Weekday, Year } from './types';
 
-//https://web.library.yale.edu/cataloging/months
+// https://web.library.yale.edu/cataloging/months
 const DE_MONTHS = {
     narrow: [
         'J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D',
@@ -40,7 +40,7 @@ const processMonth = (
 ) => {
     if (typeof month === 'undefined') return;
     if (month === '2-digit' || month === 'numeric') {
-        const strMonth = (date.getMonth() + 1).toString() + '.';
+        const strMonth = `${(date.getMonth() + 1).toString()}.`;
         dateParts.push(strMonth);
     } else {
         const finalMonth = DE_MONTHS[month][date.getMonth()];
@@ -80,10 +80,10 @@ const toLocaleDateString = (date: Date) => (
     const dateConnection = '';
     const dateParts: string[] = [];
     processDay(dateParts, day, date);
-    if ((month === 'narrow' ||
-        month === 'short' ||
-        month === 'long') &&
-        day != null
+    if ((month === 'narrow'
+        || month === 'short'
+        || month === 'long')
+        && day != null
     ) {
         dateParts.push(' ');
     }

package/packages/l10n/src/date/en-common.ts

@@ -32,7 +32,7 @@ export const processWeekday = (
     day: Day | undefined,
     weekday: Weekday | undefined,
     date: Date,
-    weekdaysLocaleData: LocaleData = EN_WEEKDAYS
+    weekdaysLocaleData: LocaleData = EN_WEEKDAYS,
 ) => {
     if (typeof weekday === 'undefined') return;
     let weekdayString = weekdaysLocaleData[weekday][date.getDay()];

package/packages/l10n/src/date/fr.ts

@@ -1,7 +1,7 @@
 import { dateFormatter, processYear, toTwoDigitLocaleTimeString } from './common';
 import { DateTimeFormatOptions, Day, Month, Weekday, Year } from './types';
 
-//https://web.library.yale.edu/cataloging/months
+// https://web.library.yale.edu/cataloging/months
 const FR_MONTHS = {
     narrow: [
         'J', 'F', 'M', 'A', 'M', 'J', 'J', 'A', 'S', 'O', 'N', 'D',
@@ -38,7 +38,7 @@ const processWeekday = (
     if (typeof weekday === 'undefined') return;
     let weekdayString = FR_WEEKDAYS[weekday][date.getDay()];
     if (
-        ( typeof year !== 'undefined'
+        (typeof year !== 'undefined'
         || typeof month !== 'undefined'
         || typeof day !== 'undefined') && weekday !== 'long'
     ) {
@@ -48,11 +48,12 @@ const processWeekday = (
 };
 
 const processDay = (
-    dateParts: string[], day: Day | undefined, month: Month | undefined, date: Date) => {
+    dateParts: string[], day: Day | undefined, month: Month | undefined, date: Date,
+) => {
     if (typeof day === 'undefined') return;
     const strDate = date.getDate().toString();
     dateParts.push(
-        strDate.length === 1 && month !== 'short' && month !== 'long'  ? `0${strDate}` : strDate
+        strDate.length === 1 && month !== 'short' && month !== 'long' ? `0${strDate}` : strDate,
     );
 };
 

package/packages/l10n/src/date/he.ts

@@ -81,14 +81,14 @@ const toLocaleDateString = (date: Date) => (
     },
 ) => {
     const dateStringParts: string[] = [];
-    processWeekday(dateStringParts,  weekday, date);
-    const dateConnection = month === 'numeric' || month === '2-digit' ?  '.' : '';
+    processWeekday(dateStringParts, weekday, date);
+    const dateConnection = month === 'numeric' || month === '2-digit' ? '.' : '';
     const dateParts: string[] = [];
     processDay(dateParts, day, date);
-    if ((month === 'narrow' ||
-        month === 'short' ||
-        month === 'long') &&
-        day != null
+    if ((month === 'narrow'
+        || month === 'short'
+        || month === 'long')
+        && day != null
     ) {
         dateParts.push(' ');
     }

package/packages/l10n/src/date/types.ts

@@ -46,7 +46,7 @@ export type Props = {
     options?: DateTimeFormatOptions,
 };
 
-export type LocaleData  = {
+export type LocaleData = {
     narrow: string[];
     short: string[];
     long: string[];

package/packages/list/src/Base/Base.tsx

@@ -152,14 +152,6 @@ export class ListBase<T extends Item<U>, U>
         }
     };
 
-    shouldPreventBlur(event: KeyboardEvent) {
-        const { horizontal, preventBlurOnLongPress } = this.props;
-        return (this.preventBlurCounter >= PREVENT_BLUR_ON_LONG_PRESS_KEYDOWNS && (
-            (preventBlurOnLongPress.forward && isForward(event, horizontal))
-            || (preventBlurOnLongPress.backward && isBackward(event, horizontal))
-        ));
-    }
-
     getRefAtIndex(i: number): Reference<T> {
         const ref = this.itemRefs[i];
         if (!ref) {
@@ -201,6 +193,14 @@ export class ListBase<T extends Item<U>, U>
         this.fastScrollingCounter.reset();
     }
 
+    shouldPreventBlur(event: KeyboardEvent) {
+        const { horizontal, preventBlurOnLongPress } = this.props;
+        return (this.preventBlurCounter >= PREVENT_BLUR_ON_LONG_PRESS_KEYDOWNS && (
+            (preventBlurOnLongPress.forward && isForward(event, horizontal))
+            || (preventBlurOnLongPress.backward && isBackward(event, horizontal))
+        ));
+    }
+
     animatedScrollStarted() {
         this.isAnimatedScrollRunning = true;
     }

package/packages/player-ui/src/PlayerUI.tsx

@@ -1,6 +1,6 @@
 import { Component, createRef, DeclareProps } from '@24i/bigscreen-sdk/jsx';
 import { PlayerBase } from '@24i/player-base';
-import { switchByKey } from '@24i/bigscreen-sdk/device/keymap';
+import { FF, REW, switchByKey } from '@24i/bigscreen-sdk/device/keymap';
 import { stopEvent } from '@24i/bigscreen-sdk/utils/stopEvent';
 import {
     IDisplayToggler, getDisplayToggler, DISPLAY_NONE,
@@ -23,6 +23,7 @@ type Props = {
     onClose?: () => void,
     onHide?: () => void,
     isPauseAllowed?: () => boolean,
+    showSubtitlesPicker?: () => void,
 };
 
 export class PlayerUI extends Component<Props>
@@ -84,8 +85,17 @@ export class PlayerUI extends Component<Props>
             STOP: this.onKeyStop,
             FF: this.onKeyForward,
             REW: this.onKeyRewind,
+            SUBTITLES: this.onKeySubtitles,
         });
-        if (processed) stopEvent(event);
+        if (processed && !FF.is(event) && !REW.is(event)) stopEvent(event);
+    };
+
+    onKeySubtitles = () => {
+        const { showSubtitlesPicker } = this.props;
+        if (showSubtitlesPicker) {
+            showSubtitlesPicker();
+        }
+        return true;
     };
 
     onKeyPlay = () => {
@@ -103,7 +113,8 @@ export class PlayerUI extends Component<Props>
     };
 
     onKeyPause = () => {
-        if (!this.props.isPauseAllowed()) return false;
+        const { isPauseAllowed } = this.props;
+        if (!isPauseAllowed()) return false;
         if (this.seeking.isAutomaticallySeeking()) {
             this.seeking.stopAutomaticSeek();
             if (this.isPlaying()) this.trigger(PlayerAction.PAUSE);
@@ -118,7 +129,8 @@ export class PlayerUI extends Component<Props>
     };
 
     onKeyPlayPause = () => {
-        if (!this.props.isPauseAllowed()) return false;
+        const { isPauseAllowed } = this.props;
+        if (!isPauseAllowed()) return false;
         if (this.seeking.isSeeking()) {
             this.seeking.confirmSeek();
             if (!this.isPlaying()) this.trigger(PlayerAction.PLAY);
@@ -137,33 +149,22 @@ export class PlayerUI extends Component<Props>
     };
 
     onKeyForward = () => {
-        if (this.seeking.isAutomaticallySeekingBackward) {
-            this.seeking.stopAutomaticSeek();
-            return true;
-        }
-        if (!this.seeking.isAutomaticallySeekingForward) {
-            this.seeking.startAutomaticSeekForward();
-            return true;
-        }
-        return false;
+        if (this.seeking.isAutomaticallySeekingBackward) this.seeking.stopAutomaticSeek();
+        this.disableHiding();
+        this.seeking.automaticSeekForward();
+        return true;
     };
 
     onKeyRewind = () => {
-        if (this.seeking.isAutomaticallySeekingForward) {
-            this.seeking.stopAutomaticSeek();
-            return true;
-        }
-        if (!this.seeking.isAutomaticallySeekingBackward) {
-            this.seeking.startAutomaticSeekBackward();
-            return true;
-        }
-        return false;
-    };
+        if (this.seeking.isAutomaticallySeekingForward) this.seeking.stopAutomaticSeek();
+        this.disableHiding();
+        this.seeking.automaticSeekBackward();
+        return true;
 
-    getPlayer = () => {
-        return this.player!;
     };
 
+    getPlayer = () => this.player!;
+
     setPlayer(player: PlayerBase<any>) {
         this.player = player;
         this.seeking.setPlayer(player);

package/packages/player-ui/src/Seekbar.tsx

@@ -11,7 +11,7 @@ import { PlayerUICommonProps } from './types';
 const CONSECUTIVE_TIMEOUT = 500;
 const FAST_TRESHOLD = 5;
 const SLOW_TIME = 10000;
-const FAST_TIME = 20000;
+const FAST_TIME = 30000;
 const SAFE_END_MARGIN = 10000;
 const TO_PERCENT = 100;
 
@@ -26,9 +26,9 @@ export class Seekbar extends Component<Props> implements IFocusable {
 
     seekTime = createRef<PlayerTime>();
 
-    leftConsecutives = 0;
+    leftConsecutiveness = 0;
 
-    rightConsecutives = 0;
+    rightConsecutiveness = 0;
 
     leftConsecutiveTimeout = createTimeout();
 
@@ -51,6 +51,7 @@ export class Seekbar extends Component<Props> implements IFocusable {
         document.addEventListener('mouseup', this.onMouseUp);
         document.addEventListener('mousemove', this.onMouseMove);
         ui.seeking.addEventListener('seektimeupdate', this.onSeekTimeUpdate);
+        ui.seeking.addEventListener('stopautomaticseek', this.onStopAutomaticSeek);
         ui.getPlayer().addEventListener('timeupdate', this.onTimeUpdate);
         ui.getPlayer().addEventListener('durationchange', this.onDurationUpdate);
     }
@@ -60,6 +61,7 @@ export class Seekbar extends Component<Props> implements IFocusable {
         document.removeEventListener('mouseup', this.onMouseUp);
         document.removeEventListener('mousemove', this.onMouseMove);
         ui.seeking.removeEventListener('seektimeupdate', this.onSeekTimeUpdate);
+        ui.seeking.removeEventListener('stopautomaticseek', this.onStopAutomaticSeek);
         ui.getPlayer().removeEventListener('timeupdate', this.onTimeUpdate);
         ui.getPlayer().removeEventListener('durationchange', this.onDurationUpdate);
     }
@@ -114,13 +116,13 @@ export class Seekbar extends Component<Props> implements IFocusable {
 
     onLeft = () => {
         const { ui } = this.props;
-        this.leftConsecutives += 1;
+        this.leftConsecutiveness += 1;
         if (ui.seeking.isAutomaticallySeeking()) {
             ui.seeking.stopAutomaticSeek();
         }
-        ui.seeking.seekBackward(this.leftConsecutives >= FAST_TRESHOLD ? FAST_TIME : SLOW_TIME);
+        ui.seeking.seekBackward(this.leftConsecutiveness >= FAST_TRESHOLD ? FAST_TIME : SLOW_TIME);
         this.leftConsecutiveTimeout.set(() => {
-            this.leftConsecutives = 0;
+            this.leftConsecutiveness = 0;
         }, CONSECUTIVE_TIMEOUT);
         return true;
     };
@@ -129,14 +131,14 @@ export class Seekbar extends Component<Props> implements IFocusable {
         const { ui } = this.props;
         const { seekTime } = ui.seeking;
         if (seekTime == null && this.currentTime + SLOW_TIME >= this.duration) return true;
-        this.rightConsecutives += 1;
+        this.rightConsecutiveness += 1;
         if (ui.seeking.isAutomaticallySeeking()) {
             ui.seeking.stopAutomaticSeek();
         }
-        const isFastSeeking = this.rightConsecutives >= FAST_TRESHOLD;
+        const isFastSeeking = this.rightConsecutiveness >= FAST_TRESHOLD;
         if (
-            (seekTime != null &&
-              (seekTime + SLOW_TIME >= this.duration - SAFE_END_MARGIN
+            (seekTime != null
+              && (seekTime + SLOW_TIME >= this.duration - SAFE_END_MARGIN
               || (isFastSeeking && seekTime + FAST_TIME >= this.duration - SAFE_END_MARGIN)))
             || (seekTime == null && this.currentTime >= this.duration - SAFE_END_MARGIN)
         ) {
@@ -145,7 +147,7 @@ export class Seekbar extends Component<Props> implements IFocusable {
             ui.seeking.seekForward(isFastSeeking ? FAST_TIME : SLOW_TIME);
         }
         this.rightConsecutiveTimeout.set(() => {
-            this.rightConsecutives = 0;
+            this.rightConsecutiveness = 0;
         }, CONSECUTIVE_TIMEOUT);
         return true;
     };
@@ -163,6 +165,11 @@ export class Seekbar extends Component<Props> implements IFocusable {
         this.updateSeekBar();
     };
 
+    onStopAutomaticSeek = () => {
+        const { ui } = this.props;
+        ui.enableHiding();
+    };
+
     onTimeUpdate = ({ currentTime }: ITimeUpdateEvent) => {
         const { ui } = this.props;
         this.currentTime = currentTime;

package/packages/player-ui/src/Seeking.ts

@@ -1,9 +1,12 @@
 import { IEvents, EventMapType, EventsManager } from '@24i/bigscreen-sdk/events-manager';
-import { createInterval } from '@24i/bigscreen-sdk/utils/timers';
+import { createInterval, createTimeout } from '@24i/bigscreen-sdk/utils/timers';
 import { PlayerBase } from '@24i/player-base';
 
-const DEFAULT_SEEK_TIME = 20000;
+const DEFAULT_SEEK_TIME = 10000;
+const FAST_SEEK_TIME = 30000;
 const AUTOMATIC_SEEK_INTERVAL = 300;
+const FAST_THRESHOLD = 5;
+const CONSECUTIVE_TIMEOUT = 500;
 
 interface SeekingEventsMap extends EventMapType {
     'seektimeupdate': (payload: number) => void,
@@ -29,6 +32,14 @@ export class Seeking implements IEvents<SeekingEventsMap> {
 
     isAutomaticallySeekingBackward = false;
 
+    ffConsecutiveness = 0;
+
+    rewConsecutiveness = 0;
+
+    ffConsecutiveTimeout = createTimeout();
+
+    rewConsecutiveTimeout = createTimeout();
+
     constructor(player: PlayerBase<any> | null = null) {
         this.player = player;
     }
@@ -76,28 +87,53 @@ export class Seeking implements IEvents<SeekingEventsMap> {
         this.triggerEvent('seektimeupdate', this.seekTime!);
     }
 
-    startAutomaticSeekForward() {
-        this.stopAutomaticSeek();
+    automaticSeekForward() {
+        if (this.isAutomaticallySeekingForward) {
+            this.ffConsecutiveTimeout.set(() => {
+                this.ffConsecutiveness = 0;
+            }, CONSECUTIVE_TIMEOUT);
+            this.ffConsecutiveness += 1;
+            if (this.ffConsecutiveness === FAST_THRESHOLD) {
+                this.automaticSeekInterval.set(
+                    () => this.seekForward(FAST_SEEK_TIME),
+                    AUTOMATIC_SEEK_INTERVAL,
+                );
+            }
+            return;
+        }
         this.isAutomaticallySeekingForward = true;
+        this.ffConsecutiveness += 1;
         this.seekForward();
-        this.automaticSeekInterval.set(() => {
-            this.seekForward();
-        }, AUTOMATIC_SEEK_INTERVAL);
+        this.automaticSeekInterval.set(() => this.seekForward(), AUTOMATIC_SEEK_INTERVAL);
     }
 
-    startAutomaticSeekBackward() {
-        this.stopAutomaticSeek();
+    automaticSeekBackward() {
+        if (this.isAutomaticallySeekingBackward) {
+            this.rewConsecutiveTimeout.set(() => {
+                this.rewConsecutiveness = 0;
+            }, CONSECUTIVE_TIMEOUT);
+            this.rewConsecutiveness += 1;
+            if (this.rewConsecutiveness === FAST_THRESHOLD) {
+                this.automaticSeekInterval.set(
+                    () => this.seekBackward(FAST_SEEK_TIME),
+                    AUTOMATIC_SEEK_INTERVAL,
+                );
+            }
+            return;
+        }
         this.isAutomaticallySeekingBackward = true;
+        this.rewConsecutiveness += 1;
         this.seekBackward();
-        this.automaticSeekInterval.set(() => {
-            this.seekBackward();
-        }, AUTOMATIC_SEEK_INTERVAL);
+        this.automaticSeekInterval.set(() => this.seekBackward(), AUTOMATIC_SEEK_INTERVAL);
     }
 
     stopAutomaticSeek() {
+        if (this.isAutomaticallySeeking()) this.triggerEvent('stopautomaticseek');
         this.automaticSeekInterval.clear();
         this.isAutomaticallySeekingForward = false;
         this.isAutomaticallySeekingBackward = false;
+        this.ffConsecutiveness = 0;
+        this.rewConsecutiveness = 0;
     }
 
     cancelSeek() {

package/packages/player-ui/src/mocks.ts

@@ -13,12 +13,16 @@ const getSeekingMock = (): jest.Mocked<IPlayerUI['seeking']> => ({
     isAutomaticallySeeking: jest.fn(),
     isAutomaticallySeekingForward: false,
     isAutomaticallySeekingBackward: false,
+    ffConsecutiveness: 0,
+    rewConsecutiveness: 0,
+    ffConsecutiveTimeout: null!,
+    rewConsecutiveTimeout: null!,
     isSeeking: jest.fn(),
     startSeeking: jest.fn(),
     seekForward: jest.fn(),
     seekBackward: jest.fn(),
-    startAutomaticSeekForward: jest.fn(),
-    startAutomaticSeekBackward: jest.fn(),
+    automaticSeekForward: jest.fn(),
+    automaticSeekBackward: jest.fn(),
     stopAutomaticSeek: jest.fn(),
     cancelSeek: jest.fn(),
     confirmSeek: jest.fn(),
@@ -31,8 +35,8 @@ const getSeekingMock = (): jest.Mocked<IPlayerUI['seeking']> => ({
 
 const PLAYER_MOCK_DURATION = 60000;
 
-export const getPlayerMock = (): PlayerBase<any> =>{
-    const playerMock =  new PlayerBaseMock();
+export const getPlayerMock = (): PlayerBase<any> => {
+    const playerMock = new PlayerBaseMock();
     jest.spyOn(playerMock, 'duration', 'get').mockReturnValue(PLAYER_MOCK_DURATION);
 
     return playerMock;

package/packages/player-ui/src/timeUtils.ts

@@ -63,9 +63,9 @@ export const formatTime = (duration: number, pattern: string) => {
     const unitValues = calculateUnitValues(duration, units);
     let result: string = pattern;
     forEach(matches, (match) => {
-        const formatedValue = Number.isNaN(unitValues[match.unit]) ?
-            '--' :
-            unitValues[match.unit]!.toString().padStart(match.count, '0');
+        const formatedValue = Number.isNaN(unitValues[match.unit])
+            ? '--'
+            : unitValues[match.unit]!.toString().padStart(match.count, '0');
         result = result.replace(
             match.completeMatch,
             formatedValue,

package/packages/time/src/adapters/24iMediaTimeApi.ts

@@ -0,0 +1,47 @@
+import { HOUR_IN_MS, MINUTE_IN_MS } from '@24i/bigscreen-sdk/utils';
+import * as TwentyFourIMediaTimeApi from '../services/24iMediaTimeApi';
+
+type ParamOptions = TwentyFourIMediaTimeApi.ParamOptions;
+
+const defaultOptions: ParamOptions = {
+    timeoutInMs: 30000,
+    retryConfig: {
+        retry: 2,
+    },
+};
+
+/**
+ * Returns a tring in ISO format followed by +/-hh:mm suffix for timezone offset.
+ * @param resp Time api response.
+ * @returns ISO string with timezone data.
+ */
+const getIsoDateString = (resp: TwentyFourIMediaTimeApi.ServiceDataResponse): string => {
+    let datetime = new Date(resp.timestamp + resp.timezone_offset).toISOString();
+    const offset = resp.timezone_offset / HOUR_IN_MS;
+    if (offset) {
+        const sign = offset > 0 ? '+' : '-';
+        const hours = Math.abs(offset);
+        const minutes = Math.floor((resp.timezone_offset % HOUR_IN_MS) / MINUTE_IN_MS);
+        // eslint-disable-next-line no-magic-numbers, sonarjs/no-nested-template-literals
+        const timeString = `${sign + `0${hours}`.slice(-2)}:${`0${minutes}`.slice(-2)}`;
+        datetime = datetime.replace('Z', timeString);
+    }
+    return datetime;
+};
+
+/**
+ * Wrapper over "TwentyFourIMediaTimeApi.getTime" method requesting the current time
+ * from timekeeping server. Transforms the result to ISO string with timezone offset data
+ * included.
+ *
+ * @param options Options object
+ */
+export const getTime = async (options: ParamOptions = {}) => {
+    const opts = { ...defaultOptions, ...options };
+    const resp = await TwentyFourIMediaTimeApi.getTime(opts);
+
+    if ('timestamp' in resp && 'timezone_offset' in resp && 'in_dst' in resp) {
+        return { datetime: getIsoDateString(resp) };
+    }
+    return null;
+};

package/packages/time/src/services/24iMediaTimeApi/24iMediaTimeApi.ts

@@ -0,0 +1,43 @@
+/**
+ * Package "24iMediaTimeApi" provides a single function to obtain the current time
+ * adjusted by local timezone and daylight savings time for use in time package,
+ * from 24i time API at https://time.24imedia.tv/
+ */
+import {
+    xhrSendRetry, type RetryConfig, type XhrResponse,
+} from '@24i/bigscreen-sdk/utils/xhr';
+
+const API_URL = 'https://time.24imedia.tv/';
+
+export type Options = {
+    /** The request timeout in milliseconds. The value 0 for no timeout */
+    timeoutInMs: number,
+    /** Retry configuration */
+    retryConfig: RetryConfig,
+};
+export type ParamOptions = Partial<Options>;
+
+export type ServiceDataResponse = {
+    /** Is dailight savings time */
+    in_dst: boolean,
+    /** Current time in GMT, in milliseconds */
+    timestamp: number,
+    /** Timezeone offset in milliseconds */
+    timezone_offset: number,
+};
+
+/**
+ * Request the current time based on public IP of request.
+ *
+ * @param options Options object
+ */
+export async function getTime(options?: ParamOptions): Promise<ServiceDataResponse> {
+    try {
+        const resp = (await xhrSendRetry(API_URL, options)) as XhrResponse;
+        const data: any = resp.dataJson || {};
+        return data as ServiceDataResponse;
+    } catch (e) {
+        console.error('[24iMediaTimeApi] Failed to get time', e);
+        throw e;
+    }
+}

package/packages/time/src/services/24iMediaTimeApi/index.ts

@@ -0,0 +1,6 @@
+export {
+    Options,
+    ParamOptions,
+    ServiceDataResponse,
+    getTime,
+} from './24iMediaTimeApi';

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

@@ -27,6 +27,7 @@
 //                 Victor Magalhães <https://github.com/vhfmag>
 //                 Dale Tan <https://github.com/hellatan>
 //                 Priyanshu Rav <https://github.com/priyanshurav>
+//                 Dmitry Semigradsky <https://github.com/Semigradsky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -1250,6 +1251,8 @@ declare namespace React {
         target: EventTarget & T;
     }
 
+    export type ModifierKey = "Alt" | "AltGraph" | "CapsLock" | "Control" | "Fn" | "FnLock" | "Hyper" | "Meta" | "NumLock" | "ScrollLock" | "Shift" | "Super" | "Symbol" | "SymbolLock";
+
     interface KeyboardEvent<T = Element> extends UIEvent<T, NativeKeyboardEvent> {
         altKey: boolean;
         /** @deprecated */
@@ -1259,7 +1262,7 @@ declare namespace React {
         /**
          * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
          */
-        getModifierState(key: string): boolean;
+        getModifierState(key: ModifierKey): boolean;
         /**
          * See the [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#named-key-attribute-values). for possible values
          */
@@ -1285,7 +1288,7 @@ declare namespace React {
         /**
          * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
          */
-        getModifierState(key: string): boolean;
+        getModifierState(key: ModifierKey): boolean;
         metaKey: boolean;
         movementX: number;
         movementY: number;
@@ -1304,7 +1307,7 @@ declare namespace React {
         /**
          * See [DOM Level 3 Events spec](https://www.w3.org/TR/uievents-key/#keys-modifier). for a list of valid (case-sensitive) arguments to this method.
          */
-        getModifierState(key: string): boolean;
+        getModifierState(key: ModifierKey): boolean;
         metaKey: boolean;
         shiftKey: boolean;
         targetTouches: TouchList;
@@ -1459,6 +1462,8 @@ declare namespace React {
         onProgressCapture?: ReactEventHandler<T> | undefined;
         onRateChange?: ReactEventHandler<T> | undefined;
         onRateChangeCapture?: ReactEventHandler<T> | undefined;
+        onResize?: ReactEventHandler<T> | undefined;
+        onResizeCapture?: ReactEventHandler<T> | undefined;
         onSeeked?: ReactEventHandler<T> | undefined;
         onSeekedCapture?: ReactEventHandler<T> | undefined;
         onSeeking?: ReactEventHandler<T> | undefined;
@@ -1858,6 +1863,7 @@ declare namespace React {
         hidden?: boolean | undefined;
         id?: string | undefined;
         lang?: string | undefined;
+        nonce?: string | undefined;
         placeholder?: string | undefined;
         slot?: string | undefined;
         spellCheck?: Booleanish | undefined;
@@ -1978,7 +1984,6 @@ declare namespace React {
         multiple?: boolean | undefined;
         muted?: boolean | undefined;
         name?: string | undefined;
-        nonce?: string | undefined;
         noValidate?: boolean | undefined;
         open?: boolean | undefined;
         optimum?: number | undefined;
@@ -2391,7 +2396,6 @@ declare namespace React {
         defer?: boolean | undefined;
         integrity?: string | undefined;
         noModule?: boolean | undefined;
-        nonce?: string | undefined;
         referrerPolicy?: HTMLAttributeReferrerPolicy | undefined;
         src?: string | undefined;
         type?: string | undefined;
@@ -2422,7 +2426,6 @@ declare namespace React {
 
     interface StyleHTMLAttributes<T> extends HTMLAttributes<T> {
         media?: string | undefined;
-        nonce?: string | undefined;
         scoped?: boolean | undefined;
         type?: string | undefined;
     }

package/packages/utils/src/textUtils.ts

@@ -4,11 +4,12 @@ const trimWithEllipsis = (
     row: HTMLSpanElement | HTMLDivElement,
     requestedNumberOfLines: number,
     ellipsis = ELLIPSIS,
-    ending = false
+    ending = false,
 ) : void => {
     if (!row.textContent) {
         return;
     }
+    const { visibility } = row.style;
     row.style.visibility = 'hidden';
     const lineHeightString = window.getComputedStyle(row, null).getPropertyValue('line-height');
     const lineHeight = parseInt(lineHeightString, 10);
@@ -27,6 +28,7 @@ const trimWithEllipsis = (
             } while (numberOfLines <= requestedNumberOfLines
                 && currentPosition < originalTextContent.length);
             row.textContent = stringBuffer.substring(0, stringBuffer.length - 1) + ellipsis;
+
         } else {
             let currentPosition = originalTextContent.length - 1;
             do {
@@ -39,21 +41,17 @@ const trimWithEllipsis = (
             row.textContent = `${ellipsis}${stringBuffer.substring(1)}`;
         }
     }
-    row.style.visibility = '';
+    row.style.visibility = visibility;
 };
 
 export const trimWithLeadingEllipsis = (
     row: HTMLSpanElement | HTMLDivElement,
     requestedNumberOfLines: number,
     ellipsis = ELLIPSIS,
-) => {
-    return trimWithEllipsis(row, requestedNumberOfLines, ellipsis, false);
-};
+) => trimWithEllipsis(row, requestedNumberOfLines, ellipsis, false);
 
 export const trimWithEndingEllipsis = (
     row: HTMLSpanElement | HTMLDivElement,
     requestedNumberOfLines: number,
     ellipsis = ELLIPSIS,
-) => {
-    return trimWithEllipsis(row, requestedNumberOfLines, ellipsis, true);
-};
+) => trimWithEllipsis(row, requestedNumberOfLines, ellipsis, true);