@gravity-ui/page-constructor 5.25.0 → 5.26.0

package/build/esm/components/ReactPlayer/ReactPlayer.js

@@ -21,7 +21,7 @@ const FPS = 60;
 // eslint-disable-next-line react/display-name
 export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
     const isMobile = useContext(MobileContext);
-    const { src, previewImgUrl, loop = false, controls = MediaVideoControlsType.Default, customControlsOptions = {}, muted: initiallyMuted = false, elapsedTime, playButton, className, customBarControlsClassName, showPreview, onClickPreview, analyticsEvents, height, ariaLabel, ratio, } = props;
+    const { src, previewImgUrl, loop = false, controls = MediaVideoControlsType.Default, customControlsOptions = {}, muted: initiallyMuted = false, elapsedTime, playButton, className, customBarControlsClassName, showPreview, onClickPreview, analyticsEvents, height, ariaLabel, ratio, autoRatio, contain, } = props;
     const { type = PlayButtonType.Default, theme = PlayButtonThemes.Blue, text, className: buttonClassName, } = playButton || {};
     const { type: customControlsType = CustomControlsType.WithMuteButton, muteButtonShown, positioning = CustomControlsButtonPositioning.Center, } = customControlsOptions;
     const autoPlay = Boolean(!isMobile && !previewImgUrl && props.autoplay);
@@ -33,6 +33,7 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
     const [playedPercent, setPlayedPercent] = useState(0);
     const [currentHeight, setCurrentHeight] = useState(height);
     const [width, setWidth] = useState(0);
+    const [actualRatio, setActualRatio] = useState();
     const [muted, setMuted] = useState(mute);
     const [started, setStarted] = useState(autoPlay);
     const [ended, setEnded] = useState(false);
@@ -103,7 +104,7 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
                     parseFloat(paddingLeft) -
                     parseFloat(paddingRight);
                 setWidth(newWidth);
-                setCurrentHeight(Math.floor(getHeight(newWidth, ratio)));
+                setCurrentHeight(Math.floor(getHeight(newWidth, ratio !== null && ratio !== void 0 ? ratio : (autoRatio ? actualRatio : undefined))));
             }
         }, 200);
         updateSize();
@@ -111,7 +112,7 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
         return () => {
             window.removeEventListener('resize', updateSize);
         };
-    }, [ratio]);
+    }, [actualRatio, autoRatio, ratio]);
     const playEvents = useMemo(() => eventsArray === null || eventsArray === void 0 ? void 0 : eventsArray.filter((e) => e.type === PredefinedEventTypes.Play), [eventsArray]);
     const stopEvents = useMemo(() => eventsArray === null || eventsArray === void 0 ? void 0 : eventsArray.filter((e) => e.type === PredefinedEventTypes.Stop), [eventsArray]);
     const playIcon = useMemo(() => {
@@ -181,6 +182,15 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
             setEnded(false);
         }
     }, [changeMute, controls, customControlsType, ended, isPlaying, muted]);
