@vkontakte/videoplayer 1.1.52-dev.d7d08e6d.0 → 1.1.52-dev.f5d6dcc9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.52-dev.d7d08e6d.0",
+  "version": "1.1.52-dev.f5d6dcc9.0",
   "author": "vk.com",
   "description": "Videoplayer based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -49,9 +49,9 @@
     "**/*.d.ts"
   ],
   "dependencies": {
-    "@vkontakte/videoplayer-core": "2.0.119-dev.df6b2fd8.0",
-    "@vkontakte/videoplayer-interactive": "1.0.27-dev.fb9d0f4c.0",
-    "@vkontakte/videoplayer-shared": "1.0.51-dev.5628c766.0",
-    "@vkontakte/videoplayer-statistics": "1.0.66-dev.7901d9e7.0"
+    "@vkontakte/videoplayer-core": "2.0.119-dev.c81726f6.0",
+    "@vkontakte/videoplayer-interactive": "1.0.27-dev.13f3531e.0",
+    "@vkontakte/videoplayer-shared": "1.0.51-dev.b5aa895a.0",
+    "@vkontakte/videoplayer-statistics": "1.0.66-dev.8a6011fa.0"
   }
 }

package/types/components/Menus/constants/subMenuIds.d.ts

@@ -1,7 +1,6 @@
 export declare enum SubMenuIds {
     QUALITY = "quality-sub",
     QUALITY_DETAIL = "quality-detail-sub",
-    DEFAULT_QUALITY_APPLIENCE = "default_quality_applies_to_sub",
     AUDIO_LANGUAGES = "audio-language-sub",
     PLAYBACK_RATE = "playback-rate-sub",
     SUBTITLES = "subtitles-sub"

package/types/components/Menus/types.d.ts

@@ -47,47 +47,40 @@ export type AdditionalClickSettingsMenuItem = Omit<SwitchSettingsMenuItem, 'icon
 };
 export type SettingsMenuItem = OpenSubMenuSettingsMenuItem | ClickSettingsMenuItem | SwitchSettingsMenuItem;
 export type AdditionalSettingsMenuItem = AdditionalSwitchSettingsMenuItem | AdditionalClickSettingsMenuItem;
