remotion 4.0.490 → 4.0.491

package/dist/cjs/series/index.js

@@ -1,63 +1,136 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Series = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const react_1 = require("react");
+const react_1 = __importStar(require("react"));
 const enable_sequence_stack_traces_js_1 = require("../enable-sequence-stack-traces.js");
+const Interactive_js_1 = require("../Interactive.js");
 const interactivity_schema_js_1 = require("../interactivity-schema.js");
 const Sequence_js_1 = require("../Sequence.js");
 const validate_duration_in_frames_js_1 = require("../validation/validate-duration-in-frames.js");
 const with_interactivity_schema_js_1 = require("../with-interactivity-schema.js");
 const flatten_children_js_1 = require("./flatten-children.js");
 const is_inside_series_js_1 = require("./is-inside-series.js");
-const SeriesSequenceRefForwardingFunction = ({ children }, _ref) => {
-    (0, is_inside_series_js_1.useRequireToBeInsideSeries)();
-    // Discard ref
-    return jsx_runtime_1.jsx(is_inside_series_js_1.IsNotInsideSeriesProvider, { children: children });
+const seriesSequenceSchema = {
+    durationInFrames: Interactive_js_1.Interactive.baseSchema.durationInFrames,
+    name: Interactive_js_1.Interactive.sequenceSchema.name,
+    hidden: Interactive_js_1.Interactive.sequenceSchema.hidden,
+    showInTimeline: Interactive_js_1.Interactive.sequenceSchema.showInTimeline,
+    freeze: Interactive_js_1.Interactive.baseSchema.freeze,
+    layout: Interactive_js_1.Interactive.sequenceSchema.layout,
 };
-const SeriesSequence = (0, react_1.forwardRef)(SeriesSequenceRefForwardingFunction);
+const SeriesSequenceInner = (0, react_1.forwardRef)(({ offset = 0, className = '', stack = null, _remotionInternalRender = null, ...props }, ref) => {
+    (0, is_inside_series_js_1.useRequireToBeInsideSeries)();
+    if (_remotionInternalRender) {
+        return _remotionInternalRender({ ...props, offset, className: className || undefined, stack }, ref);
+    }
+    return (jsx_runtime_1.jsx(is_inside_series_js_1.IsNotInsideSeriesProvider, { children: props.children }));
+});
+const SeriesSequence = Interactive_js_1.Interactive.withSchema({
+    Component: SeriesSequenceInner,
+    componentName: '<Series.Sequence>',
+    componentIdentity: 'dev.remotion.remotion.Series.Sequence',
+    schema: seriesSequenceSchema,
+    supportsEffects: false,
+});
 const SequenceWithoutSchemaWithRef = Sequence_js_1.SequenceWithoutSchema;
+const validateSeriesSequenceProps = ({ durationInFrames, offset: offsetProp, index, childrenLength, }) => {
+    const debugInfo = `index = ${index}, duration = ${durationInFrames}`;
+    if (index !== childrenLength - 1 || durationInFrames !== Infinity) {
+        (0, validate_duration_in_frames_js_1.validateDurationInFrames)(durationInFrames, {
+            component: `of a <Series.Sequence /> component`,
+            allowFloats: true,
+        });
+    }
+    const offset = offsetProp !== null && offsetProp !== void 0 ? offsetProp : 0;
+    if (Number.isNaN(offset)) {
+        throw new TypeError(`The "offset" property of a <Series.Sequence /> must not be NaN, but got NaN (${debugInfo}).`);
+    }
+    if (!Number.isFinite(offset)) {
+        throw new TypeError(`The "offset" property of a <Series.Sequence /> must be finite, but got ${offset} (${debugInfo}).`);
+    }
+    if (offset % 1 !== 0) {
+        throw new TypeError(`The "offset" property of a <Series.Sequence /> must be finite, but got ${offset} (${debugInfo}).`);
+    }
+    return offset;
+};
 const SeriesInner = (props) => {
     const childrenValue = (0, react_1.useMemo)(() => {
-        let startFrame = 0;
         const flattenedChildren = (0, flatten_children_js_1.flattenChildren)(props.children);
-        return react_1.Children.map(flattenedChildren, (child, i) => {
-            var _a;
+        const renderChildren = (i, startFrame) => {
+            if (i === flattenedChildren.length) {
+                return null;
+            }
+            const child = flattenedChildren[i];
             const castedChild = child;
             if (typeof castedChild === 'string') {
                 // Don't throw if it's just some accidential whitespace
                 if (castedChild.trim() === '') {
-                    return null;
+                    return renderChildren(i + 1, startFrame);
                 }
                 throw new TypeError(`The <Series /> component only accepts a list of <Series.Sequence /> components as its children, but you passed a string "${castedChild}"`);
             }
             if (castedChild.type !== SeriesSequence) {
                 throw new TypeError(`The <Series /> component only accepts a list of <Series.Sequence /> components as its children, but got ${castedChild} instead`);
             }
-            const debugInfo = `index = ${i}, duration = ${castedChild.props.durationInFrames}`;
-            const durationInFramesProp = castedChild.props.durationInFrames;
-            const { durationInFrames, children: _children, from, name, ...passedProps } = castedChild.props; // `from` is not accepted and must be filtered out if used in JS
-            if (i !== flattenedChildren.length - 1 ||
-                durationInFramesProp !== Infinity) {
-                (0, validate_duration_in_frames_js_1.validateDurationInFrames)(durationInFramesProp, {
-                    component: `of a <Series.Sequence /> component`,
-                    allowFloats: true,
-                });
-            }
-            const offset = (_a = castedChild.props.offset) !== null && _a !== void 0 ? _a : 0;
-            if (Number.isNaN(offset)) {
-                throw new TypeError(`The "offset" property of a <Series.Sequence /> must not be NaN, but got NaN (${debugInfo}).`);
-            }
-            if (!Number.isFinite(offset)) {
-                throw new TypeError(`The "offset" property of a <Series.Sequence /> must be finite, but got ${offset} (${debugInfo}).`);
-            }
-            if (offset % 1 !== 0) {
-                throw new TypeError(`The "offset" property of a <Series.Sequence /> must be finite, but got ${offset} (${debugInfo}).`);
-            }
-            const currentStartFrame = startFrame + offset;
-            startFrame += durationInFramesProp + offset;
-            return (jsx_runtime_1.jsx(SequenceWithoutSchemaWithRef, { ref: castedChild.ref, name: name || '<Series.Sequence>', _remotionInternalDocumentationLink: name ? undefined : 'https://www.remotion.dev/docs/series', from: currentStartFrame, durationInFrames: durationInFramesProp, ...passedProps, children: child }));
-        });
+            const castedElement = castedChild;
+            validateSeriesSequenceProps({
+                durationInFrames: castedElement.props.durationInFrames,
+                offset: castedElement.props.offset,
+                index: i,
+                childrenLength: flattenedChildren.length,
+            });
+            return react_1.default.cloneElement(castedElement, {
+                _remotionInternalRender: (resolvedProps, ref) => {
+                    const durationInFramesProp = resolvedProps.durationInFrames;
+                    const { durationInFrames: _durationInFrames, children: sequenceChildren, offset: offsetProp, controls, stack, from: _from, name, ...passedProps } = resolvedProps; // `from` is not accepted and must be filtered out if used in JS
+                    const offset = validateSeriesSequenceProps({
+                        durationInFrames: durationInFramesProp,
+                        offset: offsetProp,
+                        index: i,
+                        childrenLength: flattenedChildren.length,
+                    });
+                    const currentStartFrame = startFrame + offset;
+                    const nextStartFrame = startFrame + durationInFramesProp + offset;
+                    return (jsx_runtime_1.jsxs(jsx_runtime_1.Fragment, { children: [
+                            jsx_runtime_1.jsx(SequenceWithoutSchemaWithRef, { ref: ref, name: name || '<Series.Sequence>', _remotionInternalDocumentationLink: name ? undefined : 'https://www.remotion.dev/docs/series', _remotionInternalStack: stack !== null && stack !== void 0 ? stack : undefined, controls: controls !== null && controls !== void 0 ? controls : undefined, from: currentStartFrame, durationInFrames: durationInFramesProp, ...passedProps, children: jsx_runtime_1.jsx(is_inside_series_js_1.IsNotInsideSeriesProvider, { children: sequenceChildren }) }), renderChildren(i + 1, nextStartFrame)] }));
+                },
+            });
+        };
+        return renderChildren(0, 0);
     }, [props.children]);
     return (jsx_runtime_1.jsx(is_inside_series_js_1.IsInsideSeriesContainer, { children: jsx_runtime_1.jsx(Sequence_js_1.Sequence, { layout: "none", name: "<Series>", _remotionInternalDocumentationLink: "https://www.remotion.dev/docs/series", ...props, children: childrenValue }) }));
 };

package/dist/cjs/use-media-in-timeline.js

@@ -133,6 +133,7 @@ const useMediaInTimeline = ({ volume, mediaVolume, src, mediaType, playbackRate,
             showInTimeline: true,
             nonce: nonce.get(),
             startMediaFrom: 0 - startsAt,
+            mediaFrameAtSequenceZero: null,
             doesVolumeChange,
             loopDisplay,
             playbackRate,

package/dist/cjs/use-schema.d.ts

@@ -4,10 +4,27 @@ import type { CanUpdateSequencePropsResponse, SequencePropsSubscriptionKey } fro
 export type CanUpdateSequencePropStatusStatic = {
     status: 'static';
     codeValue: unknown;
+    numericExpression?: VideoConfigNumericExpression;
 };
 export type CanUpdateSequencePropStatusKeyframe = {
     frame: number;
     value: unknown;
+    frameExpression?: VideoConfigNumericExpression;
+};
+export type VideoConfigNumericExpression = {
+    type: 'literal';
+    value: number;
+} | {
+    type: 'video-config-value';
+    identifier: string;
+    value: number;
+} | {
+    type: 'video-config-multiplication';
+    identifier: string;
+    multiplier: number;
+    multiplicand: number;
+    factorPosition: 'left' | 'right';
+    value: number;
 };
 export type CanUpdateSequencePropStatusLinearEasing = {
     type: 'linear';

package/dist/cjs/version.d.ts

@@ -3,4 +3,4 @@
  * @see [Documentation](https://remotion.dev/docs/version)
  * @returns {string} The current version of the remotion package
  */
-export declare const VERSION = "4.0.490";
+export declare const VERSION = "4.0.491";

package/dist/cjs/version.js

@@ -7,4 +7,4 @@ exports.VERSION = void 0;
  * @see [Documentation](https://remotion.dev/docs/version)
  * @returns {string} The current version of the remotion package
  */
-exports.VERSION = '4.0.490';
+exports.VERSION = '4.0.491';

package/dist/cjs/wrap-in-schema.d.ts

@@ -1,16 +1,16 @@
 import React from 'react';
 import type { SequenceControls } from './CompositionManager.js';
-import { type InteractivitySchema } from './interactivity-schema.js';
+import { type SequenceSchema } from './sequence-field-schema.js';
 export declare const getNestedValue: (obj: Record<string, unknown>, key: string) => unknown;
 export declare const readValuesFromProps: (props: Record<string, unknown>, keys: string[]) => Record<string, unknown>;
-export declare const selectActiveKeys: (schema: InteractivitySchema, values: Record<string, unknown>) => string[];
+export declare const selectActiveKeys: (schema: SequenceSchema, values: Record<string, unknown>) => string[];
 export declare const mergeValues: ({ props, valuesDotNotation, schemaKeys, propsToDelete, }: {
     props: Record<string, unknown>;
     valuesDotNotation: Record<string, unknown>;
     schemaKeys: string[];
     propsToDelete: Set<string>;
 }) => Record<string, unknown>;
-export declare const wrapInSchema: <S extends InteractivitySchema, Props extends object>({ Component, componentIdentity, schema, supportsEffects, }: {
+export declare const wrapInSchema: <S extends SequenceSchema, Props extends object>({ Component, componentIdentity, schema, supportsEffects, }: {
     Component: React.ComponentType<Props & {
         readonly _experimentalControls: SequenceControls | undefined;
     }>;

package/dist/cjs/wrap-in-schema.js

@@ -38,7 +38,7 @@ const react_1 = __importStar(require("react"));
 const delete_nested_key_js_1 = require("./delete-nested-key.js");
 const use_memoized_effects_js_1 = require("./effects/use-memoized-effects.js");
 const flatten_schema_js_1 = require("./flatten-schema.js");
-const interactivity_schema_js_1 = require("./interactivity-schema.js");
+const sequence_field_schema_js_1 = require("./sequence-field-schema.js");
 const sequence_node_path_js_1 = require("./sequence-node-path.js");
 const SequenceManager_js_1 = require("./SequenceManager.js");
 const use_current_frame_js_1 = require("./use-current-frame.js");
@@ -100,7 +100,7 @@ exports.mergeValues = mergeValues;
 const stackToOverrideMap = {};
 const wrapInSchema = ({ Component, componentIdentity, schema, supportsEffects, }) => {
     // Schema is static for a component, so we move this outside
-    const schemaWithSequenceName = (0, interactivity_schema_js_1.extendSchemaWithSequenceName)(schema);
+    const schemaWithSequenceName = (0, sequence_field_schema_js_1.extendSchemaWithSequenceName)(schema);
     const flatSchema = (0, flatten_schema_js_1.getFlatSchemaWithAllKeys)(schemaWithSequenceName);
     const flatKeys = Object.keys(flatSchema);
     const Wrapped = (0, react_1.forwardRef)((props, ref) => {