@vkontakte/videoplayer-interactive 1.0.36-dev.c84721ac.0 → 1.0.36-dev.ca6258d6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vkontakte/videoplayer-interactive",
-  "version": "1.0.36-dev.c84721ac.0",
+  "version": "1.0.36-dev.ca6258d6.0",
   "author": "vk.com",
   "description": "Movika interactive SDK",
   "homepage": "https://vk.com",
@@ -56,8 +56,8 @@
   "dependencies": {
     "@interactiveplatform/movika-graph-editor": "2.1.7",
     "@interactiveplatform/movika-manifest": "1.0.1",
-    "@vkontakte/videoplayer-core": "2.0.131-dev.662c3dd6.0",
-    "@vkontakte/videoplayer-shared": "1.0.59-dev.b6ac7f5c.0",
-    "@vkontakte/videoplayer-statistics": "1.0.77-dev.d9b2286d.0"
+    "@vkontakte/videoplayer-core": "2.0.131-dev.1b9d4a49.0",
+    "@vkontakte/videoplayer-shared": "1.0.59-dev.4d0599d9.0",
+    "@vkontakte/videoplayer-statistics": "1.0.77-dev.91b6acbc.0"
   }
 }

package/types/modules/Interactives/Interactives.d.ts

@@ -95,12 +95,16 @@ export declare class Interactives {
      *
      * Контрол считается удалённым, если его флаг `isRemoved` установлен в `true`.
      * Однако, есть исключение для `openURI` — если с ним было взаимодействие, он
-     * получит `isRemoved = true`, но может оставаться в DOM до завершения эпизода (`endTime`).
+     * получит `isRemoved = true`, но может оставаться в DOM до завершения эпизода
+     * (`endTime`).
      *
-     * Из-за этого метод может вернуть `true` (что все контроллы "удалены"),
-     * хотя `openURI` всё ещё присутствует в DOM.
+     * Из-за этого метод может вернуть `true` (что все контроллы "удалены"), хотя
+     * `openURI` всё ещё присутствует в DOM.
+     *
+     * includeWillRemovedState - нужно ли считать состояние 'willRemoved' как
+     * 'removed'
      */
-    allControlsAreRemoved(): boolean;
+    allControlsAreRemoved(includeWillRemovedState?: boolean): boolean;
     isEndedExpectation(): boolean;
     playPrevChapter(): void;
     setDisabledControls(value: boolean): void;

package/types/modules/Interactives/containers/ChoiceContainer.d.ts

@@ -1,25 +1,28 @@
-import { Subject } from '@vkontakte/videoplayer-shared';
 import { Container } from './Container';
 import { ChapterContainer } from '../../../manifest';
 import type { ChoiceContainerOptions, ContainerCreateViewParams } from './types';
-import { CustomError } from '../../../utils/Error';
 import { Nullable } from '@vkontakte/videoplayer-shared';
 export declare const createChoiceContainer: (container: ChapterContainer, rootElement: HTMLElement, options?: ChoiceContainerOptions) => ChoiceContainer | undefined;
 export declare class ChoiceContainer extends Container {
     private rootElement;
     private containerElement;
     private layout;
-    private controlSubscriptions;
+    private subscriptions;
     isRemoved: boolean;
     isDisabled: boolean;
-    error$: Subject<CustomError>;
+    willRemoved: boolean;
     constructor(container: ChapterContainer, rootElement: HTMLElement, options?: ChoiceContainerOptions);
-    createView({ eventCallback }: ContainerCreateViewParams): HTMLElement;
+    createView({ eventCallback, videoDurationMs }: ContainerCreateViewParams): HTMLElement;
+    updateControlsFillAnimationDimensions(): void;
     hide(): void;
     show(): void;
     enable(): void;
     disable(): void;
-    removeView(): void;
+    removeView(withTransition?: boolean, useDelay?: boolean): void;
+    private onTransitionEnd;
+    removeAllControls(withTransition?: boolean): void;
+    removeNonInteractedControls(withTransition?: boolean): void;
+    isInteracted(): boolean;
     fakeRemove(): void;
     getElement(): Nullable<HTMLElement>;
     onProgress(currentTimeMs: number, isInteractiveTime: boolean): void;

package/types/modules/Interactives/containers/Container.d.ts

@@ -1,3 +1,5 @@
+import { Subject } from '@vkontakte/videoplayer-shared';
+import { CustomError } from '../../../utils/Error';
 import type { ChapterContainer } from '../../../manifest';
 import { type Control, type ControlCreator, type Options } from '../../../modules/Interactives/controls';
 import { type ChoiceContainerOptions } from './types';
@@ -6,8 +8,10 @@ export declare class Container {
     options?: Options;
     private factories;
     controls: Control[];
+    error$: Subject<CustomError>;
     constructor(container: ChapterContainer, options?: Options);
     featureIsEnabled(name: keyof ChoiceContainerOptions['features']): boolean | undefined;
+    onError(message: string | undefined, error: unknown): void;
     addControlFactory(type: string, factory: ControlCreator<any>): void;
     removeControlFactory(type: string): void;
     private setControls;

package/types/modules/Interactives/containers/types.d.ts

@@ -1,9 +1,11 @@
 import { Options, ControlEventCallback } from '../controls';
 import { AnimationsFeatureToggles } from '../types';
 export type ChoiceContainerOptions = {
-    features: Pick<AnimationsFeatureToggles, 'controlsExpectTimeBlinkAnimation'>;
+    isTouch: boolean;
+    features: Pick<AnimationsFeatureToggles, 'controlsExpectTimeBlinkAnimation' | 'controlsTapPlace' | 'controlsFillAnimation'>;
 };
 export declare function isChoiceContainerOptions(options: Options): options is ChoiceContainerOptions;
 export type ContainerCreateViewParams = {
     eventCallback: ControlEventCallback;
+    videoDurationMs: number;
 };

package/types/modules/Interactives/controls/AreaControl.d.ts

@@ -4,7 +4,7 @@ export declare const createAreaControl: ControlCreator<ControlOptions, AreaContr
 declare class AreaControl extends Control {
     constructor(control: TControl, options?: ControlOptions);
     createView({ parentElement, callbacks }: ControlCreateViewParams): void;
-    registerEvents(): void;
+    registerBlinkAnimationEvents(): void;
     disable(): void;
     enable(): void;
     getElement(): import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
@@ -12,7 +12,8 @@ declare class AreaControl extends Control {
     toggleBlinkAnimation(enable?: boolean): void;
     syncBlinkAnimation(refAnim: HTMLElement): void;
     onBlinkHovering(): void;
-    onError(message: string | undefined, error: unknown): void;
+    setShowTimeRange(): void;
+    updateFillAnimationDimensions(): void;
     onProgress(): void;
     onResize(): void;
 }

package/types/modules/Interactives/controls/ButtonControl.d.ts

@@ -1,18 +1,23 @@
 import { Control } from './Control';
 import { type ControlCreator, type ControlCreateViewParams, type TControl, type ControlOptions } from './types';
+import { ControlFillAnimation } from '../utils/ControlFillAnimation';
 export declare const createButtonControl: ControlCreator<ControlOptions, ButtonControl>;
 declare class ButtonControl extends Control {
+    startTime?: number;
+    endTime?: number;
+    controlFillAnimation?: ControlFillAnimation;
     constructor(control: TControl, options?: ControlOptions);
     createView({ parentElement, callbacks }: ControlCreateViewParams): void;
-    registerEvents(): void;
+    registerBlinkAnimationEvents(): void;
     disable(): void;
     enable(): void;
     getElement(): import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
     toggleBlinkAnimation(enable?: boolean): void;
     syncBlinkAnimation(refAnim: HTMLElement): void;
     onBlinkHovering(): void;
-    onError(message: string | undefined, error: unknown): void;
-    onProgress(): void;
+    updateFillAnimationDimensions(): void;
+    setShowTimeRange(startTime: number, endTime: number): void;
+    onProgress(currentTime: number): void;
     onResize(): void;
     updateShadowStyles(): void;
 }

package/types/modules/Interactives/controls/Control.d.ts

@@ -1,10 +1,11 @@
-import { Subject, Subscription } from '@vkontakte/videoplayer-shared';
-import type { ControlEventCallback, ControlCreateViewParams, Dimensions, Callbacks, Options, TControl, ControlOptions } from './types';
+import { Subject, Subscription, Nullable } from '@vkontakte/videoplayer-shared';
 import { CustomError } from '../../../utils/Error';
-import { Nullable } from '@vkontakte/videoplayer-shared';
+import { ControlTap } from '../utils/ControlTap';
+import type { ControlEventCallback, ControlCreateViewParams, Dimensions, Callbacks, Options, TControl, ControlOptions } from './types';
 type ControlContainer = {
     element: HTMLElement;
     dimensions: Dimensions;
+    isManifestContainerDisabled: () => boolean;
 };
 type ClickListener = (event: MouseEvent) => void;
 export declare abstract class Control {
@@ -14,6 +15,9 @@ export declare abstract class Control {
     controlElement: Nullable<HTMLElement>;
     subscriptions: Subscription;
     error$: Subject<CustomError>;
+    controlTap?: ControlTap;
+    isInteracted: boolean;
+    isRemoved: boolean;
     constructor(control: TControl, options?: Options | undefined);
     abstract createView(params: ControlCreateViewParams): void;
     abstract getElement(): Nullable<HTMLElement>;
@@ -21,12 +25,19 @@ export declare abstract class Control {
     abstract enable(): void;
     abstract onProgress(currentTimeMs: number): void;
     abstract onResize(): void;
-    abstract onError(message: string, error?: string | Error | CustomError): void;
+    abstract setShowTimeRange(startTime: number, endTime: number): void;
+    abstract updateFillAnimationDimensions(): void;
     abstract updateShadowStyles(isDark?: boolean): void;
     abstract toggleBlinkAnimation(enable?: boolean): void;
+    onControlSelect: () => void;
+    removeView(withTransition?: boolean): void;
+    onTransitionEnd: (event: TransitionEvent) => void;
+    onError(message: string | undefined, error: unknown): void;
+    addControlTap(controlElement: HTMLElement): void;
     createContainerElement(callbacks: Callbacks): void;
     createClickListener(callback: AnyFn): ClickListener;
     featureIsEnabled(name: keyof ControlOptions['features']): boolean | undefined;
+    isTouch(): boolean | undefined;
     setEvents(callback: ControlEventCallback): void;
     removeListeners(): void;
 }

package/types/modules/Interactives/controls/TextControl.d.ts

@@ -11,6 +11,7 @@ declare class TextControl extends Control {
     onResize(): void;
     updateShadowStyles(): void;
     toggleBlinkAnimation(): void;
-    onError(): void;
+    setShowTimeRange(): void;
+    updateFillAnimationDimensions(): void;
 }
 export {};

package/types/modules/Interactives/controls/types.d.ts

@@ -14,6 +14,7 @@ export type Dimensions<T = string> = {
 };
 export type Callbacks = {
     setControlLayout: (element: HTMLElement, controlLayoutParams: ControlLayoutParams) => void;
+    isContainerDisabled: () => boolean;
 };
 export type ControlCreateViewParams = {
     parentElement: HTMLElement;
@@ -21,7 +22,8 @@ export type ControlCreateViewParams = {
 };
 export type Options = Record<string, unknown>;
 export type ControlOptions = {
-    features: Pick<AnimationsFeatureToggles, 'controlsExpectTimeBlinkAnimation'>;
+    isTouch: boolean;
+    features: Pick<AnimationsFeatureToggles, 'controlsExpectTimeBlinkAnimation' | 'controlsTapPlace' | 'controlsFillAnimation'>;
 };
 export declare function isControlOptions(options: Options): options is ControlOptions;
 type ControlEventCallbackParams = {

package/types/modules/Interactives/controls/utils.d.ts

@@ -11,3 +11,4 @@ export declare const controlsClassNames: {
     blinkAnimButton: string;
     blinkAnimArea: string;
 };
+export declare const TOUCH_DEVICES_CIRCLE_SIZE_PX = 40;

package/types/modules/Interactives/index.d.ts

@@ -9,7 +9,7 @@ export declare const utils: {
     createChoiceContainer: (container: import("@interactiveplatform/movika-manifest").ChapterContainer, rootElement: HTMLElement, options?: import("./containers/types").ChoiceContainerOptions) => import("./containers/ChoiceContainer").ChoiceContainer | undefined;
     createAreaControl: import("./controls").ControlCreator<import("./controls").ControlOptions, {
         createView({ parentElement, callbacks }: import("./controls").ControlCreateViewParams): void;
-        registerEvents(): void;
+        registerBlinkAnimationEvents(): void;
         disable(): void;
         enable(): void;
         getElement(): import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
@@ -17,49 +17,74 @@ export declare const utils: {
         toggleBlinkAnimation(enable?: boolean): void;
         syncBlinkAnimation(refAnim: HTMLElement): void;
         onBlinkHovering(): void;
-        onError(message: string | undefined, error: unknown): void;
+        setShowTimeRange(): void;
+        updateFillAnimationDimensions(): void;
         onProgress(): void;
         onResize(): void;
         container: import("@vkontakte/videoplayer-shared").Nullable<{
             element: HTMLElement;
             dimensions: import("./controls").Dimensions;
+            isManifestContainerDisabled: () => boolean;
         }>;
         controlElement: import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
         subscriptions: import("@vkontakte/videoplayer-shared").Subscription;
         error$: import("@vkontakte/videoplayer-shared").Subject<import("../..").CustomError>;
+        controlTap?: import("./utils/ControlTap").ControlTap;
+        isInteracted: boolean;
+        isRemoved: boolean;
         control: import("@interactiveplatform/movika-manifest/dist/chapter-DI_7rDZW").e;
         options?: import("./controls").Options | undefined;
+        onControlSelect: () => void;
+        removeView(withTransition?: boolean): void;
+        onTransitionEnd: (event: TransitionEvent) => void;
+        onError(message: string | undefined, error: unknown): void;
+        addControlTap(controlElement: HTMLElement): void;
         createContainerElement(callbacks: import("./controls").Callbacks): void;
         createClickListener(callback: AnyFn): (event: MouseEvent) => void;
         featureIsEnabled(name: keyof import("./controls").ControlOptions["features"]): boolean | undefined;
+        isTouch(): boolean | undefined;
         setEvents(callback: import("./controls").ControlEventCallback): void;
         removeListeners(): void;
     }>;
     createButtonControl: import("./controls").ControlCreator<import("./controls").ControlOptions, {
+        startTime?: number;
+        endTime?: number;
+        controlFillAnimation?: import("./utils/ControlFillAnimation").ControlFillAnimation;
         createView({ parentElement, callbacks }: import("./controls").ControlCreateViewParams): void;
-        registerEvents(): void;
+        registerBlinkAnimationEvents(): void;
         disable(): void;
         enable(): void;
         getElement(): import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
         toggleBlinkAnimation(enable?: boolean): void;
         syncBlinkAnimation(refAnim: HTMLElement): void;
         onBlinkHovering(): void;
-        onError(message: string | undefined, error: unknown): void;
-        onProgress(): void;
+        updateFillAnimationDimensions(): void;
+        setShowTimeRange(startTime: number, endTime: number): void;
+        onProgress(currentTime: number): void;
         onResize(): void;
         updateShadowStyles(): void;
         container: import("@vkontakte/videoplayer-shared").Nullable<{
             element: HTMLElement;
             dimensions: import("./controls").Dimensions;
+            isManifestContainerDisabled: () => boolean;
         }>;
         controlElement: import("@vkontakte/videoplayer-shared").Nullable<HTMLElement>;
         subscriptions: import("@vkontakte/videoplayer-shared").Subscription;
         error$: import("@vkontakte/videoplayer-shared").Subject<import("../..").CustomError>;
+        controlTap?: import("./utils/ControlTap").ControlTap;
+        isInteracted: boolean;
+        isRemoved: boolean;
         control: import("@interactiveplatform/movika-manifest/dist/chapter-DI_7rDZW").e;
         options?: import("./controls").Options | undefined;
+        onControlSelect: () => void;
+        removeView(withTransition?: boolean): void;
+        onTransitionEnd: (event: TransitionEvent) => void;
+        onError(message: string | undefined, error: unknown): void;
+        addControlTap(controlElement: HTMLElement): void;
         createContainerElement(callbacks: import("./controls").Callbacks): void;
         createClickListener(callback: AnyFn): (event: MouseEvent) => void;
         featureIsEnabled(name: keyof import("./controls").ControlOptions["features"]): boolean | undefined;
+        isTouch(): boolean | undefined;
         setEvents(callback: import("./controls").ControlEventCallback): void;
         removeListeners(): void;
     }>;

package/types/modules/Interactives/types.d.ts

@@ -18,6 +18,9 @@ export type IOptionalInteractiveOptions = Partial<Omit<IInteractiveOptions, Requ
 export type AnimationsFeatureToggles = Partial<{
     areaControlShadow: boolean;
     controlsExpectTimeBlinkAnimation: boolean;
+    controlsTapPlace: boolean;
+    controlsFillAnimation: boolean;
+    controlsHideAnimation: boolean;
 }>;
 export interface IInteractiveOptions {
     parentElement: HTMLElement;
@@ -44,6 +47,7 @@ export interface IInteractiveOptions {
      * @deprecated
      * */
     disableControlsOnPause?: boolean;
+    isTouch?: boolean;
     animationsFeatureToggles?: AnimationsFeatureToggles;
 }
 export type ChapterChangedData = {

package/types/modules/Interactives/utils/ControlFillAnimation/ControlFillAnimation.d.ts

@@ -0,0 +1,34 @@
+export type Options = {
+    startTime: number;
+    endTime: number;
+    rotateAngle: number;
+    borderRadius: string;
+    debug?: boolean;
+};
+export declare class ControlFillAnimation {
+    fillAnimationElement: HTMLDivElement;
+    private fillAnimationFillerElement;
+    private fillAnimationFillerWrapperElement;
+    private startTime;
+    private endTime;
+    private shouldFillHeight;
+    private widthExpansionCoef;
+    private isDebug;
+    private fromLeft;
+    private useSkew;
+    private rotateAngle;
+    constructor(opts: Options);
+    updateDimension(opts: {
+        width: number;
+        height: number;
+        borderWidth: number;
+    }): void;
+    updateAnimation(currentTime: number): void;
+    /**
+     * Когда мы применяем scew для контрол, расстояние между крайними left & right
+     * точками становится больше. Это значит, что нужно увеличивать
+     * элемент-заполнитель, чтобы он заполнял контрол полностью. Этот метод
+     * возвращает коэффцицент увеличения для элемента-заполнителя.
+     */
+    private calcWidthExpansionCoef;
+}

package/types/modules/Interactives/utils/ControlFillAnimation/index.d.ts

@@ -0,0 +1 @@
+export * from './ControlFillAnimation';

package/types/modules/Interactives/utils/ControlFillAnimation/utils.d.ts

@@ -0,0 +1,12 @@
+export declare const CONTROL_FILL_ANIMATION_CLASSNAME_PREFIX = "interactive-control-fill-animation";
+export declare const controlFillAnimationClassNames: {
+    common: string;
+    fillerWrapper: string;
+    filler: string;
+    fillHeight: string;
+    fillWidth: string;
+    fromTop: string;
+    fromBottom: string;
+    fromLeft: string;
+    fromRight: string;
+};

package/types/modules/Interactives/utils/ControlTap/ControlTap.d.ts

@@ -0,0 +1,17 @@
+type Options = {
+    controlRotateAngleRad: number;
+    circleDiameterPx?: number;
+    useDimensionsBasedSize?: boolean;
+    clickCancelCondition: () => boolean;
+};
+export declare class ControlTap {
+    element: HTMLDivElement;
+    controlRotateAngleRad: number;
+    clickCancelCondition: () => boolean;
+    circleDiameterPx: number;
+    useDimensionsBasedSize: boolean;
+    constructor({ controlRotateAngleRad, clickCancelCondition, circleDiameterPx, useDimensionsBasedSize, }: Options);
+    onElementClick: (e: MouseEvent) => void;
+    onAnimationEnd: (e: TransitionEvent) => void;
+}
+export {};

package/types/modules/Interactives/utils/ControlTap/index.d.ts

@@ -0,0 +1 @@
+export * from './ControlTap';

package/types/modules/Interactives/utils/ControlTap/utils.d.ts

@@ -0,0 +1,6 @@
+export declare const CONTROL_TAP_CLASSNAME_PREFIX = "interactive-control-tap";
+export declare const controlTapClassNames: {
+    common: string;
+    animation: string;
+    visible: string;
+};

package/types/modules/Interactives/utils/GameController.d.ts

@@ -5,10 +5,11 @@ import type { ChapterBranch } from '../../../manifest';
 import type { EventEmitter } from '../../../utils/EventEmitter';
 import { CustomError } from '../../../utils/Error';
 import type { SelectBranchesType } from './SelectBranches';
-import type { IgnoreExpectState } from '../../../modules/Interactives/types';
+import type { IgnoreExpectState, AnimationsFeatureToggles } from '../../../modules/Interactives/types';
 import type { ChoiceContainer } from '../../../modules/Interactives/containers';
 import { type GlobalEvents } from './events';
 import { GameStates } from './gameUtils';
+type Features = Pick<AnimationsFeatureToggles, 'controlsHideAnimation'>;
 type ConstructorArg = {
     player: IPlayer;
     container: ChoiceContainer;
@@ -23,6 +24,7 @@ type ConstructorArg = {
     disabledControls$: IValueSubject<boolean>;
     onRemove: () => void;
     onError: (error: CustomError) => void;
+    features: Features;
 };
 export declare class GameController {
     container: ChoiceContainer;
@@ -42,7 +44,8 @@ export declare class GameController {
     isSelectedContainerEvent: boolean;
     globalEvents: GlobalEvents;
     onError: ConstructorArg['onError'];
-    constructor({ player, container, branches, selectBranches, interactiveEvents, globalEvents, globalEventEmitter, getContainerEventState, permanentTextControls, interactiveTimeOpenUri, disabledControls$, onRemove, onError, }: ConstructorArg);
+    features: Features;
+    constructor({ player, container, branches, selectBranches, interactiveEvents, globalEvents, globalEventEmitter, getContainerEventState, permanentTextControls, interactiveTimeOpenUri, disabledControls$, onRemove, onError, features, }: ConstructorArg);
     private emitContainerVisibilityEvent;
     registerEvents(): void;
     hide: () => void;
@@ -55,10 +58,12 @@ export declare class GameController {
     whilePlaying: () => void;
     onResize(isInteractiveTime: boolean): void;
     reset(): void;
-    removeView(): void;
+    removeView(withTransition?: boolean | undefined): void;
     fakeRemoveView(remove?: boolean): void;
     updateControlsShadowStyles(isDark?: boolean): void;
     toggleBlinkAnimation(value: boolean): void;
-    destroy(): void;
+    isInteracted(): boolean;
+    isRemovedOrDestroyed(includeWillRemovedState?: boolean): boolean;
+    destroy(withTransition?: boolean): void;
 }
 export {};

package/types/modules/Interactives/utils/angleUtils.d.ts

@@ -0,0 +1,2 @@
+export declare function normalizeRadians(rad: number): number;
+export declare function radiansToDegrees(rad: number): number;

package/types/modules/Interactives/utils/emitOnError.d.ts

@@ -0,0 +1,13 @@
+import { ErrorCategoryEnum, ErrorSeverityEnum } from '../../../types';
+import { CustomError } from '../../../utils/Error';
+import { Subject } from '@vkontakte/videoplayer-shared';
+type EmitOnErrorArg = {
+    emitter$: Subject<CustomError>;
+    error?: unknown;
+    subjectId?: string;
+    message?: string;
+    severity?: ErrorSeverityEnum;
+    category?: ErrorCategoryEnum;
+};
+export declare function emitOnError({ emitter$, error, subjectId, message, severity, category, }: EmitOnErrorArg): void;
+export {};

package/types/modules/Interactives/utils/gameUtils.d.ts

@@ -36,5 +36,6 @@ type ExecForAllExpectContainersParamsType = {
     execFn: (gameController: GameController) => void;
 };
 export declare function execForAllExpectContainers({ gameControllers, subjectName, subjectId, execFn, }: ExecForAllExpectContainersParamsType): void;
+export declare function isControlHasOpenURIEvent(control: Control): boolean;
 export declare const evaluateContainerEventStatus: (container: ChapterContainer, gameControllers: GameController[]) => IgnoreExpectState;
 export {};