+    const onReady = useCallback((player) => {
+        setPlayerRef(player);
+        const videoElement = player.getInternalPlayer();
+        const videoWidth = videoElement.videoWidth;
+        const videoHeight = videoElement.videoHeight;
+        if (videoWidth && videoHeight) {
+            setActualRatio(videoHeight / videoWidth);
+        }
+    }, []);
     const onProgress = useCallback((progress) => {
         setPlayedPercent(progress.played);
         if (progress.played === 1) {
@@ -221,8 +231,9 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
     return (React.createElement("div", { className: b({
             wrapper: !currentHeight,
             controls,
+            contain,
         }, className), ref: ref, onClick: handleClick, onMouseEnter: onFocusIn, onMouseLeave: onFocusOut, onFocus: onFocusIn, onBlur: onFocusOut }, isMounted ? (React.createElement(Fragment, null,
-        React.createElement(ReactPlayer, { className: b('player'), url: videoSrc, muted: muted, controls: controls === MediaVideoControlsType.Default, height: currentHeight || '100%', width: width || '100%', light: previewImgUrl, playing: isPlaying, playIcon: playIcon, progressInterval: FPS, onClickPreview: handleClickPreview, onStart: onStart, onReady: setPlayerRef, onPlay: onPlay, onPause: autoPlay && customControlsType !== CustomControlsType.WithMuteButton
+        React.createElement(ReactPlayer, { className: b('player'), url: videoSrc, muted: muted, controls: controls === MediaVideoControlsType.Default, height: currentHeight || '100%', width: width || '100%', light: previewImgUrl, playing: isPlaying, playIcon: playIcon, progressInterval: FPS, onClickPreview: handleClickPreview, onStart: onStart, onReady: onReady, onPlay: onPlay, onPause: autoPlay && customControlsType !== CustomControlsType.WithMuteButton
                 ? undefined
                 : onPause, onProgress: onProgress, onEnded: onEnded, "aria-label": ariaLabel, previewTabIndex: -1, config: {
                 file: {

package/build/esm/models/constructor-items/common.d.ts

@@ -127,6 +127,7 @@ export interface MediaVideoProps extends AnalyticsEventsBase {
     controls?: MediaVideoControlsType;
     customControlsOptions?: CustomControlsOptions;
     ariaLabel?: string;
+    contain?: boolean;
 }
 export interface LinkProps extends AnalyticsEventsBase, Stylable, Tabbable {
     url: string;
@@ -179,7 +180,7 @@ export type ThemedMediaVideoProps = ThemeSupporting<MediaVideoProps>;
 export interface MediaComponentVideoProps extends AnalyticsEventsBase {
     video: MediaVideoProps;
     height?: number;
-    ratio?: number;
+    ratio?: number | 'auto';
     previewImg?: string;
 }
 export interface MediaComponentVideoIframeProps {

package/build/esm/schema/constants.d.ts

@@ -1549,6 +1549,9 @@ export declare const cardSchemas: {
                     ariaLabel: {
                         type: string;
                     };
+                    contain: {
+                        type: string;
+                    };
                 };
             };
             youtube: {
@@ -1590,7 +1593,8 @@ export declare const cardSchemas: {
                 type: string;
             };
             ratio: {
-                type: string;
+                type: string[];
+                pattern: string;
             };
             iframe: {
                 type: string;

package/build/esm/schema/validators/common.d.ts

@@ -203,6 +203,9 @@ export declare const VideoProps: {
         ariaLabel: {
             type: string;
         };
+        contain: {
+            type: string;
+        };
     };
 };
 export declare const ThemeProps: {
@@ -365,6 +368,9 @@ export declare const BackgroundProps: {
                 ariaLabel: {
                     type: string;
                 };
+                contain: {
+                    type: string;
+                };
             };
         };
         height: {
@@ -1129,6 +1135,9 @@ export declare const MediaProps: {
             ariaLabel: {
                 type: string;
             };
+            contain: {
+                type: string;
+            };
         };
     };
     youtube: {
@@ -1248,7 +1257,8 @@ export declare const MediaProps: {
         })[];
     };
     ratio: {
-        type: string;
+        type: string[];
+        pattern: string;
     };
     iframe: {
         type: string;

package/build/esm/schema/validators/common.js

@@ -160,6 +160,9 @@ export const VideoProps = {
         ariaLabel: {
             type: 'string',
         },
+        contain: {
+            type: 'boolean',
+        },
     },
 };
 export const ThemeProps = {
@@ -542,7 +545,8 @@ export const MediaProps = {
         anyOf: [AnalyticsEventSchema, { type: 'array', items: AnalyticsEventSchema }],
     },
     ratio: {
-        type: 'number',
+        type: ['number', 'string'],
+        pattern: '^auto$',
     },
     iframe: Object.assign({}, IframeProps),
     margins: {

package/build/esm/sub-blocks/LayoutItem/schema.d.ts

@@ -157,6 +157,9 @@ export declare const LayoutItem: {
                     ariaLabel: {
                         type: string;
                     };
+                    contain: {
+                        type: string;
+                    };
                 };
             };
             youtube: {
@@ -276,7 +279,8 @@ export declare const LayoutItem: {
                 })[];
             };
             ratio: {
-                type: string;
+                type: string[];
+                pattern: string;
             };
             iframe: {
                 type: string;

package/build/esm/sub-blocks/MediaCard/schema.d.ts

@@ -240,6 +240,9 @@ export declare const MediaCardBlock: {
                     ariaLabel: {
                         type: string;
                     };
+                    contain: {
+                        type: string;
+                    };
                 };
             };
             youtube: {
@@ -281,7 +284,8 @@ export declare const MediaCardBlock: {
                 type: string;
             };
             ratio: {
-                type: string;
+                type: string[];
+                pattern: string;
             };
             iframe: {
                 type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "5.25.0",
+  "version": "5.26.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

package/server/models/constructor-items/common.d.ts

@@ -127,6 +127,7 @@ export interface MediaVideoProps extends AnalyticsEventsBase {
     controls?: MediaVideoControlsType;
     customControlsOptions?: CustomControlsOptions;
     ariaLabel?: string;
+    contain?: boolean;
 }
 export interface LinkProps extends AnalyticsEventsBase, Stylable, Tabbable {
     url: string;
@@ -179,7 +180,7 @@ export type ThemedMediaVideoProps = ThemeSupporting<MediaVideoProps>;
 export interface MediaComponentVideoProps extends AnalyticsEventsBase {
     video: MediaVideoProps;
     height?: number;
-    ratio?: number;
+    ratio?: number | 'auto';
     previewImg?: string;
 }
 export interface MediaComponentVideoIframeProps {

package/styles/variables.scss

@@ -37,6 +37,7 @@ $animationDuration: 300ms;
 
 //colors
 $videoPlayButtonGrey: #eff2f8;
+$videoPlayerBg: #000;
 $secondary: var(--g-color-text-secondary);
 $lightSecondary: var(--g-color-text-light-secondary);