@vkontakte/videoplayer 1.1.64-beta.0 → 1.1.64-dev.095ddfcb.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer",
-  "version": "1.1.64-beta.0",
+  "version": "1.1.64-dev.095ddfcb.0",
   "author": "vk.com",
   "description": "Videoplayer based on the vk.com platform",
   "homepage": "https://vk.com",
@@ -55,9 +55,9 @@
   ],
   "dependencies": {
     "@adtech/rbadman": "2.2.57",
-    "@vkontakte/videoplayer-core": "2.0.134-beta.0",
-    "@vkontakte/videoplayer-interactive": "1.0.39-beta.0",
-    "@vkontakte/videoplayer-shared": "1.0.62-beta.0",
-    "@vkontakte/videoplayer-statistics": "1.0.80-beta.0"
+    "@vkontakte/videoplayer-core": "2.0.134-dev.7c887c5b.0",
+    "@vkontakte/videoplayer-interactive": "1.0.39-dev.1b1e0ff2.0",
+    "@vkontakte/videoplayer-shared": "1.0.62-dev.effde8f2.0",
+    "@vkontakte/videoplayer-statistics": "1.0.80-dev.537a6b8f.0"
   }
 }

package/types/components/Ads/admanWrapper.d.ts

@@ -34,6 +34,7 @@ interface IConfig {
     useAdmanFromNPM: boolean;
     volumeMultiplier: number;
     isVsidOriginal: boolean;
+    usePuid: boolean;
 }
 export declare class AdmanWrapper {
     private adman;
@@ -51,6 +52,7 @@ export declare class AdmanWrapper {
     private runtimeTimeout;
     private useAdmanFromNPM;
     private isVsidOriginal;
+    private usePuid;
     private watchDogTimeout;
     events: {
         init$: Subject<void>;

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

@@ -20,7 +20,6 @@ export type Context = {
     onCopyDataClick: () => void;
     onSaveTraceDataClick: () => void;
     toggleShowDebugInfo: () => void;
-    debugPanelVisible: boolean;
 };
 /**
  * Мапа элементов меню, которые показываются на первом уровне.

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

@@ -79,6 +79,7 @@ type BaseSubMenuItem<U = any> = {
     label?: string;
     sublabel?: string;
     ariaLabel?: string;
+    dataTestid?: string;
 };
 export type SubMenuItemOpenSubMenu = {
     type: SubMenuItemType.OPEN_SUB_MENU;

package/types/config.d.ts

@@ -37,6 +37,7 @@ export interface IUIConfig {
         useAdmanFromNPM: boolean;
         volumeMultiplier: number;
         isVsidOriginal: boolean;
+        usePuid: boolean;
     };
     /**
      * Если нет ранее сохранённого значения громкости будет использовано это
@@ -184,6 +185,12 @@ export interface IUIConfig {
         buttonColor: string | null;
         buttonToggleOnColor: string | null;
         focusedColor: string | null;
+        font: string | null;
+        focusedOutlineWidth: string | null;
+        focusedOutlineRadius: string | null;
+        controlsDesktopPaddingHorizontal: string | null;
+        timelinePaddingHorizontal: string | null;
+        settingsBackgroundColor: string | null;
     };
 }
 export declare const defaultConfig: IUIConfig;

package/types/constans/subtitles.d.ts

@@ -0,0 +1 @@
+export declare const SUBTITLE_OFF_VALUE = "off";

package/types/store/index.d.ts

@@ -7,7 +7,7 @@ import type { InteractiveRange } from '@vkontakte/videoplayer-interactive';
 import type { Readable, Writable } from 'svelte/store';
 import { AdmanWrapper } from '../components/Ads/admanWrapper';
 import type { Key, LanguageConfig } from '../translation/types';
-import type { AdditionalButtonDeprecated, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerControlsRef, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, VideoPlaybackRate, VideoPlayerView, VideoQualityForRender, VideoQualityUI, VideoSubtitle, VideoSubtitleParsed } from '../types';
+import type { AdditionalButtonDeprecated, ControlsKeys, HotKeyMapData, IAnnotationsApi, IControlInfo, IDisabledControls, IInteractiveData, IPictureInPictureApi, IPlayerPhase, ITimelinePreviewThumbsData, IVideoEpisode, IVKVideoPlayerCallbacks, IVKVideoPlayerUICallbacks, Position, VideoPlaybackRate, VideoPlayerView, VideoQualityForRender, VideoQualityUI, VideoSubtitle, VideoSubtitleParsed } from '../types';
 import { AdsPlaybackState } from '../types';
 import { type QualitySettingsAppliesTo } from '../utils/userSettings';
 import type { DebugData } from './utils';
@@ -31,10 +31,6 @@ export interface IAdsState {
 export interface IUIState {
     t: (key: Key, params?: Record<string, string>) => string;
     controlsVisible: Writable<boolean>;
-    /**
-     * Точечно скрываем контролы.
-     */
-    hiddenControls: Partial<Record<keyof IPlayerControlsRef, Writable<boolean>>>;
     /**
      * Определяет, могут ли вообще контролы быть показаны.
      */

package/types/translation/types.d.ts

@@ -1,5 +1,5 @@
 import { InterfaceLanguage } from '@vkontakte/videoplayer-shared';
-export type Key = 'auto_quality_invariant' | 'auto_quality' | 'menu_quality' | 'menu_playback_rate' | 'menu_traffic_saving' | 'menu_report' | 'menu_pip' | 'menu_copy_video_link' | 'menu_copy_video_link_with_timestamp' | 'menu_video_rotate' | 'menu_video_loop_on' | 'menu_video_loop_off' | 'menu_chromecast' | 'menu_copy_debug' | 'menu_save_debug' | 'menu_debug_overlay' | 'menu_copy_embed_code' | 'pip_dummy_title' | 'submenu_traffic_saving' | 'submenu_quality' | 'submenu_playback_rate' | 'submenu_settings' | 'submenu_audio_languages' | 'auto_quality_option' | 'mobile_unmute' | 'playing_ads' | 'skip_ads_now' | 'skip_ads_after' | 'visit_advertiser' | 'aria_timeline' | 'aria_open_settings' | 'aria_timeline_value' | 'doubletap_seek_step' | 'playback_rate_1' | 'playback_rate' | 'video360' | 'subtitles_caption' | 'subtitles_auto' | 'subtitles_off' | 'subtitles_auto_caption' | 'subtitles_turn_on' | 'subtitles_turn_off' | 'traffic_saving_off' | 'traffic_saving_on' | 'traffic_saving_disable' | 'traffic_saving_enable' | 'traffic_saving_helper_text' | 'tooltip_previous' | 'tooltip_restart' | 'tooltip_play' | 'tooltip_pause' | 'tooltip_next' | 'tooltip_button_disabled' | 'tooltip_interactive_go_back' | 'tooltip_interactive_go_back_disabled' | 'tooltip_interactive_go_back_disabled_first' | 'tooltip_interactive_go_back_disabled_limit' | 'tooltip_chapter_without_interactive' | 'tooltip_interactive_of_chapter_completed' | 'tooltip_interactive_seek' | 'tooltip_interactive_graph_off' | 'tooltip_interactive_graph_on' | 'tooltip_live' | 'tooltip_episodes' | 'tooltip_volume' | 'tooltip_volume_muted' | 'tooltip_sound_unavailable' | 'tooltip_settings_on' | 'tooltip_subtitles_off' | 'tooltip_settings_off' | 'tooltip_subtitles_on' | 'tooltip_fullscreen_off' | 'tooltip_fullscreen_on' | 'tooltip_chromecast_off' | 'tooltip_chromecast_on' | 'tooltip_episode_finished' | 'tooltip_episode_unfinished' | 'tooltip_disabled_when_interactive' | 'tooltip_disabled_when_graph_on' | 'tooltip_interactive_interaction_time_indicator' | 'tooltip_vk_logo' | 'tooltip_vk_video_logo' | 'tooltip_autoplay_off' | 'tooltip_autoplay_on' | 'download_video_caption' | 'hotkey_helper_current_volume' | 'hotkey_map_modal_title' | 'hotkey_map_modal_close_btn_text' | 'hotkey_map_group_title_common' | 'hotkey_map_group_title_playback' | 'hotkey_map_group_title_subtitles' | 'hotkey_map_group_title_episodes' | 'hotkey_map_item_mute_description' | 'hotkey_map_item_mute_value' | 'hotkey_map_item_volume_down_description' | 'hotkey_map_item_volume_down_value' | 'hotkey_map_item_volume_up_description' | 'hotkey_map_item_volume_up_value' | 'hotkey_map_item_pip_description' | 'hotkey_map_item_pip_value' | 'hotkey_map_item_full_screen_description' | 'hotkey_map_item_full_screen_value' | 'hotkey_map_item_show_context_menu_description' | 'hotkey_map_item_show_context_menu_value' | 'hotkey_map_item_show_hotkey_map_description' | 'hotkey_map_item_show_hotkey_map_value' | 'hotkey_map_item_play_toggle_description' | 'hotkey_map_item_play_toggle_value' | 'hotkey_map_item_seek_backward_description' | 'hotkey_map_item_seek_backward_value' | 'hotkey_map_item_seek_forward_description' | 'hotkey_map_item_seek_forward_value' | 'hotkey_map_item_fast_seek_backward_description' | 'hotkey_map_item_fast_seek_backward_value' | 'hotkey_map_item_fast_seek_forward_description' | 'hotkey_map_item_fast_seek_forward_value' | 'hotkey_map_item_rate_down_description' | 'hotkey_map_item_rate_down_value' | 'hotkey_map_item_rate_up_description' | 'hotkey_map_item_rate_up_value' | 'hotkey_map_item_prev_frame_description' | 'hotkey_map_item_prev_frame_value' | 'hotkey_map_item_next_frame_description' | 'hotkey_map_item_next_frame_value' | 'hotkey_map_item_jump_seek_description' | 'hotkey_map_item_jump_seek_value' | 'hotkey_map_item_subtitles_toggle_description' | 'hotkey_map_item_subtitles_toggle_value' | 'hotkey_map_item_prev_episode_description' | 'hotkey_map_item_prev_episode_pc_value' | 'hotkey_map_item_prev_episode_mac_value' | 'hotkey_map_item_next_episode_description' | 'hotkey_map_item_next_episode_pc_value' | 'hotkey_map_item_next_episode_mac_value' | 'hotkey_map_item_next_video_description' | 'hotkey_map_item_next_video_value' | 'hotkey_map_item_prev_video_description' | 'hotkey_map_item_prev_video_value' | 'waiting_live_day_value' | 'waiting_live_hour_value' | 'waiting_live_minute_value' | 'waiting_live_second_value' | 'waiting_live_colon' | 'waiting_live_upcoming_title' | 'waiting_live_timer_title' | 'waiting_live_recover_title' | 'waiting_record_title' | 'aria_label_submenu_traffic_saving_off' | 'aria_label_submenu_traffic_saving_on' | 'aria_label_submenu_back' | 'aria_label_menu_quality' | 'aria_label_menu_rate' | 'aria_label_menu_subtitle' | 'aria_label_menu_download' | 'aria_label_new_tab_alert' | 'aria_label_menu_debug_overlay_enable' | 'aria_label_menu_debug_overlay_disable' | 'aria_label_menu_rotate' | 'aria_label_menu_loop' | 'aria_label_debug_panel' | 'aria_label_context_menu_open' | 'aria_label_context_menu_close' | 'aria_label_video_player' | 'aria_label_spherical_control' | 'aria_label_menu_audio_languages' | 'menu_audio_languages' | 'audio_stream_display_language_label' | 'audio_stream_display_language_label_index' | 'audio_stream_display_label_index' | 'audio_stream_display_language_index' | 'audio_stream_display_unknown' | 'end_screen_next_video' | 'end_screen_recommended_video' | 'other_quality' | 'high_quality' | 'high_quality_description' | 'auto_quality_limit' | 'traffic_saving_quality' | 'traffic_saving_quality_description' | 'quality_applience' | 'quality_applience_action' | 'default_quality_for_any_video' | 'slow_video_notification_button' | 'slow_video_notification_force_description' | 'slow_video_notification_suggest_description';
+export type Key = 'auto_quality_invariant' | 'auto_quality' | 'menu_quality' | 'menu_playback_rate' | 'menu_traffic_saving' | 'menu_report' | 'menu_pip' | 'menu_copy_video_link' | 'menu_copy_video_link_with_timestamp' | 'menu_video_rotate' | 'menu_video_loop_on' | 'menu_video_loop_off' | 'menu_chromecast' | 'menu_copy_debug' | 'menu_save_debug' | 'menu_debug_overlay' | 'menu_copy_embed_code' | 'pip_dummy_title' | 'submenu_traffic_saving' | 'submenu_quality' | 'submenu_playback_rate' | 'submenu_settings' | 'submenu_audio_languages' | 'auto_quality_option' | 'mobile_unmute' | 'playing_ads' | 'skip_ads_now' | 'skip_ads_after' | 'visit_advertiser' | 'aria_timeline' | 'aria_timeline_value' | 'doubletap_seek_step' | 'playback_rate_1' | 'playback_rate' | 'video360' | 'subtitles_caption' | 'subtitles_auto' | 'subtitles_off' | 'subtitles_auto_caption' | 'subtitles_turn_on' | 'subtitles_turn_off' | 'traffic_saving_off' | 'traffic_saving_on' | 'traffic_saving_helper_text' | 'tooltip_previous' | 'tooltip_restart' | 'tooltip_play' | 'tooltip_pause' | 'tooltip_next' | 'tooltip_button_disabled' | 'tooltip_interactive_go_back' | 'tooltip_interactive_go_back_disabled' | 'tooltip_interactive_go_back_disabled_first' | 'tooltip_interactive_go_back_disabled_limit' | 'tooltip_chapter_without_interactive' | 'tooltip_interactive_of_chapter_completed' | 'tooltip_interactive_seek' | 'tooltip_interactive_graph_off' | 'tooltip_interactive_graph_on' | 'tooltip_live' | 'tooltip_episodes' | 'tooltip_volume_on' | 'tooltip_volume_muted' | 'tooltip_sound_unavailable' | 'tooltip_settings_on' | 'tooltip_subtitles_off' | 'tooltip_settings_off' | 'tooltip_subtitles_on' | 'tooltip_fullscreen_off' | 'tooltip_fullscreen_on' | 'tooltip_chromecast_off' | 'tooltip_chromecast_on' | 'tooltip_episode_finished' | 'tooltip_episode_unfinished' | 'tooltip_disabled_when_interactive' | 'tooltip_disabled_when_graph_on' | 'tooltip_interactive_interaction_time_indicator' | 'tooltip_vk_logo' | 'tooltip_vk_video_logo' | 'tooltip_autoplay_off' | 'tooltip_autoplay_on' | 'tooltip_context_menu_open' | 'tooltip_context_menu_close' | 'download_video_caption' | 'hotkey_helper_current_volume' | 'hotkey_map_modal_title' | 'hotkey_map_modal_close_btn_text' | 'hotkey_map_group_title_common' | 'hotkey_map_group_title_playback' | 'hotkey_map_group_title_subtitles' | 'hotkey_map_group_title_episodes' | 'hotkey_map_item_mute_description' | 'hotkey_map_item_mute_value' | 'hotkey_map_item_volume_down_description' | 'hotkey_map_item_volume_down_value' | 'hotkey_map_item_volume_up_description' | 'hotkey_map_item_volume_up_value' | 'hotkey_map_item_pip_description' | 'hotkey_map_item_pip_value' | 'hotkey_map_item_full_screen_description' | 'hotkey_map_item_full_screen_value' | 'hotkey_map_item_show_context_menu_description' | 'hotkey_map_item_show_context_menu_value' | 'hotkey_map_item_show_hotkey_map_description' | 'hotkey_map_item_show_hotkey_map_value' | 'hotkey_map_item_play_toggle_description' | 'hotkey_map_item_play_toggle_value' | 'hotkey_map_item_seek_backward_description' | 'hotkey_map_item_seek_backward_value' | 'hotkey_map_item_seek_forward_description' | 'hotkey_map_item_seek_forward_value' | 'hotkey_map_item_fast_seek_backward_description' | 'hotkey_map_item_fast_seek_backward_value' | 'hotkey_map_item_fast_seek_forward_description' | 'hotkey_map_item_fast_seek_forward_value' | 'hotkey_map_item_rate_down_description' | 'hotkey_map_item_rate_down_value' | 'hotkey_map_item_rate_up_description' | 'hotkey_map_item_rate_up_value' | 'hotkey_map_item_prev_frame_description' | 'hotkey_map_item_prev_frame_value' | 'hotkey_map_item_next_frame_description' | 'hotkey_map_item_next_frame_value' | 'hotkey_map_item_jump_seek_description' | 'hotkey_map_item_jump_seek_value' | 'hotkey_map_item_subtitles_toggle_description' | 'hotkey_map_item_subtitles_toggle_value' | 'hotkey_map_item_prev_episode_description' | 'hotkey_map_item_prev_episode_pc_value' | 'hotkey_map_item_prev_episode_mac_value' | 'hotkey_map_item_next_episode_description' | 'hotkey_map_item_next_episode_pc_value' | 'hotkey_map_item_next_episode_mac_value' | 'hotkey_map_item_next_video_description' | 'hotkey_map_item_next_video_value' | 'hotkey_map_item_prev_video_description' | 'hotkey_map_item_prev_video_value' | 'waiting_live_day_value' | 'waiting_live_hour_value' | 'waiting_live_minute_value' | 'waiting_live_second_value' | 'waiting_live_colon' | 'waiting_live_upcoming_title' | 'waiting_live_timer_title' | 'waiting_live_recover_title' | 'waiting_record_title' | 'aria_label_submenu_traffic_saving' | 'aria_label_submenu_back' | 'aria_label_menu_quality' | 'aria_label_menu_rate' | 'aria_label_menu_subtitle' | 'aria_label_menu_download' | 'aria_label_new_tab_alert' | 'aria_label_menu_debug_overlay' | 'aria_label_menu_rotate' | 'aria_label_menu_loop' | 'aria_label_debug_panel' | 'aria_label_context_menu' | 'aria_label_video_player' | 'aria_label_spherical_control' | 'aria_label_menu_audio_languages' | 'aria_label_volume' | 'aria_label_settings' | 'menu_audio_languages' | 'audio_stream_display_language_label' | 'audio_stream_display_language_label_index' | 'audio_stream_display_label_index' | 'audio_stream_display_language_index' | 'audio_stream_display_unknown' | 'end_screen_next_video' | 'end_screen_recommended_video' | 'other_quality' | 'high_quality' | 'high_quality_description' | 'auto_quality_limit' | 'traffic_saving_quality' | 'traffic_saving_quality_description' | 'quality_applience' | 'quality_applience_action' | 'default_quality_for_any_video' | 'slow_video_notification_button' | 'slow_video_notification_force_description' | 'slow_video_notification_suggest_description';
 export type LanguagePack = Record<Key, string>;
 export type LanguageConfig = {
     language: string;

package/types/utils/changeVolume.d.ts

@@ -1,6 +1,9 @@
-export declare const isAvailableVolumeChange: ({ isAudioDisabled, audioDisabledHintCallback, isAudioAvailable, audioIsNotExistHintCallback, }: {
+type Params = {
     isAudioDisabled: boolean;
-    audioDisabledHintCallback?: () => void;
     isAudioAvailable: boolean;
+    isAds: boolean;
+    audioDisabledHintCallback?: () => void;
     audioIsNotExistHintCallback?: () => void;
-}) => boolean;
+};
+export declare const isAvailableVolumeChange: ({ isAudioDisabled, isAudioAvailable, isAds, audioDisabledHintCallback, audioIsNotExistHintCallback, }: Params) => boolean;
+export {};

package/types/utils/webAPI/slotsApi.d.ts

@@ -1,5 +1,3 @@
-import type { IStore } from '../../store';
-import type { IPlayerControlsRef } from '../../types';
 /**
  * Если смотреть по порядку расположения типов, то чем дальше тип, тем выше у него zIndex.
  *
@@ -8,37 +6,16 @@ import type { IPlayerControlsRef } from '../../types';
  */
 export type SlotOverlay = 'over_video' | 'over_controls';
 export declare const SLOT_NAME = "annotation";
-export type HideControlsWhenIntersectedOptions = {
-    observedSlotElementId: string;
-    controlsToObserve: (keyof IPlayerControlsRef)[];
-};
 type AddOptions = {
     id: string;
     overlay: SlotOverlay;
-    hideAllControls?: boolean;
-    controlsBehaviour?: HideControlsWhenIntersectedOptions;
 };
 export declare class SlotsApi {
     private shadowRootContainer;
     private slots;
-    private store;
-    constructor();
-    init(shadowRootContainer: HTMLElement, store: IStore | undefined): void;
-    add(element: HTMLElement, options: AddOptions): void;
+    init(shadowRootContainer: HTMLElement): void;
+    add(element: HTMLElement, { overlay, id }: AddOptions): void;
     private setupSlotStyles;
-    /**
-     * Запускаем отслеживание пересечения между переданным элементом внутри слота и контролами.
-     */
-    private runHidingControlsWhenIntersected;
-    /**
-     * Ищем внутри рутового элемента слота элемент, с которым хотим отслеживать пересечение контролов.
-     * Приходится делать через mutationObserver, так как данный элемент в силу асинхронной работы внешнего
-     * фреймворка может появиться позже.
-     * @param slotRootElement Рутовый элемент слота.
-     * @param slotElementId Идентификатор элемента внутри слота, с которым хотим отслеживать пересечение контролов.
-     * @param slotId Идентификатор слота.
-     */
-    private findSlotElement;
     remove(id: string): void;
     destroy(): void;
     haveSlots(): boolean;