-interface SubMenuItemBase<U = any> {
-    selected?: boolean;
+export interface SelectValueSubMenuItem<T = any, U = any> {
+    type: SubMenuItemType.SELECT_VALUE;
+    value: T;
+    dataValue?: T | keyof T;
     valueComponent?: ComponentType;
     valueComponentParams?: {
         [key: string]: U;
     };
-    bottomBordered?: boolean;
-    label?: string;
-    sublabel?: string;
     ariaLabel?: string;
-    onClick?: () => void;
-}
-export interface SelectValueSubMenuItem<T = any, U = any> extends SubMenuItemBase<U> {
-    type: SubMenuItemType.SELECT_VALUE;
-    value: T;
-    dataValue?: T | keyof T;
+    label?: string;
+    selected?: boolean;
     selectItem: (value: T) => void;
 }
-export interface OpenSubMenuSubMenuItem extends SubMenuItemBase {
+export interface OpenSubMenuSubMenuItem {
     type: SubMenuItemType.OPEN_SUB_MENU;
+    ariaLabel?: string;
+    label: string;
     id: string;
     subMenuId: SubMenuIds;
-    getSubItemForFocus?: () => HTMLLIElement;
+    getSubItemForFocus: () => HTMLLIElement;
 }
 export type SubMenuItem = SelectValueSubMenuItem | OpenSubMenuSubMenuItem;
 export interface SubMenuList {
     id: SubMenuIds;
-    parentItemId?: string;
+    parentItemId: string;
     items: SubMenuItem[];
     returnFromSubMenu?: () => void;
     ariaLabelReturnFromSubMenu?: string;
     title: string;
     closeSettingsMenu: () => void;
     minWidth?: number;
-    onMount?: () => void;
 }
 export interface ContextMenuItem extends BaseMenuItem {
     onClick: () => void;
 }
 export type AdditionalContextMenuItem = ContextMenuItem;
-export type MenuRefs = {
-    [key: string]: HTMLUListElement;
-};
 export {};

package/types/components/Menus/utils/getCurrentQualityDisplayValue.d.ts

@@ -1,21 +1,3 @@
 import { VideoQuality } from '@vkontakte/videoplayer-core';
-import { type VideoQualityForRender } from '../../../types';
-type Params = {
-    quality: VideoQuality;
-    availableQualities: VideoQualityForRender[];
-};
-export declare const getQualityDisplayValue: ({ quality, availableQualities }: Params) => string;
-type CurrentQualityParams = {
-    isAutoQualityEnabled: boolean | undefined;
-    quality: VideoQuality | undefined;
-    availableQualities: VideoQualityForRender[];
-};
-export declare const getCurrentQualityDisplayValue: ({ quality, availableQualities, isAutoQualityEnabled, }: CurrentQualityParams) => string;
-type QualityWithPrefixParams = {
-    quality: VideoQuality | undefined;
-    availableQualities: VideoQualityForRender[];
-    prefix: string;
-    onlyPrefix: boolean;
-};
-export declare const getQualityWithPrefix: ({ quality, availableQualities, prefix, onlyPrefix }: QualityWithPrefixParams) => string;
-export {};
+import type { VideoQualityForRender } from '../../../types';
+export declare const getCurrentQualityDisplayValue: (currentQuality: VideoQuality | undefined, availableQualities: VideoQualityForRender[], isAutoQualityEnabled: boolean | undefined) => string;

package/types/components/Menus/utils/menuNavigation.d.ts

@@ -11,8 +11,11 @@ export declare const returnFocusToMenuItem: (refMenuItems: {
     [key: string]: HTMLLIElement;
 }, id: string) => Promise<void>;
 export declare const handleKeyDownMainMenu: (event: KeyboardEvent, closeCallback: () => void) => void;
-export declare const handleKeyDownOpenSubMenuItem: (event: KeyboardEvent, openSubmenuFn: () => void, getSubItemFn?: () => HTMLLIElement) => Promise<void>;
-export declare const handleKeyDownSubMenu: (event: KeyboardEvent, returnFromSubMenu: () => void, closeSettingsMenuFn: () => void) => Promise<void>;
+export declare const handleKeyDownOpenSubMenuItem: (event: KeyboardEvent, openSubmenuFn: () => void, getSubItemFn: () => HTMLLIElement) => Promise<void>;
+export declare const handleKeyDownSubMenu: (event: KeyboardEvent, returnFromSubMenu: () => void, { itemIdReturnCase, id }: {
+    itemIdReturnCase: Writable<string | undefined>;
+    id: string;
+}, closeSettingsMenuFn: () => void) => Promise<void>;
 export declare const handleChoseMenuItem: (event: KeyboardEvent, selectFn: () => void) => void;
 export declare const handleSwitchMenuItem: (event: KeyboardEvent, enabled: boolean, selectFn: (value: boolean) => void) => void;
 export declare const getContextMenuPositionByButton: (btnRef: HTMLButtonElement) => Position;

package/types/config.d.ts

@@ -37,7 +37,6 @@ export interface IUIConfig {
     minSubtitlesFontSize: number;
     autoSubtitlesTimeout: Milliseconds;
     trafficSavingLimit: ExactVideoQuality;
-    highQualityLimit: ExactVideoQuality;
     episodeMinWidthPc: number;
     controls: {
         showOnStartupAtAutoplay: boolean;
@@ -116,7 +115,6 @@ export interface IUIConfig {
         nextPrevButtons: boolean;
         previewNoEmptySpace: boolean;
         exposeInternalsToGlobal: boolean;
-        qualityDetailsSubMenuEnabled: boolean;
     };
     interactive: {
         historyMaxLength: number;

package/types/store/index.d.ts

@@ -1,4 +1,4 @@
-import type { IAudioStream, IConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, IVideoStream, PlaybackRate } from '@vkontakte/videoplayer-core';
+import type { IAudioStream, IConfig, IExternalTextTrack, IOptionalTuningConfig, IPlayer, ISources, ITextTrack, IVideoStream, PlaybackRate } from '@vkontakte/videoplayer-core';
 import { ChromecastState, PlaybackState, VideoFormat } from '@vkontakte/videoplayer-core';
 import { type IError, type ILogger, InterfaceLanguage, type IRectangle, type IValueObservable, type QualityLimits, VideoQuality, type InternalsExposure } from '@vkontakte/videoplayer-shared';
 import type { IUIConfig } from '../config';
@@ -9,16 +9,11 @@ import { AdmanWrapper } from '../components/Ads/admanWrapper';
 import type { LanguageConfig } from '../translation/types';
 import type { AdditionalButtonDeprecated, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, VideoPlaybackRate, VideoQualityForRender, VideoQualityUI, VideoSubtitle, VideoSubtitleParsed } from '../types';
 import { AdsPlaybackState, PictureInPictureType } from '../types';
-import { type QualitySettingsAppliesTo } from '../utils/userSettings';
 import type { DebugData } from './utils';
 import { GridTypes, type PlayPrevChapterDisabledTooltipKey } from '../constans';
 import { UIOneStat } from '../services/statistics';
 import type { AdditionalContextMenuItem, AdditionalSettingsMenuItem, ContextMenuItem, SettingsMenuItem } from '../components/Menus/types';
 import type { AdditionalButton, AdditionalDesktopControlPanelButton } from '../components/Controls/types';
-type Info = {
-    appliesTo?: QualitySettingsAppliesTo;
-    changeReason?: 'default' | 'limit-changed';
-};
 export interface IAdsState {
     position: Writable<number>;
     duration: Writable<number>;
@@ -144,7 +139,6 @@ export interface IStore {
         volume$: Readable<number>;
         muted$: Readable<boolean>;
         trafficSavingEnabled$: Readable<boolean>;
-        highQualityEnabled$: Readable<boolean>;
         availableVideoStreams$: Readable<IVideoStream[]>;
         availableAudioStreams$: Readable<IAudioStream[]>;
         videoStream$: Readable<IVideoStream | undefined>;
@@ -156,6 +150,7 @@ export interface IStore {
         currentPlaybackRate$: Readable<number>;
         availablePlaybackRates$: Readable<VideoPlaybackRate[]>;
         currentSubtitle$: Writable<Omit<VideoSubtitle, 'selected'>>;
+        availableTextTracks$: Readable<ITextTrack[]>;
         availableSubtitlesList$: Readable<VideoSubtitle[]>;
         currentSubtitleCaptions$: Readable<VideoSubtitleParsed['texts']>;
         isAutoSubtitleCaptionVisible$: Writable<boolean>;
@@ -202,17 +197,15 @@ export interface IStore {
             closeSettingsMenu: (fromSubMenu?: boolean) => void;
             openSettingsSubMenu: (name: string, ref: HTMLElement) => void;
             closeSettingsSubMenu: (ref: HTMLElement, isClosing?: boolean) => void;
-            setTrafficSavingEnabled: (trafficSavingEnabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
-            setHighQualityEnabled: (highQualityEnabled: boolean, appliesTo?: QualitySettingsAppliesTo) => void;
-            initQualitySettings: () => void;
+            setTrafficSavingEnabled: (trafficSavingEnabled: boolean) => void;
             setVolume: (volume: number, preferredVolume?: number) => void;
             setAudioStream: (stream: IAudioStream) => void;
             setVideoStream: (stream: IVideoStream) => void;
-            setQuality: (quality: VideoQualityUI, info?: Info) => void;
+            setQuality: (quality: VideoQualityUI) => void;
             setPlaybackRate: (playbackRate: PlaybackRate) => void;
             incrementPlaybackRate: () => void;
             decrementPlaybackRate: () => void;
-            setSubtitle: (subtitle: VideoSubtitle) => void;
+            setSubtitle: (subtitle?: VideoSubtitle) => void;
             toggleSubtitle: () => void;
             togglePictureInPicture: () => void;
             startScrubbing: (progress: number) => void;
@@ -293,7 +286,6 @@ export interface IStore {
     setUiCallbacks: (uiCallbacks: IVKVideoPlayerUICallbacks) => void;
     getAdmanWrapper: () => AdmanWrapper;
     getLogger: () => ILogger;
-    getPlayer: () => IPlayer;
     destroy(): void;
 }
 interface IStoreParams {

package/types/utils/hooks/useIosSafariFullscreen.d.ts

@@ -0,0 +1,6 @@
+interface Params {
+    getFullscreenTarget: () => HTMLElement;
+    fullScreenChangeHandler: (forced?: boolean) => void;
+}
+export declare const useIosSafariFullscreen: ({ getFullscreenTarget, fullScreenChangeHandler }: Params) => void;
+export {};

package/types/utils/hooks/useIosSafariFullscreenSubtitles.d.ts

@@ -0,0 +1,7 @@
+import type { IStore } from '../../store';
+interface Params {
+    store: IStore;
+    getFullscreenTarget: () => HTMLElement;
+}
+export declare const useIosSafariFullscreenSubtitles: ({ store, getFullscreenTarget }: Params) => void;
+export {};

package/types/utils/subtitles.d.ts

@@ -0,0 +1,10 @@
+import type { ITextTrack } from '@vkontakte/videoplayer-core';
+export declare class NativeSubtitles {
+    private readonly video;
+    constructor(video: HTMLVideoElement);
+    private getTracksArray;
+    attach(track: ITextTrack, showing?: boolean): void;
+    detachAll(): void;
+    updateSrc(track: ITextTrack): void;
+    getCurrentShowingId(): string | null;
+}

package/types/utils/userSettings.d.ts

@@ -15,18 +15,3 @@ export declare const savePreferredRate: (rate: PlaybackRate) => void;
 export declare const getPreferredRate: () => PlaybackRate | undefined;
 export declare const savePreferredAutoplayNext: (autoplayNext: boolean) => void;
 export declare const getPreferredAutoplayNext: () => boolean;
-type PreferredQualitySettingsType = 'traffic_saving' | 'high_quality' | 'auto_quality' | 'exact_video';
-type PreferredQualitySettingsValue = {
-    type: Exclude<PreferredQualitySettingsType, 'exact_video'>;
-    videoId?: number;
-} | {
-    type: 'exact_quality';
-    quality: VideoQuality;
-    videoId?: number;
-};
-type DefaultPreferredQualitySettingsValue = Exclude<PreferredQualitySettingsValue, {
-    type: 'exact_quality';
-}>;
-export type QualitySettingsAppliesTo = 'as-default' | 'to-video';
-export declare const getPreferredQualitySettings: (videoId: number | undefined) => PreferredQualitySettingsValue | null, migrateSettingsToLegacyWay: (videoId?: number) => void, savePreferredQualitySettings: (value: PreferredQualitySettingsValue, appliesTo?: QualitySettingsAppliesTo) => void, savePreferredDefaultQualitySettings: (value: DefaultPreferredQualitySettingsValue) => void, removePreferredQualitySettingsByVideo: () => void;
-export {};

package/types/components/Menus/subMenuTabs/getQualityDetailsSubMenuList.d.ts

@@ -1,15 +0,0 @@
-import { type MenuRefs, type SubMenuList } from '../types';
-import type { VideoQualityForRender, VideoQualityUI } from '../../../types';
-import { type QualitySettingsAppliesTo } from '../../../utils/userSettings';
-type Params = {
-    menuRefs: MenuRefs;
-    autoQualityItem: VideoQualityForRender | undefined;
-    trafficSavingEnabled: boolean;
-    highQualityEnabled: boolean;
-    closeSettingsMenu: () => void;
-    selectQuality: (quality: VideoQualityUI, appliesTo: QualitySettingsAppliesTo) => void;
-    toggleTrafficSaving: (value: boolean, appliesTo: QualitySettingsAppliesTo) => void;
-    toggleHighQuality: (valiue: boolean, appliesTo: QualitySettingsAppliesTo) => void;
-};
-export declare const getQualityDetailsSubMenuList: ({ closeSettingsMenu, menuRefs, trafficSavingEnabled, autoQualityItem, highQualityEnabled, toggleHighQuality, selectQuality, toggleTrafficSaving, }: Params) => SubMenuList;
-export {};

package/types/components/Menus/subMenuTabs/getQualityLimitsForSubMenu.d.ts

@@ -1,12 +0,0 @@
-import { type SubMenuItem } from '../types';
-import type { VideoQualityForRender, VideoQualityUI } from '../../../types';
-type Params = {
-    trafficSavingEnabled: boolean;
-    toggleTrafficSaving: (value: boolean) => void;
-    autoQualityItem: VideoQualityForRender | undefined;
-    selectQuality: (quality: VideoQualityUI) => void;
-    highQualityEnabled: boolean;
-    toggleHighQuality: (valiue: boolean) => void;
-};
-export declare const getQualityLimitsForSubMenu: ({ trafficSavingEnabled, autoQualityItem, highQualityEnabled, toggleHighQuality, selectQuality, toggleTrafficSaving, }: Params) => SubMenuItem[];
-export {};

package/types/components/Menus/subMenuTabs/getQualitySubMenuList.d.ts

@@ -1,11 +0,0 @@
-import { type MenuRefs, type SubMenuList } from '../types';
-import type { VideoQualityForRender, VideoQualityUI } from '../../../types';
-type Params = {
-    availableQualities: VideoQualityForRender[];
-    isMobile: boolean;
-    menuRefs: MenuRefs;
-    closeSettingsMenu: () => void;
-    selectQuality: (quality: VideoQualityUI) => void;
-};
-export declare const getQualitySubMenuList: ({ closeSettingsMenu, availableQualities, isMobile, menuRefs, selectQuality, }: Params) => SubMenuList;
-export {};

package/types/components/Menus/subMenuTabs/getSubMenuList.d.ts

@@ -1,23 +0,0 @@
-import { SubMenuIds } from '../constants/subMenuIds';
-import { type SubMenuList } from '../types';
-import { getQualitySubMenuList } from './getQualitySubMenuList';
-import type { IAudioStream, PlaybackRate } from '@vkontakte/videoplayer-core';
-import { type VideoPlaybackRate, type VideoQualityUI, type VideoSubtitle } from '../../../types';
-import type { QualitySettingsAppliesTo } from 'packages/ui/src/utils/userSettings';
-type Params = {
-    currentSubMenuList: SubMenuIds | null;
-    availableAudioStreams: IAudioStream[];
-    currentAudioStream: IAudioStream | undefined;
-    selectAudioLanguage: (stream: IAudioStream) => void;
-    availablePlaybackRates: VideoPlaybackRate[];
-    selectPlaybackRate: (playbackRate: PlaybackRate) => void;
-    availableSubtitlesList: VideoSubtitle[];
-    selectSubtitle: (subtitle: VideoSubtitle) => void;
-    trafficSavingEnabled: boolean;
-    toggleTrafficSaving: (value: boolean, appliesTo: QualitySettingsAppliesTo) => void;
-    highQualityEnabled: boolean;
-    toggleHighQuality: (value: boolean, appliesTo: QualitySettingsAppliesTo) => void;
-    selectQuality: (quality: VideoQualityUI, appliesTo: QualitySettingsAppliesTo) => void;
-} & Omit<Parameters<typeof getQualitySubMenuList>[0], 'selectQuality'>;
-export declare const getSubMenuList: ({ currentSubMenuList, availableQualities, closeSettingsMenu, isMobile, menuRefs, availableAudioStreams, currentAudioStream, availablePlaybackRates, availableSubtitlesList, trafficSavingEnabled, highQualityEnabled, toggleHighQuality, toggleTrafficSaving, selectPlaybackRate, selectAudioLanguage, selectQuality, selectSubtitle, }: Params) => SubMenuList[];
-export {};

package/types/components/Menus/subMenuTabs/utils.d.ts

@@ -1,2 +0,0 @@
-import { type QualitySettingsAppliesTo } from '../../../utils/userSettings';
-export declare const getEnrichWithQualityAppliesTo: (appliesTo: QualitySettingsAppliesTo) => <T>(fn: (value: T, appliesTo: QualitySettingsAppliesTo) => void) => (value: T) => void;

package/types/components/Menus/utils/useSubMenuListsManager.d.ts

@@ -1,12 +0,0 @@
-import type { SettingsMenuItemIds } from '../constants';
-import type { SubMenuIds } from '../constants/subMenuIds';
-export declare const useSubMenuListsManager: () => {
-    parentMenuId: {
-        subscribe: (this: void, run: import("svelte/store").Subscriber<SettingsMenuItemIds | null | undefined>, invalidate?: import("svelte/store").Invalidator<SettingsMenuItemIds | null | undefined> | undefined) => import("svelte/store").Unsubscriber;
-    };
-    currentSubMenuList: import("svelte/store").Readable<SubMenuIds | null>;
-    pushNextSubList: (nextList: SubMenuIds) => void;
-    setParent: (parentId: SettingsMenuItemIds | null) => void;
-    popCurrentSubList: () => void;
-    popWholeSubMenu: () => void;
-};