Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
experimental: Support video upload for animations (#5144)
Ivan Starkov4138a5698209
diff --git a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsxindex 4c8a65408b..a8d0397766 100644--- a/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx+++ b/apps/builder/app/builder/features/settings-panel/props-section/props-section.tsx@@ -76,7 +76,7 @@ const renderProperty = (logic.handleChange({ prop, propName }, propValue);if (- component === "Image" &&+ (component === "Image" || component === "Video") &&propName === "src" &&propValue.type === "asset") {diff --git a/apps/builder/app/builder/shared/assets/asset-utils.ts b/apps/builder/app/builder/shared/assets/asset-utils.tsindex 939ad2c907..c457dbc380 100644--- a/apps/builder/app/builder/shared/assets/asset-utils.ts+++ b/apps/builder/app/builder/shared/assets/asset-utils.ts@@ -2,6 +2,14 @@ import type { Asset, FontAsset, ImageAsset } from "@webstudio-is/sdk";import { nanoid } from "nanoid";import type { UploadingFileData } from "~/shared/nano-states";+const videoExtensionToMime = [+ [".mp4", "video/mp4"],+ [".webm", "video/webm"],+ [".mpg", "video/mpeg"],+ [".mpeg", "video/mpeg"],+ [".mov", "video/quicktime"],+] as const;+const extensionToMime = new Map([[".gif", "image/gif"],[".ico", "image/x-icon"],@@ -10,8 +18,14 @@ const extensionToMime = new Map([[".png", "image/png"],[".svg", "image/svg+xml"],[".webp", "image/webp"],+ // Support video formats as images+ ...videoExtensionToMime,] as const);+export const isVideoFormat = (format: string) => {+ return videoExtensionToMime.some(([extension]) => extension.includes(format));+};+const extensions = [...extensionToMime.keys()];export const imageMimeTypes = [...extensionToMime.values()];@@ -102,6 +116,27 @@ export const uploadingFileDataToAsset = ();const format = mimeType.split("/")[1];+ if (mimeType.startsWith("video/")) {+ // Use image type for now+ const asset: ImageAsset = {+ id: fileData.assetId,+ name: fileData.objectURL,+ format,+ type: "image",+ description: "",+ createdAt: "",+ projectId: "",+ size: 0,++ meta: {+ width: Number.NaN,+ height: Number.NaN,+ },+ };++ return asset;+ }+if (mimeType.startsWith("image/")) {const asset: ImageAsset = {id: fileData.assetId,diff --git a/apps/builder/app/builder/shared/assets/use-assets.tsx b/apps/builder/app/builder/shared/assets/use-assets.tsxindex 1fab484c41..16fab0b4b3 100644--- a/apps/builder/app/builder/shared/assets/use-assets.tsx+++ b/apps/builder/app/builder/shared/assets/use-assets.tsx@@ -145,6 +145,24 @@ const $assetContainers = computed(export type UploadData = ActionData;+const getVideoDimensions = async (file: File) => {+ return new Promise<{ width: number; height: number }>((resolve, reject) => {+ const url = URL.createObjectURL(file);+ const vid = document.createElement("video");+ vid.preload = "metadata";+ vid.src = url;++ vid.onloadedmetadata = () => {+ URL.revokeObjectURL(url);+ resolve({ width: vid.videoWidth, height: vid.videoHeight });+ };+ vid.onerror = () => {+ URL.revokeObjectURL(url);+ reject(new Error("Invalid video file"));+ };+ });+};+const uploadAsset = async ({authToken,projectId,@@ -198,8 +216,17 @@ const uploadAsset = async ({headers.set("Content-Type", "application/json");}+ let width = undefined;+ let height = undefined;++ if (mimeType.startsWith("video/") && fileOrUrl instanceof File) {+ const videoSize = await getVideoDimensions(fileOrUrl);+ width = videoSize.width;+ height = videoSize.height;+ }+const uploadResponse = await fetch(- restAssetsUploadPath({ name: metaData.name }),+ restAssetsUploadPath({ name: metaData.name, width, height }),{method: "POST",body,diff --git a/apps/builder/app/builder/shared/image-manager/image-manager.tsx b/apps/builder/app/builder/shared/image-manager/image-manager.tsxindex 669c32e117..7f59a18d3d 100644--- a/apps/builder/app/builder/shared/image-manager/image-manager.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-manager.tsx@@ -99,6 +99,21 @@ export const ImageManager = ({ accept, onChange }: ImageManagerProps) => {selectedIndex,} = useLogic({ onChange, accept });+ // https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Attributes/accept+ // https://github.com/webstudio-is/webstudio/blob/83503e39b0e1561ea93cfcff92aa35b54c15fefa/packages/sdk-components-react/src/video.ws.ts#L34+ //+ // To reproduce:+ // 1. Create Video Animation+ // 2. Open "Video" component properties+ // 3. Click "Choose source" button+ // 4. See ImageManager allows upload all image and video files+ // 5. See ImageManager do not filter video files based on accept parameter+ // 6. But see accept = ".mp4,.webm,.mpg,.mpeg,.mov" is right here+ console.info(+ "@todo accept for video tag should allow only video uploads and filter items",+ accept+ );+return (<AssetsShellsearchProps={searchProps}diff --git a/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx b/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsxindex 9d6d18ab15..e2a4ff2dd6 100644--- a/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx+++ b/apps/builder/app/builder/shared/image-manager/image-thumbnail.tsx@@ -7,6 +7,7 @@ import { Filename } from "./filename";import { Image } from "./image";import brokenImage from "~/shared/images/broken-image-placeholder.svg";import { theme } from "@webstudio-is/design-system";+import { isVideoFormat } from "../assets/asset-utils";const StyledWebstudioImage = styled(Image, {position: "absolute",@@ -34,6 +35,32 @@ const StyledWebstudioImage = styled(Image, {},});+const StyledWebstudioVideo = styled("video", {+ position: "absolute",+ width: "100%",+ height: "100%",+ objectFit: "contain",++ // This is shown only if an image was not loaded and broken+ // From the spec:+ // - The pseudo-elements generated by ::before and ::after are contained by the element's formatting box,+ // and thus don't apply to "replaced" elements such as <img>, or to <br> elements+ // Not in spec but supported by all browsers:+ // - broken image is not a "replaced" element so this style is applied+ "&::after": {+ content: "' '",+ position: "absolute",+ width: "100%",+ height: "100%",+ left: 0,+ top: 0,+ backgroundSize: "contain",+ backgroundRepeat: "no-repeat",+ backgroundPosition: "center",+ backgroundImage: `url(${brokenImage})`,+ },+});+const ThumbnailContainer = styled(Box, {position: "relative",display: "flex",@@ -120,18 +147,23 @@ export const ImageThumbnail = ({onChange?.(assetContainer);}}>- <StyledWebstudioImage- assetId={assetContainer.asset.id}- name={assetContainer.asset.name}- objectURL={- assetContainer.status === "uploading"- ? assetContainer.objectURL- : undefined- }- alt={description ?? name}- // width={64} used for Image optimizations it should be approximately equal to the width of the picture on the screen in px- width={64}- />+ {isVideoFormat(assetContainer.asset.format) &&+ assetContainer.status === "uploading" ? (+ <StyledWebstudioVideo width={64} src={assetContainer.objectURL} />+ ) : (+ <StyledWebstudioImage+ assetId={assetContainer.asset.id}+ name={assetContainer.asset.name}+ objectURL={+ assetContainer.status === "uploading"+ ? assetContainer.objectURL+ : undefined+ }+ alt={description ?? name}+ // width={64} used for Image optimizations it should be approximately equal to the width of the picture on the screen in px+ width={64}+ />+ )}</Thumbnail><Boxcss={{diff --git a/apps/builder/app/routes/cgi.video.$.ts b/apps/builder/app/routes/cgi.video.$.tsnew file mode 100644index 0000000000..4954aab45c--- /dev/null+++ b/apps/builder/app/routes/cgi.video.$.ts@@ -0,0 +1,34 @@+import type { LoaderFunctionArgs } from "@remix-run/server-runtime";+import env from "~/env/env.server";++// this route used as proxy for images to cloudflare endpoint+// https://developers.cloudflare.com/fundamentals/get-started/reference/cdn-cgi-endpoint/++export const loader = async ({ request }: LoaderFunctionArgs) => {+ if (env.RESIZE_ORIGIN !== undefined) {+ const url = new URL(request.url);+ const imgUrl = new URL(env.RESIZE_ORIGIN + url.pathname);+ imgUrl.search = url.search;++ const response = await fetch(imgUrl.href, {+ headers: {+ accept: request.headers.get("accept") ?? "",+ "accept-encoding": request.headers.get("accept-encoding") ?? "",+ },+ });++ const responseWHeaders = new Response(response.body, response);++ if (false === responseWHeaders.ok) {+ console.error(+ `Request to Image url ${imgUrl.href} responded with status = ${responseWHeaders.status}`+ );+ }++ return responseWHeaders;+ }++ return new Response("Not supported", {+ status: 200,+ });+};diff --git a/apps/builder/app/routes/rest.assets_.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsxindex ca54b16bb2..dcc5b3d320 100644--- a/apps/builder/app/routes/rest.assets_.$name.tsx+++ b/apps/builder/app/routes/rest.assets_.$name.tsx@@ -21,6 +21,8 @@ export const action = async (const { request, params } = props;+ // await new Promise((resolve) => setTimeout(resolve, 20000));+if (params.name === undefined) {throw new Error("Name is undefined");}@@ -57,12 +59,31 @@ export const action = async (body = imageRequest.body;}+ const url = new URL(request.url);+ const contentTypeArr = contentType?.split(";")[0]?.split("/") ?? [];++ const format =+ contentTypeArr[0] === "video" ? contentTypeArr[1] : undefined;++ const width = url.searchParams.has("width")+ ? Number.parseInt(url.searchParams.get("width")!, 10)+ : undefined;+ const height = url.searchParams.has("height")+ ? Number.parseInt(url.searchParams.get("height")!, 10)+ : undefined;++ const assetInfoFallback =+ height !== undefined && width !== undefined && format !== undefined+ ? { width, height, format }+ : undefined;+const context = await createContext(request);const asset = await uploadFile(params.name,body,createAssetClient(),- context+ context,+ assetInfoFallback);return {uploadedAssets: [asset],diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex 4f87e727b1..7488177fb5 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -123,7 +123,27 @@ export const restAssetsPath = () => {return `/rest/assets`;};-export const restAssetsUploadPath = ({ name }: { name: string }) => {+export const restAssetsUploadPath = ({+ name,+ width,+ height,+}: {+ name: string;+ width?: number | undefined;+ height?: number | undefined;+}) => {+ const urlSearchParams = new URLSearchParams();+ if (width !== undefined) {+ urlSearchParams.set("width", String(width));+ }+ if (height !== undefined) {+ urlSearchParams.set("height", String(height));+ }++ if (urlSearchParams.size > 0) {+ return `/rest/assets/${name}?${urlSearchParams.toString()}`;+ }+return `/rest/assets/${name}`;};diff --git a/packages/asset-uploader/src/client.ts b/packages/asset-uploader/src/client.tsindex 035eb9b0b2..197f74195d 100644--- a/packages/asset-uploader/src/client.ts+++ b/packages/asset-uploader/src/client.ts@@ -4,6 +4,9 @@ export type AssetClient = {uploadFile: (name: string,type: string,- data: AsyncIterable<Uint8Array>+ data: AsyncIterable<Uint8Array>,+ assetInfoFallback:+ | { width: number; height: number; format: string }+ | undefined) => Promise<AssetData>;};diff --git a/packages/asset-uploader/src/clients/s3/s3.ts b/packages/asset-uploader/src/clients/s3/s3.tsindex 81eecb1010..e1f4a2c73a 100644--- a/packages/asset-uploader/src/clients/s3/s3.ts+++ b/packages/asset-uploader/src/clients/s3/s3.ts@@ -26,7 +26,12 @@ export const createS3Client = (options: S3ClientOptions): AssetClient => {uriEscapePath: false,});- const uploadFile: AssetClient["uploadFile"] = async (name, type, data) => {+ const uploadFile: AssetClient["uploadFile"] = async (+ name,+ type,+ data,+ assetInfoFallback+ ) => {return uploadToS3({signer,name,@@ -36,6 +41,7 @@ export const createS3Client = (options: S3ClientOptions): AssetClient => {endpoint: options.endpoint,bucket: options.bucket,acl: options.acl,+ assetInfoFallback,});};diff --git a/packages/asset-uploader/src/clients/s3/upload.ts b/packages/asset-uploader/src/clients/s3/upload.tsindex ee20957f23..f45b65c6ad 100644--- a/packages/asset-uploader/src/clients/s3/upload.ts+++ b/packages/asset-uploader/src/clients/s3/upload.ts@@ -13,6 +13,7 @@ export const uploadToS3 = async ({endpoint,bucket,acl,+ assetInfoFallback,}: {signer: SignatureV4;name: string;@@ -22,6 +23,9 @@ export const uploadToS3 = async ({endpoint: string;bucket: string;acl?: string;+ assetInfoFallback:+ | { width: number; height: number; format: string }+ | undefined;}): Promise<AssetData> => {const limitSize = createSizeLimiter(maxSize, name);@@ -65,6 +69,17 @@ export const uploadToS3 = async ({throw Error(`Cannot upload file ${name}`);}+ if (type.startsWith("video") && assetInfoFallback !== undefined) {+ return {+ size: data.byteLength,+ format: assetInfoFallback?.format,+ meta: {+ width: assetInfoFallback?.width ?? 0,+ height: assetInfoFallback?.height ?? 0,+ },+ };+ }+const assetData = await getAssetData({type: type.startsWith("image") ? "image" : "font",size: data.byteLength,diff --git a/packages/asset-uploader/src/upload.ts b/packages/asset-uploader/src/upload.tsindex cb7281dbdd..b5ef5c748c 100644--- a/packages/asset-uploader/src/upload.ts+++ b/packages/asset-uploader/src/upload.ts@@ -96,7 +96,10 @@ export const uploadFile = async (name: string,data: ReadableStream<Uint8Array>,client: AssetClient,- context: AppContext+ context: AppContext,+ assetInfoFallback:+ | { width: number; height: number; format: string }+ | undefined): Promise<Asset> => {let file = await context.postgrest.client.from("File")@@ -117,7 +120,8 @@ export const uploadFile = async (name,file.data.format,// global web streams types do not define ReadableStream as async iterable- data as unknown as AsyncIterable<Uint8Array>+ data as unknown as AsyncIterable<Uint8Array>,+ assetInfoFallback);const { meta, format, size } = assetData;file = await context.postgrest.clientdiff --git a/packages/sdk-components-react/src/video.tsx b/packages/sdk-components-react/src/video.tsxindex 48a0f2a385..fab3d71467 100644--- a/packages/sdk-components-react/src/video.tsx+++ b/packages/sdk-components-react/src/video.tsx@@ -4,8 +4,10 @@ import {type ComponentProps,useEffect,useId,+ useContext,} from "react";import type { Atom } from "nanostores";+import { ReactSdkContext } from "@webstudio-is/react-sdk/runtime";export const defaultTag = "video";@@ -26,117 +28,137 @@ export const Video = forwardRef<$progress?: Atom<number | undefined>;$visible?: Atom<boolean>;$timeline?: boolean;+ } & {+ $webstudio$canvasOnly$assetId?: string | undefined;}->(({ $progress, $visible, $timeline, children, ...props }, ref) => {- const id = useId();- const videoIdProps = {- [videoIdAttribute]: id,- };-- useEffect(() => {- if ($progress === undefined) {- return;- }-- if ($visible === undefined) {- return;- }-- const video = document.querySelector(`[${videoIdAttribute}="${id}"]`);-- if (video === null) {- return;- }-- if (false === video instanceof HTMLVideoElement) {- return;- }-- // Safari IOS does not seek video without play called at least once- // this is in case autoPlay is not set- video.play().catch(() => {- /**/- });- video.pause();-- if ($timeline) {- return $progress.subscribe((progress) => {- if (video.readyState < READY_STATE.HAVE_METADATA) {- return;- }+>(+ (+ {+ $progress,+ $visible,+ $timeline,+ $webstudio$canvasOnly$assetId: _,+ children,+ src: srcProp,+ ...props+ },+ ref+ ) => {+ const id = useId();+ const videoIdProps = {+ [videoIdAttribute]: id,+ };+ const { assetBaseUrl } = useContext(ReactSdkContext);- if (!video.paused) {- video.pause();- }+ const src = srcProp?.startsWith(assetBaseUrl)+ ? `/cgi/video/${srcProp.slice(assetBaseUrl.length)}`+ : srcProp;- if (video.seeking) {- return;- }+ useEffect(() => {+ if ($progress === undefined) {+ return;+ }- let duration = video.duration;+ if ($visible === undefined) {+ return;+ }- if (Number.isNaN(duration)) {- return;- }+ const video = document.querySelector(`[${videoIdAttribute}="${id}"]`);- if (!Number.isFinite(duration)) {- // Set to 60s on streaming videos- duration = 60;- }+ if (video === null) {+ return;+ }++ if (false === video instanceof HTMLVideoElement) {+ return;+ }- video.currentTime = (progress ?? 0) * duration;+ // Safari IOS does not seek video without play called at least once+ // this is in case autoPlay is not set+ video.play().catch(() => {+ /**/});- }+ video.pause();++ if ($timeline) {+ return $progress.subscribe((progress) => {+ if (video.readyState < READY_STATE.HAVE_METADATA) {+ return;+ }++ if (!video.paused) {+ video.pause();+ }++ if (video.seeking) {+ return;+ }++ let duration = video.duration;- let isPlaying = false;- let isVisible = false;+ if (Number.isNaN(duration)) {+ return;+ }- const unsubscribeVisible = $visible.subscribe((visible) => {- isVisible = visible;+ if (!Number.isFinite(duration)) {+ // Set to 60s on streaming videos+ duration = 60;+ }- // Seek video only if it's invisible to avoid jumps- if (isVisible === false && isPlaying === false && !video.loop) {- video.currentTime = 0;+ video.currentTime = (progress ?? 0) * duration;+ });}- });- const unsubscribeProgress = $progress.subscribe((progress) => {- if (- isPlaying &&- (progress === undefined || progress === 0 || progress === 1)- ) {- isPlaying = false;- video.pause();+ let isPlaying = false;+ let isVisible = false;++ const unsubscribeVisible = $visible.subscribe((visible) => {+ isVisible = visible;// Seek video only if it's invisible to avoid jumpsif (isVisible === false && isPlaying === false && !video.loop) {video.currentTime = 0;}+ });- return;- }+ const unsubscribeProgress = $progress.subscribe((progress) => {+ if (+ isPlaying &&+ (progress === undefined || progress === 0 || progress === 1)+ ) {+ isPlaying = false;+ video.pause();++ // Seek video only if it's invisible to avoid jumps+ if (isVisible === false && isPlaying === false && !video.loop) {+ video.currentTime = 0;+ }- if (!isPlaying) {- isPlaying = true;- if (!video.ended) {- video.play().catch(() => {- /**/- });+ return;}- }- });- return () => {- unsubscribeProgress();- unsubscribeVisible();- };- }, [$progress, $timeline, $visible, id]);-- return (- <video {...props} {...videoIdProps} ref={ref}>- {children}- </video>- );-});+ if (!isPlaying) {+ isPlaying = true;+ if (!video.ended) {+ video.play().catch(() => {+ /**/+ });+ }+ }+ });++ return () => {+ unsubscribeProgress();+ unsubscribeVisible();+ };+ }, [$progress, $timeline, $visible, id]);++ return (+ <video src={src} {...props} {...videoIdProps} ref={ref}>+ {children}+ </video>+ );+ }+);Video.displayName = "Video";diff --git a/packages/sdk-components-react/src/video.ws.ts b/packages/sdk-components-react/src/video.ws.tsindex bbad296f7f..a5130f1a52 100644--- a/packages/sdk-components-react/src/video.ws.ts+++ b/packages/sdk-components-react/src/video.ws.ts@@ -23,7 +23,17 @@ export const meta: WsComponentMeta = {};export const propsMeta: WsComponentPropsMeta = {- props,+ props: {+ ...props,+ // Automatically generated props don't have the right control.+ src: {+ type: "string",+ control: "file",+ label: "Source",+ required: false,+ accept: ".mp4,.webm,.mpg,.mpeg,.mov",+ },+ },initialProps: ["id","className",